| Message ID | 20210515065006.210238-1-shinichiro.kawasaki@wdc.com (mailing list archive) |
|---|---|
| State | Changes Requested |
| Headers | show |
| Series | [v2] scsi: target: tcmu: Fix xarray RCU warning | expand |
On 15.05.21 08:50, Shin'ichiro Kawasaki wrote: > Commit f5ce815f34bc ("scsi: target: tcmu: Support DATA_BLOCK_SIZE = N * > PAGE_SIZE") introduced xas_next() calls to iterate xarray elements. > These calls triggered the WARNING "suspicious RCU usage" at tcmu device > set up [1]. In the call stack of xas_next(), xas_load() was called. > According to its comment, this function requires "the xa_lock or the RCU > lock". > > To avoid the warning, guard xas_next() calls. For the small loop of > xas_next(), guard with the RCU lock. For the large loop of xas_next(), > guard with the xa_lock using xas_lock(). > > [1] > > [ 1899.867091] ============================= > [ 1899.871199] WARNING: suspicious RCU usage > [ 1899.875310] 5.13.0-rc1+ #41 Not tainted > [ 1899.879222] ----------------------------- > [ 1899.883299] include/linux/xarray.h:1182 suspicious rcu_dereference_check() usage! > [ 1899.890940] other info that might help us debug this: > [ 1899.899082] rcu_scheduler_active = 2, debug_locks = 1 > [ 1899.905719] 3 locks held by kworker/0:1/1368: > [ 1899.910161] #0: ffffa1f8c8b98738 ((wq_completion)target_submission){+.+.}-{0:0}, at: process_one_work+0x1ee/0x580 > [ 1899.920732] #1: ffffbd7040cd7e78 ((work_completion)(&q->sq.work)){+.+.}-{0:0}, at: process_one_work+0x1ee/0x580 > [ 1899.931146] #2: ffffa1f8d1c99768 (&udev->cmdr_lock){+.+.}-{3:3}, at: tcmu_queue_cmd+0xea/0x160 [target_core_user] > [ 1899.941678] stack backtrace: > [ 1899.946093] CPU: 0 PID: 1368 Comm: kworker/0:1 Not tainted 5.13.0-rc1+ #41 > [ 1899.953070] Hardware name: System manufacturer System Product Name/PRIME Z270-A, BIOS 1302 03/15/2018 > [ 1899.962459] Workqueue: target_submission target_queued_submit_work [target_core_mod] > [ 1899.970337] Call Trace: > [ 1899.972839] dump_stack+0x6d/0x89 > [ 1899.976222] xas_descend+0x10e/0x120 > [ 1899.979875] xas_load+0x39/0x50 > [ 1899.983077] tcmu_get_empty_blocks+0x115/0x1c0 [target_core_user] > [ 1899.989318] queue_cmd_ring+0x1da/0x630 [target_core_user] > [ 1899.994897] ? rcu_read_lock_sched_held+0x3f/0x70 > [ 1899.999695] ? trace_kmalloc+0xa6/0xd0 > [ 1900.003501] ? __kmalloc+0x205/0x380 > [ 1900.007167] tcmu_queue_cmd+0x12f/0x160 [target_core_user] > [ 1900.012746] __target_execute_cmd+0x23/0xa0 [target_core_mod] > [ 1900.018589] transport_generic_new_cmd+0x1f3/0x370 [target_core_mod] > [ 1900.025046] transport_handle_cdb_direct+0x34/0x50 [target_core_mod] > [ 1900.031517] target_queued_submit_work+0x43/0xe0 [target_core_mod] > [ 1900.037837] process_one_work+0x268/0x580 > [ 1900.041952] ? process_one_work+0x580/0x580 > [ 1900.046195] worker_thread+0x55/0x3b0 > [ 1900.049921] ? process_one_work+0x580/0x580 > [ 1900.054192] kthread+0x143/0x160 > [ 1900.057499] ? kthread_create_worker_on_cpu+0x40/0x40 > [ 1900.062661] ret_from_fork+0x1f/0x30 > > Fixes: f5ce815f34bc ("scsi: target: tcmu: Support DATA_BLOCK_SIZE = N * PAGE_SIZE") > Signed-off-by: Shin'ichiro Kawasaki <shinichiro.kawasaki@wdc.com> > --- > Changes from v1: > * Used xas_(un)lock() instead of rcu_read_(un)lock() for the large loop > > drivers/target/target_core_user.c | 4 ++++ > 1 file changed, 4 insertions(+) > > diff --git a/drivers/target/target_core_user.c b/drivers/target/target_core_user.c > index 198d25ae482a..834bd3910de8 100644 > --- a/drivers/target/target_core_user.c > +++ b/drivers/target/target_core_user.c > @@ -516,8 +516,10 @@ static inline int tcmu_get_empty_block(struct tcmu_dev *udev, > dpi = dbi * udev->data_pages_per_blk; > /* Count the number of already allocated pages */ > xas_set(&xas, dpi); > + rcu_read_lock(); > for (cnt = 0; xas_next(&xas) && cnt < page_cnt;) > cnt++; > + rcu_read_unlock(); > > for (i = cnt; i < page_cnt; i++) { > /* try to get new page from the mm */ > @@ -727,6 +729,7 @@ static inline void tcmu_copy_data(struct tcmu_dev *udev, > page_cnt = udev->data_pages_per_blk; > > xas_set(&xas, dbi * udev->data_pages_per_blk); > + xas_lock(&xas); > for (page_inx = 0; page_inx < page_cnt && data_len; page_inx++) { > page = xas_next(&xas); > > @@ -763,6 +766,7 @@ static inline void tcmu_copy_data(struct tcmu_dev *udev, > if (direction == TCMU_SG_TO_DATA_AREA) > flush_dcache_page(page); > } > + xas_unlock(&xas); > } > } > > Thank you for v2 patch. May I ask you to put xas_lock before the big outer "while" loop and the xas_unlock behind it? Since we hold the cmdr_lock mutex when calling tcmu_copy_data, it doesn't harm to hold xas lock for duration of entire data copy. So let's take the lock once before starting the loop and release it after data copy is done. That saves some cpu cycles if data consists of multiple data blocks. -Bodo
On May 16, 2021 / 18:17, Bodo Stroesser wrote: > On 15.05.21 08:50, Shin'ichiro Kawasaki wrote: > > Commit f5ce815f34bc ("scsi: target: tcmu: Support DATA_BLOCK_SIZE = N * > > PAGE_SIZE") introduced xas_next() calls to iterate xarray elements. > > These calls triggered the WARNING "suspicious RCU usage" at tcmu device > > set up [1]. In the call stack of xas_next(), xas_load() was called. > > According to its comment, this function requires "the xa_lock or the RCU > > lock". > > > > To avoid the warning, guard xas_next() calls. For the small loop of > > xas_next(), guard with the RCU lock. For the large loop of xas_next(), > > guard with the xa_lock using xas_lock(). > > > > [1] > > > > [ 1899.867091] ============================= > > [ 1899.871199] WARNING: suspicious RCU usage > > [ 1899.875310] 5.13.0-rc1+ #41 Not tainted > > [ 1899.879222] ----------------------------- > > [ 1899.883299] include/linux/xarray.h:1182 suspicious rcu_dereference_check() usage! > > [ 1899.890940] other info that might help us debug this: > > [ 1899.899082] rcu_scheduler_active = 2, debug_locks = 1 > > [ 1899.905719] 3 locks held by kworker/0:1/1368: > > [ 1899.910161] #0: ffffa1f8c8b98738 ((wq_completion)target_submission){+.+.}-{0:0}, at: process_one_work+0x1ee/0x580 > > [ 1899.920732] #1: ffffbd7040cd7e78 ((work_completion)(&q->sq.work)){+.+.}-{0:0}, at: process_one_work+0x1ee/0x580 > > [ 1899.931146] #2: ffffa1f8d1c99768 (&udev->cmdr_lock){+.+.}-{3:3}, at: tcmu_queue_cmd+0xea/0x160 [target_core_user] > > [ 1899.941678] stack backtrace: > > [ 1899.946093] CPU: 0 PID: 1368 Comm: kworker/0:1 Not tainted 5.13.0-rc1+ #41 > > [ 1899.953070] Hardware name: System manufacturer System Product Name/PRIME Z270-A, BIOS 1302 03/15/2018 > > [ 1899.962459] Workqueue: target_submission target_queued_submit_work [target_core_mod] > > [ 1899.970337] Call Trace: > > [ 1899.972839] dump_stack+0x6d/0x89 > > [ 1899.976222] xas_descend+0x10e/0x120 > > [ 1899.979875] xas_load+0x39/0x50 > > [ 1899.983077] tcmu_get_empty_blocks+0x115/0x1c0 [target_core_user] > > [ 1899.989318] queue_cmd_ring+0x1da/0x630 [target_core_user] > > [ 1899.994897] ? rcu_read_lock_sched_held+0x3f/0x70 > > [ 1899.999695] ? trace_kmalloc+0xa6/0xd0 > > [ 1900.003501] ? __kmalloc+0x205/0x380 > > [ 1900.007167] tcmu_queue_cmd+0x12f/0x160 [target_core_user] > > [ 1900.012746] __target_execute_cmd+0x23/0xa0 [target_core_mod] > > [ 1900.018589] transport_generic_new_cmd+0x1f3/0x370 [target_core_mod] > > [ 1900.025046] transport_handle_cdb_direct+0x34/0x50 [target_core_mod] > > [ 1900.031517] target_queued_submit_work+0x43/0xe0 [target_core_mod] > > [ 1900.037837] process_one_work+0x268/0x580 > > [ 1900.041952] ? process_one_work+0x580/0x580 > > [ 1900.046195] worker_thread+0x55/0x3b0 > > [ 1900.049921] ? process_one_work+0x580/0x580 > > [ 1900.054192] kthread+0x143/0x160 > > [ 1900.057499] ? kthread_create_worker_on_cpu+0x40/0x40 > > [ 1900.062661] ret_from_fork+0x1f/0x30 > > > > Fixes: f5ce815f34bc ("scsi: target: tcmu: Support DATA_BLOCK_SIZE = N * PAGE_SIZE") > > Signed-off-by: Shin'ichiro Kawasaki <shinichiro.kawasaki@wdc.com> > > --- > > Changes from v1: > > * Used xas_(un)lock() instead of rcu_read_(un)lock() for the large loop > > > > drivers/target/target_core_user.c | 4 ++++ > > 1 file changed, 4 insertions(+) > > > > diff --git a/drivers/target/target_core_user.c b/drivers/target/target_core_user.c > > index 198d25ae482a..834bd3910de8 100644 > > --- a/drivers/target/target_core_user.c > > +++ b/drivers/target/target_core_user.c > > @@ -516,8 +516,10 @@ static inline int tcmu_get_empty_block(struct tcmu_dev *udev, > > dpi = dbi * udev->data_pages_per_blk; > > /* Count the number of already allocated pages */ > > xas_set(&xas, dpi); > > + rcu_read_lock(); > > for (cnt = 0; xas_next(&xas) && cnt < page_cnt;) > > cnt++; > > + rcu_read_unlock(); > > for (i = cnt; i < page_cnt; i++) { > > /* try to get new page from the mm */ > > @@ -727,6 +729,7 @@ static inline void tcmu_copy_data(struct tcmu_dev *udev, > > page_cnt = udev->data_pages_per_blk; > > xas_set(&xas, dbi * udev->data_pages_per_blk); > > + xas_lock(&xas); > > for (page_inx = 0; page_inx < page_cnt && data_len; page_inx++) { > > page = xas_next(&xas); > > @@ -763,6 +766,7 @@ static inline void tcmu_copy_data(struct tcmu_dev *udev, > > if (direction == TCMU_SG_TO_DATA_AREA) > > flush_dcache_page(page); > > } > > + xas_unlock(&xas); > > } > > } > > > > Thank you for v2 patch. > > May I ask you to put xas_lock before the big outer "while" loop and the > xas_unlock behind it? Since we hold the cmdr_lock mutex when calling > tcmu_copy_data, it doesn't harm to hold xas lock for duration of entire > data copy. So let's take the lock once before starting the loop and > release it after data copy is done. That saves some cpu cycles if > data consists of multiple data blocks. Okay, less lock/unlock sounds better. Will send v3.
On 17.05.21 12:18, Shinichiro Kawasaki wrote: > On May 16, 2021 / 18:17, Bodo Stroesser wrote: >> On 15.05.21 08:50, Shin'ichiro Kawasaki wrote: >>> Commit f5ce815f34bc ("scsi: target: tcmu: Support DATA_BLOCK_SIZE = N * >>> PAGE_SIZE") introduced xas_next() calls to iterate xarray elements. >>> These calls triggered the WARNING "suspicious RCU usage" at tcmu device >>> set up [1]. In the call stack of xas_next(), xas_load() was called. >>> According to its comment, this function requires "the xa_lock or the RCU >>> lock". >>> >>> To avoid the warning, guard xas_next() calls. For the small loop of >>> xas_next(), guard with the RCU lock. For the large loop of xas_next(), >>> guard with the xa_lock using xas_lock(). >>> >>> [1] >>> >>> [ 1899.867091] ============================= >>> [ 1899.871199] WARNING: suspicious RCU usage >>> [ 1899.875310] 5.13.0-rc1+ #41 Not tainted >>> [ 1899.879222] ----------------------------- >>> [ 1899.883299] include/linux/xarray.h:1182 suspicious rcu_dereference_check() usage! >>> [ 1899.890940] other info that might help us debug this: >>> [ 1899.899082] rcu_scheduler_active = 2, debug_locks = 1 >>> [ 1899.905719] 3 locks held by kworker/0:1/1368: >>> [ 1899.910161] #0: ffffa1f8c8b98738 ((wq_completion)target_submission){+.+.}-{0:0}, at: process_one_work+0x1ee/0x580 >>> [ 1899.920732] #1: ffffbd7040cd7e78 ((work_completion)(&q->sq.work)){+.+.}-{0:0}, at: process_one_work+0x1ee/0x580 >>> [ 1899.931146] #2: ffffa1f8d1c99768 (&udev->cmdr_lock){+.+.}-{3:3}, at: tcmu_queue_cmd+0xea/0x160 [target_core_user] >>> [ 1899.941678] stack backtrace: >>> [ 1899.946093] CPU: 0 PID: 1368 Comm: kworker/0:1 Not tainted 5.13.0-rc1+ #41 >>> [ 1899.953070] Hardware name: System manufacturer System Product Name/PRIME Z270-A, BIOS 1302 03/15/2018 >>> [ 1899.962459] Workqueue: target_submission target_queued_submit_work [target_core_mod] >>> [ 1899.970337] Call Trace: >>> [ 1899.972839] dump_stack+0x6d/0x89 >>> [ 1899.976222] xas_descend+0x10e/0x120 >>> [ 1899.979875] xas_load+0x39/0x50 >>> [ 1899.983077] tcmu_get_empty_blocks+0x115/0x1c0 [target_core_user] >>> [ 1899.989318] queue_cmd_ring+0x1da/0x630 [target_core_user] >>> [ 1899.994897] ? rcu_read_lock_sched_held+0x3f/0x70 >>> [ 1899.999695] ? trace_kmalloc+0xa6/0xd0 >>> [ 1900.003501] ? __kmalloc+0x205/0x380 >>> [ 1900.007167] tcmu_queue_cmd+0x12f/0x160 [target_core_user] >>> [ 1900.012746] __target_execute_cmd+0x23/0xa0 [target_core_mod] >>> [ 1900.018589] transport_generic_new_cmd+0x1f3/0x370 [target_core_mod] >>> [ 1900.025046] transport_handle_cdb_direct+0x34/0x50 [target_core_mod] >>> [ 1900.031517] target_queued_submit_work+0x43/0xe0 [target_core_mod] >>> [ 1900.037837] process_one_work+0x268/0x580 >>> [ 1900.041952] ? process_one_work+0x580/0x580 >>> [ 1900.046195] worker_thread+0x55/0x3b0 >>> [ 1900.049921] ? process_one_work+0x580/0x580 >>> [ 1900.054192] kthread+0x143/0x160 >>> [ 1900.057499] ? kthread_create_worker_on_cpu+0x40/0x40 >>> [ 1900.062661] ret_from_fork+0x1f/0x30 >>> >>> Fixes: f5ce815f34bc ("scsi: target: tcmu: Support DATA_BLOCK_SIZE = N * PAGE_SIZE") >>> Signed-off-by: Shin'ichiro Kawasaki <shinichiro.kawasaki@wdc.com> >>> --- >>> Changes from v1: >>> * Used xas_(un)lock() instead of rcu_read_(un)lock() for the large loop >>> >>> drivers/target/target_core_user.c | 4 ++++ >>> 1 file changed, 4 insertions(+) >>> >>> diff --git a/drivers/target/target_core_user.c b/drivers/target/target_core_user.c >>> index 198d25ae482a..834bd3910de8 100644 >>> --- a/drivers/target/target_core_user.c >>> +++ b/drivers/target/target_core_user.c >>> @@ -516,8 +516,10 @@ static inline int tcmu_get_empty_block(struct tcmu_dev *udev, >>> dpi = dbi * udev->data_pages_per_blk; >>> /* Count the number of already allocated pages */ >>> xas_set(&xas, dpi); >>> + rcu_read_lock(); >>> for (cnt = 0; xas_next(&xas) && cnt < page_cnt;) >>> cnt++; >>> + rcu_read_unlock(); >>> for (i = cnt; i < page_cnt; i++) { >>> /* try to get new page from the mm */ >>> @@ -727,6 +729,7 @@ static inline void tcmu_copy_data(struct tcmu_dev *udev, >>> page_cnt = udev->data_pages_per_blk; >>> xas_set(&xas, dbi * udev->data_pages_per_blk); >>> + xas_lock(&xas); >>> for (page_inx = 0; page_inx < page_cnt && data_len; page_inx++) { >>> page = xas_next(&xas); >>> @@ -763,6 +766,7 @@ static inline void tcmu_copy_data(struct tcmu_dev *udev, >>> if (direction == TCMU_SG_TO_DATA_AREA) >>> flush_dcache_page(page); >>> } >>> + xas_unlock(&xas); >>> } >>> } >>> >> >> Thank you for v2 patch. >> >> May I ask you to put xas_lock before the big outer "while" loop and the >> xas_unlock behind it? Since we hold the cmdr_lock mutex when calling >> tcmu_copy_data, it doesn't harm to hold xas lock for duration of entire >> data copy. So let's take the lock once before starting the loop and >> release it after data copy is done. That saves some cpu cycles if >> data consists of multiple data blocks. > > Okay, less lock/unlock sounds better. Will send v3. > Hey Shin'ichiro, sorry, sorry, I was wrong. I forgot that taking spinlocks also disables preemption. So using the spinlocks is _not_ better than rcu_read_lock. We end up disabling preemption for a possibly long time. I'm wondering, whether the change should be to go back to xa_load instead of XA_STATE, xas_set, xas_next. I switched to xas_* as an optimization. But meanwhile I think one should not use it if the loop is very long. With xa_load() the loop should look somewhat like: ... int dpi; ... dpi = dbi * udev->data_pages_per_blk; for (page_inx = 0; page_inx < page_cnt && data_len; page_inx++, dpi++) { page = xa_load(&udev->data_pages, dpi); ... What do you think? -Bodo
On May 17, 2021 / 15:51, Bodo Stroesser wrote: > On 17.05.21 12:18, Shinichiro Kawasaki wrote: > > On May 16, 2021 / 18:17, Bodo Stroesser wrote: > > > On 15.05.21 08:50, Shin'ichiro Kawasaki wrote: > > > > Commit f5ce815f34bc ("scsi: target: tcmu: Support DATA_BLOCK_SIZE = N * > > > > PAGE_SIZE") introduced xas_next() calls to iterate xarray elements. > > > > These calls triggered the WARNING "suspicious RCU usage" at tcmu device > > > > set up [1]. In the call stack of xas_next(), xas_load() was called. > > > > According to its comment, this function requires "the xa_lock or the RCU > > > > lock". > > > > > > > > To avoid the warning, guard xas_next() calls. For the small loop of > > > > xas_next(), guard with the RCU lock. For the large loop of xas_next(), > > > > guard with the xa_lock using xas_lock(). > > > > > > > > [1] > > > > > > > > [ 1899.867091] ============================= > > > > [ 1899.871199] WARNING: suspicious RCU usage > > > > [ 1899.875310] 5.13.0-rc1+ #41 Not tainted > > > > [ 1899.879222] ----------------------------- > > > > [ 1899.883299] include/linux/xarray.h:1182 suspicious rcu_dereference_check() usage! > > > > [ 1899.890940] other info that might help us debug this: > > > > [ 1899.899082] rcu_scheduler_active = 2, debug_locks = 1 > > > > [ 1899.905719] 3 locks held by kworker/0:1/1368: > > > > [ 1899.910161] #0: ffffa1f8c8b98738 ((wq_completion)target_submission){+.+.}-{0:0}, at: process_one_work+0x1ee/0x580 > > > > [ 1899.920732] #1: ffffbd7040cd7e78 ((work_completion)(&q->sq.work)){+.+.}-{0:0}, at: process_one_work+0x1ee/0x580 > > > > [ 1899.931146] #2: ffffa1f8d1c99768 (&udev->cmdr_lock){+.+.}-{3:3}, at: tcmu_queue_cmd+0xea/0x160 [target_core_user] > > > > [ 1899.941678] stack backtrace: > > > > [ 1899.946093] CPU: 0 PID: 1368 Comm: kworker/0:1 Not tainted 5.13.0-rc1+ #41 > > > > [ 1899.953070] Hardware name: System manufacturer System Product Name/PRIME Z270-A, BIOS 1302 03/15/2018 > > > > [ 1899.962459] Workqueue: target_submission target_queued_submit_work [target_core_mod] > > > > [ 1899.970337] Call Trace: > > > > [ 1899.972839] dump_stack+0x6d/0x89 > > > > [ 1899.976222] xas_descend+0x10e/0x120 > > > > [ 1899.979875] xas_load+0x39/0x50 > > > > [ 1899.983077] tcmu_get_empty_blocks+0x115/0x1c0 [target_core_user] > > > > [ 1899.989318] queue_cmd_ring+0x1da/0x630 [target_core_user] > > > > [ 1899.994897] ? rcu_read_lock_sched_held+0x3f/0x70 > > > > [ 1899.999695] ? trace_kmalloc+0xa6/0xd0 > > > > [ 1900.003501] ? __kmalloc+0x205/0x380 > > > > [ 1900.007167] tcmu_queue_cmd+0x12f/0x160 [target_core_user] > > > > [ 1900.012746] __target_execute_cmd+0x23/0xa0 [target_core_mod] > > > > [ 1900.018589] transport_generic_new_cmd+0x1f3/0x370 [target_core_mod] > > > > [ 1900.025046] transport_handle_cdb_direct+0x34/0x50 [target_core_mod] > > > > [ 1900.031517] target_queued_submit_work+0x43/0xe0 [target_core_mod] > > > > [ 1900.037837] process_one_work+0x268/0x580 > > > > [ 1900.041952] ? process_one_work+0x580/0x580 > > > > [ 1900.046195] worker_thread+0x55/0x3b0 > > > > [ 1900.049921] ? process_one_work+0x580/0x580 > > > > [ 1900.054192] kthread+0x143/0x160 > > > > [ 1900.057499] ? kthread_create_worker_on_cpu+0x40/0x40 > > > > [ 1900.062661] ret_from_fork+0x1f/0x30 > > > > > > > > Fixes: f5ce815f34bc ("scsi: target: tcmu: Support DATA_BLOCK_SIZE = N * PAGE_SIZE") > > > > Signed-off-by: Shin'ichiro Kawasaki <shinichiro.kawasaki@wdc.com> > > > > --- > > > > Changes from v1: > > > > * Used xas_(un)lock() instead of rcu_read_(un)lock() for the large loop > > > > > > > > drivers/target/target_core_user.c | 4 ++++ > > > > 1 file changed, 4 insertions(+) > > > > > > > > diff --git a/drivers/target/target_core_user.c b/drivers/target/target_core_user.c > > > > index 198d25ae482a..834bd3910de8 100644 > > > > --- a/drivers/target/target_core_user.c > > > > +++ b/drivers/target/target_core_user.c > > > > @@ -516,8 +516,10 @@ static inline int tcmu_get_empty_block(struct tcmu_dev *udev, > > > > dpi = dbi * udev->data_pages_per_blk; > > > > /* Count the number of already allocated pages */ > > > > xas_set(&xas, dpi); > > > > + rcu_read_lock(); > > > > for (cnt = 0; xas_next(&xas) && cnt < page_cnt;) > > > > cnt++; > > > > + rcu_read_unlock(); > > > > for (i = cnt; i < page_cnt; i++) { > > > > /* try to get new page from the mm */ > > > > @@ -727,6 +729,7 @@ static inline void tcmu_copy_data(struct tcmu_dev *udev, > > > > page_cnt = udev->data_pages_per_blk; > > > > xas_set(&xas, dbi * udev->data_pages_per_blk); > > > > + xas_lock(&xas); > > > > for (page_inx = 0; page_inx < page_cnt && data_len; page_inx++) { > > > > page = xas_next(&xas); > > > > @@ -763,6 +766,7 @@ static inline void tcmu_copy_data(struct tcmu_dev *udev, > > > > if (direction == TCMU_SG_TO_DATA_AREA) > > > > flush_dcache_page(page); > > > > } > > > > + xas_unlock(&xas); > > > > } > > > > } > > > > > > > > > > Thank you for v2 patch. > > > > > > May I ask you to put xas_lock before the big outer "while" loop and the > > > xas_unlock behind it? Since we hold the cmdr_lock mutex when calling > > > tcmu_copy_data, it doesn't harm to hold xas lock for duration of entire > > > data copy. So let's take the lock once before starting the loop and > > > release it after data copy is done. That saves some cpu cycles if > > > data consists of multiple data blocks. > > > > Okay, less lock/unlock sounds better. Will send v3. > > > > Hey Shin'ichiro, > > sorry, sorry, I was wrong. I forgot that taking spinlocks also disables > preemption. So using the spinlocks is _not_ better than rcu_read_lock. > We end up disabling preemption for a possibly long time. Indeed, xa_lock() is spin_lock()! > > I'm wondering, whether the change should be to go back to xa_load > instead of XA_STATE, xas_set, xas_next. I switched to xas_* as an > optimization. But meanwhile I think one should not use it if the loop > is very long. > > With xa_load() the loop should look somewhat like: > > ... > int dpi; > ... > dpi = dbi * udev->data_pages_per_blk; > for (page_inx = 0; page_inx < page_cnt && data_len; page_inx++, dpi++) { > page = xa_load(&udev->data_pages, dpi); > ... > > What do you think? This is the discussion about the balance between critical section size and critical section entry cost, isn't it?. To make the critical sections small, the RCU lock within xa_load() should be good. But it repeats RCU lock in the loop: costly. On the other hand, one shot lock for the whole loop has less RCU lock cost, but has larger critical section. Though I don't have very clear view about the work in the loop, it looks large and lengthy. So my +1 is for the xa_load() approach.
diff --git a/drivers/target/target_core_user.c b/drivers/target/target_core_user.c index 198d25ae482a..834bd3910de8 100644 --- a/drivers/target/target_core_user.c +++ b/drivers/target/target_core_user.c @@ -516,8 +516,10 @@ static inline int tcmu_get_empty_block(struct tcmu_dev *udev, dpi = dbi * udev->data_pages_per_blk; /* Count the number of already allocated pages */ xas_set(&xas, dpi); + rcu_read_lock(); for (cnt = 0; xas_next(&xas) && cnt < page_cnt;) cnt++; + rcu_read_unlock(); for (i = cnt; i < page_cnt; i++) { /* try to get new page from the mm */ @@ -727,6 +729,7 @@ static inline void tcmu_copy_data(struct tcmu_dev *udev, page_cnt = udev->data_pages_per_blk; xas_set(&xas, dbi * udev->data_pages_per_blk); + xas_lock(&xas); for (page_inx = 0; page_inx < page_cnt && data_len; page_inx++) { page = xas_next(&xas); @@ -763,6 +766,7 @@ static inline void tcmu_copy_data(struct tcmu_dev *udev, if (direction == TCMU_SG_TO_DATA_AREA) flush_dcache_page(page); } + xas_unlock(&xas); } }
Commit f5ce815f34bc ("scsi: target: tcmu: Support DATA_BLOCK_SIZE = N * PAGE_SIZE") introduced xas_next() calls to iterate xarray elements. These calls triggered the WARNING "suspicious RCU usage" at tcmu device set up [1]. In the call stack of xas_next(), xas_load() was called. According to its comment, this function requires "the xa_lock or the RCU lock". To avoid the warning, guard xas_next() calls. For the small loop of xas_next(), guard with the RCU lock. For the large loop of xas_next(), guard with the xa_lock using xas_lock(). [1] [ 1899.867091] ============================= [ 1899.871199] WARNING: suspicious RCU usage [ 1899.875310] 5.13.0-rc1+ #41 Not tainted [ 1899.879222] ----------------------------- [ 1899.883299] include/linux/xarray.h:1182 suspicious rcu_dereference_check() usage! [ 1899.890940] other info that might help us debug this: [ 1899.899082] rcu_scheduler_active = 2, debug_locks = 1 [ 1899.905719] 3 locks held by kworker/0:1/1368: [ 1899.910161] #0: ffffa1f8c8b98738 ((wq_completion)target_submission){+.+.}-{0:0}, at: process_one_work+0x1ee/0x580 [ 1899.920732] #1: ffffbd7040cd7e78 ((work_completion)(&q->sq.work)){+.+.}-{0:0}, at: process_one_work+0x1ee/0x580 [ 1899.931146] #2: ffffa1f8d1c99768 (&udev->cmdr_lock){+.+.}-{3:3}, at: tcmu_queue_cmd+0xea/0x160 [target_core_user] [ 1899.941678] stack backtrace: [ 1899.946093] CPU: 0 PID: 1368 Comm: kworker/0:1 Not tainted 5.13.0-rc1+ #41 [ 1899.953070] Hardware name: System manufacturer System Product Name/PRIME Z270-A, BIOS 1302 03/15/2018 [ 1899.962459] Workqueue: target_submission target_queued_submit_work [target_core_mod] [ 1899.970337] Call Trace: [ 1899.972839] dump_stack+0x6d/0x89 [ 1899.976222] xas_descend+0x10e/0x120 [ 1899.979875] xas_load+0x39/0x50 [ 1899.983077] tcmu_get_empty_blocks+0x115/0x1c0 [target_core_user] [ 1899.989318] queue_cmd_ring+0x1da/0x630 [target_core_user] [ 1899.994897] ? rcu_read_lock_sched_held+0x3f/0x70 [ 1899.999695] ? trace_kmalloc+0xa6/0xd0 [ 1900.003501] ? __kmalloc+0x205/0x380 [ 1900.007167] tcmu_queue_cmd+0x12f/0x160 [target_core_user] [ 1900.012746] __target_execute_cmd+0x23/0xa0 [target_core_mod] [ 1900.018589] transport_generic_new_cmd+0x1f3/0x370 [target_core_mod] [ 1900.025046] transport_handle_cdb_direct+0x34/0x50 [target_core_mod] [ 1900.031517] target_queued_submit_work+0x43/0xe0 [target_core_mod] [ 1900.037837] process_one_work+0x268/0x580 [ 1900.041952] ? process_one_work+0x580/0x580 [ 1900.046195] worker_thread+0x55/0x3b0 [ 1900.049921] ? process_one_work+0x580/0x580 [ 1900.054192] kthread+0x143/0x160 [ 1900.057499] ? kthread_create_worker_on_cpu+0x40/0x40 [ 1900.062661] ret_from_fork+0x1f/0x30 Fixes: f5ce815f34bc ("scsi: target: tcmu: Support DATA_BLOCK_SIZE = N * PAGE_SIZE") Signed-off-by: Shin'ichiro Kawasaki <shinichiro.kawasaki@wdc.com> --- Changes from v1: * Used xas_(un)lock() instead of rcu_read_(un)lock() for the large loop drivers/target/target_core_user.c | 4 ++++ 1 file changed, 4 insertions(+)