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 DEB7AA0524 for ; Fri, 5 Feb 2021 12:22:36 +0100 (CET) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id A4DD81606C3; Fri, 5 Feb 2021 12:22:36 +0100 (CET) Received: from mail-wr1-f53.google.com (mail-wr1-f53.google.com [209.85.221.53]) by mails.dpdk.org (Postfix) with ESMTP id D581E1606CE for ; Fri, 5 Feb 2021 12:22:34 +0100 (CET) Received: by mail-wr1-f53.google.com with SMTP id 7so7341695wrz.0 for ; Fri, 05 Feb 2021 03:22:34 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=rQd1ZbIKWdYddtM2poW+5i5ciCboWZhFE5t/WDWKGfY=; b=FDKa79jiP93rbH9+y0yrMLYpMV0NBLrP5RavNdvpyUgruiSdVlzHBfsAZegWe71+YD e0HjHX2nLGNReo2ZIdVvZMz1RwKWCKRZkjXQF33w/3PTbHPbMLVojGwNWBQO9e2kUbML NpWfi4bhOGJUI6dYzwByoQYZnPWiojT+xrd7zAIOIVBuHZwcAUIZutPcUV9RzYzuvOoh BnVisHjBD2YJRbbiPm5HVlmXevATMXx2VFgRd96TeuD3vQLSLmcI2ny/yF7OMgvzAMzR lKXw8Ggx4tY78+47ClUJx7qjaMdDlauX+UdnvXd439bqxa2tsV0nR/XR+P0dbv/IGeTp P63Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=rQd1ZbIKWdYddtM2poW+5i5ciCboWZhFE5t/WDWKGfY=; b=YRDFuakvJceWHpTSPW2rkEzAyuVaPxjuid/44MHbAFZoIRXBzheUXW5VIv2Zx0886A VSoQESRYwV5qKsYO/TfrglMlTR2iLAiB37e0y75JwbzT/ilpj/IQ4AjWo8vkszIBzOAm 7FG3rDU9CKzbGjYTufGwfR7FIiAOuCD8EClNot6fbxcfBR8tIQ9gilM2e4wUciIm1GAZ +NXLPQwDIIBhjFMuNXbwslALfVpKvTYEPWsfBL5Di6Ooms8yOJf295blzK+1j+X3ZpkN JWw8ATL6urZsIaUJWYSVzzAxmp8JeYf/iPXdBb9ObDk4nV2HFVjAWQNrAyXrvRqSY4w3 Vjag== X-Gm-Message-State: AOAM532fm2ZQnht6P/yPwtwpyDtsrEHseDGHWxNj+OV48k215KBnFHhh CgzK5jk6Kuqj5Zh+56mWAUpNRacydroFyx2V X-Google-Smtp-Source: ABdhPJxeb+N1h5GijmWus9cfSwz+shkZIgMlraHSgtyAwZUXNL62zDVi0jQNq0OLUDav58eMIREqaQ== X-Received: by 2002:adf:b60f:: with SMTP id f15mr4501826wre.83.1612524154657; Fri, 05 Feb 2021 03:22:34 -0800 (PST) Received: from localhost ([88.98.246.218]) by smtp.gmail.com with ESMTPSA id u10sm8212723wmj.40.2021.02.05.03.22.33 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 05 Feb 2021 03:22:33 -0800 (PST) From: luca.boccassi@gmail.com To: Igor Ryzhov Cc: Qi Zhang , dpdk stable Date: Fri, 5 Feb 2021 11:15:44 +0000 Message-Id: <20210205111920.1272063-58-luca.boccassi@gmail.com> X-Mailer: git-send-email 2.29.2 In-Reply-To: <20210205111920.1272063-1-luca.boccassi@gmail.com> References: <20210205111920.1272063-1-luca.boccassi@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [dpdk-stable] patch 'net/i40e: fix stats counters' has been queued to stable release 20.11.1 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 Sender: "stable" Hi, FYI, your patch has been queued to stable release 20.11.1 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 02/07/21. 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/935edd8d9578f59e2970c68936cf50474faa8227 Thanks. Luca Boccassi --- >From 935edd8d9578f59e2970c68936cf50474faa8227 Mon Sep 17 00:00:00 2001 From: Igor Ryzhov Date: Tue, 17 Nov 2020 11:56:39 +0300 Subject: [PATCH] net/i40e: fix stats counters [ upstream commit d8d652ec7266d9ea4c8763d4a71a2c7853b9c23b ] When low and high registers are read separately, this opens the door to a race condition: - low register is read - NIC updates the registers - high register is read Because of this, we may end up with an incorrect counter value. Let's read the registers in one shot, as it is done in Linux kernel since the introduction of the i40e driver. Fixes: 4861cde46116 ("i40e: new poll mode driver") Signed-off-by: Igor Ryzhov Acked-by: Qi Zhang --- drivers/net/i40e/base/i40e_osdep.h | 10 ++++++++++ drivers/net/i40e/i40e_ethdev.c | 10 +++++++--- 2 files changed, 17 insertions(+), 3 deletions(-) diff --git a/drivers/net/i40e/base/i40e_osdep.h b/drivers/net/i40e/base/i40e_osdep.h index 9b5033024f..c9287ff255 100644 --- a/drivers/net/i40e/base/i40e_osdep.h +++ b/drivers/net/i40e/base/i40e_osdep.h @@ -133,6 +133,14 @@ static inline uint32_t i40e_read_addr(volatile void *addr) return rte_le_to_cpu_32(I40E_PCI_REG(addr)); } +#define I40E_PCI_REG64(reg) rte_read64(reg) +#define I40E_PCI_REG64_ADDR(a, reg) \ + ((volatile uint64_t *)((char *)(a)->hw_addr + (reg))) +static inline uint64_t i40e_read64_addr(volatile void *addr) +{ + return rte_le_to_cpu_64(I40E_PCI_REG64(addr)); +} + #define I40E_PCI_REG_WRITE(reg, value) \ rte_write32((rte_cpu_to_le_32(value)), reg) #define I40E_PCI_REG_WRITE_RELAXED(reg, value) \ @@ -150,6 +158,8 @@ static inline uint32_t i40e_read_addr(volatile void *addr) #define I40E_WRITE_REG(hw, reg, value) \ I40E_PCI_REG_WRITE(I40E_PCI_REG_ADDR((hw), (reg)), (value)) +#define I40E_READ_REG64(hw, reg) i40e_read64_addr(I40E_PCI_REG64_ADDR((hw), (reg))) + #define rd32(a, reg) i40e_read_addr(I40E_PCI_REG_ADDR((a), (reg))) #define wr32(a, reg, value) \ I40E_PCI_REG_WRITE(I40E_PCI_REG_ADDR((a), (reg)), (value)) diff --git a/drivers/net/i40e/i40e_ethdev.c b/drivers/net/i40e/i40e_ethdev.c index 2cb18ecc03..7f9bba4052 100644 --- a/drivers/net/i40e/i40e_ethdev.c +++ b/drivers/net/i40e/i40e_ethdev.c @@ -6620,9 +6620,13 @@ i40e_stat_update_48(struct i40e_hw *hw, { uint64_t new_data; - new_data = (uint64_t)I40E_READ_REG(hw, loreg); - new_data |= ((uint64_t)(I40E_READ_REG(hw, hireg) & - I40E_16_BIT_MASK)) << I40E_32_BIT_WIDTH; + if (hw->device_id == I40E_DEV_ID_QEMU) { + new_data = (uint64_t)I40E_READ_REG(hw, loreg); + new_data |= ((uint64_t)(I40E_READ_REG(hw, hireg) & + I40E_16_BIT_MASK)) << I40E_32_BIT_WIDTH; + } else { + new_data = I40E_READ_REG64(hw, loreg); + } if (!offset_loaded) *offset = new_data; -- 2.29.2 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2021-02-05 11:18:31.880440689 +0000 +++ 0058-net-i40e-fix-stats-counters.patch 2021-02-05 11:18:28.802691036 +0000 @@ -1 +1 @@ -From d8d652ec7266d9ea4c8763d4a71a2c7853b9c23b Mon Sep 17 00:00:00 2001 +From 935edd8d9578f59e2970c68936cf50474faa8227 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit d8d652ec7266d9ea4c8763d4a71a2c7853b9c23b ] + @@ -17 +18,0 @@ -Cc: stable@dpdk.org