mirrors/scst
1
0
Fork 0
mirror of https://github.com/SCST-project/scst.git synced 2026-05-20 12:11:26 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixed a bug that caused trouble while handling send completions for failed data transfer commands. An example of the call stack that could be logged:

Browse Source 
WARNING: at srpt/src/ib_srpt.c:2908 srpt_unmap_sg_to_ib_sge+0xcb/0x13e [ib_srpt]()
[ ... ]
Call Trace:
 <IRQ>  [<ffffffffa0317827>] ? srpt_unmap_sg_to_ib_sge+0xcb/0x13e [ib_srpt]
 [<ffffffff8023885a>] ? warn_slowpath_common+0x77/0x8e
 [<ffffffffa0317827>] ? srpt_unmap_sg_to_ib_sge+0xcb/0x13e [ib_srpt]
 [<ffffffffa03178f1>] ? srpt_handle_send_comp+0x57/0x7d [ib_srpt]
 [<ffffffffa0319c18>] ? srpt_send_completion+0x82/0xca [ib_srpt]
 [<ffffffffa024f646>] ? mlx4_cq_completion+0x21/0x62 [mlx4_core]
 [<ffffffffa025051e>] ? mlx4_eq_int+0x55/0x2a4 [mlx4_core]
 [<ffffffffa025077c>] ? mlx4_msi_x_interrupt+0xf/0x17 [mlx4_core]
 [<ffffffff8023cff6>] ? tasklet_action+0x64/0xb5
 [<ffffffff802675f9>] ? handle_IRQ_event+0x53/0x105
 [<ffffffff802690ac>] ? handle_edge_irq+0xda/0x11a
 [<ffffffff8020db65>] ? handle_irq+0x81/0x8a
 [<ffffffff8020d399>] ? do_IRQ+0x57/0xbf
 [<ffffffff8020c2d3>] ? ret_from_intr+0x0/0xa
 <EOI>  [<ffffffff80211ca6>] ? mwait_idle+0xa3/0xd1
 [<ffffffff8051ac1a>] ? notifier_call_chain+0x29/0x4c
 [<ffffffff8020aa61>] ? cpu_idle+0x40/0x5e
---[ end trace fef4d0c17ebda700 ]---
------------[ cut here ]------------
kernel BUG at /usr/src/redhat/BUILD/kernel-2.6.30.10/arch/x86/include/asm/dma-mapping.h:104!
invalid opcode: 0000 [#1] SMP
[ ... ]

git-svn-id: http://svn.code.sf.net/p/scst/svn/trunk@1866 d57e44dd-8a1f-0410-8b47-8ef2f437770f
This commit is contained in:
Bart Van Assche
2010-07-23 07:38:15 +00:00
parent 5da3fc1f1b
commit baa4b4ee29
2 changed files with 24 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
srpt/src/ib_srpt.c
View File

@@ -2729,6 +2729,12 @@ static int srpt_map_sg_to_ib_sge(struct srpt_rdma_ch *ch,
scat = scst_cmd_get_sg(scmnd);
WARN_ON(!scat);
dir = scst_cmd_get_data_direction(scmnd);
BUG_ON(dir == SCST_DATA_NONE);
/*
* Cache 'dir' because it is needed in srpt_unmap_sg_to_ib_sge()
* and because scst_set_cmd_error_status() resets scmnd->data_direction.
*/
ioctx->dir = dir;
count = ib_dma_map_sg(ch->sport->sdev->device, scat,
scst_cmd_get_sg_cnt(scmnd),
scst_to_tgt_dma_dir(dir));
@@ -2904,8 +2910,8 @@ static void srpt_unmap_sg_to_ib_sge(struct srpt_rdma_ch *ch,
WARN_ON(ioctx != scst_cmd_get_tgt_priv(scmnd));
scat = scst_cmd_get_sg(scmnd);
WARN_ON(!scat);
dir = scst_cmd_get_data_direction(scmnd);
WARN_ON(dir == SCST_DATA_NONE);
dir = ioctx->dir;
BUG_ON(dir == SCST_DATA_NONE);
ib_dma_unmap_sg(ch->sport->sdev->device, scat,
scst_cmd_get_sg_cnt(scmnd),
scst_to_tgt_dma_dir(dir));
@@ -3113,7 +3119,7 @@ static int srpt_xmit_response(struct scst_cmd *scmnd)
enum srpt_command_state new_state;
s32 req_lim_delta;
int ret;
int dir;
scst_data_direction dir;
int resp_len;
ioctx = scst_cmd_get_tgt_priv(scmnd);
@@ -3931,3 +3937,10 @@ static void __exit srpt_cleanup_module(void)
module_init(srpt_init_module);
module_exit(srpt_cleanup_module);
/*
* Local variables:
* c-basic-offset: 8
* indent-tabs-mode: t
* End:
*/

8
srpt/src/ib_srpt.h
View File

@@ -187,6 +187,7 @@ struct srpt_ioctx {
struct list_head comp_list;
struct srpt_rdma_ch *ch;
struct scst_cmd *scmnd;
scst_data_direction dir;
atomic_t state;
};
@@ -318,3 +319,10 @@ struct srpt_device {
};
#endif /* IB_SRPT_H */
/*
* Local variables:
* c-basic-offset: 8
* indent-tabs-mode: t
* End:
*/