Date:   Mon, 6 Feb 2023 12:19:21 +0200
From:   Vladimir Oltean <vladimir.oltean@nxp.com>
To:     netdev@vger.kernel.org
Cc:     "David S. Miller" <davem@davemloft.net>,
        Eric Dumazet <edumazet@google.com>,
        Jakub Kicinski <kuba@kernel.org>,
        Paolo Abeni <pabeni@redhat.com>,
        Claudiu Manoil <claudiu.manoil@nxp.com>,
        =?utf-8?B?QmrDtnJuIFTDtnBlbA==?= <bjorn@kernel.org>,
        Magnus Karlsson <magnus.karlsson@intel.com>,
        Maciej Fijalkowski <maciej.fijalkowski@intel.com>,
        Alexei Starovoitov <ast@kernel.org>,
        Daniel Borkmann <daniel@iogearbox.net>,
        Jesper Dangaard Brouer <hawk@kernel.org>,
        John Fastabend <john.fastabend@gmail.com>, bpf@vger.kernel.org,
        linux-kernel@vger.kernel.org
Subject: Re: [RFC PATCH net-next 11/11] net: enetc: add TX support for
 zero-copy XDP sockets
Message-ID: <20230206101921.zmslsxfzdm6ovxf5@skbuf>
References: <20230206100837.451300-1-vladimir.oltean@nxp.com>
 <20230206100837.451300-12-vladimir.oltean@nxp.com>
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
In-Reply-To: <20230206100837.451300-12-vladimir.oltean@nxp.com>
MIME-Version: 1.0
X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?nbQOg3ezHarT/1MDrh3yH+9Exw/llVbL53y/RPBxpregb/gNM5564cEMgUiL?=
 =?us-ascii?Q?0bdqAPBo2Mc67Ok7rwjyRGGoP4XiuiyMfuTFYF0EUysN24zveQuJ89VYVZKM?=
 =?us-ascii?Q?JTNgwfxOX3oX8rkISlQilHH0ZONUeMn2d5MLAfajbMi70yaQQbah96R3HHqF?=
 =?us-ascii?Q?ZJofwW4Jmi5rtJoJJ0fOJCCuM5R2OWyjad90QvjVgLgeHBJY/e+WXzG1FG2F?=
 =?us-ascii?Q?45Wcgnqr4xgO2ZTTOFR82XP//SZhVlWuIQwXs4N5lMlEcXw/2KEk3syxf5OQ?=
 =?us-ascii?Q?yWyYBrql/l+btj+2vkkKwolgKXq0+Ywgd4jwFbX3Hsn8BssknyBMRaqiDe9x?=
 =?us-ascii?Q?G3FawJHR4c+RiFMGwG7DPrlvk1CL9vjCTowR1CZyp79lyn99KhW3xQABdOXH?=
 =?us-ascii?Q?trwwhKzf04JugZBTI+6YGRx08Jc7zsD384NjnmbTCethyMJjco1xnrxJGMTP?=
 =?us-ascii?Q?D8jdQUF7akiWqp28sDCsjGLyR4uehsXdHdjCROGSFoKwLpMOhil8J29lS58+?=
 =?us-ascii?Q?QSBQ6h7lnDu0AMVcRqqZnFAwhilhl9YaIg7QmtA2BdFjF1wSS210lf+CxIZn?=
 =?us-ascii?Q?pQESKHhhOaChgKdE/ifV0ChcUKlySj2PeTE9hJl0h9il1bHYv/MZohvEKXRs?=
 =?us-ascii?Q?ztv7uaXSBSGqzgH6F8sICdj5BGfbt6JNxJ7LQK1aavmRV1JWULEIqz2uM2RE?=
 =?us-ascii?Q?SEVJwfac6kRt2U5h1VCrCexLkUNqDyTZH1lSeN+ZwxGGFkoSgmZziN1FD/GB?=
 =?us-ascii?Q?og2XDecJbtnhjD+vdnEohDqJg98lGaSZXWnx2dnH9GWQIh1XyMSFy5U588Yh?=
 =?us-ascii?Q?s/7nlbTh0QwogAVQqTpRSQ6oE+xd+kW4N/hnNHber06ElvrK88ABGk6lz8gc?=
 =?us-ascii?Q?5oM0bAkFnmduiAEQXDkq5WzTGr14rU+7m7DRAS+NTcHcM4QNBa7oOcvxndgS?=
 =?us-ascii?Q?FNeVQ5WGZuWI19dOFJQfGv9pKWi6ysz5AhqBwQxPX7YQFEiz4XBErPKuAoyP?=
 =?us-ascii?Q?tUkt9D8pc5EUWR7NsLUOAg28r71P8d0v+ui0kNJ0bkXbUjIMm51AyDkCGa7F?=
 =?us-ascii?Q?rVtQphp18oDYAlAVv6vUENHIm94paXsM/aD3mL5tva87NyWqU8IFe+7BaTxq?=
 =?us-ascii?Q?BXjcyLj+BlmtvTuG0nxllafRaexHWs5b3jDbORFOLiWV1BjsXuQKJL6Lg4HY?=
 =?us-ascii?Q?mgIwrx19so2o0a5PD/asqO0pE9DyGgUDifZxjG/AkFM5cS0CG0/zo1/0U00e?=
 =?us-ascii?Q?4uzUI1CWB8vsUoxTLWcfZhA7JE0POn9nUmZh6S1IYmg+elAcXab2X84J8eQY?=
 =?us-ascii?Q?NS9fDQVs6m6l9i8FUwLbeuV8JKf3T/8luz/AWcBmFYac5fDkXYPXNMgLW8Ry?=
 =?us-ascii?Q?+pCNJ3fvdmc64PHctH8gZpo/vYcbM6hU2hJl09i5L5+zyYsfzWWGZwdxovI7?=
 =?us-ascii?Q?qdjgq18PaZOA3WVIqf2FSZ25Bf2V44cOa07FxA29ncnVTOokMG0ZMtLcfsQ2?=
 =?us-ascii?Q?9r5QxaNz9mM0LAvRk1XtrHy2PN1wG3WPM8ktZCfEKUM/Nudo4dPBr5lPlZ/S?=
 =?us-ascii?Q?eECLchIozoG4ojZ/iTl2xu7siAgBqQcsVhfm9AYh9G2NQtBuIqp1RUePocRB?=
 =?us-ascii?Q?Ag=3D=3D?=
