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 AD351A0524 for ; Fri, 5 Feb 2021 12:21:28 +0100 (CET) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id A699B4067B; Fri, 5 Feb 2021 12:21:28 +0100 (CET) Received: from mail-wm1-f49.google.com (mail-wm1-f49.google.com [209.85.128.49]) by mails.dpdk.org (Postfix) with ESMTP id 9D17F1606B6 for ; Fri, 5 Feb 2021 12:21:27 +0100 (CET) Received: by mail-wm1-f49.google.com with SMTP id m1so5621349wml.2 for ; Fri, 05 Feb 2021 03:21:27 -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=CSFkMLCQD9xrPJXQrBGomCzBl2LaB1ihHq9aSNJ7ujU=; b=ohMO6JRwxGPgDWr3tA31hMTAo/T5Vaa8397YUdqMVH8CgKUIB1J4MSGrkARnwUhlgZ bFypR5bwMskWZCfQyHOzSOQeD+U56mzu2pDBw9fjBikWHXX6X+HYamQhu2MTjFZsY7Nt 0iSrMsGzIndYZMU1r/eUbv7Ul1i35OZL98ah1tgj6NTkyi87lc4TUzfBosrmFNsZd6AU tiYEwqcd9l4lGf0n3VCml8Rsagm2oXunrvA8O7OirjMMj4LzBnq5OU9NkLTBQLzOaug6 eaIutN3EeSJhzhsTsnkSk5svICWdwZTrc72WKo0uTYuYdZZXVOmNq/rWUcKiJob2tTZ9 D4rA== 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=CSFkMLCQD9xrPJXQrBGomCzBl2LaB1ihHq9aSNJ7ujU=; b=IuMhLXxb42x2dtPvXC+yWJFcrv/RvQJ6EDoIOOX/eY7guX8y9vBrpl1QKjlWaqw3lM 6kb1h59Z4mQhfDOFlh4ziLoT7Hi9oh51KDs/hDsguF3lLDelqX5a4nDXm039+m9TIxUO fLh2F1hv+Y1E3CEPp24VefO0MViymgo6SjekmYk9lZAWKtyRQ90pZGZBPQ5VP9MriUwI KSkMXaIsVOZO++WUeU+Q0ZBgvE34eXZgy54KXYaSEOlOhbsKG/BpOAHm88WsDrCiteBs BHz+1zSwrhUx/C2Nh4Ve7wMYitPkgGRQ6O04oC4qS5yrFyfLJ92/S88kBjmBUrDrJngu ptBg== X-Gm-Message-State: AOAM533owU8BWsZUteDqTHwD5oYhGtcbNg6TYcE+AVdofpexKhSih76X GLE80NcPcIrwfsgeovcDYZI= X-Google-Smtp-Source: ABdhPJwMB6ijDblj3TEU/m4b2QhqTCdwtrWsRc18A0Y2c0pRqBQvGJi3dOCXvjhKJco+MZJ6cuYlqg== X-Received: by 2002:a1c:2ed4:: with SMTP id u203mr3203573wmu.45.1612524087378; Fri, 05 Feb 2021 03:21:27 -0800 (PST) Received: from localhost ([88.98.246.218]) by smtp.gmail.com with ESMTPSA id 36sm12516510wrj.97.2021.02.05.03.21.25 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 05 Feb 2021 03:21:26 -0800 (PST) From: luca.boccassi@gmail.com To: Beilei Xing Cc: Jeff Guo , dpdk stable Date: Fri, 5 Feb 2021 11:15:23 +0000 Message-Id: <20210205111920.1272063-37-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 global register recovery' 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/de803d7e033ee2cdb5df86ab47a46ddae1041875 Thanks. Luca Boccassi --- >From de803d7e033ee2cdb5df86ab47a46ddae1041875 Mon Sep 17 00:00:00 2001 From: Beilei Xing Date: Fri, 20 Nov 2020 16:49:47 +0800 Subject: [PATCH] net/i40e: fix global register recovery [ upstream commit ac241c74ac75b2670788635b1a8e6809afae0827 ] PMD configures the global register I40E_GLINT_CTL during device initialization to work around the Rx write back issue. But when a device is bound from DPDK to kernel, the global register is not recovered to the original state, it will cause kernel driver performance drop issue. This patch fixes this issue. Fixes: be6c228d4da3 ("i40e: support Rx interrupt") Fixes: 4ab831449a1c ("net/i40e: fix interrupt conflict with multi-driver") Signed-off-by: Beilei Xing Acked-by: Jeff Guo --- drivers/net/i40e/i40e_ethdev.c | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/drivers/net/i40e/i40e_ethdev.c b/drivers/net/i40e/i40e_ethdev.c index f54769c29d..2cb18ecc03 100644 --- a/drivers/net/i40e/i40e_ethdev.c +++ b/drivers/net/i40e/i40e_ethdev.c @@ -763,6 +763,21 @@ static inline void i40e_config_automask(struct i40e_pf *pf) I40E_WRITE_REG(hw, I40E_GLINT_CTL, val); } +static inline void i40e_clear_automask(struct i40e_pf *pf) +{ + struct i40e_hw *hw = I40E_PF_TO_HW(pf); + uint32_t val; + + val = I40E_READ_REG(hw, I40E_GLINT_CTL); + val &= ~(I40E_GLINT_CTL_DIS_AUTOMASK_PF0_MASK | + I40E_GLINT_CTL_DIS_AUTOMASK_VF0_MASK); + + if (!pf->support_multi_driver) + val &= ~I40E_GLINT_CTL_DIS_AUTOMASK_N_MASK; + + I40E_WRITE_REG(hw, I40E_GLINT_CTL, val); +} + #define I40E_FLOW_CONTROL_ETHERTYPE 0x8808 /* @@ -2741,6 +2756,8 @@ i40e_dev_close(struct rte_eth_dev *dev) /* Remove all Traffic Manager configuration */ i40e_tm_conf_uninit(dev); + i40e_clear_automask(pf); + hw->adapter_closed = 1; return ret; } -- 2.29.2 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2021-02-05 11:18:30.950659779 +0000 +++ 0037-net-i40e-fix-global-register-recovery.patch 2021-02-05 11:18:28.690688903 +0000 @@ -1 +1 @@ -From ac241c74ac75b2670788635b1a8e6809afae0827 Mon Sep 17 00:00:00 2001 +From de803d7e033ee2cdb5df86ab47a46ddae1041875 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit ac241c74ac75b2670788635b1a8e6809afae0827 ] + @@ -15 +16,0 @@ -Cc: stable@dpdk.org