Skip to contentSkip to conversation

RDMA/rtrs: Call {get,put}_cpu_ptr to silence a debug kernel warning

PATCH Applied Guoqing Jiang 5 participants 6 messages Nov 28, 2021 – Dec 1, 2021

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

PATCH v2 1/1 RDMA/rtrs: Call {get,put}_cpu_ptr to silence a debug kernel warning

With preemption enabled (CONFIG_DEBUG_PREEMPT=y), the following appeared when rnbd client tries to map remote block device.

[ 2123.221071] BUG: using smp_processor_id() in preemptible [00000000] code: bash/1733
[ 2123.221175] caller is debug_smp_processor_id+0x17/0x20
[ 2123.221214] CPU: 0 PID: 1733 Comm: bash Not tainted 5.16.0-rc1 #5
[ 2123.221218] Hardware name: QEMU Standard PC (Q35 + ICH9, 2009), BIOS rel-1.14.0-0-g155821a-rebuilt.opensuse.org 04/01/2014
[ 2123.221229] Call Trace:
[ 2123.221231]  <TASK>
[ 2123.221235]  dump_stack_lvl+0x5d/0x78
[ 2123.221252]  dump_stack+0x10/0x12
[ 2123.221257]  check_preemption_disabled+0xe4/0xf0
[ 2123.221266]  debug_smp_processor_id+0x17/0x20
[ 2123.221271]  rtrs_clt_update_all_stats+0x3b/0x70 [rtrs_client]
[ 2123.221285]  rtrs_clt_read_req+0xc3/0x380 [rtrs_client]
[ 2123.221298]  ? rtrs_clt_init_req+0xe3/0x120 [rtrs_client]
[ 2123.221321]  rtrs_clt_request+0x1a7/0x320 [rtrs_client]
[ 2123.221340]  ? 0xffffffffc0ab1000
[ 2123.221357]  send_usr_msg+0xbf/0x160 [rnbd_client]
[ 2123.221370]  ? rnbd_clt_put_sess+0x60/0x60 [rnbd_client]
[ 2123.221377]  ? send_usr_msg+0x160/0x160 [rnbd_client]
[ 2123.221386]  ? sg_alloc_table+0x27/0xb0
[ 2123.221395]  ? sg_zero_buffer+0xd0/0xd0
[ 2123.221407]  send_msg_sess_info+0xe9/0x180 [rnbd_client]
[ 2123.221413]  ? rnbd_clt_put_sess+0x60/0x60 [rnbd_client]
[ 2123.221429]  ? blk_mq_alloc_tag_set+0x2ef/0x370
[ 2123.221447]  rnbd_clt_map_device+0xba8/0xcd0 [rnbd_client]
[ 2123.221462]  ? send_msg_open+0x200/0x200 [rnbd_client]
[ 2123.221479]  rnbd_clt_map_device_store+0x3e5/0x620 [rnbd_client

To supress the calltrace, let's call get_cpu_ptr/put_cpu_ptr pair in rtrs_clt_update_rdma_stats to disable preemption when accessing per-cpu variable.

While at it, let's make the similar change in rtrs_clt_update_wc_stats. And for rtrs_clt_inc_failover_cnt, though it was only called inside rcu section, but it still can be preempted in case CONFIG_PREEMPT_RCU is enabled, so change it to {get,put}_cpu_ptr pair either.

---
V2: also make the change in rtrs_clt_update_wc_stats and rtrs_clt_inc_failover_cnt

 drivers/infiniband/ulp/rtrs/rtrs-clt-stats.c | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)
drivers/infiniband/ulp/rtrs/rtrs-clt-stats.c +6 -3
index f7e459fe68be..76e4352fe3f6 100644
@@ -19,7 +19,7 @@ void rtrs_clt_update_wc_stats(struct rtrs_clt_con *con)
 	int cpu;
 
 	cpu = raw_smp_processor_id();