X-OriginatorOrg: nxp.com
X-MS-Exchange-CrossTenant-Network-Message-Id: 8eb6d31f-8236-45f1-f162-08db082b9f79
X-MS-Exchange-CrossTenant-AuthSource: VI1PR04MB5136.eurprd04.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 06 Feb 2023 10:19:25.7116
 (UTC)
X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted
X-MS-Exchange-CrossTenant-Id: 686ea1d3-bc2b-4c6f-a92c-d99c5c301635
X-MS-Exchange-CrossTenant-MailboxType: HOSTED
X-MS-Exchange-CrossTenant-UserPrincipalName: JNqlw0gxApqn27+CXlotvtXeImlQUGUbfeJSRXFvoRNyy983kO9CAC25OFE/Mm7KWSrHw3Uzupp8WEmt09DiZw==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM0PR04MB7009
Precedence: bulk
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

Yikes, ran git format-patch one patch too soon. There's also a hidden,
bonus patch "12/11" below. Doesn't affect first 11 patches in any way,
though. Here it is.

From f7f10232622309d66a7a1ae1932d0c081936d546 Mon Sep 17 00:00:00 2001
From: Vladimir Oltean <vladimir.oltean@nxp.com>
Date: Tue, 25 Oct 2022 02:32:24 +0300
Subject: [RFC PATCH net-next 12/12] net: enetc: add support for XDP_TX
 with zero-copy XDP sockets

Add support for the case when the BPF program attached to a ring with an
XSK pool returns the XDP_TX verdict. The frame needs to go back on the
interface it came from.

No dma_map or dma_sync_for_device is necessary, just a small impedance
matching logic with the XDP_TX procedure we have in place for non-XSK,
since the data structures are different (xdp_buff vs xdp_frame; cannot
have multi-buffer with XSK).

In the TX confirmation routine, just release the RX buffer (as opposed
to non-XSK XDP_TX). Recycling might be possible, but I haven't
experimented with it.

Signed-off-by: Vladimir Oltean <vladimir.oltean@nxp.com>
---
 drivers/net/ethernet/freescale/enetc/enetc.c | 35 ++++++++++++++++++--
 drivers/net/ethernet/freescale/enetc/enetc.h |  1 +
 2 files changed, 34 insertions(+), 2 deletions(-)

