From nobody Sun Apr 5 18:17:37 2026 Received: from mail-wr1-f50.google.com (mail-wr1-f50.google.com [209.85.221.50]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 819603D0925 for ; Mon, 23 Mar 2026 18:28:53 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.221.50 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1774290537; cv=none; b=AqiJsmBRyhw2U5Ce86uzIoRUN/q3G1nIYV/U5cuRN1K7xrRLYpZDGaHwT+sR6/qgSTunlWdqzpQo9CKB0cf/4ztI+JrVgNrVApbvHeHUCNkIkCshJIez3W7ZqiT+M/Jay9lSb5NRYywAlwm9rCdg3QDh06Uy3PJyM0fk+fjwzDI= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1774290537; c=relaxed/simple; bh=UR0wxAJljmGCXJ+jOK6daMXItb/fhYUqkOWlYcn0dBg=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=BHR9jc7yXTXrfoF/D3sHD0pIvpisNG73dH0gnIJGi9DIuxQ/pOZzakzkKABQBbz/nBQLg3zT1bijqCjUFHtSIzN0AFG3niRcsZiNBEESVdwnr5eTiBMYbN3f7e5pvxv40CFapmPfCLRLgxM3VXat+5AggplnJAmju2Rq0pSrQHg= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=h4yPnwc6; arc=none smtp.client-ip=209.85.221.50 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="h4yPnwc6" Received: by mail-wr1-f50.google.com with SMTP id ffacd0b85a97d-43b4fd681c2so388052f8f.3 for ; Mon, 23 Mar 2026 11:28:53 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1774290532; x=1774895332; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=kaHp2/FUvMOtomlFmeSVzxYjb6RSDeBp4ispDMEXgtk=; b=h4yPnwc6oAOg7qIjdmRodCa4OOKjuVrCmao4it7X4RrXzjrYRoe/eXkvwvq6FfvI7V fv3ueLwiBdvzLNmCDhxvlZUw+gzkjibLQNGPjjnfUl/WYErlzM7jFDgGoZm7Fdl2Vd6s XsRqRI60Dz6/q3CHVNlAPiT3cjtZMMo1SX/aLyeDddBcepEvJ6UGNP5wU1b8uvdbt1WB /S6kZfiseZKU7ek4VI4EWz8r+mi+kHl/YVHI1y4bGni6zptV9uArOwYZyfBDYRZGpiiA 08ZdW5Ne8E1QdtOmrZhydyDyff99T/14iWT5jJJ+Zfo2gp2QpP7n77SCrHS8axnJ5cUY 9VEw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1774290532; x=1774895332; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=kaHp2/FUvMOtomlFmeSVzxYjb6RSDeBp4ispDMEXgtk=; b=YP1/IJy2WWLC/zF8KcLMm8h8XkrEKCMC24xPxmSObyINgJy47Bdc4ZofoCvCXJhvKn JknNUH9IErTnytv34yqMiWZ4Ry516Ja/s2U23v/JMIhUB4N3naSmgpmEQR3Pep2vPbZ2 2OhiqS/Wj5SqcM4Rti9SxdBBO7Odmrq4mxMkxbs61ukwKsHABCvNzByi1qCnPt81t0W/ f8a4cHNt8Qu8iaDsF/N1WOE5OYSzDKN45RjTsF+xjppiqLf8ECXjYCm2rkoqMpIIW3yo c6EA7oq35uZZ+9tHJ30h/hdoK/cP+uw9ku1I/kp8rk5Fl3vFMdY8ZAia+dRXXUlCzMBF M17w== X-Forwarded-Encrypted: i=1; AJvYcCVTr3DMvgScge8JniK/HeljMrWd45bc05tkCCDPRGeIpim8JJ8xjapWpCX68MS7HeBStY7jJhhRudNe/xk=@vger.kernel.org X-Gm-Message-State: AOJu0Yxos96nqdv+lybanKM1hqSU88Wo6B9kw/1lFXJSKHlcaFzXkTij H4+LrBQqigcSpFv82lCwNEfS9Z104bwv2jxm4v55VPaJc7H/tBnR8AMX X-Gm-Gg: ATEYQzwf1ik252Sg/gdi5nV7BWUuyvevi4ECgObJg6l3UsVTQf6bFtxNNQpzErDxI6K f7Xnh4Zg86KYLZ4zhVc+ppxUUN7v56sfFMGuTblhOof5q9tkQBp2cyw4IDKS0EQzJBXULApBKXj MMf9OAd3PtJe8rJ07VyU/HrdkXrXpFsTHerlCAOTqAu1yBkNBvR2L80rjGXZh8SRjkj7Q98sdbO 9ZepzF/ExHbtDJtnmBNnTloJ6vKSsbXSTgt4C21Aa6zwADsjLGz11CLhnZEBqOz3mXK2W0vF1fk kPUFLJrzZvEbdBTTjSvH4iu/iARcJAs2o+RJU6gD1kFc3kbuZdxrHRuwrWUttecg8hG9hMDShoD HaI9qhZxHD1qqjFa9RXKdVX9n5IUjzXv0HPlVEflvHPOV6OXA+AgS2wLYaRzU5YWn9Nun1cF54z 6edvuwDQzDMj+Zg1kGNR/wridX1L0BJQwY4HDfYSvnYls8ESmvKIQq3laoBMYlhgL5FeS2rJ7dC 8M= X-Received: by 2002:a05:6000:1883:b0:43b:4440:9c28 with SMTP id ffacd0b85a97d-43b63fe235fmr20398332f8f.0.1774290531496; Mon, 23 Mar 2026 11:28:51 -0700 (PDT) Received: from turbo.teknoraver.net (net-37-119-137-97.cust.vodafonedsl.it. [37.119.137.97]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-43b64714decsm28448751f8f.31.2026.03.23.11.28.50 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 23 Mar 2026 11:28:51 -0700 (PDT) From: Matteo Croce X-Google-Original-From: Matteo Croce To: Tony Nguyen , Przemek Kitszel , Andrew Lunn , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Alexei Starovoitov , Daniel Borkmann , Jesper Dangaard Brouer , John Fastabend , Mohsin Bashir Cc: netdev@vger.kernel.org, bpf@vger.kernel.org, intel-wired-lan@lists.osuosl.org, linux-kernel@vger.kernel.org Subject: [PATCH net-next v4 2/2] e1000e: add XDP_REDIRECT support Date: Mon, 23 Mar 2026 19:28:23 +0100 Message-ID: <20260323182823.5813-3-teknoraver@meta.com> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260323182823.5813-1-teknoraver@meta.com> References: <20260323182823.5813-1-teknoraver@meta.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Add the ability to redirect packets to other devices via XDP_REDIRECT and to receive redirected frames from other devices via ndo_xdp_xmit. New functionality: - XDP_REDIRECT case in e1000_run_xdp() using xdp_do_redirect() - e1000_xdp_xmit() as the ndo_xdp_xmit callback for receiving redirected frames from other devices - xdp_do_flush() in e1000_finalize_xdp() for REDIR completions - xdp_features_set/clear_redirect_target() in e1000_xdp_setup() - NETDEV_XDP_ACT_REDIRECT and NETDEV_XDP_ACT_NDO_XMIT advertised Assisted-by: claude-opus-4-6 Signed-off-by: Matteo Croce --- drivers/net/ethernet/intel/e1000e/netdev.c | 85 +++++++++++++++++++++- 1 file changed, 81 insertions(+), 4 deletions(-) diff --git a/drivers/net/ethernet/intel/e1000e/netdev.c b/drivers/net/ether= net/intel/e1000e/netdev.c index d77f208f00cc..01661e1a74e5 100644 --- a/drivers/net/ethernet/intel/e1000e/netdev.c +++ b/drivers/net/ethernet/intel/e1000e/netdev.c @@ -41,6 +41,7 @@ char e1000e_driver_name[] =3D "e1000e"; #define E1000_XDP_PASS 0 #define E1000_XDP_CONSUMED BIT(0) #define E1000_XDP_TX BIT(1) +#define E1000_XDP_REDIR BIT(2) =20 static int debug =3D -1; module_param(debug, int, 0); @@ -805,6 +806,9 @@ static void e1000_finalize_xdp(struct e1000_adapter *ad= apter, { struct e1000_ring *tx_ring =3D adapter->tx_ring; =20 + if (xdp_xmit & E1000_XDP_REDIR) + xdp_do_flush(); + if (xdp_xmit & E1000_XDP_TX) { /* Force memory writes to complete before letting h/w * know there are new descriptors to fetch. @@ -823,13 +827,14 @@ static void e1000_finalize_xdp(struct e1000_adapter *= adapter, * @adapter: board private structure * @xdp: XDP buffer containing packet data * - * Returns E1000_XDP_PASS, E1000_XDP_TX, or E1000_XDP_CONSUMED + * Returns E1000_XDP_PASS, E1000_XDP_TX, E1000_XDP_REDIR, or E1000_XDP_CON= SUMED **/ static int e1000_run_xdp(struct e1000_adapter *adapter, struct xdp_buff *x= dp) { struct bpf_prog *xdp_prog =3D READ_ONCE(adapter->xdp_prog); struct net_device *netdev =3D adapter->netdev; int result =3D E1000_XDP_PASS; + int err; u32 act; =20 if (!xdp_prog) @@ -846,6 +851,12 @@ static int e1000_run_xdp(struct e1000_adapter *adapter= , struct xdp_buff *xdp) if (result =3D=3D E1000_XDP_CONSUMED) goto out_failure; break; + case XDP_REDIRECT: + err =3D xdp_do_redirect(netdev, xdp, xdp_prog); + if (err) + goto out_failure; + result =3D E1000_XDP_REDIR; + break; default: bpf_warn_invalid_xdp_action(netdev, xdp_prog, act); fallthrough; @@ -1041,11 +1052,11 @@ static bool e1000_clean_rx_irq_xdp(struct e1000_rin= g *rx_ring, int *work_done, =20 /* page consumed by skb */ buffer_info->page =3D NULL; - } else if (xdp_res & E1000_XDP_TX) { + } else if (xdp_res & (E1000_XDP_TX | E1000_XDP_REDIR)) { xdp_xmit |=3D xdp_res; total_rx_bytes +=3D length - crc_len; total_rx_packets++; - /* page consumed by XDP TX */ + /* page consumed by XDP TX/redirect */ buffer_info->page =3D NULL; } else { /* XDP_DROP / XDP_ABORTED - recycle page */ @@ -7812,6 +7823,11 @@ static int e1000_xdp_setup(struct net_device *netdev= , struct netdev_bpf *bpf) if (!need_reset) return 0; =20 + if (prog) + xdp_features_set_redirect_target(netdev, true); + else + xdp_features_clear_redirect_target(netdev); + if (running) { int err =3D e1000e_open(netdev); =20 @@ -7837,6 +7853,64 @@ static int e1000_xdp(struct net_device *netdev, stru= ct netdev_bpf *xdp) } } =20 +/** + * e1000_xdp_xmit - transmit XDP frames from another device + * @netdev: network interface device structure + * @n: number of frames to transmit + * @frames: array of XDP frame pointers + * @flags: XDP transmit flags + * + * This is the ndo_xdp_xmit callback, called when other devices redirect + * frames to this device. + **/ +static int e1000_xdp_xmit(struct net_device *netdev, int n, + struct xdp_frame **frames, u32 flags) +{ + struct e1000_adapter *adapter =3D netdev_priv(netdev); + struct e1000_ring *tx_ring =3D adapter->tx_ring; + struct netdev_queue *nq =3D netdev_get_tx_queue(netdev, 0); + int cpu =3D smp_processor_id(); + int nxmit =3D 0; + int i; + + if (unlikely(test_bit(__E1000_DOWN, &adapter->state))) + return -ENETDOWN; + + if (unlikely(flags & ~XDP_XMIT_FLAGS_MASK)) + return -EINVAL; + + if (!adapter->xdp_prog) + return -ENXIO; + + __netif_tx_lock(nq, cpu); + txq_trans_cond_update(nq); + + for (i =3D 0; i < n; i++) { + int err; + + err =3D e1000_xdp_xmit_ring(adapter, tx_ring, frames[i]); + if (err !=3D E1000_XDP_TX) + break; + nxmit++; + } + + if (unlikely(flags & XDP_XMIT_FLUSH)) { + /* Force memory writes to complete before letting h/w + * know there are new descriptors to fetch. + */ + wmb(); + if (adapter->flags2 & FLAG2_PCIM2PCI_ARBITER_WA) + e1000e_update_tdt_wa(tx_ring, + tx_ring->next_to_use); + else + writel(tx_ring->next_to_use, tx_ring->tail); + } + + __netif_tx_unlock(nq); + + return nxmit; +} + static const struct net_device_ops e1000e_netdev_ops =3D { .ndo_open =3D e1000e_open, .ndo_stop =3D e1000e_close, @@ -7860,6 +7934,7 @@ static const struct net_device_ops e1000e_netdev_ops = =3D { .ndo_hwtstamp_get =3D e1000e_hwtstamp_get, .ndo_hwtstamp_set =3D e1000e_hwtstamp_set, .ndo_bpf =3D e1000_xdp, + .ndo_xdp_xmit =3D e1000_xdp_xmit, }; =20 /** @@ -8070,7 +8145,9 @@ static int e1000_probe(struct pci_dev *pdev, const st= ruct pci_device_id *ent) netdev->max_mtu =3D adapter->max_hw_frame_size - (VLAN_ETH_HLEN + ETH_FCS_LEN); =20 - netdev->xdp_features =3D NETDEV_XDP_ACT_BASIC; + netdev->xdp_features =3D NETDEV_XDP_ACT_BASIC | + NETDEV_XDP_ACT_REDIRECT | + NETDEV_XDP_ACT_NDO_XMIT; =20 if (e1000e_enable_mng_pass_thru(&adapter->hw)) adapter->flags |=3D FLAG_MNG_PT_ENABLED; --=20 2.53.0