Netdev List
 help / color / mirror / Atom feed
From: Dragos Tatulea <dtatulea@nvidia.com>
To: Jakub Kicinski <kuba@kernel.org>, davem@davemloft.net
Cc: netdev@vger.kernel.org, edumazet@google.com, pabeni@redhat.com,
	andrew+netdev@lunn.ch, horms@kernel.org,
	michael.chan@broadcom.com, manishc@marvell.com,
	joshwash@google.com, hramamurthy@google.com, tariqt@nvidia.com,
	saeedm@nvidia.com, daniel@iogearbox.net, hawk@kernel.org,
	sdf@fomichev.me, willemb@google.com,
	przemyslaw.kitszel@intel.com, bpf@vger.kernel.org
Subject: Re: [PATCH net-next 5/8] eth: mlx5e: drop the now-dead HW-GRO and LRO vs XDP handling
Date: Thu, 19 Nov 2026 16:42:06 +0100	[thread overview]
Message-ID: <e3d1c5ff-110e-43d6-8211-9c107fb0bed0@nvidia.com> (raw)
In-Reply-To: <20261118232315.3593731-6-kuba@kernel.org>

On 19.11.26 00:23, Jakub Kicinski wrote:
> The core clears HW-GRO and LRO before ndo_bpf runs and keeps them off
> for as long as a program is attached. mlx5e_fix_features() never sees
> either with params->xdp_prog set, and packet merge is always off by the
> time mlx5e_xdp_set() gets called, packet_merge.type only follows the two
> feature handlers. If tcp-data-split keeps HW-GRO on, the core refuses
> the attach with -EBUSY before calling the driver.
> 
> The AF_XDP check stays, the core doesn't know about XSK pools.
> 
> This does change user visible behavior: attaching XDP with HW-GRO or LRO
> on used to fail with -EINVAL and now succeeds with them turned off.
> 
Thanks for the cleanup!

