Skip to contentSkip to conversation

IB/srp: Fix a debug kernel crash

PATCH In review Bart Van Assche 3 participants 3 messages Apr 12, 2016 – Apr 13, 2016 1 message not in the archive

Subsystems (2)
InfiniBand SCSI RDMA protocol (SRP) initiator
lore
Share & tools
lore

Bart Van Assche

author
#0 lore raw

PATCH 1/1 IB/srp: Fix a debug kernel crash

Avoid that the following BUG() is triggered against a debug kernel:

kernel BUG at include/linux/scatterlist.h:92!

RIP: 0010:[<ffffffffa0467199>]  [<ffffffffa0467199>] srp_map_idb+0x199/0x1a0 [ib_srp]
Call Trace:
 [<ffffffffa04685fa>] srp_map_data+0x84a/0x890 [ib_srp]
 [<ffffffffa0469674>] srp_queuecommand+0x1e4/0x610 [ib_srp]
 [<ffffffff813f5a5e>] scsi_dispatch_cmd+0x9e/0x180
 [<ffffffff813f8b07>] scsi_request_fn+0x477/0x610
 [<ffffffff81298ffe>] __blk_run_queue+0x2e/0x40
 [<ffffffff81299070>] blk_delay_work+0x20/0x30
 [<ffffffff81071f07>] process_one_work+0x197/0x480
 [<ffffffff81072239>] worker_thread+0x49/0x490
 [<ffffffff810787ea>] kthread+0xea/0x100
 [<ffffffff8159b632>] ret_from_fork+0x22/0x40
Fixes f7f7aab1a5c0 ("IB/srp: Convert to new registration API")
Signed-off-by Bart Van Assche <[email protected]>
Cc Sagi Grimberg <[email protected]>
Cc Christoph Hellwig <[email protected]>
Cc <[email protected]> # v4.4+
---
 drivers/infiniband/ulp/srp/ib_srp.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/infiniband/ulp/srp/ib_srp.c +1 -1
index 7672b19..30c3dfc 100644
@@ -1503,7 +1503,7 @@ static int srp_map_idb(struct srp_rdma_ch *ch, struct srp_request *req,
 
 	if (dev->use_fast_reg) {
 		state.sg = idb_sg;
-		sg_set_buf(idb_sg, req->indirect_desc, idb_len);
+		sg_init_one(idb_sg, req->indirect_desc, idb_len);
 		idb_sg->dma_address = req->indirect_dma_addr; /* hack! */
 #ifdef CONFIG_NEED_SG_DMA_LENGTH
 		idb_sg->dma_length = idb_sg->length;	      /* hack^2 */
Signature · 6 lines
2.8.1

--
To unsubscribe from this list: send the line "unsubscribe linux-rdma" in
the body of a message to [email protected]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

A message that is not in the archive (sent off-list or not yet received): [email protected]

Reviewed-by
#2 lore raw
Quoted 3 lines · Bart Van Assche

Avoid that the following BUG() is triggered against a debug kernel:

Looks good.

Reviewed-by Max Gurtovoy <maxg-VPRAkNaXOzVWk0Htik3J/[email protected]>
Quoted 7 lines
drivers/infiniband/ulp/srp/ib_srp.c +0 -0
index 7672b19..30c3dfc 100644

drivers/infiniband/ulp/srp/ib_srp.c static int srp_map_idb(struct srp_rdma_ch *ch, struct srp_request *req, · line 1509

Quoted 8 lines
drivers/infiniband/ulp/srp/ib_srp.c +1 -1
@@ -1503,7 +1503,7 @@ static int srp_map_idb(struct srp_rdma_ch *ch, struct srp_request *req,
 
  	if (dev->use_fast_reg) {
  		state.sg = idb_sg;
-		sg_set_buf(idb_sg, req->indirect_desc, idb_len);
+		sg_init_one(idb_sg, req->indirect_desc, idb_len);
  		idb_sg->dma_address = req->indirect_dma_addr; /* hack! */
  #ifdef CONFIG_NEED_SG_DMA_LENGTH
  		idb_sg->dma_length = idb_sg->length;	      /* hack^2 */

--
To unsubscribe from this list: send the line "unsubscribe linux-rdma" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html