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 3A451454E9 for ; Tue, 25 Jun 2024 02:00:15 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 2B32A410DC; Tue, 25 Jun 2024 02:00:15 +0200 (CEST) Received: from mail-wm1-f45.google.com (mail-wm1-f45.google.com [209.85.128.45]) by mails.dpdk.org (Postfix) with ESMTP id 15E1E400EF for ; Tue, 25 Jun 2024 02:00:14 +0200 (CEST) Received: by mail-wm1-f45.google.com with SMTP id 5b1f17b1804b1-4217d451f69so42234465e9.0 for ; Mon, 24 Jun 2024 17:00:14 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1719273614; x=1719878414; darn=dpdk.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=7G4jkjzuOzh4OclPN4RBKrox8ANrcKfpAbwIu1KB628=; b=i7m8u4M/pRICFA4oFWQOq6WM3rIBeWff2oR8biSyzNNADeDl+TXSA5wTFZOkU7nbVc 8+/6zM07wt84Tive88ZhdOZg6xuBdFpAZ0PLs8EA3dGo9ygAjx8AvlGeN7M03YKins4E Akfp/l440WOZIiFxKNU0GH1sTdu9E3P8jk7X+tB/1HaNlLftzB0uHCHmkfT2OxYNyLfO 0PQemXJ7bMJE+HlYE7WWKDzo4UNCg43kleFnOLa4RUnbfsASNciPuxMwA9pwsr0wr+c5 LaPOhbiLRy17jAtuwWYoTYxxDE4v9onXsldPWSQw3ANG/0w3UkiHdWcXq+L9BkQS7kJH CwqQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1719273614; x=1719878414; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=7G4jkjzuOzh4OclPN4RBKrox8ANrcKfpAbwIu1KB628=; b=FOuIU6UMdPFEptqFu6dSsCR9uyH10kn9DK5etG03/wMG5Trb3OcEBX3z/n2asCQXiL gtpwzKvPw7pLSUdoxlWSFq+bs5cUtnD/ELAFGrAP+2P4lcF0fDjJSuNSu36maYgIC+6g WVQTflkL+WwAkWR8VToQoJXZ0qw1qBb03MxnQ3rj/qwfe8e+dl3oHk/rqe4lpJ7yLRLA Fk62medfex1HelN4fhXBrQGW9wcTBdOIRDTTAAhA1KesZ5MovU05jpnfcuQPnIwkTf0f 5zRyi3zA9ieT4pOrB9P1afumNMgu2gi7KtlRZ6TfOIxOgXkuNshiaeD9EDu0MeYqM/ZH Y1SA== X-Forwarded-Encrypted: i=1; AJvYcCXh+GWlZgyMqOyx1o2hVusKX5Sek5zL9uOpL2LBYU/jd9kt8iHNTFpWQP+j5d+0EPIKcjKaPPrS7YnpNjKM1B4= X-Gm-Message-State: AOJu0YyHKMy2my9SZ/ga8RsojUDrM9RLI9+hXJL+SNjKPZTGCIeTvNcS rHoQB8DYGYk0123BGzypLgbRvaV5vGVcxttPdV+gaNU/n4X+Vv225oK95g== X-Google-Smtp-Source: AGHT+IFmj8Fd7O7UAQ1JAgkZwr0Yj3ysstf1uPGAaTkYaIPAvKy0b0WZK1+qEFVnd22nlpLh68xtwA== X-Received: by 2002:a7b:cd97:0:b0:424:982c:4df0 with SMTP id 5b1f17b1804b1-424982c4f73mr16792945e9.29.1719273613655; Mon, 24 Jun 2024 17:00:13 -0700 (PDT) Received: from localhost ([137.220.120.171]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-3663a8c7bdfsm11318012f8f.102.2024.06.24.17.00.13 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 24 Jun 2024 17:00:13 -0700 (PDT) From: luca.boccassi@gmail.com To: Ciara Loftus Cc: Stephen Hemminger , dpdk stable Subject: patch 'net/af_xdp: remove unused local statistic' has been queued to stable release 22.11.6 Date: Tue, 25 Jun 2024 00:58:06 +0100 Message-Id: <20240624235907.885628-20-luca.boccassi@gmail.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20240624235907.885628-1-luca.boccassi@gmail.com> References: <20240624235907.885628-1-luca.boccassi@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 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 22.11.6 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 06/27/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/bluca/dpdk-stable This queued commit can be viewed at: https://github.com/bluca/dpdk-stable/commit/19c6df9ce8fdb63c39c779b4adbd3b0bb5a90b3f Thanks. Luca Boccassi --- >From 19c6df9ce8fdb63c39c779b4adbd3b0bb5a90b3f Mon Sep 17 00:00:00 2001 From: Ciara Loftus Date: Tue, 14 May 2024 08:41:55 +0000 Subject: [PATCH] net/af_xdp: remove unused local statistic [ upstream commit abdabad636a54660f4a260e1e9dc573900582bd4 ] The rx_dropped statistic is never incremented so its existence is pointless. Remove it. 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 | 2 -- 1 file changed, 2 deletions(-) diff --git a/drivers/net/af_xdp/rte_eth_af_xdp.c b/drivers/net/af_xdp/rte_eth_af_xdp.c index df6ac7a4f2..343b4c40c9 100644 --- a/drivers/net/af_xdp/rte_eth_af_xdp.c +++ b/drivers/net/af_xdp/rte_eth_af_xdp.c @@ -104,7 +104,6 @@ struct xsk_umem_info { struct rx_stats { uint64_t rx_pkts; uint64_t rx_bytes; - uint64_t rx_dropped; uint64_t imissed_offset; }; @@ -854,7 +853,6 @@ eth_stats_get(struct rte_eth_dev *dev, struct rte_eth_stats *stats) stats->ipackets += stats->q_ipackets[i]; stats->ibytes += stats->q_ibytes[i]; - stats->imissed += rxq->stats.rx_dropped; stats->oerrors += txq->stats.tx_dropped; fd = process_private->rxq_xsk_fds[i]; ret = fd >= 0 ? getsockopt(fd, SOL_XDP, XDP_STATISTICS, -- 2.39.2 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2024-06-25 00:22:14.807938029 +0100 +++ 0020-net-af_xdp-remove-unused-local-statistic.patch 2024-06-25 00:22:13.105184018 +0100 @@ -1 +1 @@ -From abdabad636a54660f4a260e1e9dc573900582bd4 Mon Sep 17 00:00:00 2001 +From 19c6df9ce8fdb63c39c779b4adbd3b0bb5a90b3f Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit abdabad636a54660f4a260e1e9dc573900582bd4 ] + @@ -10 +11,0 @@ -Cc: stable@dpdk.org @@ -20 +21 @@ -index 25e67851f6..4b282adb03 100644 +index df6ac7a4f2..343b4c40c9 100644 @@ -23 +24 @@ -@@ -125,7 +125,6 @@ struct xsk_umem_info { +@@ -104,7 +104,6 @@ struct xsk_umem_info { @@ -31 +32 @@ -@@ -884,7 +883,6 @@ eth_stats_get(struct rte_eth_dev *dev, struct rte_eth_stats *stats) +@@ -854,7 +853,6 @@ eth_stats_get(struct rte_eth_dev *dev, struct rte_eth_stats *stats)