From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from dpdk.org (dpdk.org [92.243.14.124]) by inbox.dpdk.org (Postfix) with ESMTP id 22B18A04B3 for ; Tue, 24 Dec 2019 12:16:05 +0100 (CET) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id B1B3E1252; Tue, 24 Dec 2019 12:16:04 +0100 (CET) Received: from mail-wm1-f65.google.com (mail-wm1-f65.google.com [209.85.128.65]) by dpdk.org (Postfix) with ESMTP id 06CD21252 for ; Tue, 24 Dec 2019 12:16:03 +0100 (CET) Received: by mail-wm1-f65.google.com with SMTP id p17so2240469wmb.0 for ; Tue, 24 Dec 2019 03:16:03 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:message-id:subject:from:to:cc:date:in-reply-to :references:content-transfer-encoding:user-agent:mime-version; bh=WSWLpzJ+g2App6sTPCAmYPn7icUaOpiDv0KUaG+KKDw=; b=YDsWXcpvPYsN1LJvs0rprQ6biVc6Gk9ShWJpSYZFArFDv+EWwINTaFtEe9C/+Ydkzv Yn3By8kFgFUNYN4wKqrj7EGrH9NPNWYy5j04us1hvR4BnuY/QA9umZcPTLCg8xsX8bvz jGDoUMQbEvtKepRGoHiGPQpdrXRTPzSKBFW0XIIO1sf2vEm0pBAAIxKQiNAIuBsQ03kr fZYLucxDS4o9Zlk7lqT86sX9dmfob8/rojwzCA+Qc48m597IKn5cBs6Tjw55rFwcddFE hFRD6fy3oNqLF/CRIwgvoKortsM5Q7LswB1tllEna9FP5st72sJTv43DmQHBIZ2mx2/z P43w== X-Gm-Message-State: APjAAAX5bT1aLvMS+Udl1CPkbMpLuPDsHvSGssmgm/UIwa/uv2AO/8Ih 2ERXFv/I/HHrUC4SrRUWGiQ= X-Google-Smtp-Source: APXvYqxhUH5O9xbbhv536KRACTw9lNgTlaM5z3EKQwmvoYHjNcXzRNGjh3qV7KMlrO3DcANxigIn3w== X-Received: by 2002:a1c:1bc3:: with SMTP id b186mr3754953wmb.79.1577186163659; Tue, 24 Dec 2019 03:16:03 -0800 (PST) Received: from localhost ([80.120.231.178]) by smtp.gmail.com with ESMTPSA id d10sm24449607wrw.64.2019.12.24.03.16.01 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 24 Dec 2019 03:16:02 -0800 (PST) Message-ID: From: Luca Boccassi To: "Zhang, AlvinX" Cc: "Ye, Xiaolong" , dpdk stable Date: Tue, 24 Dec 2019 11:16:01 +0000 In-Reply-To: <6CE17E955B70FA409286764E3E0B3641127F3174@CDSMSX102.ccr.corp.intel.com> References: <20191219143447.21506-1-luca.boccassi@gmail.com> <20191219143447.21506-83-luca.boccassi@gmail.com> <6CE17E955B70FA409286764E3E0B3641127F3174@CDSMSX102.ccr.corp.intel.com> Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable User-Agent: Evolution 3.30.5-1.1 MIME-Version: 1.0 Subject: Re: [dpdk-stable] patch 'net/i40e: fix exception with multi-driver' has been queued to LTS release 17.11.10 X-BeenThere: stable@dpdk.org X-Mailman-Version: 2.1.15 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, Thanks for checking, removed. On Fri, 2019-12-20 at 01:45 +0000, Zhang, AlvinX wrote: > Hi, >=20 > This patch does not need to be integrated into version 17.11, it > only valid for versions 18.02 and later. >=20 > BR, > Alvin >=20 > > -----Original Message----- > > From:=20 > > luca.boccassi@gmail.com > > [mailto: > > luca.boccassi@gmail.com > > ] > > Sent: Thursday, December 19, 2019 10:34 PM > > To: Zhang, AlvinX < > > alvinx.zhang@intel.com > > > > > Cc: Ye, Xiaolong < > > xiaolong.ye@intel.com > > >; dpdk stable < > > stable@dpdk.org > > > > > Subject: patch 'net/i40e: fix exception with multi-driver' has been > > queued to > > LTS release 17.11.10 > >=20 > > Hi, > >=20 > > FYI, your patch has been queued to LTS release 17.11.10 > >=20 > > Note it hasn't been pushed to=20 > > http://dpdk.org/browse/dpdk-stable > > yet. > > It will be pushed if I get no objections before 12/21/19. So please > > shout if > > anyone has objections. > >=20 > > 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. > >=20 > > Thanks. > >=20 > > Luca Boccassi > >=20 > > --- > > From 97d3af2037014e15165aaf5fafe5c24ab61d7805 Mon Sep 17 00:00:00 > > 2001 > > From: Alvin Zhang < > > alvinx.zhang@intel.com > > > > > Date: Tue, 8 Oct 2019 18:52:31 +0800 > > Subject: [PATCH] net/i40e: fix exception with multi-driver > >=20 > > [ upstream commit 39de80b267e05d6f3322044e5851306acc84f892 ] > >=20 > > If support-multi-driver is enabled, the global registers should not > > be > > configured. But with the current code base, if creating a flow with > > rte_flow > > API, the global register GLQF_FD_MSK may be changed. > >=20 > > Fixes: cfdfca493cae ("net/i40e: fix multiple driver support") > >=20 > > Signed-off-by: Alvin Zhang < > > alvinx.zhang@intel.com > > > > > Reviewed-by: Xiaolong Ye < > > xiaolong.ye@intel.com > > > > > --- > > drivers/net/i40e/i40e_flow.c | 38 +++++++++++++++++++++++++++++--- > > -- > > -- > > 1 file changed, 31 insertions(+), 7 deletions(-) > >=20 > > diff --git a/drivers/net/i40e/i40e_flow.c > > b/drivers/net/i40e/i40e_flow.c > > index 4ebf925a68..4fa099481a 100644 > > --- a/drivers/net/i40e/i40e_flow.c > > +++ b/drivers/net/i40e/i40e_flow.c > > @@ -2366,6 +2366,37 @@ i40e_flow_set_fdir_inset(struct i40e_pf *pf, > > if (num < 0) > > return -EINVAL; > >=20 > > + if (pf->support_multi_driver) { > > + for (i =3D 0; i < num; i++) > > + if (i40e_read_rx_ctl(hw, > > + I40E_GLQF_FD_MSK(i, pctype)) !=3D > > + mask_reg[i]) { > > + PMD_DRV_LOG(ERR, "Input set setting is > > not" > > + " supported with" > > + " `support-multi- > > driver`" > > + " enabled!"); > > + return -EPERM; > > + } > > + for (i =3D num; i < I40E_INSET_MASK_NUM_REG; i++) > > + if (i40e_read_rx_ctl(hw, > > + I40E_GLQF_FD_MSK(i, pctype)) !=3D > > 0) > > { > > + PMD_DRV_LOG(ERR, "Input set setting is > > not" > > + " supported with" > > + " `support-multi- > > driver`" > > + " enabled!"); > > + return -EPERM; > > + } > > + > > + } else { > > + for (i =3D 0; i < num; i++) > > + i40e_check_write_reg(hw, I40E_GLQF_FD_MSK(i, > > pctype), > > + mask_reg[i]); > > + /*clear unused mask registers of the pctype */ > > + for (i =3D num; i < I40E_INSET_MASK_NUM_REG; i++) > > + i40e_check_write_reg(hw, > > + I40E_GLQF_FD_MSK(i, pctype), > > 0); > > + } > > + > > inset_reg |=3D i40e_translate_input_set_reg(hw->mac.type, > > input_set); > >=20 > > i40e_check_write_reg(hw, I40E_PRTQF_FD_INSET(pctype, 0), @@ - > > 2374,13 +2405,6 @@ i40e_flow_set_fdir_inset(struct i40e_pf *pf, > > (uint32_t)((inset_reg >> > > I40E_32_BIT_WIDTH) & > > UINT32_MAX)); > >=20 > > - for (i =3D 0; i < num; i++) > > - i40e_check_write_reg(hw, I40E_GLQF_FD_MSK(i, pctype), > > - mask_reg[i]); > > - > > - /*clear unused mask registers of the pctype */ > > - for (i =3D num; i < I40E_INSET_MASK_NUM_REG; i++) > > - i40e_check_write_reg(hw, I40E_GLQF_FD_MSK(i, pctype), > > 0); > > I40E_WRITE_FLUSH(hw); > >=20 > > pf->fdir.input_set[pctype] =3D input_set; > > -- > > 2.20.1 > >=20 > > --- > > Diff of the applied patch vs upstream commit (please double-check=20 > > if non- > > empty: > > --- > > --- - 2019-12-19 14:32:29.667640280 +0000 > > +++ 0083-net-i40e-fix-exception-with-multi-driver.patch 2019- > > 12-19 > > 14:32:26.201299729 +0000 > > @@ -1,14 +1,15 @@ > > -From 39de80b267e05d6f3322044e5851306acc84f892 Mon Sep 17 00:00:00 > > 2001 > > +From 97d3af2037014e15165aaf5fafe5c24ab61d7805 Mon Sep 17 00:00:00 > > 2001 > > From: Alvin Zhang < > > alvinx.zhang@intel.com > > > > > Date: Tue, 8 Oct 2019 18:52:31 +0800 > > Subject: [PATCH] net/i40e: fix exception with multi-driver > >=20 > > +[ upstream commit 39de80b267e05d6f3322044e5851306acc84f892 ] > > + > > If support-multi-driver is enabled, the global registers should > > not be > > configured. But with the current code base, if creating a > > flow with rte_flow > > API, the global register GLQF_FD_MSK may be changed. > >=20 > > Fixes: cfdfca493cae ("net/i40e: fix multiple driver support") > > -Cc:=20 > > stable@dpdk.org > >=20 > >=20 > > Signed-off-by: Alvin Zhang < > > alvinx.zhang@intel.com > > > > > Reviewed-by: Xiaolong Ye < > > xiaolong.ye@intel.com > > > @@ -17,10 +18,10 @@ > > 1 file changed, 31 insertions(+), 7 deletions(-) > >=20 > > diff --git a/drivers/net/i40e/i40e_flow.c > > b/drivers/net/i40e/i40e_flow.c - > > index 9e038fa48f..61021037c8 100644 > > +index 4ebf925a68..4fa099481a 100644 > > --- a/drivers/net/i40e/i40e_flow.c > > +++ b/drivers/net/i40e/i40e_flow.c > > -@@ -2349,6 +2349,37 @@ i40e_flow_set_fdir_inset(struct i40e_pf > > *pf, > > +@@ -2366,6 +2366,37 @@ i40e_flow_set_fdir_inset(struct i40e_pf > > *pf, > > if (num < 0) > > return -EINVAL; > >=20 > > @@ -58,7 +59,7 @@ > > inset_reg |=3D i40e_translate_input_set_reg(hw->mac.type, > > input_set); > >=20 > > i40e_check_write_reg(hw, I40E_PRTQF_FD_INSET(pctype, 0), -@@ - > > 2357,13 +2388,6 @@ i40e_flow_set_fdir_inset(struct i40e_pf *pf, > > +@@ -2374,13 +2405,6 @@ i40e_flow_set_fdir_inset(struct i40e_pf > > *pf, > > (uint32_t)((inset_reg >> > > I40E_32_BIT_WIDTH) & > > UINT32_MAX)); > >=20 --=20 Kind regards, Luca Boccassi