From: Jason Xing <kerneljasonxing@gmail•com>
To: edumazet@google•com, kuba@kernel•org, pabeni@redhat•com,
davem@davemloft•net, horms@kernel•org
Cc: netdev@vger•kernel.org, kerneljasonxing@gmail•com,
Jason Xing <kernelxing@tencent•com>
Subject: [PATCH net-next v3 1/3] net: rps: protect last_qtail with rps_input_queue_tail_save() helper
Date: Thu, 18 Apr 2024 15:36:01 +0800 [thread overview]
Message-ID: <20240418073603.99336-2-kerneljasonxing@gmail.com> (raw)
In-Reply-To: <20240418073603.99336-1-kerneljasonxing@gmail.com>
From: Jason Xing <kernelxing@tencent•com>
Removing one unnecessary reader protection and add another writer
protection to finish the locklessly proctection job.
Note: the removed READ_ONCE() is not needed because we only have to protect
the locklessly reader in the different context (rps_may_expire_flow()).
Signed-off-by: Jason Xing <kernelxing@tencent•com>
---
net/core/dev.c | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/net/core/dev.c b/net/core/dev.c
index 854a3a28a8d8..58e0da91bfef 100644
--- a/net/core/dev.c
+++ b/net/core/dev.c
@@ -4501,7 +4501,7 @@ set_rps_cpu(struct net_device *dev, struct sk_buff *skb,
struct netdev_rx_queue *rxqueue;
struct rps_dev_flow_table *flow_table;
struct rps_dev_flow *old_rflow;
- u32 flow_id;
+ u32 flow_id, head;
u16 rxq_index;
int rc;
@@ -4529,8 +4529,8 @@ set_rps_cpu(struct net_device *dev, struct sk_buff *skb,
old_rflow->filter = RPS_NO_FILTER;
out:
#endif
- rflow->last_qtail =
- READ_ONCE(per_cpu(softnet_data, next_cpu).input_queue_head);
+ head = READ_ONCE(per_cpu(softnet_data, next_cpu).input_queue_head);
+ rps_input_queue_tail_save(&rflow->last_qtail, head);
}
rflow->cpu = next_cpu;
@@ -4613,7 +4613,7 @@ static int get_rps_cpu(struct net_device *dev, struct sk_buff *skb,
if (unlikely(tcpu != next_cpu) &&
(tcpu >= nr_cpu_ids || !cpu_online(tcpu) ||
((int)(READ_ONCE(per_cpu(softnet_data, tcpu).input_queue_head) -
- READ_ONCE(rflow->last_qtail))) >= 0)) {
+ rflow->last_qtail)) >= 0)) {
tcpu = next_cpu;
rflow = set_rps_cpu(dev, skb, rflow, next_cpu);
}
--
2.37.3
next prev parent reply other threads:[~2024-04-18 7:36 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-04-18 7:36 [PATCH net-next v3 0/3] locklessly protect left members in struct rps_dev_flow Jason Xing
2024-04-18 7:36 ` Jason Xing [this message]
2024-04-19 5:57 ` [PATCH net-next v3 1/3] net: rps: protect last_qtail with rps_input_queue_tail_save() helper Eric Dumazet
2024-05-29 20:34 ` compile error in set_rps_cpu() without CONFIG_RFS_ACCEL? John Sperbeck
2024-05-29 20:45 ` Eric Dumazet
2024-05-30 2:56 ` Jason Xing
2024-05-30 2:55 ` Jason Xing
2024-04-18 7:36 ` [PATCH net-next v3 2/3] net: rps: protect filter locklessly Jason Xing
2024-04-19 5:58 ` Eric Dumazet
2024-04-18 7:36 ` [PATCH net-next v3 3/3] net: rps: locklessly access rflow->cpu Jason Xing
2024-04-19 5:58 ` Eric Dumazet
2024-04-19 10:40 ` [PATCH net-next v3 0/3] locklessly protect left members in struct rps_dev_flow patchwork-bot+netdevbpf
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20240418073603.99336-2-kerneljasonxing@gmail.com \
--to=kerneljasonxing@gmail$(echo .)com \
--cc=davem@davemloft$(echo .)net \
--cc=edumazet@google$(echo .)com \
--cc=horms@kernel$(echo .)org \
--cc=kernelxing@tencent$(echo .)com \
--cc=kuba@kernel$(echo .)org \
--cc=netdev@vger$(echo .)kernel.org \
--cc=pabeni@redhat$(echo .)com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox