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 4EDD5A0093 for ; Wed, 9 Mar 2022 17:31:34 +0100 (CET) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 4B47E410DC; Wed, 9 Mar 2022 17:31:34 +0100 (CET) Received: from mail-wm1-f42.google.com (mail-wm1-f42.google.com [209.85.128.42]) by mails.dpdk.org (Postfix) with ESMTP id 551C54013F for ; Wed, 9 Mar 2022 17:31:33 +0100 (CET) Received: by mail-wm1-f42.google.com with SMTP id k29-20020a05600c1c9d00b003817fdc0f00so1799646wms.4 for ; Wed, 09 Mar 2022 08:31:33 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=zSle5kb1vQ8vY/v46MOYMnTKinDnFBYVYJ4A/hoWZMs=; b=fYfE8Zf37yU302kKfxmTbYsQ6jqEJAf8hlOykRPQfwb2CS4cIUF5p0jBgrrRGt3DJU 5YQMuti451KjSor2/atIB9ZBAe6193GZtumZcDa/L6yYR1B6HD/O44qJsj6AcklOKZ5Z WzF6e0PqH2cO+7YOYPM9gVoPl1AQWToSDmawmBvhOYooXDS94Qm75t9TIcNfV1/UjKso md2op/9MGDALdCnt0wC70mpMeag8w+b4eTQarO2zMWm2kCDYlOl7H8wECSaiSHmTnLLx PRsJ4Us2lwgasHUme5sefLFXX+2VBSKwPRPo5kfkvx7tuYAnM4KupKmLtxgMUt7oplei c+WQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=zSle5kb1vQ8vY/v46MOYMnTKinDnFBYVYJ4A/hoWZMs=; b=jGIh+IM+ITeiqon68e4PduRD3EGoa4koL2YdwTfXvMpZqXJr98i2EaZbDXhTlTVN/k luIbDZzeWxt+v4s2+m5N+MoU/0QbAV+s/tvU3ETlbaOrvMa+uBOx1OpGTKH6JN4B79qQ ISwZOMLGm7usGGKUJ6/OpV/B7tOCsCh2gKh+YYbYUwdvLxOcTkspFSy3yY9CLy169g+j voHyHwAYQoe1dNIf8J9UvYf/eqXuYwkI6a3ASwV8BwSZ6nxAqFMCJj913GbXUkeCiQva 2Ei6olKSCGx+AalGAHE1bGQvV87U+B+hlUTwTqtm+HPayRNXaB824MR4xl/bVvEo97wu dxWg== X-Gm-Message-State: AOAM532xCy6JoLqgFNDwXCJltuxug8MxPrmYy32Bha3j3gpeweIgHv3R /cPo6jviWx83FB9duWxmIP1v7OS4iTw= X-Google-Smtp-Source: ABdhPJyLgBijOiTYKOe08iMrIZkApnzUXoxwo72c+SquGYtv9udYf9X3yjiLI+LU37a3UedCO6gIpg== X-Received: by 2002:a1c:6a14:0:b0:383:a58c:3635 with SMTP id f20-20020a1c6a14000000b00383a58c3635mr8170461wmc.129.1646843493026; Wed, 09 Mar 2022 08:31:33 -0800 (PST) Received: from localhost ([137.220.125.106]) by smtp.gmail.com with ESMTPSA id h10-20020adf9cca000000b001f0236ba918sm2055358wre.35.2022.03.09.08.31.32 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 09 Mar 2022 08:31:32 -0800 (PST) From: luca.boccassi@gmail.com To: Weiguo Li Cc: Jiawen Wu , dpdk stable Subject: patch 'net/txgbe: fix queue statistics mapping' has been queued to stable release 20.11.5 Date: Wed, 9 Mar 2022 16:30:29 +0000 Message-Id: <20220309163053.245754-13-luca.boccassi@gmail.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220309163053.245754-1-luca.boccassi@gmail.com> References: <20220218123931.1749595-1-luca.boccassi@gmail.com> <20220309163053.245754-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 20.11.5 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 03/11/22. 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/4e76a13521aa9afb7576712309f052ee418f6471 Thanks. Luca Boccassi --- >From 4e76a13521aa9afb7576712309f052ee418f6471 Mon Sep 17 00:00:00 2001 From: Weiguo Li Date: Tue, 1 Mar 2022 14:08:30 +0800 Subject: [PATCH] net/txgbe: fix queue statistics mapping [ upstream commit f69467177fa34afaeeeae81ad83142121ee1bc98 ] Since boolean value is in 0 and 1, it's strange to combines a boolean value with a bit operator. Thus it's highly possible a typo error with "if (A & !B)", and more probably to use "if (A & ~B)" instead. Fixes: c1d4e9d37abd ("net/txgbe: add queue stats mapping") Signed-off-by: Weiguo Li Acked-by: Jiawen Wu --- drivers/net/txgbe/txgbe_ethdev.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/net/txgbe/txgbe_ethdev.c b/drivers/net/txgbe/txgbe_ethdev.c index 4a5d6aad26..1a2c9ff976 100644 --- a/drivers/net/txgbe/txgbe_ethdev.c +++ b/drivers/net/txgbe/txgbe_ethdev.c @@ -366,7 +366,7 @@ txgbe_dev_queue_stats_mapping_set(struct rte_eth_dev *eth_dev, if (hw->mac.type != txgbe_mac_raptor) return -ENOSYS; - if (stat_idx & !QMAP_FIELD_RESERVED_BITS_MASK) + if (stat_idx & ~QMAP_FIELD_RESERVED_BITS_MASK) return -EIO; PMD_INIT_LOG(DEBUG, "Setting port %d, %s queue_id %d to stat index %d", -- 2.30.2 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2022-03-09 16:30:09.023214853 +0000 +++ 0013-net-txgbe-fix-queue-statistics-mapping.patch 2022-03-09 16:30:08.523024617 +0000 @@ -1 +1 @@ -From f69467177fa34afaeeeae81ad83142121ee1bc98 Mon Sep 17 00:00:00 2001 +From 4e76a13521aa9afb7576712309f052ee418f6471 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit f69467177fa34afaeeeae81ad83142121ee1bc98 ] + @@ -13 +14,0 @@ -Cc: stable@dpdk.org @@ -22 +23 @@ -index 19d4444748..f0994f028d 100644 +index 4a5d6aad26..1a2c9ff976 100644 @@ -25 +26 @@ -@@ -376,7 +376,7 @@ txgbe_dev_queue_stats_mapping_set(struct rte_eth_dev *eth_dev, +@@ -366,7 +366,7 @@ txgbe_dev_queue_stats_mapping_set(struct rte_eth_dev *eth_dev,