[SCSI] libosd: bug in osd_req_decode_sense_full()
[safe/jmp/linux-2.6] / drivers / scsi / osd / osd_initiator.c
index f6340c2..5e90d19 100644 (file)
@@ -42,6 +42,8 @@
 #include <scsi/osd_initiator.h>
 #include <scsi/osd_sec.h>
 #include <scsi/osd_attributes.h>
+#include <scsi/osd_sense.h>
+
 #include <scsi/scsi_device.h>
 
 #include "osd_debug.h"
@@ -71,7 +73,8 @@ static const char *_osd_ver_desc(struct osd_request *or)
 
 #define ATTR_DEF_RI(id, len) ATTR_DEF(OSD_APAGE_ROOT_INFORMATION, id, len)
 
-static int _osd_print_system_info(struct osd_dev *od, void *caps)
+static int _osd_get_print_system_info(struct osd_dev *od,
+       void *caps, struct osd_dev_info *odi)
 {
        struct osd_request *or;
        struct osd_attr get_attrs[] = {
@@ -116,44 +119,51 @@ static int _osd_print_system_info(struct osd_dev *od, void *caps)
                _osd_ver_desc(or));
 
        pFirst = get_attrs[a++].val_ptr;
-       OSD_INFO("OSD_ATTR_RI_VENDOR_IDENTIFICATION [%s]\n",
+       OSD_INFO("VENDOR_IDENTIFICATION  [%s]\n",
                (char *)pFirst);
 
        pFirst = get_attrs[a++].val_ptr;
-       OSD_INFO("OSD_ATTR_RI_PRODUCT_IDENTIFICATION [%s]\n",
+       OSD_INFO("PRODUCT_IDENTIFICATION [%s]\n",
                (char *)pFirst);
 
        pFirst = get_attrs[a++].val_ptr;
-       OSD_INFO("OSD_ATTR_RI_PRODUCT_MODEL [%s]\n",
+       OSD_INFO("PRODUCT_MODEL          [%s]\n",
                (char *)pFirst);
 
        pFirst = get_attrs[a++].val_ptr;
-       OSD_INFO("OSD_ATTR_RI_PRODUCT_REVISION_LEVEL [%u]\n",
-               get_unaligned_be32(pFirst));
+       OSD_INFO("PRODUCT_REVISION_LEVEL [%u]\n",
+               pFirst ? get_unaligned_be32(pFirst) : ~0U);
 
        pFirst = get_attrs[a++].val_ptr;
-       OSD_INFO("OSD_ATTR_RI_PRODUCT_SERIAL_NUMBER [%s]\n",
+       OSD_INFO("PRODUCT_SERIAL_NUMBER  [%s]\n",
                (char *)pFirst);
 
-       pFirst = get_attrs[a].val_ptr;
-       OSD_INFO("OSD_ATTR_RI_OSD_NAME [%s]\n", (char *)pFirst);
+       odi->osdname_len = get_attrs[a].len;
+       /* Avoid NULL for memcmp optimization 0-length is good enough */
+       odi->osdname = kzalloc(odi->osdname_len + 1, GFP_KERNEL);
+       if (odi->osdname_len)
+               memcpy(odi->osdname, get_attrs[a].val_ptr, odi->osdname_len);
+       OSD_INFO("OSD_NAME               [%s]\n", odi->osdname);
        a++;
 
        pFirst = get_attrs[a++].val_ptr;
-       OSD_INFO("OSD_ATTR_RI_TOTAL_CAPACITY [0x%llx]\n",
-               _LLU(get_unaligned_be64(pFirst)));
+       OSD_INFO("TOTAL_CAPACITY         [0x%llx]\n",
+               pFirst ? _LLU(get_unaligned_be64(pFirst)) : ~0ULL);
 
        pFirst = get_attrs[a++].val_ptr;
-       OSD_INFO("OSD_ATTR_RI_USED_CAPACITY [0x%llx]\n",
-               _LLU(get_unaligned_be64(pFirst)));
+       OSD_INFO("USED_CAPACITY          [0x%llx]\n",
+               pFirst ? _LLU(get_unaligned_be64(pFirst)) : ~0ULL);
 
        pFirst = get_attrs[a++].val_ptr;
-       OSD_INFO("OSD_ATTR_RI_NUMBER_OF_PARTITIONS [%llu]\n",
-               _LLU(get_unaligned_be64(pFirst)));
+       OSD_INFO("NUMBER_OF_PARTITIONS   [%llu]\n",
+               pFirst ? _LLU(get_unaligned_be64(pFirst)) : ~0ULL);
+
+       if (a >= nelem)
+               goto out;
 
        /* FIXME: Where are the time utilities */
        pFirst = get_attrs[a++].val_ptr;
-       OSD_INFO("OSD_ATTR_RI_CLOCK [0x%02x%02x%02x%02x%02x%02x]\n",
+       OSD_INFO("CLOCK                  [0x%02x%02x%02x%02x%02x%02x]\n",
                ((char *)pFirst)[0], ((char *)pFirst)[1],
                ((char *)pFirst)[2], ((char *)pFirst)[3],
                ((char *)pFirst)[4], ((char *)pFirst)[5]);
@@ -164,7 +174,16 @@ static int _osd_print_system_info(struct osd_dev *od, void *caps)
 
                hex_dump_to_buffer(get_attrs[a].val_ptr, len, 32, 1,
                                   sid_dump, sizeof(sid_dump), true);
-               OSD_INFO("OSD_ATTR_RI_OSD_SYSTEM_ID(%d) [%s]\n", len, sid_dump);
+               OSD_INFO("OSD_SYSTEM_ID(%d)\n"
+                        "        [%s]\n", len, sid_dump);
+
+               if (unlikely(len > sizeof(odi->systemid))) {
+                       OSD_ERR("OSD Target error: OSD_SYSTEM_ID too long(%d). "
+                               "device idetification might not work\n", len);
+                       len = sizeof(odi->systemid);
+               }
+               odi->systemid_len = len;
+               memcpy(odi->systemid, get_attrs[a].val_ptr, len);
                a++;
        }
 out:
@@ -172,16 +191,17 @@ out:
        return ret;
 }
 
-int osd_auto_detect_ver(struct osd_dev *od, void *caps)
+int osd_auto_detect_ver(struct osd_dev *od,
+       void *caps, struct osd_dev_info *odi)
 {
        int ret;
 
        /* Auto-detect the osd version */
-       ret = _osd_print_system_info(od, caps);
+       ret = _osd_get_print_system_info(od, caps, odi);
        if (ret) {
                osd_dev_set_ver(od, OSD_VER1);
                OSD_DEBUG("converting to OSD1\n");
-               ret = _osd_print_system_info(od, caps);
+               ret = _osd_get_print_system_info(od, caps, odi);
        }
 
        return ret;
@@ -200,6 +220,74 @@ static unsigned _osd_req_alist_elem_size(struct osd_request *or, unsigned len)
                osdv2_attr_list_elem_size(len);
 }
 
+static void _osd_req_alist_elem_encode(struct osd_request *or,
+       void *attr_last, const struct osd_attr *oa)
+{
+       if (osd_req_is_ver1(or)) {
+               struct osdv1_attributes_list_element *attr = attr_last;
+
+               attr->attr_page = cpu_to_be32(oa->attr_page);
+               attr->attr_id = cpu_to_be32(oa->attr_id);
+               attr->attr_bytes = cpu_to_be16(oa->len);
+               memcpy(attr->attr_val, oa->val_ptr, oa->len);
+       } else {
+               struct osdv2_attributes_list_element *attr = attr_last;
+
+               attr->attr_page = cpu_to_be32(oa->attr_page);
+               attr->attr_id = cpu_to_be32(oa->attr_id);
+               attr->attr_bytes = cpu_to_be16(oa->len);
+               memcpy(attr->attr_val, oa->val_ptr, oa->len);
+       }
+}
+
+static int _osd_req_alist_elem_decode(struct osd_request *or,
+       void *cur_p, struct osd_attr *oa, unsigned max_bytes)
+{
+       unsigned inc;
+       if (osd_req_is_ver1(or)) {
+               struct osdv1_attributes_list_element *attr = cur_p;
+
+               if (max_bytes < sizeof(*attr))
+                       return -1;
+
+               oa->len = be16_to_cpu(attr->attr_bytes);
+               inc = _osd_req_alist_elem_size(or, oa->len);
+               if (inc > max_bytes)
+                       return -1;
+
+               oa->attr_page = be32_to_cpu(attr->attr_page);
+               oa->attr_id = be32_to_cpu(attr->attr_id);
+
+               /* OSD1: On empty attributes we return a pointer to 2 bytes
+                * of zeros. This keeps similar behaviour with OSD2.
+                * (See below)
+                */
+               oa->val_ptr = likely(oa->len) ? attr->attr_val :
+                                               (u8 *)&attr->attr_bytes;
+       } else {
+               struct osdv2_attributes_list_element *attr = cur_p;
+
+               if (max_bytes < sizeof(*attr))
+                       return -1;
+
+               oa->len = be16_to_cpu(attr->attr_bytes);
+               inc = _osd_req_alist_elem_size(or, oa->len);
+               if (inc > max_bytes)
+                       return -1;
+
+               oa->attr_page = be32_to_cpu(attr->attr_page);
+               oa->attr_id = be32_to_cpu(attr->attr_id);
+
+               /* OSD2: For convenience, on empty attributes, we return 8 bytes
+                * of zeros here. This keeps the same behaviour with OSD2r04,
+                * and is nice with null terminating ASCII fields.
+                * oa->val_ptr == NULL marks the end-of-list, or error.
+                */
+               oa->val_ptr = likely(oa->len) ? attr->attr_val : attr->reserved;
+       }
+       return inc;
+}
+
 static unsigned _osd_req_alist_size(struct osd_request *or, void *list_head)
 {
        return osd_req_is_ver1(or) ?
@@ -277,9 +365,9 @@ _osd_req_sec_params(struct osd_request *or)
        struct osd_cdb *ocdb = &or->cdb;
 
        if (osd_req_is_ver1(or))
-               return &ocdb->v1.sec_params;
+               return (struct osd_security_parameters *)&ocdb->v1.sec_params;
        else
-               return &ocdb->v2.sec_params;
+               return (struct osd_security_parameters *)&ocdb->v2.sec_params;
 }
 
 void osd_dev_init(struct osd_dev *osdd, struct scsi_device *scsi_device)
@@ -333,20 +421,6 @@ struct osd_request *osd_start_request(struct osd_dev *dev, gfp_t gfp)
 }
 EXPORT_SYMBOL(osd_start_request);
 
-/*
- * If osd_finalize_request() was called but the request was not executed through
- * the block layer, then we must release BIOs.
- */
-static void _abort_unexecuted_bios(struct request *rq)
-{
-       struct bio *bio;
-
-       while ((bio = rq->bio) != NULL) {
-               rq->bio = bio->bi_next;
-               bio_endio(bio, 0);
-       }
-}
-
 static void _osd_free_seg(struct osd_request *or __unused,
        struct _osd_req_data_segment *seg)
 {
@@ -358,9 +432,30 @@ static void _osd_free_seg(struct osd_request *or __unused,
        seg->alloc_size = 0;
 }
 
+static void _put_request(struct request *rq , bool is_async)
+{
+       if (is_async) {
+               WARN_ON(rq->bio);
+               __blk_put_request(rq->q, rq);
+       } else {
+               /*
+                * If osd_finalize_request() was called but the request was not
+                * executed through the block layer, then we must release BIOs.
+                * TODO: Keep error code in or->async_error. Need to audit all
+                *       code paths.
+                */
+               if (unlikely(rq->bio))
+                       blk_end_request(rq, -ENOMEM, blk_rq_bytes(rq));
+               else
+                       blk_put_request(rq);
+       }
+}
+
 void osd_end_request(struct osd_request *or)
 {
        struct request *rq = or->request;
+       /* IMPORTANT: make sure this agrees with osd_execute_request_async */
+       bool is_async = (or->request->end_io_data == or);
 
        _osd_free_seg(or, &or->set_attr);
        _osd_free_seg(or, &or->enc_get_attr);
@@ -368,12 +463,11 @@ void osd_end_request(struct osd_request *or)
 
        if (rq) {
                if (rq->next_rq) {
-                       _abort_unexecuted_bios(rq->next_rq);
-                       blk_put_request(rq->next_rq);
+                       _put_request(rq->next_rq, is_async);
+                       rq->next_rq = NULL;
                }
 
-               _abort_unexecuted_bios(rq);
-               blk_put_request(rq);
+               _put_request(rq, is_async);
        }
        _osd_request_free(or);
 }
@@ -590,7 +684,7 @@ static int _osd_req_list_objects(struct osd_request *or,
        __be16 action, const struct osd_obj_id *obj, osd_id initial_id,
        struct osd_obj_id_list *list, unsigned nelem)
 {
-       struct request_queue *q = or->osd_dev->scsi_device->request_queue;
+       struct request_queue *q = osd_request_queue(or->osd_dev);
        u64 len = nelem * sizeof(osd_id) + sizeof(*list);
        struct bio *bio;
 
@@ -601,9 +695,9 @@ static int _osd_req_list_objects(struct osd_request *or,
 
        WARN_ON(or->in.bio);
        bio = bio_map_kern(q, list, len, or->alloc_flags);
-       if (!bio) {
+       if (IS_ERR(bio)) {
                OSD_ERR("!!! Failed to allocate list_objects BIO\n");
-               return -ENOMEM;
+               return PTR_ERR(bio);
        }
 
        bio->bi_rw &= ~(1 << BIO_RW);
@@ -699,16 +793,32 @@ EXPORT_SYMBOL(osd_req_remove_object);
 */
 
 void osd_req_write(struct osd_request *or,
-       const struct osd_obj_id *obj, struct bio *bio, u64 offset)
+       const struct osd_obj_id *obj, u64 offset,
+       struct bio *bio, u64 len)
 {
-       _osd_req_encode_common(or, OSD_ACT_WRITE, obj, offset, bio->bi_size);
+       _osd_req_encode_common(or, OSD_ACT_WRITE, obj, offset, len);
        WARN_ON(or->out.bio || or->out.total_bytes);
-       bio->bi_rw |= (1 << BIO_RW);
+       WARN_ON(0 ==  bio_rw_flagged(bio, BIO_RW));
        or->out.bio = bio;
-       or->out.total_bytes = bio->bi_size;
+       or->out.total_bytes = len;
 }
 EXPORT_SYMBOL(osd_req_write);
 
+int osd_req_write_kern(struct osd_request *or,
+       const struct osd_obj_id *obj, u64 offset, void* buff, u64 len)
+{
+       struct request_queue *req_q = osd_request_queue(or->osd_dev);
+       struct bio *bio = bio_map_kern(req_q, buff, len, GFP_KERNEL);
+
+       if (IS_ERR(bio))
+               return PTR_ERR(bio);
+
+       bio->bi_rw |= (1 << BIO_RW); /* FIXME: bio_set_dir() */
+       osd_req_write(or, obj, offset, bio, len);
+       return 0;
+}
+EXPORT_SYMBOL(osd_req_write_kern);
+
 /*TODO: void osd_req_append(struct osd_request *,
        const struct osd_obj_id *, struct bio *data_out); */
 /*TODO: void osd_req_create_write(struct osd_request *,
@@ -734,16 +844,31 @@ void osd_req_flush_object(struct osd_request *or,
 EXPORT_SYMBOL(osd_req_flush_object);
 
 void osd_req_read(struct osd_request *or,
-       const struct osd_obj_id *obj, struct bio *bio, u64 offset)
+       const struct osd_obj_id *obj, u64 offset,
+       struct bio *bio, u64 len)
 {
-       _osd_req_encode_common(or, OSD_ACT_READ, obj, offset, bio->bi_size);
+       _osd_req_encode_common(or, OSD_ACT_READ, obj, offset, len);
        WARN_ON(or->in.bio || or->in.total_bytes);
-       bio->bi_rw &= ~(1 << BIO_RW);
+       WARN_ON(1 == bio_rw_flagged(bio, BIO_RW));
        or->in.bio = bio;
-       or->in.total_bytes = bio->bi_size;
+       or->in.total_bytes = len;
 }
 EXPORT_SYMBOL(osd_req_read);
 
+int osd_req_read_kern(struct osd_request *or,
+       const struct osd_obj_id *obj, u64 offset, void* buff, u64 len)
+{
+       struct request_queue *req_q = osd_request_queue(or->osd_dev);
+       struct bio *bio = bio_map_kern(req_q, buff, len, GFP_KERNEL);
+
+       if (IS_ERR(bio))
+               return PTR_ERR(bio);
+
+       osd_req_read(or, obj, offset, bio, len);
+       return 0;
+}
+EXPORT_SYMBOL(osd_req_read_kern);
+
 void osd_req_get_attributes(struct osd_request *or,
        const struct osd_obj_id *obj)
 {
@@ -787,7 +912,6 @@ int osd_req_add_set_attr_list(struct osd_request *or,
        attr_last = or->set_attr.buff + total_bytes;
 
        for (; nelem; --nelem) {
-               struct osd_attributes_list_element *attr;
                unsigned elem_size = _osd_req_alist_elem_size(or, oa->len);
 
                total_bytes += elem_size;
@@ -800,11 +924,7 @@ int osd_req_add_set_attr_list(struct osd_request *or,
                                or->set_attr.buff + or->set_attr.total_bytes;
                }
 
-               attr = attr_last;
-               attr->attr_page = cpu_to_be32(oa->attr_page);
-               attr->attr_id = cpu_to_be32(oa->attr_id);
-               attr->attr_bytes = cpu_to_be16(oa->len);
-               memcpy(attr->attr_val, oa->val_ptr, oa->len);
+               _osd_req_alist_elem_encode(or, attr_last, oa);
 
                attr_last += elem_size;
                ++oa;
@@ -815,26 +935,6 @@ int osd_req_add_set_attr_list(struct osd_request *or,
 }
 EXPORT_SYMBOL(osd_req_add_set_attr_list);
 
-static int _append_map_kern(struct request *req,
-       void *buff, unsigned len, gfp_t flags)
-{
-       struct bio *bio;
-       int ret;
-
-       bio = bio_map_kern(req->q, buff, len, flags);
-       if (IS_ERR(bio)) {
-               OSD_ERR("Failed bio_map_kern(%p, %d) => %ld\n", buff, len,
-                       PTR_ERR(bio));
-               return PTR_ERR(bio);
-       }
-       ret = blk_rq_append_bio(req->q, req, bio);
-       if (ret) {
-               OSD_ERR("Failed blk_rq_append_bio(%p) => %d\n", bio, ret);
-               bio_put(bio);
-       }
-       return ret;
-}
-
 static int _req_append_segment(struct osd_request *or,
        unsigned padding, struct _osd_req_data_segment *seg,
        struct _osd_req_data_segment *last_seg, struct _osd_io_info *io)
@@ -850,14 +950,14 @@ static int _req_append_segment(struct osd_request *or,
                else
                        pad_buff = io->pad_buff;
 
-               ret = _append_map_kern(io->req, pad_buff, padding,
+               ret = blk_rq_map_kern(io->req->q, io->req, pad_buff, padding,
                                       or->alloc_flags);
                if (ret)
                        return ret;
                io->total_bytes += padding;
        }
 
-       ret = _append_map_kern(io->req, seg->buff, seg->total_bytes,
+       ret = blk_rq_map_kern(io->req->q, io->req, seg->buff, seg->total_bytes,
                               or->alloc_flags);
        if (ret)
                return ret;
@@ -1059,15 +1159,10 @@ int osd_req_decode_get_attr_list(struct osd_request *or,
        }
 
        for (n = 0; (n < *nelem) && (cur_bytes < returned_bytes); ++n) {
-               struct osd_attributes_list_element *attr = cur_p;
-               unsigned inc;
+               int inc = _osd_req_alist_elem_decode(or, cur_p, oa,
+                                                returned_bytes - cur_bytes);
 
-               oa->len = be16_to_cpu(attr->attr_bytes);
-               inc = _osd_req_alist_elem_size(or, oa->len);
-               OSD_DEBUG("oa->len=%d inc=%d cur_bytes=%d\n",
-                         oa->len, inc, cur_bytes);
-               cur_bytes += inc;
-               if (cur_bytes > returned_bytes) {
+               if (inc < 0) {
                        OSD_ERR("BAD FOOD from target. list not valid!"
                                "c=%d r=%d n=%d\n",
                                cur_bytes, returned_bytes, n);
@@ -1075,10 +1170,7 @@ int osd_req_decode_get_attr_list(struct osd_request *or,
                        break;
                }
 
-               oa->attr_page = be32_to_cpu(attr->attr_page);
-               oa->attr_id = be32_to_cpu(attr->attr_id);
-               oa->val_ptr = attr->attr_val;
-
+               cur_bytes += inc;
                cur_p += inc;
                ++oa;
        }
@@ -1148,8 +1240,26 @@ static int _osd_req_finalize_attr_page(struct osd_request *or)
        return ret;
 }
 
+static inline void osd_sec_parms_set_out_offset(bool is_v1,
+       struct osd_security_parameters *sec_parms, osd_cdb_offset offset)
+{
+       if (is_v1)
+               sec_parms->v1.data_out_integrity_check_offset = offset;
+       else
+               sec_parms->v2.data_out_integrity_check_offset = offset;
+}
+
+static inline void osd_sec_parms_set_in_offset(bool is_v1,
+       struct osd_security_parameters *sec_parms, osd_cdb_offset offset)
+{
+       if (is_v1)
+               sec_parms->v1.data_in_integrity_check_offset = offset;
+       else
+               sec_parms->v2.data_in_integrity_check_offset = offset;
+}
+
 static int _osd_req_finalize_data_integrity(struct osd_request *or,
-       bool has_in, bool has_out, const u8 *cap_key)
+       bool has_in, bool has_out, u64 out_data_bytes, const u8 *cap_key)
 {
        struct osd_security_parameters *sec_parms = _osd_req_sec_params(or);
        int ret;
@@ -1164,15 +1274,14 @@ static int _osd_req_finalize_data_integrity(struct osd_request *or,
                };
                unsigned pad;
 
-               or->out_data_integ.data_bytes = cpu_to_be64(
-                       or->out.bio ? or->out.bio->bi_size : 0);
+               or->out_data_integ.data_bytes = cpu_to_be64(out_data_bytes);
                or->out_data_integ.set_attributes_bytes = cpu_to_be64(
                        or->set_attr.total_bytes);
                or->out_data_integ.get_attributes_bytes = cpu_to_be64(
                        or->enc_get_attr.total_bytes);
 
-               sec_parms->data_out_integrity_check_offset =
-                       osd_req_encode_offset(or, or->out.total_bytes, &pad);
+               osd_sec_parms_set_out_offset(osd_req_is_ver1(or), sec_parms,
+                       osd_req_encode_offset(or, or->out.total_bytes, &pad));
 
                ret = _req_append_segment(or, pad, &seg, or->out.last_seg,
                                          &or->out);
@@ -1192,8 +1301,8 @@ static int _osd_req_finalize_data_integrity(struct osd_request *or,
                };
                unsigned pad;
 
-               sec_parms->data_in_integrity_check_offset =
-                       osd_req_encode_offset(or, or->in.total_bytes, &pad);
+               osd_sec_parms_set_in_offset(osd_req_is_ver1(or), sec_parms,
+                       osd_req_encode_offset(or, or->in.total_bytes, &pad));
 
                ret = _req_append_segment(or, pad, &seg, or->in.last_seg,
                                          &or->in);
@@ -1209,6 +1318,21 @@ static int _osd_req_finalize_data_integrity(struct osd_request *or,
 /*
  * osd_finalize_request and helpers
  */
+static struct request *_make_request(struct request_queue *q, bool has_write,
+                             struct _osd_io_info *oii, gfp_t flags)
+{
+       if (oii->bio)
+               return blk_make_request(q, oii->bio, flags);
+       else {
+               struct request *req;
+
+               req = blk_get_request(q, has_write ? WRITE : READ, flags);
+               if (unlikely(!req))
+                       return ERR_PTR(-ENOMEM);
+
+               return req;
+       }
+}
 
 static int _init_blk_request(struct osd_request *or,
        bool has_in, bool has_out)
@@ -1217,14 +1341,18 @@ static int _init_blk_request(struct osd_request *or,
        struct scsi_device *scsi_device = or->osd_dev->scsi_device;
        struct request_queue *q = scsi_device->request_queue;
        struct request *req;
-       int ret = -ENOMEM;
+       int ret;
 
-       req = blk_get_request(q, has_out, flags);
-       if (!req)
+       req = _make_request(q, has_out, has_out ? &or->out : &or->in, flags);
+       if (IS_ERR(req)) {
+               ret = PTR_ERR(req);
                goto out;
+       }
 
        or->request = req;
        req->cmd_type = REQ_TYPE_BLOCK_PC;
+       req->cmd_flags |= REQ_QUIET;
+
        req->timeout = or->timeout;
        req->retries = or->retries;
        req->sense = or->sense;
@@ -1234,9 +1362,10 @@ static int _init_blk_request(struct osd_request *or,
                or->out.req = req;
                if (has_in) {
                        /* allocate bidi request */
-                       req = blk_get_request(q, READ, flags);
-                       if (!req) {
+                       req = _make_request(q, false, &or->in, flags);
+                       if (IS_ERR(req)) {
                                OSD_DEBUG("blk_get_request for bidi failed\n");
+                               ret = PTR_ERR(req);
                                goto out;
                        }
                        req->cmd_type = REQ_TYPE_BLOCK_PC;
@@ -1257,6 +1386,7 @@ int osd_finalize_request(struct osd_request *or,
 {
        struct osd_cdb_head *cdbh = osd_cdb_head(&or->cdb);
        bool has_in, has_out;
+       u64 out_data_bytes = or->out.total_bytes;
        int ret;
 
        if (options & OSD_REQ_FUA)
@@ -1280,26 +1410,6 @@ int osd_finalize_request(struct osd_request *or,
                return ret;
        }
 
-       if (or->out.bio) {
-               ret = blk_rq_append_bio(or->request->q, or->out.req,
-                                       or->out.bio);
-               if (ret) {
-                       OSD_DEBUG("blk_rq_append_bio out failed\n");
-                       return ret;
-               }
-               OSD_DEBUG("out bytes=%llu (bytes_req=%u)\n",
-                       _LLU(or->out.total_bytes), or->out.req->data_len);
-       }
-       if (or->in.bio) {
-               ret = blk_rq_append_bio(or->request->q, or->in.req, or->in.bio);
-               if (ret) {
-                       OSD_DEBUG("blk_rq_append_bio in failed\n");
-                       return ret;
-               }
-               OSD_DEBUG("in bytes=%llu (bytes_req=%u)\n",
-                       _LLU(or->in.total_bytes), or->in.req->data_len);
-       }
-
        or->out.pad_buff = sg_out_pad_buffer;
        or->in.pad_buff = sg_in_pad_buffer;
 
@@ -1326,7 +1436,8 @@ int osd_finalize_request(struct osd_request *or,
                }
        }
 
-       ret = _osd_req_finalize_data_integrity(or, has_in, has_out, cap_key);
+       ret = _osd_req_finalize_data_integrity(or, has_in, has_out,
+                                              out_data_bytes, cap_key);
        if (ret)
                return ret;
 
@@ -1339,6 +1450,196 @@ int osd_finalize_request(struct osd_request *or,
 }
 EXPORT_SYMBOL(osd_finalize_request);
 
+#define OSD_SENSE_PRINT1(fmt, a...) \
+       do { \
+               if (__cur_sense_need_output) \
+                       OSD_ERR(fmt, ##a); \
+       } while (0)
+
+#define OSD_SENSE_PRINT2(fmt, a...) OSD_SENSE_PRINT1("    " fmt, ##a)
+
+int osd_req_decode_sense_full(struct osd_request *or,
+       struct osd_sense_info *osi, bool silent,
+       struct osd_obj_id *bad_obj_list __unused, int max_obj __unused,
+       struct osd_attr *bad_attr_list, int max_attr)
+{
+       int sense_len, original_sense_len;
+       struct osd_sense_info local_osi;
+       struct scsi_sense_descriptor_based *ssdb;
+       void *cur_descriptor;
+#if (CONFIG_SCSI_OSD_DPRINT_SENSE == 0)
+       const bool __cur_sense_need_output = false;
+#else
+       bool __cur_sense_need_output = !silent;
+#endif
+
+       if (!or->request->errors)
+               return 0;
+
+       ssdb = or->request->sense;
+       sense_len = or->request->sense_len;
+       if ((sense_len < (int)sizeof(*ssdb) || !ssdb->sense_key)) {
+               OSD_ERR("Block-layer returned error(0x%x) but "
+                       "sense_len(%u) || key(%d) is empty\n",
+                       or->request->errors, sense_len, ssdb->sense_key);
+               return -EIO;
+       }
+
+       if ((ssdb->response_code != 0x72) && (ssdb->response_code != 0x73)) {
+               OSD_ERR("Unrecognized scsi sense: rcode=%x length=%d\n",
+                       ssdb->response_code, sense_len);
+               return -EIO;
+       }
+
+       osi = osi ? : &local_osi;
+       memset(osi, 0, sizeof(*osi));
+       osi->key = ssdb->sense_key;
+       osi->additional_code = be16_to_cpu(ssdb->additional_sense_code);
+       original_sense_len = ssdb->additional_sense_length + 8;
+
+#if (CONFIG_SCSI_OSD_DPRINT_SENSE == 1)
+       if (__cur_sense_need_output)
+               __cur_sense_need_output = (osi->key > scsi_sk_recovered_error);
+#endif
+       OSD_SENSE_PRINT1("Main Sense information key=0x%x length(%d, %d) "
+                       "additional_code=0x%x\n",
+                       osi->key, original_sense_len, sense_len,
+                       osi->additional_code);
+
+       if (original_sense_len < sense_len)
+               sense_len = original_sense_len;
+
+       cur_descriptor = ssdb->ssd;
+       sense_len -= sizeof(*ssdb);
+       while (sense_len > 0) {
+               struct scsi_sense_descriptor *ssd = cur_descriptor;
+               int cur_len = ssd->additional_length + 2;
+
+               sense_len -= cur_len;
+
+               if (sense_len < 0)
+                       break; /* sense was truncated */
+
+               switch (ssd->descriptor_type) {
+               case scsi_sense_information:
+               case scsi_sense_command_specific_information:
+               {
+                       struct scsi_sense_command_specific_data_descriptor
+                               *sscd = cur_descriptor;
+
+                       osi->command_info =
+                               get_unaligned_be64(&sscd->information) ;
+                       OSD_SENSE_PRINT2(
+                               "command_specific_information 0x%llx \n",
+                               _LLU(osi->command_info));
+                       break;
+               }
+               case scsi_sense_key_specific:
+               {
+                       struct scsi_sense_key_specific_data_descriptor
+                               *ssks = cur_descriptor;
+
+                       osi->sense_info = get_unaligned_be16(&ssks->value);
+                       OSD_SENSE_PRINT2(
+                               "sense_key_specific_information %u"
+                               "sksv_cd_bpv_bp (0x%x)\n",
+                               osi->sense_info, ssks->sksv_cd_bpv_bp);
+                       break;
+               }
+               case osd_sense_object_identification:
+               { /*FIXME: Keep first not last, Store in array*/
+                       struct osd_sense_identification_data_descriptor
+                               *osidd = cur_descriptor;
+
+                       osi->not_initiated_command_functions =
+                               le32_to_cpu(osidd->not_initiated_functions);
+                       osi->completed_command_functions =
+                               le32_to_cpu(osidd->completed_functions);
+                       osi->obj.partition = be64_to_cpu(osidd->partition_id);
+                       osi->obj.id = be64_to_cpu(osidd->object_id);
+                       OSD_SENSE_PRINT2(
+                               "object_identification pid=0x%llx oid=0x%llx\n",
+                               _LLU(osi->obj.partition), _LLU(osi->obj.id));
+                       OSD_SENSE_PRINT2(
+                               "not_initiated_bits(%x) "
+                               "completed_command_bits(%x)\n",
+                               osi->not_initiated_command_functions,
+                               osi->completed_command_functions);
+                       break;
+               }
+               case osd_sense_response_integrity_check:
+               {
+                       struct osd_sense_response_integrity_check_descriptor
+                               *osricd = cur_descriptor;
+                       const unsigned len =
+                                         sizeof(osricd->integrity_check_value);
+                       char key_dump[len*4 + 2]; /* 2nibbles+space+ASCII */
+
+                       hex_dump_to_buffer(osricd->integrity_check_value, len,
+                                      32, 1, key_dump, sizeof(key_dump), true);
+                       OSD_SENSE_PRINT2("response_integrity [%s]\n", key_dump);
+               }
+               case osd_sense_attribute_identification:
+               {
+                       struct osd_sense_attributes_data_descriptor
+                               *osadd = cur_descriptor;
+                       unsigned len = min(cur_len, sense_len);
+                       struct osd_sense_attr *pattr = osadd->sense_attrs;
+
+                       while (len >= sizeof(*pattr)) {
+                               u32 attr_page = be32_to_cpu(pattr->attr_page);
+                               u32 attr_id = be32_to_cpu(pattr->attr_id);
+
+                               if (!osi->attr.attr_page) {
+                                       osi->attr.attr_page = attr_page;
+                                       osi->attr.attr_id = attr_id;
+                               }
+
+                               if (bad_attr_list && max_attr) {
+                                       bad_attr_list->attr_page = attr_page;
+                                       bad_attr_list->attr_id = attr_id;
+                                       bad_attr_list++;
+                                       max_attr--;
+                               }
+
+                               len -= sizeof(*pattr);
+                               OSD_SENSE_PRINT2(
+                                       "osd_sense_attribute_identification"
+                                       "attr_page=0x%x attr_id=0x%x\n",
+                                       attr_page, attr_id);
+                       }
+               }
+               /*These are not legal for OSD*/
+               case scsi_sense_field_replaceable_unit:
+                       OSD_SENSE_PRINT2("scsi_sense_field_replaceable_unit\n");
+                       break;
+               case scsi_sense_stream_commands:
+                       OSD_SENSE_PRINT2("scsi_sense_stream_commands\n");
+                       break;
+               case scsi_sense_block_commands:
+                       OSD_SENSE_PRINT2("scsi_sense_block_commands\n");
+                       break;
+               case scsi_sense_ata_return:
+                       OSD_SENSE_PRINT2("scsi_sense_ata_return\n");
+                       break;
+               default:
+                       if (ssd->descriptor_type <= scsi_sense_Reserved_last)
+                               OSD_SENSE_PRINT2(
+                                       "scsi_sense Reserved descriptor (0x%x)",
+                                       ssd->descriptor_type);
+                       else
+                               OSD_SENSE_PRINT2(
+                                       "scsi_sense Vendor descriptor (0x%x)",
+                                       ssd->descriptor_type);
+               }
+
+               cur_descriptor += cur_len;
+       }
+
+       return (osi->key > scsi_sk_recovered_error) ? -EIO : 0;
+}
+EXPORT_SYMBOL(osd_req_decode_sense_full);
+
 /*
  * Implementation of osd_sec.h API
  * TODO: Move to a separate osd_sec.c file at a later stage.