From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-wm1-f46.google.com (mail-wm1-f46.google.com [209.85.128.46]) (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 33FAE346E43 for ; Fri, 20 Mar 2026 13:24:30 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.128.46 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1774013072; cv=none; b=VN7dBQ88sAfGj1buMQC11xf3ns468NkUltt7q+edco2JgfbBtxoIyef8yjmcvMSBRy6PStKSiUGhDvlmxh1CTdS3VY+ZUbllRB3ap0a4aTkIly3mAC13sZcpB8B3oYSQlec3E4mBiC0mzJlAUJ3fpOloYOBDo30dcAR1VetmIpY= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1774013072; c=relaxed/simple; bh=PD9juSUsML20xVTwE8RCFOWj95oRmvJZgs05+pTq+Qk=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=dBMXMgIzTdINGBXz6hEbt6rnI4gBYr3AegoOKOr6hYQqApofpsdUZ/JPrf2t0ENCzK542aQI9as2IQwSUlhuv7GwHoYDmeyMiQD5IgZWKR5K3LIHRIgSIfhioEpqlaD1quadWu+bdnGYceegInFoubi8FIm/8QnTralSl9jO9uc= 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=Cmn/wP1j; arc=none smtp.client-ip=209.85.128.46 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="Cmn/wP1j" Received: by mail-wm1-f46.google.com with SMTP id 5b1f17b1804b1-486fe655187so10665745e9.2 for ; Fri, 20 Mar 2026 06:24:30 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1774013068; x=1774617868; 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=aLTuTnfwehV2L1dYdqxcXAxrjOVio+7F/VaVFTc7JYo=; b=Cmn/wP1jHQs7GgyundFrM00/EXxqNZfib9Jb1SRRIE7kmcsbd/9wG3YnssN0CoFegl Ea8nt6GXvErSqFHINtpMR3qUepQWlG2XAilwTgaWHKYFZOimEAy1y2hf4Rib1WyIrYUr BlS4M8bOZjf/1E/nDWUN7UJj2qJg2B4jIOcjsS6WEDhQsOzXYt5+TtFX9RT/+mOI9DrM 2OQxEt2rtEXtBrHogUCBtOCJ1dVIiCKBEk7NGiWKdlqAkjG/0idlETfeFsGRQZXEw1er 7BuN87uZTJJf6UAQE6JVpoBBiJJj15X9fbvQUOfbwvVOI7YniKmy1rEYPDPrJHR247dt RApg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1774013068; x=1774617868; 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=aLTuTnfwehV2L1dYdqxcXAxrjOVio+7F/VaVFTc7JYo=; b=ClF1mmXMHQuuXyAul7uA2L8A/T+F141MfpKyj5g9pyYsJXLxsyZfMLYhSSRoOs1wA2 OHBjS7ErJzK/w/gBu2/sG2XkhjxlQQv8C2J+2JXBFjij3x7vr7MCp6XhCTRZbqEEGM70 go/2mRY9IJt//qBDfrSQFFyzqqkJzS8OJOgRRG5jsuEM3MnbRbszBOginyVtox4dabGv +iI3BMXAepuRfzNcZj9tTZPOIULJeLK8B2DQ74+WGk8Ki05QmmGub99CzoTPKJsA8pk5 UN1xalIWudk1kaVz0kZdbNwhO5rK4ybg91KOjdUhBrzxkvV/tGaz/L+3FfBV0pYk0hjw jpUQ== X-Gm-Message-State: AOJu0YynerwuB9qAcUkTSZY+Qg/oIYgg3BC3F4PcpGCmPddpuf80pax7 jVhohYbFdcbHLQ/7qVtTiBxCINuB2wPv5Caj0lmvp2IahhoDUXypTbqm X-Gm-Gg: ATEYQzzpAG9kBNq/PAqkjwxducCvxV7h7aiCKR7Pb6+sJ2hdzuGo3aGly1JPexxdjCb kEbjiEvq1ljiJO9qnAYTZ6EEb7wt3v/L2Vm+w0EM9WxVsf+1Oy9qind3H+UCy0EZ7G5AH3sH4w7 ZLiIkEgXzuclsoA2wQu2ZS7vpq/WZnE5plxdq6eYPJmMhlHUmYWNjR4wFI0CgYYuXpy1T/AlwPM uC2667iTBsFBicUJWw+Dnkni7J/+/pVuhRIIlu9mfMW+pkEUCgtN/RfOxBST9IfnPiVp2pEBb0Q 9SeMemRwze1Kixfas6BR6KvlXebXKH5KKfIYn3zZbErudfLjGF4/9p3PH9FQmbgMyGicwoDvFCK hmMfD0E7TryvdTjDGXHdJLmVscSnUSUr2QwF3OAu4BO43hTSgyNfhmQ7IGjVPFXZxZaO1lcsBZG bENb53ne9doYkDjtPah+4HgtasUd4ahDJsahNneTh2jDjvhey2X6gzJEH9lxMXxJXEgh4DW/SS X-Received: by 2002:a05:600c:1d1b:b0:485:3cf3:1010 with SMTP id 5b1f17b1804b1-486febb5fefmr49625065e9.2.1774013068226; Fri, 20 Mar 2026 06:24:28 -0700 (PDT) Received: from turbo.teknoraver.net (net-5-95-156-124.cust.vodafonedsl.it. [5.95.156.124]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-487004e7bc4sm16427095e9.2.2026.03.20.06.24.27 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 20 Mar 2026 06:24:27 -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 Cc: netdev@vger.kernel.org, bpf@vger.kernel.org, intel-wired-lan@lists.osuosl.org, linux-kernel@vger.kernel.org Subject: [PATCH net-next v3 2/2] e1000e: add XDP_REDIRECT support Date: Fri, 20 Mar 2026 14:23:56 +0100 Message-ID: <20260320132356.63194-3-teknoraver@meta.com> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260320132356.63194-1-teknoraver@meta.com> References: <20260320132356.63194-1-teknoraver@meta.com> Precedence: bulk X-Mailing-List: netdev@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 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/ethernet/intel/e1000e/netdev.c index 3ee5246f0b84..83f188f9b510 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[] = "e1000e"; #define E1000_XDP_PASS 0 #define E1000_XDP_CONSUMED BIT(0) #define E1000_XDP_TX BIT(1) +#define E1000_XDP_REDIR BIT(2) static int debug = -1; module_param(debug, int, 0); @@ -805,6 +806,9 @@ static void e1000_finalize_xdp(struct e1000_adapter *adapter, { struct e1000_ring *tx_ring = adapter->tx_ring; + 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_CONSUMED **/ static int e1000_run_xdp(struct e1000_adapter *adapter, struct xdp_buff *xdp) { struct bpf_prog *xdp_prog = READ_ONCE(adapter->xdp_prog); struct net_device *netdev = adapter->netdev; int result = E1000_XDP_PASS; + int err; u32 act; if (!xdp_prog) @@ -846,6 +851,12 @@ static int e1000_run_xdp(struct e1000_adapter *adapter, struct xdp_buff *xdp) if (result == E1000_XDP_CONSUMED) goto out_failure; break; + case XDP_REDIRECT: + err = xdp_do_redirect(netdev, xdp, xdp_prog); + if (err) + goto out_failure; + result = E1000_XDP_REDIR; + break; default: bpf_warn_invalid_xdp_action(netdev, xdp_prog, act); fallthrough; @@ -1040,11 +1051,11 @@ static bool e1000_clean_rx_irq_xdp(struct e1000_ring *rx_ring, int *work_done, /* page consumed by skb */ buffer_info->page = NULL; - } else if (xdp_res & E1000_XDP_TX) { + } else if (xdp_res & (E1000_XDP_TX | E1000_XDP_REDIR)) { xdp_xmit |= xdp_res; total_rx_bytes += length; total_rx_packets++; - /* page consumed by XDP TX */ + /* page consumed by XDP TX/redirect */ buffer_info->page = NULL; } else { /* XDP_DROP / XDP_ABORTED - recycle page */ @@ -7811,6 +7822,11 @@ static int e1000_xdp_setup(struct net_device *netdev, struct netdev_bpf *bpf) if (!need_reset) return 0; + if (prog) + xdp_features_set_redirect_target(netdev, true); + else + xdp_features_clear_redirect_target(netdev); + if (running) e1000e_open(netdev); @@ -7827,6 +7843,64 @@ static int e1000_xdp(struct net_device *netdev, struct netdev_bpf *xdp) } } +/** + * 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 = netdev_priv(netdev); + struct e1000_ring *tx_ring = adapter->tx_ring; + struct netdev_queue *nq = netdev_get_tx_queue(netdev, 0); + int cpu = smp_processor_id(); + int nxmit = 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 = 0; i < n; i++) { + int err; + + err = e1000_xdp_xmit_ring(adapter, tx_ring, frames[i]); + if (err != 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 = { .ndo_open = e1000e_open, .ndo_stop = e1000e_close, @@ -7850,6 +7924,7 @@ static const struct net_device_ops e1000e_netdev_ops = { .ndo_hwtstamp_get = e1000e_hwtstamp_get, .ndo_hwtstamp_set = e1000e_hwtstamp_set, .ndo_bpf = e1000_xdp, + .ndo_xdp_xmit = e1000_xdp_xmit, }; /** @@ -8060,7 +8135,9 @@ static int e1000_probe(struct pci_dev *pdev, const struct pci_device_id *ent) netdev->max_mtu = adapter->max_hw_frame_size - (VLAN_ETH_HLEN + ETH_FCS_LEN); - netdev->xdp_features = NETDEV_XDP_ACT_BASIC; + netdev->xdp_features = NETDEV_XDP_ACT_BASIC | + NETDEV_XDP_ACT_REDIRECT | + NETDEV_XDP_ACT_NDO_XMIT; if (e1000e_enable_mng_pass_thru(&adapter->hw)) adapter->flags |= FLAG_MNG_PT_ENABLED; -- 2.53.0