macvlan: broadcast delivery changes
Subsystems (2)
cover macvlan: broadcast delivery changes
First patch adds data-race annotations.
Second patch changes macvlan_broadcast_enqueue() to return early if the queue is full.
Eric Dumazet (2):
macvlan: annotate data-races around port->bc_queue_len_used
macvlan: avoid spinlock contention in macvlan_broadcast_enqueue()
drivers/net/macvlan.c | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-)
Signature · 1 line
2.53.0.1118.gaef5881109-goog
PATCH 1/2 macvlan: annotate data-races around port->bc_queue_len_used
port->bc_queue_len_used is read and written locklessly, add READ_ONCE()/WRITE_ONCE() annotations.
While WRITE_ONCE() in macvlan_fill_info() is not yet needed, it is a prereq for future RTNL avoidance.
--- drivers/net/macvlan.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-)
drivers/net/macvlan.c +5 -3
@@ -356,6 +356,7 @@ static void macvlan_broadcast_enqueue(struct macvlan_port *port,const struct macvlan_dev *src, struct sk_buff *skb) { + u32 bc_queue_len_used = READ_ONCE(port->bc_queue_len_used);struct sk_buff *nskb;int err = -ENOMEM ;
@@ -366,7 +367,7 @@ static void macvlan_broadcast_enqueue(struct macvlan_port *port,MACVLAN_SKB_CB (nskb)->src = src;spin_lock (&port->bc_queue.lock); -if (skb_queue_len (&port->bc_queue) < port->bc_queue_len_used) { +if (skb_queue_len (&port->bc_queue) < bc_queue_len_used) {if (src)dev_hold (src->dev);__skb_queue_tail (&port->bc_queue, nskb);
@@ -1731,7 +1732,8 @@ static int macvlan_fill_info(struct sk_buff *skb, }if (nla_put_u32 (skb,IFLA_MACVLAN_BC_QUEUE_LEN , vlan->bc_queue_len_req)) goto nla_put_failure; -if (nla_put_u32 (skb,IFLA_MACVLAN_BC_QUEUE_LEN_USED , port->bc_queue_len_used)) +if (nla_put_u32 (skb,IFLA_MACVLAN_BC_QUEUE_LEN_USED , +READ_ONCE (port->bc_queue_len_used))) goto nla_put_failure;if (port->bc_cutoff !=1 &&nla_put_s32 (skb,IFLA_MACVLAN_BC_CUTOFF , port->bc_cutoff))
@@ -1791,7 +1793,7 @@ static void update_port_bc_queue_len(struct macvlan_port *port)if (vlan->bc_queue_len_req > max_bc_queue_len_req) max_bc_queue_len_req = vlan->bc_queue_len_req; } - port->bc_queue_len_used = max_bc_queue_len_req; +WRITE_ONCE (port->bc_queue_len_used, max_bc_queue_len_req); } static int macvlan_device_event(struct notifier_block *unused,
Signature · 1 line
2.53.0.1118.gaef5881109-goog
PATCH 2/2 macvlan: avoid spinlock contention in macvlan_broadcast_enqueue()
In reply to Eric DumazetUnder high stress, we spend a lot of time cloning skbs, then acquiring a spinlock, then freeing the clone because the queue is full.
Add a shortcut to avoid these costs under pressure.
--- drivers/net/macvlan.c | 3 +++ 1 file changed, 3 insertions(+)
drivers/net/macvlan.c +3 -0
@@ -360,6 +360,9 @@ static void macvlan_broadcast_enqueue(struct macvlan_port *port,struct sk_buff *nskb;int err = -ENOMEM ; +if (skb_queue_len_lockless (&port->bc_queue) >= bc_queue_len_used) + goto err; + nskb =skb_clone (skb,GFP_ATOMIC );if (!nskb) goto err;
Signature · 1 line
2.53.0.1118.gaef5881109-goog
This series was applied to netdev/net-next.git (main) by Jakub Kicinski <[email protected]>:
Hello:
This series was applied to netdev/net-next.git (main) by Jakub Kicinski <[email protected]>:
Quoted 10 lines · On Wed, 1 Apr 2026 10:38:07 +0000 you wrote:
First patch adds data-race annotations.
Second patch changes
macvlan_broadcast_enqueue()to return early if the queue is full.Eric Dumazet (2):
macvlan: annotate data-races aroundport->bc_queue_len_used
macvlan: avoid spinlock contention inmacvlan_broadcast_enqueue()[...]
Here is the summary with links:
- [net-next,1/2] macvlan: annotate data-races around port->bc_queue_len_used
https://git.kernel.org/netdev/net-next/c/1ef5789d9906 - [net-next,2/2] macvlan: avoid spinlock contention in macvlan_broadcast_enqueue() https://git.kernel.org/netdev/net-next/c/0d5dc1d7aad1
You are awesome, thank you!
Signature · 2 lines
Deet-doot-dot, I am a bot. https://korg.docs.kernel.org/patchwork/pwbot.html