> Signed-off-by: Jakub Kicinski <kuba@kernel.org>
> ---
>  .../net/ethernet/mellanox/mlx5/core/en_main.c | 32 ++-----------------
>  1 file changed, 3 insertions(+), 29 deletions(-)
> 
> diff --git a/drivers/net/ethernet/mellanox/mlx5/core/en_main.c b/drivers/net/ethernet/mellanox/mlx5/core/en_main.c
> index d8563f863844..e462dfc725ae 100644
> --- a/drivers/net/ethernet/mellanox/mlx5/core/en_main.c
> +++ b/drivers/net/ethernet/mellanox/mlx5/core/en_main.c
> @@ -4585,17 +4585,6 @@ static netdev_features_t mlx5e_fix_features(struct net_device *netdev,
>  		}
>  	}
>  
> -	if (params->xdp_prog) {
> -		if (features & NETIF_F_LRO) {
> -			netdev_warn(netdev, "LRO is incompatible with XDP\n");
> -			features &= ~NETIF_F_LRO;
> -		}
> -		if (features & NETIF_F_GRO_HW) {
> -			netdev_warn(netdev, "HW GRO is incompatible with XDP\n");
> -			features &= ~NETIF_F_GRO_HW;
> -		}
> -	}
> -
>  	if (priv->xsk.refcnt) {
>  		if (features & NETIF_F_LRO) {
>  			netdev_warn(netdev, "LRO is incompatible with AF_XDP (%u XSKs are active)\n",
> @@ -5177,20 +5166,6 @@ static void mlx5e_tx_timeout(struct net_device *dev, unsigned int txqueue)
>  	queue_work(priv->wq, &priv->tx_timeout_work);
>  }
>  
> -static int mlx5e_xdp_allowed(struct net_device *netdev, struct mlx5_core_dev *mdev,
> -			     struct mlx5e_params *params)
> -{
> -	if (params->packet_merge.type != MLX5E_PACKET_MERGE_NONE) {
> -		netdev_warn(netdev, "can't set XDP while HW-GRO/LRO is on, disable them first\n");
> -		return -EINVAL;
> -	}
> -
> -	if (!mlx5e_params_validate_xdp(netdev, mdev, params))
> -		return -EINVAL;
> -
> -	return 0;
> -}
> -
>  static void mlx5e_rq_replace_xdp_prog(struct mlx5e_rq *rq, struct bpf_prog *prog)
>  {
>  	struct bpf_prog *old_prog;
> @@ -5215,10 +5190,9 @@ static int mlx5e_xdp_set(struct net_device *netdev, struct bpf_prog *prog)
>  	new_params = priv->channels.params;
>  	new_params.xdp_prog = prog;
>  
> -	if (prog) {
> -		err = mlx5e_xdp_allowed(netdev, priv->mdev, &new_params);
> -		if (err)
> -			goto unlock;
> +	if (prog && !mlx5e_params_validate_xdp(netdev, priv->mdev, &new_params)) {
> +		err = -EINVAL;
> +		goto unlock;
>  	}
>  
>  	/* no need for full reset when exchanging programs */
There's a netdev_update_features() at the end of mlx5e_xdp_set(). It
doesn't seem necessary anyore.

Also, there's a check left in mlx5e_set_xdp_feature().

Thanks,
Dragos

  reply	other threads:[~2026-11-19 15:42 UTC|newest]

Thread overview: 11+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2026-11-18 23:23 [PATCH net-next 0/8] net: adjust HW GRO and LRO feature handling Jakub Kicinski
2026-11-18 23:23 ` [PATCH net-next 1/8] net: stop making HW-GRO depend on SW GRO Jakub Kicinski
2026-11-18 23:23 ` [PATCH net-next 2/8] selftests: drv-net: drop the generic XDP hack from the HW GRO setup Jakub Kicinski
2026-11-18 23:23 ` [PATCH net-next 3/8] net: state the "XDP excludes HW-GRO" rule in the core Jakub Kicinski
2026-11-18 23:23 ` [PATCH net-next 4/8] net: state the "XDP excludes LRO" " Jakub Kicinski
2026-11-18 23:23 ` [PATCH net-next 5/8] eth: mlx5e: drop the now-dead HW-GRO and LRO vs XDP handling Jakub Kicinski
2026-11-19 15:42   ` Dragos Tatulea [this message]
2026-11-18 23:23 ` [PATCH net-next 6/8] eth: bnxt_en: don't clear HW-GRO and LRO for XDP in ndo_fix_features Jakub Kicinski
2026-11-18 23:23 ` [PATCH net-next 7/8] eth: qede: drop the now-dead HW-GRO vs XDP handling Jakub Kicinski
2026-11-18 23:23 ` [PATCH net-next 8/8] eth: gve: drop the now-dead HW-GRO vs XDP interlock Jakub Kicinski
2026-11-18 23:44   ` Ankit Garg

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=e3d1c5ff-110e-43d6-8211-9c107fb0bed0@nvidia.com \
    --to=dtatulea@nvidia.com \
    --cc=andrew+netdev@lunn.ch \
    --cc=bpf@vger.kernel.org \
    --cc=daniel@iogearbox.net \
    --cc=davem@davemloft.net \
    --cc=edumazet@google.com \
    --cc=hawk@kernel.org \
    --cc=horms@kernel.org \
    --cc=hramamurthy@google.com \
    --cc=joshwash@google.com \
    --cc=kuba@kernel.org \
    --cc=manishc@marvell.com \
    --cc=michael.chan@broadcom.com \
    --cc=netdev@vger.kernel.org \
    --cc=pabeni@redhat.com \
    --cc=przemyslaw.kitszel@intel.com \
    --cc=saeedm@nvidia.com \
    --cc=sdf@fomichev.me \
    --cc=tariqt@nvidia.com \
    --cc=willemb@google.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
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