diff --git a/drivers/net/ethernet/freescale/enetc/enetc.c b/drivers/net/ethernet/freescale/enetc/enetc.c
index bc0db788afc7..06aaf0334dc3 100644
--- a/drivers/net/ethernet/freescale/enetc/enetc.c
+++ b/drivers/net/ethernet/freescale/enetc/enetc.c
@@ -855,7 +855,9 @@ static bool enetc_clean_tx_ring(struct enetc_bdr *tx_ring, int napi_budget,
 				tx_win_drop++;
 		}
 
-		if (tx_swbd->is_xsk)
+		if (tx_swbd->is_xsk && tx_swbd->is_xdp_tx)
+			xsk_buff_free(tx_swbd->xsk_buff);
+		else if (tx_swbd->is_xsk)
 			(*xsk_confirmed)++;
 		else if (tx_swbd->is_xdp_tx)
 			enetc_recycle_xdp_tx_buff(tx_ring, tx_swbd);
@@ -1661,6 +1663,21 @@ static int enetc_rx_swbd_to_xdp_tx_swbd(struct enetc_tx_swbd *xdp_tx_arr,
 	return n;
 }
 
+static bool enetc_xsk_xdp_tx(struct enetc_bdr *tx_ring,
+			     struct xdp_buff *xsk_buff)
+{
+	struct enetc_tx_swbd tx_swbd = {
+		.dma = xsk_buff_xdp_get_dma(xsk_buff),
+		.len = xdp_get_buff_len(xsk_buff),
+		.is_xdp_tx = true,
+		.is_xsk = true,
+		.is_eof = true,
+		.xsk_buff = xsk_buff,
+	};
+
+	return enetc_xdp_tx(tx_ring, &tx_swbd, 1);
+}
+
 static void enetc_xdp_drop(struct enetc_bdr *rx_ring, int rx_ring_first,
 			   int rx_ring_last)
 {
@@ -1839,10 +1856,12 @@ static int enetc_clean_rx_ring_xsk(struct enetc_bdr *rx_ring,
 				   struct bpf_prog *prog,
 				   struct xsk_buff_pool *pool)
 {
+	struct enetc_ndev_priv *priv = netdev_priv(rx_ring->ndev);
+	struct enetc_bdr *tx_ring = priv->xdp_tx_ring[rx_ring->index];
+	int xdp_redirect_frm_cnt = 0, xdp_tx_frm_cnt = 0;
 	struct net_device *ndev = rx_ring->ndev;
 	union enetc_rx_bd *rxbd, *orig_rxbd;
 	int rx_frm_cnt = 0, rx_byte_cnt = 0;
-	int xdp_redirect_frm_cnt = 0;
 	struct xdp_buff *xsk_buff;
 	int buffs_missing, err, i;
 	bool wakeup_xsk = false;
@@ -1895,6 +1914,15 @@ static int enetc_clean_rx_ring_xsk(struct enetc_bdr *rx_ring,
 			enetc_xsk_buff_to_skb(xsk_buff, rx_ring, orig_rxbd,
 					      napi);
 			break;
+		case XDP_TX:
+			if (enetc_xsk_xdp_tx(tx_ring, xsk_buff)) {
+				xdp_tx_frm_cnt++;
+				tx_ring->stats.xdp_tx++;
+			} else {
+				xsk_buff_free(xsk_buff);
+				tx_ring->stats.xdp_tx_drops++;
+			}
+			break;
 		case XDP_REDIRECT:
 			err = xdp_do_redirect(ndev, xsk_buff, prog);
 			if (unlikely(err)) {
@@ -1919,6 +1947,9 @@ static int enetc_clean_rx_ring_xsk(struct enetc_bdr *rx_ring,
 	if (xdp_redirect_frm_cnt)
 		xdp_do_flush_map();
 
+	if (xdp_tx_frm_cnt)
+		enetc_update_tx_ring_tail(tx_ring);
+
 	if (xsk_uses_need_wakeup(pool)) {
 		if (wakeup_xsk)
 			xsk_set_rx_need_wakeup(pool);
diff --git a/drivers/net/ethernet/freescale/enetc/enetc.h b/drivers/net/ethernet/freescale/enetc/enetc.h
index 403f40473b52..58df6c32cfb3 100644
--- a/drivers/net/ethernet/freescale/enetc/enetc.h
+++ b/drivers/net/ethernet/freescale/enetc/enetc.h
@@ -24,6 +24,7 @@ struct enetc_tx_swbd {
 	union {
 		struct sk_buff *skb;
 		struct xdp_frame *xdp_frame;
+		struct xdp_buff *xsk_buff;
 	};
 	dma_addr_t dma;
 	struct page *page;	/* valid only if is_xdp_tx */
-- 
2.34.1