From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id E6F5045804 for ; Fri, 23 Aug 2024 18:20:16 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id E1F6D43390; Fri, 23 Aug 2024 18:20:16 +0200 (CEST) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by mails.dpdk.org (Postfix) with ESMTP id 7CB0F40295 for ; Fri, 23 Aug 2024 18:20:14 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1724430014; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=raTMuXyN6cuzThEn/NzRHx6vFA8HtjhWbNmj4fuDjyc=; b=UxlckIpJu+18K4tCVs/f1O84+KDxyD5Ub51ZRvHef8H1BhiKDRpgIq+zLMmTd71O7pQCea CeeBOsUAmD02fnGoKytd+DqztwDocOjZ2+Xd29NdXZm8KVvgUZGvsdavdBZmBouEyk1amm Y8tpENTZDzk52lPYsZiVT/19sh3anJc= Received: from mx-prod-mc-03.mail-002.prod.us-west-2.aws.redhat.com (ec2-54-186-198-63.us-west-2.compute.amazonaws.com [54.186.198.63]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-675-EeobgmBqOZCSykya6B6Gpw-1; Fri, 23 Aug 2024 12:20:10 -0400 X-MC-Unique: EeobgmBqOZCSykya6B6Gpw-1 Received: from mx-prod-int-05.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-05.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.17]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mx-prod-mc-03.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 7377E19560B4; Fri, 23 Aug 2024 16:20:09 +0000 (UTC) Received: from rh.redhat.com (unknown [10.39.193.224]) by mx-prod-int-05.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 80C401956053; Fri, 23 Aug 2024 16:20:07 +0000 (UTC) From: Kevin Traynor To: Ciara Loftus Cc: Stephen Hemminger , Maryam Tahhan , dpdk stable Subject: patch 'net/af_xdp: fix port ID in Rx mbuf' has been queued to stable release 21.11.8 Date: Fri, 23 Aug 2024 17:17:22 +0100 Message-ID: <20240823161929.1004778-14-ktraynor@redhat.com> In-Reply-To: <20240823161929.1004778-1-ktraynor@redhat.com> References: <20240823161929.1004778-1-ktraynor@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.0 on 10.30.177.17 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII"; x-default=true X-BeenThere: stable@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: patches for DPDK stable branches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: stable-bounces@dpdk.org Hi, FYI, your patch has been queued to stable release 21.11.8 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 08/28/24. So please shout if anyone has objections. Also note that after the patch there's a diff of the upstream commit vs the patch applied to the branch. This will indicate if there was any rebasing needed to apply to the stable branch. If there were code changes for rebasing (ie: not only metadata diffs), please double check that the rebase was correctly done. Queued patches are on a temporary branch at: https://github.com/kevintraynor/dpdk-stable This queued commit can be viewed at: https://github.com/kevintraynor/dpdk-stable/commit/6d6630439d9ffb09dad65b4292dba4723dc7f8ec Thanks. Kevin --- >From 6d6630439d9ffb09dad65b4292dba4723dc7f8ec Mon Sep 17 00:00:00 2001 From: Ciara Loftus Date: Tue, 14 May 2024 08:41:52 +0000 Subject: [PATCH] net/af_xdp: fix port ID in Rx mbuf [ upstream commit 9bab1d2667aec4942ae1d384671e5148960bd88f ] Record the port id in the af_xdp rx queue structure and use it to set the port id of the mbuf of a received packed. Bugzilla ID: 1428 Fixes: f1debd77efaf ("net/af_xdp: introduce AF_XDP PMD") Reported-by: Stephen Hemminger Signed-off-by: Ciara Loftus Acked-by: Maryam Tahhan Acked-by: Stephen Hemminger --- drivers/net/af_xdp/rte_eth_af_xdp.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/drivers/net/af_xdp/rte_eth_af_xdp.c b/drivers/net/af_xdp/rte_eth_af_xdp.c index d7214c2028..c82ea664a1 100644 --- a/drivers/net/af_xdp/rte_eth_af_xdp.c +++ b/drivers/net/af_xdp/rte_eth_af_xdp.c @@ -101,4 +101,5 @@ struct pkt_rx_queue { struct xsk_socket *xsk; struct rte_mempool *mb_pool; + uint16_t port; struct rx_stats stats; @@ -320,4 +321,5 @@ af_xdp_rx_zc(void *queue, struct rte_mbuf **bufs, uint16_t nb_pkts) rte_pktmbuf_priv_size(umem->mb_pool) - umem->mb_pool->header_size; + bufs[i]->port = rxq->port; rte_pktmbuf_pkt_len(bufs[i]) = len; @@ -386,4 +388,5 @@ af_xdp_rx_cp(void *queue, struct rte_mbuf **bufs, uint16_t nb_pkts) rx_bytes += len; bufs[i] = mbufs[i]; + bufs[i]->port = rxq->port; } @@ -1448,4 +1451,6 @@ eth_rx_queue_setup(struct rte_eth_dev *dev, rxq->fds[0].events = POLLIN; + rxq->port = dev->data->port_id; + dev->data->rx_queues[rx_queue_id] = rxq; return 0; -- 2.46.0 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2024-08-23 17:18:10.438066406 +0100 +++ 0014-net-af_xdp-fix-port-ID-in-Rx-mbuf.patch 2024-08-23 17:18:09.632429798 +0100 @@ -1 +1 @@ -From 9bab1d2667aec4942ae1d384671e5148960bd88f Mon Sep 17 00:00:00 2001 +From 6d6630439d9ffb09dad65b4292dba4723dc7f8ec Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 9bab1d2667aec4942ae1d384671e5148960bd88f ] + @@ -11 +12,0 @@ -Cc: stable@dpdk.org @@ -22 +23 @@ -index 2d6f64337e..0997543ee5 100644 +index d7214c2028..c82ea664a1 100644 @@ -25 +26 @@ -@@ -134,4 +134,5 @@ struct pkt_rx_queue { +@@ -101,4 +101,5 @@ struct pkt_rx_queue { @@ -31 +32 @@ -@@ -369,4 +370,5 @@ af_xdp_rx_zc(void *queue, struct rte_mbuf **bufs, uint16_t nb_pkts) +@@ -320,4 +321,5 @@ af_xdp_rx_zc(void *queue, struct rte_mbuf **bufs, uint16_t nb_pkts) @@ -37 +38 @@ -@@ -435,4 +437,5 @@ af_xdp_rx_cp(void *queue, struct rte_mbuf **bufs, uint16_t nb_pkts) +@@ -386,4 +388,5 @@ af_xdp_rx_cp(void *queue, struct rte_mbuf **bufs, uint16_t nb_pkts) @@ -43,2 +44,2 @@ -@@ -1814,4 +1817,6 @@ eth_rx_queue_setup(struct rte_eth_dev *dev, - process_private->rxq_xsk_fds[rx_queue_id] = rxq->fds[0].fd; +@@ -1448,4 +1451,6 @@ eth_rx_queue_setup(struct rte_eth_dev *dev, + rxq->fds[0].events = POLLIN;