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 C863F45804 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 C19214337C; 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 19A6040295 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=1724430013; 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=PPuxgykaoWYrp0HMo4pt6Nx60HyJtVfSbgQ5RB8puCg=; b=YkGxqswwNbGlzG3B8CdgvMo+fX4INC6yU2Xv7NJ0OThJxJMeC8iTZ/4JK8Mkb3m869WqKo 6eKULeOSfhjUqhqqsEcuHVeaKD5D5OAr0cYXgxwfG0FZ6xK+OKkHwJeSfYcI0cskNQsRDn AV5Lfy3OY6ftko8+yX5wCacy5Aw4Q8w= Received: from mx-prod-mc-05.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-657-LwjkX9IgOa2ruAxumHNdDQ-1; Fri, 23 Aug 2024 12:20:12 -0400 X-MC-Unique: LwjkX9IgOa2ruAxumHNdDQ-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-05.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 757F91956080; Fri, 23 Aug 2024 16:20:11 +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 C9DCA1956053; Fri, 23 Aug 2024 16:20:09 +0000 (UTC) From: Kevin Traynor To: Ciara Loftus Cc: Stephen Hemminger , dpdk stable Subject: patch 'net/af_xdp: count mbuf allocation failures' has been queued to stable release 21.11.8 Date: Fri, 23 Aug 2024 17:17:23 +0100 Message-ID: <20240823161929.1004778-15-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/6825397cf6a632fc693b2b7f2d785f99618420bf Thanks. Kevin --- >From 6825397cf6a632fc693b2b7f2d785f99618420bf Mon Sep 17 00:00:00 2001 From: Ciara Loftus Date: Tue, 14 May 2024 08:41:53 +0000 Subject: [PATCH] net/af_xdp: count mbuf allocation failures [ upstream commit f294405ab98594aa41269507dde95cc89bb20a61 ] Failures to allocate mbufs in the receive path were not being accounted for in the ethdev statistics. Fix this. Bugzilla ID: 1429 Fixes: f1debd77efaf ("net/af_xdp: introduce AF_XDP PMD") Reported-by: Stephen Hemminger Signed-off-by: Ciara Loftus 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 c82ea664a1..5e2c239db8 100644 --- a/drivers/net/af_xdp/rte_eth_af_xdp.c +++ b/drivers/net/af_xdp/rte_eth_af_xdp.c @@ -272,4 +272,5 @@ af_xdp_rx_zc(void *queue, struct rte_mbuf **bufs, uint16_t nb_pkts) int i; struct rte_mbuf *fq_bufs[ETH_AF_XDP_RX_BATCH_SIZE]; + struct rte_eth_dev *dev = &rte_eth_devices[rxq->port]; nb_pkts = xsk_ring_cons__peek(rx, nb_pkts, &idx_rx); @@ -299,4 +300,5 @@ af_xdp_rx_zc(void *queue, struct rte_mbuf **bufs, uint16_t nb_pkts) */ rx->cached_cons -= nb_pkts; + dev->data->rx_mbuf_alloc_failed += nb_pkts; return 0; } @@ -350,4 +352,5 @@ af_xdp_rx_cp(void *queue, struct rte_mbuf **bufs, uint16_t nb_pkts) uint32_t free_thresh = fq->size >> 1; struct rte_mbuf *mbufs[ETH_AF_XDP_RX_BATCH_SIZE]; + struct rte_eth_dev *dev = &rte_eth_devices[rxq->port]; if (xsk_prod_nb_free(fq, free_thresh) >= free_thresh) @@ -368,4 +371,6 @@ af_xdp_rx_cp(void *queue, struct rte_mbuf **bufs, uint16_t nb_pkts) */ rx->cached_cons -= nb_pkts; + dev->data->rx_mbuf_alloc_failed += nb_pkts; + 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.464905069 +0100 +++ 0015-net-af_xdp-count-mbuf-allocation-failures.patch 2024-08-23 17:18:09.634429805 +0100 @@ -1 +1 @@ -From f294405ab98594aa41269507dde95cc89bb20a61 Mon Sep 17 00:00:00 2001 +From 6825397cf6a632fc693b2b7f2d785f99618420bf Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit f294405ab98594aa41269507dde95cc89bb20a61 ] + @@ -11 +12,0 @@ -Cc: stable@dpdk.org @@ -21 +22 @@ -index 0997543ee5..0db761a204 100644 +index c82ea664a1..5e2c239db8 100644 @@ -24 +25 @@ -@@ -321,4 +321,5 @@ af_xdp_rx_zc(void *queue, struct rte_mbuf **bufs, uint16_t nb_pkts) +@@ -272,4 +272,5 @@ af_xdp_rx_zc(void *queue, struct rte_mbuf **bufs, uint16_t nb_pkts) @@ -30 +31 @@ -@@ -348,4 +349,6 @@ af_xdp_rx_zc(void *queue, struct rte_mbuf **bufs, uint16_t nb_pkts) +@@ -299,4 +300,5 @@ af_xdp_rx_zc(void *queue, struct rte_mbuf **bufs, uint16_t nb_pkts) @@ -34 +34,0 @@ -+ @@ -37 +37 @@ -@@ -399,4 +402,5 @@ af_xdp_rx_cp(void *queue, struct rte_mbuf **bufs, uint16_t nb_pkts) +@@ -350,4 +352,5 @@ af_xdp_rx_cp(void *queue, struct rte_mbuf **bufs, uint16_t nb_pkts) @@ -43 +43 @@ -@@ -417,4 +421,5 @@ af_xdp_rx_cp(void *queue, struct rte_mbuf **bufs, uint16_t nb_pkts) +@@ -368,4 +371,6 @@ af_xdp_rx_cp(void *queue, struct rte_mbuf **bufs, uint16_t nb_pkts) @@ -46,0 +47 @@ ++