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

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

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 834 bytes --]

Hi all,

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

  net/core/sysctl_net_core.c

between commits:

  bd8a53675c0d ("net: sysctl: use shared sysctl macro")
  4c7f24f857c7 ("net: sysctl: introduce sysctl SYSCTL_THREE")

from the net-next tree and commit:

  f922c8972fb5 ("net: sysctl: Use SYSCTL_TWO instead of &two")

from the bpf-next tree.

I fixed it up (bd8a53675c0d and f922c8972fb5 delete the same line) 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

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

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

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 3751 bytes --]

Hi all,

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

  drivers/net/ethernet/intel/ice/ice_main.c

between commit:

  5b246e533d01 ("ice: split probe into smaller functions")

from the net-next tree and commit:

  66c0e13ad236 ("drivers: net: turn on XDP features")

from the bpf-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 drivers/net/ethernet/intel/ice/ice_main.c
index 433298d0014a,074b0e6d0e2d..000000000000
--- a/drivers/net/ethernet/intel/ice/ice_main.c
+++ b/drivers/net/ethernet/intel/ice/ice_main.c
@@@ -4485,116 -4619,6 +4501,118 @@@ static int ice_register_netdev(struct i
  		return -EIO;
  
  	err = register_netdev(vsi->netdev);
 +	if (err)
 +		return err;
 +
 +	set_bit(ICE_VSI_NETDEV_REGISTERED, vsi->state);
 +	netif_carrier_off(vsi->netdev);
 +	netif_tx_stop_all_queues(vsi->netdev);
 +
 +	return 0;
 +}
 +
 +static void ice_unregister_netdev(struct ice_vsi *vsi)
 +{
 +	if (!vsi || !vsi->netdev)
 +		return;
 +
 +	unregister_netdev(vsi->netdev);
 +	clear_bit(ICE_VSI_NETDEV_REGISTERED, vsi->state);
 +}
 +
 +/**
 + * ice_cfg_netdev - Allocate, configure and register a netdev
 + * @vsi: the VSI associated with the new netdev
 + *
 + * Returns 0 on success, negative value on failure
 + */
 +static int ice_cfg_netdev(struct ice_vsi *vsi)
 +{
 +	struct ice_netdev_priv *np;
 +	struct net_device *netdev;
 +	u8 mac_addr[ETH_ALEN];
 +
 +	netdev = alloc_etherdev_mqs(sizeof(*np), vsi->alloc_txq,
 +				    vsi->alloc_rxq);
 +	if (!netdev)
 +		return -ENOMEM;
 +
 +	set_bit(ICE_VSI_NETDEV_ALLOCD, vsi->state);
 +	vsi->netdev = netdev;
 +	np = netdev_priv(netdev);
 +	np->vsi = vsi;
 +
 +	ice_set_netdev_features(netdev);
++	netdev->xdp_features = NETDEV_XDP_ACT_BASIC | NETDEV_XDP_ACT_REDIRECT |
++			       NETDEV_XDP_ACT_XSK_ZEROCOPY;
 +	ice_set_ops(netdev);
 +
 +	if (vsi->type == ICE_VSI_PF) {
 +		SET_NETDEV_DEV(netdev, ice_pf_to_dev(vsi->back));
 +		ether_addr_copy(mac_addr, vsi->port_info->mac.perm_addr);
 +		eth_hw_addr_set(netdev, mac_addr);
 +	}
 +
 +	netdev->priv_flags |= IFF_UNICAST_FLT;
 +
 +	/* Setup netdev TC information */
 +	ice_vsi_cfg_netdev_tc(vsi, vsi->tc_cfg.ena_tc);
 +
 +	netdev->max_mtu = ICE_MAX_MTU;
 +
 +	return 0;
 +}
 +
 +static void ice_decfg_netdev(struct ice_vsi *vsi)
 +{
 +	clear_bit(ICE_VSI_NETDEV_ALLOCD, vsi->state);
 +	free_netdev(vsi->netdev);
 +	vsi->netdev = NULL;
 +}
 +
 +static int ice_start_eth(struct ice_vsi *vsi)
 +{
 +	int err;
 +
 +	err = ice_init_mac_fltr(vsi->back);
 +	if (err)
 +		return err;
 +
 +	rtnl_lock();
 +	err = ice_vsi_open(vsi);
 +	rtnl_unlock();
 +
 +	return err;
 +}
 +
 +static int ice_init_eth(struct ice_pf *pf)
 +{
 +	struct ice_vsi *vsi = ice_get_main_vsi(pf);
 +	int err;
 +
 +	if (!vsi)
 +		return -EINVAL;
 +
 +	/* init channel list */
 +	INIT_LIST_HEAD(&vsi->ch_list);
 +
 +	err = ice_cfg_netdev(vsi);
 +	if (err)
 +		return err;
 +	/* Setup DCB netlink interface */
 +	ice_dcbnl_setup(vsi);
 +
 +	err = ice_init_mac_fltr(pf);
 +	if (err)
 +		goto err_init_mac_fltr;
 +
 +	err = ice_devlink_create_pf_port(pf);
 +	if (err)
 +		goto err_devlink_create_pf_port;
 +
 +	SET_NETDEV_DEVLINK_PORT(vsi->netdev, &pf->devlink_port);
 +
 +	err = ice_register_netdev(vsi);
  	if (err)
  		goto err_register_netdev;
  

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

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

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 2251 bytes --]

