From patchwork Wed Mar 5 16:21:31 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexander Lobakin X-Patchwork-Id: 14002960 X-Patchwork-Delegate: kuba@kernel.org Received: from mgamail.intel.com (mgamail.intel.com [198.175.65.19]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 466152566FD; Wed, 5 Mar 2025 16:23:19 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=198.175.65.19 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1741191800; cv=none; b=SuJUnsIAzI8SIXo2wGxctdWjWtL0t4HkCxxSgqg3xyq2ouMdaeLUjltTXIqwGj+HrIjdKCHCgMxiEYYZfERT91XUws0CYemMP7lCOmfoZx3SElK+AeByc0Z9cpbBrxg6+eG3m3YTl15kTJ69nx+pZksvcYZPBUdMye6JNZ9mgws= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1741191800; c=relaxed/simple; bh=0VNfSZ85Qv9nHHKLrIzzXtO0adTkGt6I7ftyZ5LLsEQ=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=lyvBW59oQmipE1UsIrRKwy3rXCLZ5puhDHu5Z4/Z6ehECxZVXpIhgmiRLt4Ag2GUN6NhVXwWU1e0cGQRyuitCJZil2OG3Zhcl/Cw/HUJcTxiwKkyqdb+B6RuLCmgmzg5gf32AH1pTPmojlBiYQoyTSwO1Cr6bb/VzlFOFcw4MpM= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=intel.com; spf=pass smtp.mailfrom=intel.com; dkim=pass (2048-bit key) header.d=intel.com header.i=@intel.com header.b=H/LizWPd; arc=none smtp.client-ip=198.175.65.19 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=intel.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=intel.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=intel.com header.i=@intel.com header.b="H/LizWPd" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1741191800; x=1772727800; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=0VNfSZ85Qv9nHHKLrIzzXtO0adTkGt6I7ftyZ5LLsEQ=; b=H/LizWPdyc8Q9U5o638L5m27C8GgvJZdyQWGaayYcYl3/L8Zu/LXnIzj UZHW9PCtz9xs8Y9WP6gEfuCGDGtPi9Q+U16yFFpvA0hZuPAw56XwSipGG tLkHd6B3IEfPeGuvXp2s94qCuXpTZfP24qHAJX/da5CdRH+dY7fQw8c88 KiQIVKYeEfh2alRLstN5NMwqGMGbMnBBenLn1hDymDD1bkYatPzViuWFC 4Mv2wncRnW/S2JjpY/MVv+mHn7dW/BqlyW0xW/NOq07oxDCCxE32Wshy5 7dErIYE4oKeCDuUeMcRyaxsHTJp47xjWLogprmz3Rbp2uQIXXVIQLCSeg w==; X-CSE-ConnectionGUID: JVHpMYYhRyysiOjHPsViGg== X-CSE-MsgGUID: y79SxyB4Q/GAIPB1NnM8NA== X-IronPort-AV: E=McAfee;i="6700,10204,11363"; a="42026635" X-IronPort-AV: E=Sophos;i="6.14,223,1736841600"; d="scan'208";a="42026635" Received: from fmviesa004.fm.intel.com ([10.60.135.144]) by orvoesa111.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 05 Mar 2025 08:23:19 -0800 X-CSE-ConnectionGUID: +cUmsJJ1T16k0Nfhv5ENTQ== X-CSE-MsgGUID: MQqh6KtCTwW10goXKvImoA== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.14,223,1736841600"; d="scan'208";a="123833040" Received: from newjersey.igk.intel.com ([10.102.20.203]) by fmviesa004.fm.intel.com with ESMTP; 05 Mar 2025 08:23:15 -0800 From: Alexander Lobakin To: intel-wired-lan@lists.osuosl.org Cc: Alexander Lobakin , Michal Kubiak , Maciej Fijalkowski , Tony Nguyen , Przemek Kitszel , Andrew Lunn , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Alexei Starovoitov , Daniel Borkmann , Jesper Dangaard Brouer , John Fastabend , Simon Horman , bpf@vger.kernel.org, netdev@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH net-next 15/16] idpf: add support for .ndo_xdp_xmit() Date: Wed, 5 Mar 2025 17:21:31 +0100 Message-ID: <20250305162132.1106080-16-aleksander.lobakin@intel.com> X-Mailer: git-send-email 2.48.1 In-Reply-To: <20250305162132.1106080-1-aleksander.lobakin@intel.com> References: <20250305162132.1106080-1-aleksander.lobakin@intel.com> Precedence: bulk X-Mailing-List: bpf@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-Patchwork-Delegate: kuba@kernel.org Use libeth XDP infra to implement .ndo_xdp_xmit() in idpf. The Tx callbacks are reused from XDP_TX code. XDP redirect target feature is set/cleared depending on the XDP prog presence, as for now we still don't allocate XDP Tx queues when there's no program. Signed-off-by: Alexander Lobakin --- drivers/net/ethernet/intel/idpf/xdp.h | 2 ++ drivers/net/ethernet/intel/idpf/idpf_lib.c | 1 + drivers/net/ethernet/intel/idpf/xdp.c | 29 ++++++++++++++++++++++ 3 files changed, 32 insertions(+) diff --git a/drivers/net/ethernet/intel/idpf/xdp.h b/drivers/net/ethernet/intel/idpf/xdp.h index fde85528a315..a2ac1b2f334f 100644 --- a/drivers/net/ethernet/intel/idpf/xdp.h +++ b/drivers/net/ethernet/intel/idpf/xdp.h @@ -110,5 +110,7 @@ static inline void idpf_xdp_tx_finalize(void *_xdpq, bool sent, bool flush) void idpf_xdp_set_features(const struct idpf_vport *vport); int idpf_xdp(struct net_device *dev, struct netdev_bpf *xdp); +int idpf_xdp_xmit(struct net_device *dev, int n, struct xdp_frame **frames, + u32 flags); #endif /* _IDPF_XDP_H_ */ diff --git a/drivers/net/ethernet/intel/idpf/idpf_lib.c b/drivers/net/ethernet/intel/idpf/idpf_lib.c index 2d1efcb854be..39b9885293a9 100644 --- a/drivers/net/ethernet/intel/idpf/idpf_lib.c +++ b/drivers/net/ethernet/intel/idpf/idpf_lib.c @@ -2371,4 +2371,5 @@ static const struct net_device_ops idpf_netdev_ops = { .ndo_set_features = idpf_set_features, .ndo_tx_timeout = idpf_tx_timeout, .ndo_bpf = idpf_xdp, + .ndo_xdp_xmit = idpf_xdp_xmit, }; diff --git a/drivers/net/ethernet/intel/idpf/xdp.c b/drivers/net/ethernet/intel/idpf/xdp.c index abf75e840c0a..1834f217a07f 100644 --- a/drivers/net/ethernet/intel/idpf/xdp.c +++ b/drivers/net/ethernet/intel/idpf/xdp.c @@ -357,8 +357,35 @@ LIBETH_XDP_DEFINE_START(); LIBETH_XDP_DEFINE_TIMER(static idpf_xdp_tx_timer, idpf_clean_xdp_irq); LIBETH_XDP_DEFINE_FLUSH_TX(idpf_xdp_tx_flush_bulk, idpf_xdp_tx_prep, idpf_xdp_tx_xmit); +LIBETH_XDP_DEFINE_FLUSH_XMIT(static idpf_xdp_xmit_flush_bulk, idpf_xdp_tx_prep, + idpf_xdp_tx_xmit); LIBETH_XDP_DEFINE_END(); +/** + * idpf_xdp_xmit - send frames queued by ``XDP_REDIRECT`` to this interface + * @dev: network device + * @n: number of frames to transmit + * @frames: frames to transmit + * @flags: transmit flags (``XDP_XMIT_FLUSH`` or zero) + * + * Return: number of frames successfully sent or -errno on error. + */ +int idpf_xdp_xmit(struct net_device *dev, int n, struct xdp_frame **frames, + u32 flags) +{ + const struct idpf_netdev_priv *np = netdev_priv(dev); + const struct idpf_vport *vport = np->vport; + + if (unlikely(!netif_carrier_ok(dev) || !vport->link_up)) + return -ENETDOWN; + + return libeth_xdp_xmit_do_bulk(dev, n, frames, flags, + &vport->txqs[vport->xdp_txq_offset], + vport->num_xdp_txq, + idpf_xdp_xmit_flush_bulk, + idpf_xdp_tx_finalize); +} + void idpf_xdp_set_features(const struct idpf_vport *vport) { if (!idpf_is_queue_model_split(vport->rxq_model)) @@ -417,6 +444,8 @@ idpf_xdp_setup_prog(struct idpf_vport *vport, const struct netdev_bpf *xdp) cfg->user_config.xdp_prog = old; } + libeth_xdp_set_redirect(vport->netdev, vport->xdp_prog); + return ret; }