-	s = this_cpu_ptr(stats->pcpu_stats);
+	s = get_cpu_ptr(stats->pcpu_stats);
 	if (con->cpu != cpu) {
 		s->cpu_migr.to++;
 
@@ -27,14 +27,16 @@ void rtrs_clt_update_wc_stats(struct rtrs_clt_con *con)
 		s = per_cpu_ptr(stats->pcpu_stats, con->cpu);
 		atomic_inc(&s->cpu_migr.from);
 	}
+	put_cpu_ptr(stats->pcpu_stats);
 }
 
 void rtrs_clt_inc_failover_cnt(struct rtrs_clt_stats *stats)
 {
 	struct rtrs_clt_stats_pcpu *s;
 
-	s = this_cpu_ptr(stats->pcpu_stats);
+	s = get_cpu_ptr(stats->pcpu_stats);
 	s->rdma.failover_cnt++;
+	put_cpu_ptr(stats->pcpu_stats);
 }
 
 int rtrs_clt_stats_migration_from_cnt_to_str(struct rtrs_clt_stats *stats, char *buf)
@@ -169,9 +171,10 @@ static inline void rtrs_clt_update_rdma_stats(struct rtrs_clt_stats *stats,
 {
 	struct rtrs_clt_stats_pcpu *s;
 
-	s = this_cpu_ptr(stats->pcpu_stats);
+	s = get_cpu_ptr(stats->pcpu_stats);
 	s->rdma.dir[d].cnt++;
 	s->rdma.dir[d].size_total += size;
+	put_cpu_ptr(stats->pcpu_stats);
 }
 
 void rtrs_clt_update_all_stats(struct rtrs_clt_io_req *req, int dir)
Signature · 1 line
2.31.1
Reviewed-by on v2 1/1
#1 lore raw
Quoted 39 lines · Guoqing Jiang

With preemption enabled (CONFIG_DEBUG_PREEMPT=y), the following appeared when rnbd client tries to map remote block device.

[ 2123.221071] BUG: using smp_processor_id() in preemptible [00000000] code: bash/1733
[ 2123.221175] caller is debug_smp_processor_id+0x17/0x20
[ 2123.221214] CPU: 0 PID: 1733 Comm: bash Not tainted 5.16.0-rc1 #5
[ 2123.221218] Hardware name: QEMU Standard PC (Q35 + ICH9, 2009), BIOS rel-1.14.0-0-g155821a-rebuilt.opensuse.org 04/01/2014
[ 2123.221229] Call Trace:
[ 2123.221231]  <TASK>
[ 2123.221235]  dump_stack_lvl+0x5d/0x78
[ 2123.221252]  dump_stack+0x10/0x12
[ 2123.221257]  check_preemption_disabled+0xe4/0xf0
[ 2123.221266]  debug_smp_processor_id+0x17/0x20
[ 2123.221271]  rtrs_clt_update_all_stats+0x3b/0x70 [rtrs_client]
[ 2123.221285]  rtrs_clt_read_req+0xc3/0x380 [rtrs_client]
[ 2123.221298]  ? rtrs_clt_init_req+0xe3/0x120 [rtrs_client]
[ 2123.221321]  rtrs_clt_request+0x1a7/0x320 [rtrs_client]
[ 2123.221340]  ? 0xffffffffc0ab1000
[ 2123.221357]  send_usr_msg+0xbf/0x160 [rnbd_client]
[ 2123.221370]  ? rnbd_clt_put_sess+0x60/0x60 [rnbd_client]
[ 2123.221377]  ? send_usr_msg+0x160/0x160 [rnbd_client]
[ 2123.221386]  ? sg_alloc_table+0x27/0xb0
[ 2123.221395]  ? sg_zero_buffer+0xd0/0xd0
[ 2123.221407]  send_msg_sess_info+0xe9/0x180 [rnbd_client]
[ 2123.221413]  ? rnbd_clt_put_sess+0x60/0x60 [rnbd_client]
[ 2123.221429]  ? blk_mq_alloc_tag_set+0x2ef/0x370
[ 2123.221447]  rnbd_clt_map_device+0xba8/0xcd0 [rnbd_client]
[ 2123.221462]  ? send_msg_open+0x200/0x200 [rnbd_client]
[ 2123.221479]  rnbd_clt_map_device_store+0x3e5/0x620 [rnbd_client

To supress the calltrace, let's call get_cpu_ptr/put_cpu_ptr pair in rtrs_clt_update_rdma_stats to disable preemption when accessing per-cpu variable.

While at it, let's make the similar change in rtrs_clt_update_wc_stats. And for rtrs_clt_inc_failover_cnt, though it was only called inside rcu section, but it still can be preempted in case CONFIG_PREEMPT_RCU is enabled, so change it to {get,put}_cpu_ptr pair either.

Quoted 7 lines

---
V2: also make the change in rtrs_clt_update_wc_stats and rtrs_clt_inc_failover_cnt

 drivers/infiniband/ulp/rtrs/rtrs-clt-stats.c | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

Thanks,

maintainer Applied
#2 lore raw
In reply to Guoqing Jiang
Quoted 39 lines · Guoqing Jiang

With preemption enabled (CONFIG_DEBUG_PREEMPT=y), the following appeared when rnbd client tries to map remote block device.

[ 2123.221071] BUG: using smp_processor_id() in preemptible [00000000] code: bash/1733
[ 2123.221175] caller is debug_smp_processor_id+0x17/0x20
[ 2123.221214] CPU: 0 PID: 1733 Comm: bash Not tainted 5.16.0-rc1 #5
[ 2123.221218] Hardware name: QEMU Standard PC (Q35 + ICH9, 2009), BIOS rel-1.14.0-0-g155821a-rebuilt.opensuse.org 04/01/2014
[ 2123.221229] Call Trace:
[ 2123.221231]  <TASK>
[ 2123.221235]  dump_stack_lvl+0x5d/0x78
[ 2123.221252]  dump_stack+0x10/0x12
[ 2123.221257]  check_preemption_disabled+0xe4/0xf0
[ 2123.221266]  debug_smp_processor_id+0x17/0x20
[ 2123.221271]  rtrs_clt_update_all_stats+0x3b/0x70 [rtrs_client]
[ 2123.221285]  rtrs_clt_read_req+0xc3/0x380 [rtrs_client]
[ 2123.221298]  ? rtrs_clt_init_req+0xe3/0x120 [rtrs_client]
[ 2123.221321]  rtrs_clt_request+0x1a7/0x320 [rtrs_client]
[ 2123.221340]  ? 0xffffffffc0ab1000
[ 2123.221357]  send_usr_msg+0xbf/0x160 [rnbd_client]
[ 2123.221370]  ? rnbd_clt_put_sess+0x60/0x60 [rnbd_client]
[ 2123.221377]  ? send_usr_msg+0x160/0x160 [rnbd_client]
[ 2123.221386]  ? sg_alloc_table+0x27/0xb0
[ 2123.221395]  ? sg_zero_buffer+0xd0/0xd0
[ 2123.221407]  send_msg_sess_info+0xe9/0x180 [rnbd_client]
[ 2123.221413]  ? rnbd_clt_put_sess+0x60/0x60 [rnbd_client]
[ 2123.221429]  ? blk_mq_alloc_tag_set+0x2ef/0x370
[ 2123.221447]  rnbd_clt_map_device+0xba8/0xcd0 [rnbd_client]
[ 2123.221462]  ? send_msg_open+0x200/0x200 [rnbd_client]
[ 2123.221479]  rnbd_clt_map_device_store+0x3e5/0x620 [rnbd_client

To supress the calltrace, let's call get_cpu_ptr/put_cpu_ptr pair in rtrs_clt_update_rdma_stats to disable preemption when accessing per-cpu variable.

While at it, let's make the similar change in rtrs_clt_update_wc_stats. And for rtrs_clt_inc_failover_cnt, though it was only called inside rcu section, but it still can be preempted in case CONFIG_PREEMPT_RCU is enabled, so change it to {get,put}_cpu_ptr pair either.

Quoted 7 lines

---
V2: also make the change in rtrs_clt_update_wc_stats and rtrs_clt_inc_failover_cnt

 drivers/infiniband/ulp/rtrs/rtrs-clt-stats.c | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

Applied to for-rc, thanks

Jason

#3 lore raw
In reply to Guoqing Jiang
Quoted 13 lines · Guoqing Jiang
drivers/infiniband/ulp/rtrs/rtrs-clt-stats.c +2 -1
 	int cpu;
 
 	cpu = raw_smp_processor_id();
-	s = this_cpu_ptr(stats->pcpu_stats);
+	s = get_cpu_ptr(stats->pcpu_stats);
 	if (con->cpu != cpu) {
 		s->cpu_migr.to++;
@@ -27,14 +27,16 @@ void rtrs_clt_update_wc_stats(struct rtrs_clt_con *con)
 		s = per_cpu_ptr(stats->pcpu_stats, con->cpu);
 		atomic_inc(&s->cpu_migr.from);
 	}
+	put_cpu_ptr(stats->pcpu_stats);

drivers/infiniband/ulp/rtrs/rtrs-clt-stats.c void rtrs_clt_update_wc_stats(struct rtrs_clt_con *con) · line 39

Quoted 10 lines
drivers/infiniband/ulp/rtrs/rtrs-clt-stats.c +2 -1
 }
 
 void rtrs_clt_inc_failover_cnt(struct rtrs_clt_stats *stats)
 {
 	struct rtrs_clt_stats_pcpu *s;
 
-	s = this_cpu_ptr(stats->pcpu_stats);
+	s = get_cpu_ptr(stats->pcpu_stats);
 	s->rdma.failover_cnt++;
+	put_cpu_ptr(stats->pcpu_stats);

This is equivalent to

this_cpu_inc(stats->pcpu_stats.rdma.failover_cnt);

Which will also reduce the segment to a single cpu instruction.

drivers/infiniband/ulp/rtrs/rtrs-clt-stats.c static inline void rtrs_clt_update_rdma_stats(struct rtrs_clt_stats *stats, · line 178

Quoted 13 lines
drivers/infiniband/ulp/rtrs/rtrs-clt-stats.c +2 -1
 }
 
 int rtrs_clt_stats_migration_from_cnt_to_str(struct rtrs_clt_stats *stats, char *buf)
@@ -169,9 +171,10 @@ static inline void rtrs_clt_update_rdma_stats(struct rtrs_clt_stats *stats,
 {
 	struct rtrs_clt_stats_pcpu *s;
 
-	s = this_cpu_ptr(stats->pcpu_stats);
+	s = get_cpu_ptr(stats->pcpu_stats);
 	s->rdma.dir[d].cnt++;
 	s->rdma.dir[d].size_total += size;
+	put_cpu_ptr(stats->pcpu_stats);
 }

Ditto

maintainer
#4 lore raw
Quoted 29 lines · Christoph Lameter
Quoted 13 lines · Guoqing Jiang
      int cpu;

      cpu = raw_smp_processor_id();
drivers/infiniband/ulp/rtrs/rtrs-clt-stats.c +2 -1
-     s = this_cpu_ptr(stats->pcpu_stats);
+     s = get_cpu_ptr(stats->pcpu_stats);
      if (con->cpu != cpu) {
              s->cpu_migr.to++;
@@ -27,14 +27,16 @@ void rtrs_clt_update_wc_stats(struct rtrs_clt_con *con)
              s = per_cpu_ptr(stats->pcpu_stats, con->cpu);
              atomic_inc(&s->cpu_migr.from);
      }
+     put_cpu_ptr(stats->pcpu_stats);

drivers/infiniband/ulp/rtrs/rtrs-clt-stats.c void rtrs_clt_update_wc_stats(struct rtrs_clt_con *con) · line 39

Quoted 10 lines
drivers/infiniband/ulp/rtrs/rtrs-clt-stats.c +2 -1
 }
 
 void rtrs_clt_inc_failover_cnt(struct rtrs_clt_stats *stats)
 {
      struct rtrs_clt_stats_pcpu *s;
 
-     s = this_cpu_ptr(stats->pcpu_stats);
+     s = get_cpu_ptr(stats->pcpu_stats);
      s->rdma.failover_cnt++;
+     put_cpu_ptr(stats->pcpu_stats);

This is equivalent to

Quoted 3 lines

this_cpu_inc(stats->pcpu_stats.rdma.failover_cnt);

Which will also reduce the segment to a single cpu instruction.

Thanks for your suggestion, Christoph.
As the patch is already applied, I will send a new patch as suggested.

Quoted 8 lines
Quoted 8 lines
drivers/infiniband/ulp/rtrs/rtrs-clt-stats.c +0 -0
 }
 
 int rtrs_clt_stats_migration_from_cnt_to_str(struct rtrs_clt_stats *stats, char *buf)
@@ -169,9 +171,10 @@ static inline void rtrs_clt_update_rdma_stats(struct rtrs_clt_stats *stats,
 {
      struct rtrs_clt_stats_pcpu *s;
 
Quoted 9 lines

drivers/infiniband/ulp/rtrs/rtrs-clt-stats.c static inline void rtrs_clt_update_rdma_stats(struct rtrs_clt_stats *stats, · line 178

Quoted 6 lines
drivers/infiniband/ulp/rtrs/rtrs-clt-stats.c +2 -1
-     s = this_cpu_ptr(stats->pcpu_stats);
+     s = get_cpu_ptr(stats->pcpu_stats);
      s->rdma.dir[d].cnt++;
      s->rdma.dir[d].size_total += size;
+     put_cpu_ptr(stats->pcpu_stats);
 }

Ditto

Regards!

#5 lore raw
Quoted 28 lines · Jinpu Wang
Quoted 27 lines · Christoph Lameter
Quoted 13 lines · Guoqing Jiang
       int cpu;

       cpu = raw_smp_processor_id();
drivers/infiniband/ulp/rtrs/rtrs-clt-stats.c +2 -1
-     s = this_cpu_ptr(stats->pcpu_stats);
+     s = get_cpu_ptr(stats->pcpu_stats);
       if (con->cpu != cpu) {
               s->cpu_migr.to++;
@@ -27,14 +27,16 @@ void rtrs_clt_update_wc_stats(struct rtrs_clt_con *con)
               s = per_cpu_ptr(stats->pcpu_stats, con->cpu);
               atomic_inc(&s->cpu_migr.from);
       }
+     put_cpu_ptr(stats->pcpu_stats);

drivers/infiniband/ulp/rtrs/rtrs-clt-stats.c void rtrs_clt_update_wc_stats(struct rtrs_clt_con *con) · line 39

Quoted 10 lines
drivers/infiniband/ulp/rtrs/rtrs-clt-stats.c +2 -1
  }
 
  void rtrs_clt_inc_failover_cnt(struct rtrs_clt_stats *stats)
  {
       struct rtrs_clt_stats_pcpu *s;
 
-     s = this_cpu_ptr(stats->pcpu_stats);
+     s = get_cpu_ptr(stats->pcpu_stats);
       s->rdma.failover_cnt++;
+     put_cpu_ptr(stats->pcpu_stats);

This is equivalent to

Quoted 4 lines
Quoted 3 lines

this_cpu_inc(stats->pcpu_stats.rdma.failover_cnt);

Which will also reduce the segment to a single cpu instruction.

Thanks for your suggestion, Christoph.

Good suggestion!

Quoted 1 line

As the patch is already applied, I will send a new patch as suggested.

Thanks for it.

Cheers,
Guoqing