diff mbox series

[net-next,1/3] net: rps: protect last_qtail with rps_input_queue_tail_save() helper

Message ID 20240416074232.23525-2-kerneljasonxing@gmail.com (mailing list archive)
State Superseded
Delegated to: Netdev Maintainers
Headers show
Series locklessly protect left members in struct rps_dev_flow | expand

Checks

Context Check Description
netdev/series_format success Posting correctly formatted
netdev/tree_selection success Clearly marked for net-next
netdev/ynl success Generated files up to date; no warnings/errors; no diff in generated;
netdev/fixes_present success Fixes tag not required for -next series
netdev/header_inline success No static functions without inline keyword in header files
netdev/build_32bit fail Errors and warnings before: 933 this patch: 935
netdev/build_tools success No tools touched, skip
netdev/cc_maintainers success CCed 4 of 4 maintainers
netdev/build_clang fail Errors and warnings before: 938 this patch: 16
netdev/verify_signedoff success Signed-off-by tag matches author and committer
netdev/deprecated_api success None detected
netdev/check_selftest success No net selftest shell script
netdev/verify_fixes success No Fixes tag
netdev/build_allmodconfig_warn fail Errors and warnings before: 944 this patch: 947
netdev/checkpatch warning WARNING: line length of 83 exceeds 80 columns
netdev/build_clang_rust success No Rust files in patch. Skipping build
netdev/kdoc success Errors and warnings before: 79 this patch: 79
netdev/source_inline success Was 0 now: 0

Commit Message

Jason Xing April 16, 2024, 7:42 a.m. UTC 
From: Jason Xing <kernelxing@tencent.com>

Only one left place should be proctected locklessly. This patch made it.

Signed-off-by: Jason Xing <kernelxing@tencent.com>
---
 net/core/dev.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

Comments

Jason Xing April 17, 2024, 12:26 a.m. UTC | #1 
On Tue, Apr 16, 2024 at 3:42 PM Jason Xing <kerneljasonxing@gmail.com> wrote:
>
> From: Jason Xing <kernelxing@tencent.com>
>
> Only one left place should be proctected locklessly. This patch made it.
>
> Signed-off-by: Jason Xing <kernelxing@tencent.com>
> ---
>  net/core/dev.c | 6 +++---
>  1 file changed, 3 insertions(+), 3 deletions(-)
>
> diff --git a/net/core/dev.c b/net/core/dev.c
> index 854a3a28a8d8..cd97eeae8218 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);

I made a mistake. I should pass &rflow->last_qtail actually. Will update it.

>         }
>
>         rflow->cpu = next_cpu;
> --
> 2.37.3
>
diff mbox series

Patch

diff --git a/net/core/dev.c b/net/core/dev.c
index 854a3a28a8d8..cd97eeae8218 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;