Subject: linux-next: manual merge of the net-next tree with the net tree

From: Stephen Rothwell <[email-masked]>
Date: Thu, 27 Nov 2025 10:54:50 +1100

Hi all,

Today's linux-next merge of the net-next tree got a conflict in:

  net/xdp/xsk.c

between commit:

  0ebc27a4c67d ("xsk: avoid data corruption on cq descriptor number")

from the net tree and commit:

  8da7bea7db69 ("xsk: add indirect call for xsk_destruct_skb")

from the net-next tree.

I fixed it up (see below) and can carry the fix as necessary. This
is now fixed as far as linux-next is concerned, but any non trivial
conflicts should be mentioned to your upstream maintainer when your tree
is submitted for merging.  You may also want to consider cooperating
with the maintainer of the conflicting tree to minimise any particularly
complex conflicts.

-- 
Cheers,
Stephen Rothwell

diff --cc net/xdp/xsk.c
index 69bbcca8ac75,bcfd400e9cf8..000000000000
--- a/net/xdp/xsk.c
+++ b/net/xdp/xsk.c
@@@ -591,43 -560,50 +590,42 @@@ static u32 xsk_get_num_desc(struct sk_b
  static void xsk_cq_submit_addr_locked(struct xsk_buff_pool *pool,
  				      struct sk_buff *skb)
  {
 -	struct xsk_addr_node *pos, *tmp;
 +	u32 num_descs = xsk_get_num_desc(skb);
 +	struct xsk_addrs *xsk_addr;
  	u32 descs_processed = 0;
  	unsigned long flags;
 -	u32 idx;
 +	u32 idx, i;
  
- 	spin_lock_irqsave(&pool->cq_lock, flags);
+ 	spin_lock_irqsave(&pool->cq_prod_lock, flags);
  	idx = xskq_get_prod(pool->cq);
  
 -	xskq_prod_write_addr(pool->cq, idx,
 -			     (u64)(uintptr_t)skb_shinfo(skb)->destructor_arg);
 -	descs_processed++;
 +	if (unlikely(num_descs > 1)) {
 +		xsk_addr = (struct xsk_addrs *)skb_shinfo(skb)->destructor_arg;
  
 -	if (unlikely(XSKCB(skb)->num_descs > 1)) {
 -		list_for_each_entry_safe(pos, tmp, &XSKCB(skb)->addrs_list, addr_node) {
 +		for (i = 0; i < num_descs; i++) {
  			xskq_prod_write_addr(pool->cq, idx + descs_processed,
 -					     pos->addr);
 +					     xsk_addr->addrs[i]);
  			descs_processed++;
 -			list_del(&pos->addr_node);
 -			kmem_cache_free(xsk_tx_generic_cache, pos);
  		}
 +		kmem_cache_free(xsk_tx_generic_cache, xsk_addr);
 +	} else {
 +		xskq_prod_write_addr(pool->cq, idx,
 +				     xsk_skb_destructor_get_addr(skb));
 +		descs_processed++;
  	}
  	xskq_prod_submit_n(pool->cq, descs_processed);
- 	spin_unlock_irqrestore(&pool->cq_lock, flags);
+ 	spin_unlock_irqrestore(&pool->cq_prod_lock, flags);
  }
  
  static void xsk_cq_cancel_locked(struct xsk_buff_pool *pool, u32 n)
  {
- 	unsigned long flags;
- 
- 	spin_lock_irqsave(&pool->cq_lock, flags);
+ 	spin_lock(&pool->cq_cached_prod_lock);
  	xskq_prod_cancel_n(pool->cq, n);
- 	spin_unlock_irqrestore(&pool->cq_lock, flags);
+ 	spin_unlock(&pool->cq_cached_prod_lock);
  }
  
- static void xsk_destruct_skb(struct sk_buff *skb)
 -static void xsk_inc_num_desc(struct sk_buff *skb)
 -{
 -	XSKCB(skb)->num_descs++;
 -}
 -
 -static u32 xsk_get_num_desc(struct sk_buff *skb)
 -{
 -	return XSKCB(skb)->num_descs;
 -}
 -
+ INDIRECT_CALLABLE_SCOPE
+ void xsk_destruct_skb(struct sk_buff *skb)
  {
  	struct xsk_tx_metadata_compl *compl = &skb_shinfo(skb)->xsk_meta;