Hi all,

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

  drivers/net/ethernet/intel/ice/ice_xsk.c

between commit:

  675f176b4dcc ("Merge ra.kernel.org:/pub/scm/linux/kernel/git/netdev/net")

from the net-next tree and commit:

  aa1d3faf71a6 ("ice: Robustify cleaning/completing XDP Tx buffers")

from the bpf-next tree.

I fixed it up (I guessed - 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 drivers/net/ethernet/intel/ice/ice_xsk.c
index b2d96ae5668c,917c75e530ca..000000000000
--- a/drivers/net/ethernet/intel/ice/ice_xsk.c
+++ b/drivers/net/ethernet/intel/ice/ice_xsk.c
@@@ -629,29 -613,28 +629,30 @@@ static void ice_clean_xdp_irq_zc(struc
  
  	last_rs = xdp_ring->next_to_use ? xdp_ring->next_to_use - 1 : cnt - 1;
  	tx_desc = ICE_TX_DESC(xdp_ring, last_rs);
 -	if (tx_desc->cmd_type_offset_bsz &
 -	    cpu_to_le64(ICE_TX_DESC_DTYPE_DESC_DONE)) {
 +	if ((tx_desc->cmd_type_offset_bsz &
 +	    cpu_to_le64(ICE_TX_DESC_DTYPE_DESC_DONE))) {
  		if (last_rs >= ntc)
 -			xsk_frames = last_rs - ntc + 1;
 +			completed_frames = last_rs - ntc + 1;
  		else
 -			xsk_frames = last_rs + cnt - ntc + 1;
 +			completed_frames = last_rs + cnt - ntc + 1;
  	}
  
 -	if (!xsk_frames)
 +	if (!completed_frames)
  		return;
  
 -	if (likely(!xdp_ring->xdp_tx_active))
 +	if (likely(!xdp_ring->xdp_tx_active)) {
 +		xsk_frames = completed_frames;
  		goto skip;
 +	}
  
  	ntc = xdp_ring->next_to_clean;
 -	for (i = 0; i < xsk_frames; i++) {
 +	for (i = 0; i < completed_frames; i++) {
  		tx_buf = &xdp_ring->tx_buf[ntc];
  
- 		if (tx_buf->raw_buf) {
+ 		if (tx_buf->type == ICE_TX_BUF_XSK_TX) {
+ 			tx_buf->type = ICE_TX_BUF_EMPTY;
 -			xsk_buff_free(tx_buf->xdp);
 -			xdp_ring->xdp_tx_active--;
 +			ice_clean_xdp_tx_buf(xdp_ring, tx_buf);
 +			tx_buf->raw_buf = NULL;
  		} else {
  			xsk_frames++;
  		}

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

Re: linux-next: manual merge of the bpf-next tree with the net-next tree

[Alexander Lobakin]

From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Mon, 20 Feb 2023 10:00:56 +1100

> Hi all,
> 
> Today's linux-next merge of the bpf-next tree got a conflict in:
> 
>   drivers/net/ethernet/intel/ice/ice_xsk.c
> 
> between commit:
> 
>   675f176b4dcc ("Merge ra.kernel.org:/pub/scm/linux/kernel/git/netdev/net")
> 
> from the net-next tree and commit:
> 
>   aa1d3faf71a6 ("ice: Robustify cleaning/completing XDP Tx buffers")
> 
> from the bpf-next tree.
> 
> I fixed it up (I guessed - 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.
> 

Hi,

the correct fix will be as follows (at least my Git yielded me this when
merging net-next with bpf-next).
Strange movements from Git, but basically the resolution is to pick the
latest ice_xsk.c from bpf-next and then manually carry Larysa's fix[0]
for @xsk_frames (she initially did it for bpf-next, so it's easier for
us to resolve this conflict).
Much thanks for noticing and notifying.

[0]
https://git.kernel.org/pub/scm/linux/kernel/git/netdev/net.git/commit/?id=1f090494170ea298530cf1285fb8d078e355b4c0

Thanks,
Olek
---
diff --cc drivers/net/ethernet/intel/ice/ice_xsk.c
index b2d96ae5668c,917c75e530ca..1fcfa07c205b
--- a/drivers/net/ethernet/intel/ice/ice_xsk.c
+++ b/drivers/net/ethernet/intel/ice/ice_xsk.c
@@@ -629,29 -613,28 +614,30 @@@ static void ice_clean_xdp_irq_zc(struc

  	last_rs = xdp_ring->next_to_use ? xdp_ring->next_to_use - 1 : cnt - 1;
  	tx_desc = ICE_TX_DESC(xdp_ring, last_rs);
- 	if ((tx_desc->cmd_type_offset_bsz &
- 	    cpu_to_le64(ICE_TX_DESC_DTYPE_DESC_DONE))) {
+ 	if (tx_desc->cmd_type_offset_bsz &
+ 	    cpu_to_le64(ICE_TX_DESC_DTYPE_DESC_DONE)) {
  		if (last_rs >= ntc)
 -			xsk_frames = last_rs - ntc + 1;
 +			completed_frames = last_rs - ntc + 1;
  		else
 -			xsk_frames = last_rs + cnt - ntc + 1;
 +			completed_frames = last_rs + cnt - ntc + 1;
  	}

 -	if (!xsk_frames)
 +	if (!completed_frames)
  		return;

 -	if (likely(!xdp_ring->xdp_tx_active))
 +	if (likely(!xdp_ring->xdp_tx_active)) {
 +		xsk_frames = completed_frames;
  		goto skip;
 +	}

  	ntc = xdp_ring->next_to_clean;
 -	for (i = 0; i < xsk_frames; i++) {
 +	for (i = 0; i < completed_frames; i++) {
  		tx_buf = &xdp_ring->tx_buf[ntc];

- 		if (tx_buf->raw_buf) {
- 			ice_clean_xdp_tx_buf(xdp_ring, tx_buf);
- 			tx_buf->raw_buf = NULL;
+ 		if (tx_buf->type == ICE_TX_BUF_XSK_TX) {
+ 			tx_buf->type = ICE_TX_BUF_EMPTY;
+ 			xsk_buff_free(tx_buf->xdp);
+ 			xdp_ring->xdp_tx_active--;
  		} else {
  			xsk_frames++;
  		}

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

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 1496 bytes --]

Hi all,

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

  Documentation/bpf/bpf_devel_QA.rst

between commit:

  d0ddf5065ffe ("Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net")

from the net-next tree and commit:

  0f10f647f455 ("bpf, docs: Use internal linking for link to netdev subsystem doc")

from the bpf-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 Documentation/bpf/bpf_devel_QA.rst
index 7403f81c995c,e151e61dff38..000000000000
--- a/Documentation/bpf/bpf_devel_QA.rst
+++ b/Documentation/bpf/bpf_devel_QA.rst
@@@ -684,8 -689,11 +689,7 @@@ when
  
  
  .. Links
- .. _netdev-FAQ: https://www.kernel.org/doc/html/latest/process/maintainer-netdev.html
 -.. _Documentation/process/: https://www.kernel.org/doc/html/latest/process/
  .. _selftests:
     https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/tree/tools/testing/selftests/bpf/
 -.. _Documentation/dev-tools/kselftest.rst:
 -   https://www.kernel.org/doc/html/latest/dev-tools/kselftest.html
 -.. _Documentation/bpf/btf.rst: btf.rst
  
  Happy BPF hacking!

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

Re: linux-next: manual merge of the bpf-next tree with the net-next tree

[Bagas Sanjaya]

[-- Attachment #1: Type: text/plain, Size: 905 bytes --]

On Mon, Mar 20, 2023 at 10:09:22AM +1100, Stephen Rothwell wrote:
> diff --cc Documentation/bpf/bpf_devel_QA.rst
> index 7403f81c995c,e151e61dff38..000000000000
> --- a/Documentation/bpf/bpf_devel_QA.rst
> +++ b/Documentation/bpf/bpf_devel_QA.rst
> @@@ -684,8 -689,11 +689,7 @@@ when
>   
>   
>   .. Links
> - .. _netdev-FAQ: https://www.kernel.org/doc/html/latest/process/maintainer-netdev.html
>  -.. _Documentation/process/: https://www.kernel.org/doc/html/latest/process/
>   .. _selftests:
>      https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/tree/tools/testing/selftests/bpf/
>  -.. _Documentation/dev-tools/kselftest.rst:
>  -   https://www.kernel.org/doc/html/latest/dev-tools/kselftest.html
>  -.. _Documentation/bpf/btf.rst: btf.rst
>   
>   Happy BPF hacking!

The resolution LGTM, thanks!

-- 
An old man doll... just what I always wanted! - Clara

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 228 bytes --]

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

[broonie]

Hi all,

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

  include/net/ip_tunnels.h

between commit:

  bc9d003dc48c3 ("ip_tunnel: Preserve pointer const in ip_tunnel_info_opts")

from the net-next tree and commit:

  ac931d4cdec3d ("ipip,ip_tunnel,sit: Add FOU support for externally controlled ipip devices")

from the bpf-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.

diff --cc include/net/ip_tunnels.h
index 255b32a90850a,7912f53caae0b..0000000000000
--- a/include/net/ip_tunnels.h
+++ b/include/net/ip_tunnels.h
@@@ -66,15 -73,9 +73,16 @@@ struct ip_tunnel_encap 
  #define IP_TUNNEL_OPTS_MAX					\
  	GENMASK((sizeof_field(struct ip_tunnel_info,		\
  			      options_len) * BITS_PER_BYTE) - 1, 0)
 +
 +#define ip_tunnel_info_opts(info)				\
 +	_Generic(info,						\
 +		 const struct ip_tunnel_info * : ((const void *)((info) + 1)),\
 +		 struct ip_tunnel_info * : ((void *)((info) + 1))\
 +	)
 +
  struct ip_tunnel_info {
  	struct ip_tunnel_key	key;
+ 	struct ip_tunnel_encap	encap;
  #ifdef CONFIG_DST_CACHE
  	struct dst_cache	dst_cache;
  #endif

Re: linux-next: manual merge of the bpf-next tree with the net-next tree

[Christian Ehrig]

On Thu, Apr 13, 2023 at 05:12:35PM +0100, broonie@kernel.org wrote:
> Hi all,
> 
> Today's linux-next merge of the bpf-next tree got a conflict in:
> 
>   include/net/ip_tunnels.h
> 
> between commit:
> 
>   bc9d003dc48c3 ("ip_tunnel: Preserve pointer const in ip_tunnel_info_opts")
> 
> from the net-next tree and commit:
> 
>   ac931d4cdec3d ("ipip,ip_tunnel,sit: Add FOU support for externally controlled ipip devices")
> 
> from the bpf-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.
> 
> diff --cc include/net/ip_tunnels.h
> index 255b32a90850a,7912f53caae0b..0000000000000
> --- a/include/net/ip_tunnels.h
> +++ b/include/net/ip_tunnels.h
> @@@ -66,15 -73,9 +73,16 @@@ struct ip_tunnel_encap 
>   #define IP_TUNNEL_OPTS_MAX					\
>   	GENMASK((sizeof_field(struct ip_tunnel_info,		\
>   			      options_len) * BITS_PER_BYTE) - 1, 0)
>  +
>  +#define ip_tunnel_info_opts(info)				\
>  +	_Generic(info,						\
>  +		 const struct ip_tunnel_info * : ((const void *)((info) + 1)),\
>  +		 struct ip_tunnel_info * : ((void *)((info) + 1))\
>  +	)
>  +
>   struct ip_tunnel_info {
>   	struct ip_tunnel_key	key;
> + 	struct ip_tunnel_encap	encap;
>   #ifdef CONFIG_DST_CACHE
>   	struct dst_cache	dst_cache;
>   #endif

This looks good to me. Thanks much.

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

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 4538 bytes --]

Hi all,

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

  Documentation/netlink/specs/netdev.yaml

between commit:

  839ff60df3ab ("net: page_pool: add nlspec for basic access to page pools")
(and a few following)

from the net-next tree and commit:

  48eb03dd2630 ("xsk: Add TX timestamp and TX checksum offload support")

from the bpf-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 Documentation/netlink/specs/netdev.yaml
index 20f75b7d3240,00439bcbd2e3..000000000000
--- a/Documentation/netlink/specs/netdev.yaml
+++ b/Documentation/netlink/specs/netdev.yaml
@@@ -86,112 -97,11 +97,117 @@@ attribute-sets
               See Documentation/networking/xdp-rx-metadata.rst for more details.
          type: u64
          enum: xdp-rx-metadata
+       -
+         name: xsk-features
+         doc: Bitmask of enabled AF_XDP features.
+         type: u64
+         enum: xsk-flags
 +  -
 +    name: page-pool
 +    attributes:
 +      -
 +        name: id
 +        doc: Unique ID of a Page Pool instance.
 +        type: uint
 +        checks:
 +          min: 1
 +          max: u32-max
 +      -
 +        name: ifindex
 +        doc: |
 +          ifindex of the netdev to which the pool belongs.
 +          May be reported as 0 if the page pool was allocated for a netdev
 +          which got destroyed already (page pools may outlast their netdevs
 +          because they wait for all memory to be returned).
 +        type: u32
 +        checks:
 +          min: 1
 +          max: s32-max
 +      -
 +        name: napi-id
 +        doc: Id of NAPI using this Page Pool instance.
 +        type: uint
 +        checks:
 +          min: 1
 +          max: u32-max
 +      -
 +        name: inflight
 +        type: uint
 +        doc: |
 +          Number of outstanding references to this page pool (allocated
 +          but yet to be freed pages). Allocated pages may be held in
 +          socket receive queues, driver receive ring, page pool recycling
 +          ring, the page pool cache, etc.
 +      -
 +        name: inflight-mem
 +        type: uint
 +        doc: |
 +          Amount of memory held by inflight pages.
 +      -
 +        name: detach-time
 +        type: uint
 +        doc: |
 +          Seconds in CLOCK_BOOTTIME of when Page Pool was detached by
 +          the driver. Once detached Page Pool can no longer be used to
 +          allocate memory.
 +          Page Pools wait for all the memory allocated from them to be freed
 +          before truly disappearing. "Detached" Page Pools cannot be
 +          "re-attached", they are just waiting to disappear.
 +          Attribute is absent if Page Pool has not been detached, and
 +          can still be used to allocate new memory.
 +  -
 +    name: page-pool-info
 +    subset-of: page-pool
 +    attributes:
 +      -
 +        name: id
 +      -
 +        name: ifindex
 +  -
 +    name: page-pool-stats
 +    doc: |
 +      Page pool statistics, see docs for struct page_pool_stats
 +      for information about individual statistics.
 +    attributes:
 +      -
 +        name: info
 +        doc: Page pool identifying information.
 +        type: nest
 +        nested-attributes: page-pool-info
 +      -
 +        name: alloc-fast
 +        type: uint
 +        value: 8 # reserve some attr ids in case we need more metadata later
 +      -
 +        name: alloc-slow
 +        type: uint
 +      -
 +        name: alloc-slow-high-order
 +        type: uint
 +      -
 +        name: alloc-empty
 +        type: uint
 +      -
 +        name: alloc-refill
 +        type: uint
 +      -
 +        name: alloc-waive
 +        type: uint
 +      -
 +        name: recycle-cached
 +        type: uint
 +      -
 +        name: recycle-cache-full
 +        type: uint
 +      -
 +        name: recycle-ring
 +        type: uint
 +      -
 +        name: recycle-ring-full
 +        type: uint
 +      -
 +        name: recycle-released-refcnt
 +        type: uint
  
  operations:
    list:

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

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

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 750 bytes --]

Hi all,

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

  tools/net/ynl/generated/netdev-user.c

between commit:

  f7c0e362a25f ("tools: ynl: remove generated user space code from git")

from the net-next tree and commit:

  e6795330f88b ("xdp: Add VLAN tag hint")

from the bpf-next tree.

I fixed it up (I just removed the file) 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

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

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

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 777 bytes --]

Hi all,

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

  include/linux/skbuff.h

between commit:

  bf873a800ac3 ("net: skbuff: fix spelling errors")

from the net-next tree and commit:

  2ebe81c81435 ("net, xdp: Allow metadata > 32")

from the bpf-next tree.

I fixed it up (the latter removed a line that was updated by the former,
so I just removed it) 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

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

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

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 1214 bytes --]

Hi all,

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

  drivers/net/netkit.c

between commit:

  00d066a4d4ed ("netdev_features: convert NETIF_F_LLTX to dev->lltx")

from the net-next tree and commit:

  d96608794889 ("netkit: Disable netpoll support")

from the bpf-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 drivers/net/netkit.c
index 79232f5cc088,0681cf86284d..000000000000
--- a/drivers/net/netkit.c
+++ b/drivers/net/netkit.c
@@@ -255,7 -255,7 +255,8 @@@ static void netkit_setup(struct net_dev
  	dev->priv_flags |= IFF_LIVE_ADDR_CHANGE;
  	dev->priv_flags |= IFF_PHONY_HEADROOM;
  	dev->priv_flags |= IFF_NO_QUEUE;
 +	dev->lltx = true;
+ 	dev->priv_flags |= IFF_DISABLE_NETPOLL;
  
  	dev->ethtool_ops = &netkit_ethtool_ops;
  	dev->netdev_ops  = &netkit_netdev_ops;

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

Re: linux-next: manual merge of the bpf-next tree with the net-next tree

[Alexander Lobakin]

From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Wed, 4 Sep 2024 12:02:21 +1000

> Hi all,
> 
> Today's linux-next merge of the bpf-next tree got a conflict in:
> 
>   drivers/net/netkit.c
> 
> between commit:
> 
>   00d066a4d4ed ("netdev_features: convert NETIF_F_LLTX to dev->lltx")
> 
> from the net-next tree and commit:
> 
>   d96608794889 ("netkit: Disable netpoll support")
> 
> from the bpf-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.

Your fix is technically correct, but maybe swap the lines?

 	dev->priv_flags |= IFF_NO_QUEUE;
+	dev->priv_flags |= IFF_DISABLE_NETPOLL;
+	dev->lltx = true;

Looks more natural I'd say...

Thanks,
Olek

Re: linux-next: manual merge of the bpf-next tree with the net-next tree

[Daniel Borkmann]

On 9/4/24 3:16 PM, Alexander Lobakin wrote:
> From: Stephen Rothwell <sfr@canb.auug.org.au>
> Date: Wed, 4 Sep 2024 12:02:21 +1000
> 
>> Hi all,
>>
>> Today's linux-next merge of the bpf-next tree got a conflict in:
>>
>>    drivers/net/netkit.c
>>
>> between commit:
>>
>>    00d066a4d4ed ("netdev_features: convert NETIF_F_LLTX to dev->lltx")
>>
>> from the net-next tree and commit:
>>
>>    d96608794889 ("netkit: Disable netpoll support")
>>
>> from the bpf-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.
> 
> Your fix is technically correct, but maybe swap the lines?
> 
>   	dev->priv_flags |= IFF_NO_QUEUE;
> +	dev->priv_flags |= IFF_DISABLE_NETPOLL;
> +	dev->lltx = true;
> 
> Looks more natural I'd say...

Yep, 100%, we'll use that as merge conflict resolution when flushing the
next PR, thanks!

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

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 846 bytes --]

Hi all,

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

  tools/testing/selftests/bpf/Makefile

between commit:

  cbf49bed6a8c ("Merge tag 'for-netdev' of https://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf-next")

from the net-next tree and commit:

  34419b2def88 ("Merge branch 'bpf-next/master' into for-next")

from the bpf-next tree.

The former reordered and reformatted a list.

I fixed it up (I used the former) 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

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

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

[Mark Brown]

[-- Attachment #1: Type: text/plain, Size: 1568 bytes --]

Hi all,

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

  include/net/xdp.h

between commits:

  1827f773e4168 ("net: xdp: pass full flags to xdp_update_skb_shared_info()")
  6bffdc0f88f85 ("net: xdp: handle frags with unreadable memory")

from the net-next tree and commit:

  8f12d1137c238 ("bpf: Clear pfmemalloc flag when freeing all fragments")

from the bpf-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.

diff --cc include/net/xdp.h
index 6fd294fa6841d,f288c348a6c13..0000000000000
--- a/include/net/xdp.h
+++ b/include/net/xdp.h
@@@ -126,16 -115,11 +126,21 @@@ static __always_inline void xdp_buff_se
  	xdp->flags |= XDP_FLAGS_FRAGS_PF_MEMALLOC;
  }
  
 +static __always_inline void xdp_buff_set_frag_unreadable(struct xdp_buff *xdp)
 +{
 +	xdp->flags |= XDP_FLAGS_FRAGS_UNREADABLE;
 +}
 +
 +static __always_inline u32 xdp_buff_get_skb_flags(const struct xdp_buff *xdp)
 +{
 +	return xdp->flags;
 +}
 +
+ static __always_inline void xdp_buff_clear_frag_pfmemalloc(struct xdp_buff *xdp)
+ {
+ 	xdp->flags &= ~XDP_FLAGS_FRAGS_PF_MEMALLOC;
+ }
+ 
  static __always_inline void
  xdp_init_buff(struct xdp_buff *xdp, u32 frame_sz, struct xdp_rxq_info *rxq)
  {

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

Re: linux-next: manual merge of the bpf-next tree with the net-next tree

[Martin KaFai Lau]

On 9/24/25 4:27 AM, Mark Brown wrote:
> Hi all,
> 
> Today's linux-next merge of the bpf-next tree got a conflict in:
> 
>    include/net/xdp.h
> 
> between commits:
> 
>    1827f773e4168 ("net: xdp: pass full flags to xdp_update_skb_shared_info()")
>    6bffdc0f88f85 ("net: xdp: handle frags with unreadable memory")
> 
> from the net-next tree and commit:
> 
>    8f12d1137c238 ("bpf: Clear pfmemalloc flag when freeing all fragments")
> 
> from the bpf-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.
> 
> diff --cc include/net/xdp.h
> index 6fd294fa6841d,f288c348a6c13..0000000000000
> --- a/include/net/xdp.h
> +++ b/include/net/xdp.h
> @@@ -126,16 -115,11 +126,21 @@@ static __always_inline void xdp_buff_se
>    	xdp->flags |= XDP_FLAGS_FRAGS_PF_MEMALLOC;
>    }
>    
>   +static __always_inline void xdp_buff_set_frag_unreadable(struct xdp_buff *xdp)
>   +{
>   +	xdp->flags |= XDP_FLAGS_FRAGS_UNREADABLE;
>   +}
>   +
>   +static __always_inline u32 xdp_buff_get_skb_flags(const struct xdp_buff *xdp)
>   +{
>   +	return xdp->flags;
>   +}
>   +
> + static __always_inline void xdp_buff_clear_frag_pfmemalloc(struct xdp_buff *xdp)
> + {
> + 	xdp->flags &= ~XDP_FLAGS_FRAGS_PF_MEMALLOC;
> + }
> +
>    static __always_inline void
>    xdp_init_buff(struct xdp_buff *xdp, u32 frame_sz, struct xdp_rxq_info *rxq)
>    {

Thanks for the fix and it looks correct. I had noted that in the recent net-next 
pr [1].
https://lore.kernel.org/bpf/20250924050303.2466356-1-martin.lau@linux.dev/