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 5F5D8A0C4B for ; Tue, 13 Jul 2021 04:07:19 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 35AC74069E; Tue, 13 Jul 2021 04:07:19 +0200 (CEST) Received: from mga03.intel.com (mga03.intel.com [134.134.136.65]) by mails.dpdk.org (Postfix) with ESMTP id 328DD4069E for ; Tue, 13 Jul 2021 04:07:17 +0200 (CEST) X-IronPort-AV: E=McAfee;i="6200,9189,10043"; a="210126856" X-IronPort-AV: E=Sophos;i="5.84,235,1620716400"; d="scan'208";a="210126856" Received: from fmsmga006.fm.intel.com ([10.253.24.20]) by orsmga103.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 12 Jul 2021 19:07:15 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.84,235,1620716400"; d="scan'208";a="649106747" Received: from fmsmsx606.amr.corp.intel.com ([10.18.126.86]) by fmsmga006.fm.intel.com with ESMTP; 12 Jul 2021 19:07:13 -0700 Received: from fmsmsx611.amr.corp.intel.com (10.18.126.91) by fmsmsx606.amr.corp.intel.com (10.18.126.86) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2242.10; Mon, 12 Jul 2021 19:07:13 -0700 Received: from fmsmsx605.amr.corp.intel.com (10.18.126.85) by fmsmsx611.amr.corp.intel.com (10.18.126.91) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2242.10; Mon, 12 Jul 2021 19:07:13 -0700 Received: from FMSEDG603.ED.cps.intel.com (10.1.192.133) by fmsmsx605.amr.corp.intel.com (10.18.126.85) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2242.4 via Frontend Transport; Mon, 12 Jul 2021 19:07:13 -0700 Received: from NAM12-DM6-obe.outbound.protection.outlook.com (104.47.59.176) by edgegateway.intel.com (192.55.55.68) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.1.2242.10; Mon, 12 Jul 2021 19:07:12 -0700 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=lo95t+iVj/9/SJI1udo/BFJvLeS3N7gn15lx3l7QtR1lrn11caix7O/eHykXNJZamJvbsobHAOlzIX7jkqJPwC93WVr3vP4qmVmasNsxNlRd3BVtJ8ZmiLDw2teO4PTNMI6DON12/MxqFVKMLIj72RNyN+eLbZsOY+y7/L3B5vtuF/y6kSkyHffiIWcdHglkXGibGlWbaeOqiyMVXWu/PcwKQr18w4Mu6uAxgZaujF4/0q6PTHHa3PalaO1QjrgHFE+QOc55InfY7OmP5vODg7Ybf7kO2v2PcVgBF1orQLN7aDBhL5Svu1o86dt8CsbUDwHYJqwFRGPPA6kFwn/2Ig== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=wj9GpBc90LAIt1O9JYYhR54JSAWJmolVe8qNI6fxJXs=; b=nGGsVFHotxWSUIFPGPLX2rv9xbkiq4mX5oG2VlJSzLKcgNl7v2aWeVSIkw74efp1F+h9Vz9ow0fnNjANprFPcTAFJKi1dTRcU388BKyicJCkXlBFu9KjAxIpGWrHjEeUeYxr3x1KYDAQ2t7Oqu2LNlAjvArxCL42ky0+0WGCvqmw8IjsDWPcuZ76dhDxBTnnegP1BHRnjhejnfwXjnVr7EkFpCRJQ9tzyxcBXJJh8QGjYhU8mCw6jYhAqRZRsozXqmnLlb/ilIxil6w91C0z8thuwoEbHPQIgC/HQWk3KKOC6qFWxBYT7orrEzbvcuFV36iRTzUFVmdcKbGDc0zvpA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=intel.com; dmarc=pass action=none header.from=intel.com; dkim=pass header.d=intel.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=intel.onmicrosoft.com; s=selector2-intel-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=wj9GpBc90LAIt1O9JYYhR54JSAWJmolVe8qNI6fxJXs=; b=Zh/AZbDFjWWQW3c0FTcGMqtFXU0Hkqy9C3R9LI3A4imIZO/y3GQMIejrdli7YydgyP4b5tjrxECUTnSmJTw1H224EYWNREMmxfM+YGoN5gbipaQ3o+c+qBAlCb0p5bl3ORLKrkLa9dj4DYP4/OYC9iT6T+eNLa5j03cK8z9n8Ns= Received: from SA0PR11MB4575.namprd11.prod.outlook.com (2603:10b6:806:9b::18) by SN6PR11MB3229.namprd11.prod.outlook.com (2603:10b6:805:ba::28) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4308.20; Tue, 13 Jul 2021 02:07:10 +0000 Received: from SA0PR11MB4575.namprd11.prod.outlook.com ([fe80::612f:57ee:d580:ed3d]) by SA0PR11MB4575.namprd11.prod.outlook.com ([fe80::612f:57ee:d580:ed3d%3]) with mapi id 15.20.4308.027; Tue, 13 Jul 2021 02:07:10 +0000 From: "Wu, Wenjun1" To: "luca.boccassi@gmail.com" CC: "Zhang, Qi Z" , "stable@dpdk.org" Thread-Topic: patch 'net/ice/base: fix first profile mask' has been queued to stable release 20.11.3 Thread-Index: AQHXdx+iWwOHTnVVckO19IqdU8ygVKtAKAFA Date: Tue, 13 Jul 2021 02:07:10 +0000 Message-ID: References: <20210712130551.2462159-1-luca.boccassi@gmail.com> <20210712130551.2462159-49-luca.boccassi@gmail.com> In-Reply-To: <20210712130551.2462159-49-luca.boccassi@gmail.com> Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: authentication-results: gmail.com; dkim=none (message not signed) header.d=none;gmail.com; dmarc=none action=none header.from=intel.com; x-ms-publictraffictype: Email x-ms-office365-filtering-correlation-id: 036ea684-ef3f-47a1-7580-08d945a2ec6b x-ms-traffictypediagnostic: SN6PR11MB3229: x-ld-processed: 46c98d88-e344-4ed4-8496-4ed7712e255d,ExtAddr x-ms-exchange-transport-forked: True x-microsoft-antispam-prvs: x-ms-oob-tlc-oobclassifiers: OLM:10000; x-ms-exchange-senderadcheck: 1 x-microsoft-antispam: BCL:0; x-microsoft-antispam-message-info: FWGa241bHfnLclCUFX/PJFZGE1SvozRm7NRSOWkrzRs4htgzZtUrrV4HnxctP6aJa+sA7MdW4I4IKpyYHZdvvIefrbCXf9CWxReg9j/OMbZplpaZ7gArwYoylsNBOsO2eQ7h20rWYJ9DfhlyRzmRQcHqUt+3bgFAv9JkLfxrEn1Qyv26AzOJ0mP/SgWbN3dlkaf7O9kYZ3z9y/StBAnZIPuOSzK6xIC2WPajQKP+ajvmibubFe7QFQyThrOr+hvpVZv0/ETHG8DOC4rlvSYUZAUMWCAElRPInrEDkwdYzCYItP+6xDiDw6u5QVzS59I+htkwMMDgw/GtF+cO+uuJgXgfU1dNrJNxRDuve8dfalzFmFXJsFaklDuGIzz1T0GAswiMSfjxCV/R7ZxWJggCUrEB7to2uBlpwo3UTm8tCogAwJHps/8symBa/1fswZ5jWRw8/gOnPlPufVQGB3lrjgnJ/8hiQEDchPdXSAuJEGVR4wjaJs1/296GKsXCF3iHoUMAK2pYopVFzlaaE38ngb17bONG/sy9EOTAzezh+TOF3VXMebKmleaL/bZV0mzHgj4ZP3fM9FcRGPz/VuEqPA6IvuRG4c/PH7+RVIxdi8H8ytxt0kgrTmOFm4Pz5Og/Mz7ZLtVbiYQ7VrwsLw8H7/pe8f3n0wDdIKb3SLthl1svEDdDBCqpdhWJcDgPVZuC/yDV6wGxaWaoNTEKZRfRPXDYaX2KjgAm6DWQMRMAeYHp+XXjC8rwHTIfbm2xDRtwg9FCDS7uBXSBzwtgFXkhFA== x-forefront-antispam-report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:SA0PR11MB4575.namprd11.prod.outlook.com; PTR:; CAT:NONE; SFS:(4636009)(366004)(346002)(376002)(136003)(396003)(39860400002)(186003)(8676002)(26005)(33656002)(6916009)(7696005)(66446008)(478600001)(71200400001)(4326008)(66476007)(6506007)(966005)(9686003)(55016002)(86362001)(66946007)(2906002)(5660300002)(54906003)(66556008)(8936002)(53546011)(52536014)(316002)(38100700002)(64756008)(83380400001)(122000001)(76116006); DIR:OUT; SFP:1102; x-ms-exchange-antispam-messagedata-chunkcount: 1 x-ms-exchange-antispam-messagedata-0: =?us-ascii?Q?LF8XDyuuW47GQkLl0DJjetVro3TIOP0OIE9nfu+MjTuQIes83OeNj0LIwNo3?= =?us-ascii?Q?9IgwI1mAuSnqXOtHkbqCPDUn70m5Gr445/GMZsCtQT9DFl10+KRk1mnxa1Lz?= =?us-ascii?Q?4AlZ8klR1M1GpXBWpNu2iT7caoCkLQfYmVl7wud9VRr0o84+k2GcztwyVeJc?= =?us-ascii?Q?lZkVd4h1njc1r5pmt4BwVWLos8iuFv8CW1OX+trQZZza25hZ3tbzk7vKe56q?= =?us-ascii?Q?9ahcNfgxTZFEhF6lXL9e0XwrcVhi2TA21Jz0Eec2tN7X2cl+1m3ogMO4WHCT?= =?us-ascii?Q?xB+1sW0XEhW3na4wOszAE0u6l2pncG0d93z1cj7NcjE0tBX8sOy3WpbPUdXu?= =?us-ascii?Q?YiNemks3wB/jtxb7D/yaDkV0S5NYAzZPNQ0kthG0ZUff30iutM0K76TT7/hm?= =?us-ascii?Q?m5lKGOyOZtM6TfWKj8PvKsU6IxV/HUE3gnVdPfyB/PDX2WWka1hWlYP8q4vm?= =?us-ascii?Q?A5lGmF6PsjQNnRTZ+riQ3Urxw3S1M6L0X0QJuzzunkXGHE93NlNFDGbvvn+0?= =?us-ascii?Q?u6IEVw4ZIVm6b9YFNPogiVrVVCFpZOvv5F+jqybZ98oqq6fjE3haNmyw/84h?= =?us-ascii?Q?lc871BPyvHtTi8s7m1tmUzGC3mVFhc3XFusGTpnkH2LSDJqDV+o/BwersyUS?= =?us-ascii?Q?lgrVJHpg6Meb9RS6pdvqW/Mew7Z8PJVv2w+gFZs2+sDrAaUt/blNzsQ0w0tP?= =?us-ascii?Q?xGJgopTnjCmxlXkfdxopJ9RfecG4AGNUAYHPX/agygSiQWdYYw3ESixG/RaH?= =?us-ascii?Q?OPnVw88dpOq1JHJmHGJJ4nJoi50rQojWduK1F5ALc7BzxguPeEt/FxWiJxtK?= =?us-ascii?Q?eeLZpUR7sMSkMGLtYd6Dt98lyKeixTQuO6Kh+Q0xcsrXrovc7qeYCf76ZCNQ?= =?us-ascii?Q?JtxVR2KlEnrvzo17yNXWJQDLWXQweYBWjXimopvmrObQAzX1y2ixv11bg2Wi?= =?us-ascii?Q?MXq7pd4Ywig6aPjB0gpGkwDLJCVtggZ2VdmrDnE/gbeVu2otvXg80IaSilQp?= =?us-ascii?Q?Sct7/lLIWG+/GFDZH5mj8Z7vlt655XW59dzhZaZB58Q9SFmYunzfgeYMTqF/?= =?us-ascii?Q?ACVwk8oJ9mm28i6Cka45i97zg9V1ILh2t6DKJCgnqoDaGQHJAaVDfTfjQbmF?= =?us-ascii?Q?iPgerwORnXv0TXwhlvKRzo5yuIqb4G8vyWdFw8ky3CfVwwIOcMmCxuQQpwzN?= =?us-ascii?Q?iRU2wYpvRaHXoM5b1giy3lBjp5cWxP+ZDwe9pJR/hgZBvQb/0fRiwchtQQlS?= =?us-ascii?Q?S5aIvRdSolpMQ4UWj5gbZXkgsRtPe27duWzGnrd2SDl3UMpGqxupue3EWG+E?= =?us-ascii?Q?0p8=3D?= Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-AuthSource: SA0PR11MB4575.namprd11.prod.outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 036ea684-ef3f-47a1-7580-08d945a2ec6b X-MS-Exchange-CrossTenant-originalarrivaltime: 13 Jul 2021 02:07:10.2183 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: 46c98d88-e344-4ed4-8496-4ed7712e255d X-MS-Exchange-CrossTenant-mailboxtype: HOSTED X-MS-Exchange-CrossTenant-userprincipalname: 2in41KFiC7iZBoUH2sjTwnnsFmXpWKt5oLLfPjGYW+sXt5JFqWli96VAinO1+QHCIuzSAwSF7QTz8BZuWQJlBg== X-MS-Exchange-Transport-CrossTenantHeadersStamped: SN6PR11MB3229 X-OriginatorOrg: intel.com Subject: Re: [dpdk-stable] patch 'net/ice/base: fix first profile mask' has been queued to stable release 20.11.3 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 Luca, Please do not apply this patch to stable branch. Since this fix may have so= me side effects, and the problem mentioned in this patch is also related to= hardware issue. I will submit a revert patch to dev later. Regards, Wenjun -----Original Message----- From: luca.boccassi@gmail.com =20 Sent: Monday, July 12, 2021 9:05 PM To: Wu, Wenjun1 Cc: Zhang, Qi Z ; dpdk stable Subject: patch 'net/ice/base: fix first profile mask' has been queued to st= able release 20.11.3 Hi, FYI, your patch has been queued to stable release 20.11.3 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 07/14/21. So please shout i= f 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 rebasi= ng (ie: not only metadata diffs), please double check that the rebase was corr= ectly 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/d2db814c040ba66f20e6e3e411b4f7e= 6f418610b Thanks. Luca Boccassi --- >From d2db814c040ba66f20e6e3e411b4f7e6f418610b Mon Sep 17 00:00:00 2001 From: Wenjun Wu Date: Mon, 21 Jun 2021 16:59:23 +0800 Subject: [PATCH] net/ice/base: fix first profile mask [ upstream commit 148fdf2d3537cfbb912e9c619ace7205741d9a25 ] Since each PF does not share the same structure space, the first mask value= should start at 0 instead of hw->pf_id * per_pf to avoid address overflow.= Otherwise, address space will overlap when masks.first + masks.count > ICE= _PROF_MASK_COUNT, and it may lead to unexpected variable assignment, which = causes segmentation fault. Fixes: 9467486f179f ("net/ice/base: enable masking for RSS and FD field vec= tors") Signed-off-by: Wenjun Wu Acked-by: Qi Zhang --- drivers/net/ice/base/ice_flex_pipe.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/net/ice/base/ice_flex_pipe.c b/drivers/net/ice/base/ic= e_flex_pipe.c index d74fecbf5b..de2c696477 100644 --- a/drivers/net/ice/base/ice_flex_pipe.c +++ b/drivers/net/ice/base/ice_flex_pipe.c @@ -3125,7 +3125,7 @@ static void ice_init_prof_masks(struct ice_hw *hw, en= um ice_block blk) per_pf =3D ICE_PROF_MASK_COUNT / hw->dev_caps.num_funcs; =20 hw->blk[blk].masks.count =3D per_pf; - hw->blk[blk].masks.first =3D hw->pf_id * per_pf; + hw->blk[blk].masks.first =3D 0; =20 ice_memset(hw->blk[blk].masks.masks, 0, sizeof(hw->blk[blk].masks.masks), ICE_NONDMA_MEM); -- 2.30.2 --- Diff of the applied patch vs upstream commit (please double-check if non-= empty: --- --- - 2021-07-12 13:41:39.174969941 +0100 +++ 0049-net-ice-base-fix-first-profile-mask.patch 2021-07-12 13:41:36.3701= 20111 +0100 @@ -1 +1 @@ -From 148fdf2d3537cfbb912e9c619ace7205741d9a25 Mon Sep 17 00:00:00 2001 +From d2db814c040ba66f20e6e3e411b4f7e6f418610b Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 148fdf2d3537cfbb912e9c619ace7205741d9a25 ] + @@ -13 +14,0 @@ -Cc: stable@dpdk.org @@ -22 +23 @@ -index b3cea731f3..829d88bba6 100644 +index d74fecbf5b..de2c696477 100644 @@ -25 +26 @@ -@@ -3432,7 +3432,7 @@ static void ice_init_prof_masks(struct ice_hw *hw, e= num ice_block blk) +@@ -3125,7 +3125,7 @@ static void ice_init_prof_masks(struct ice_hw=20 +*hw, enum ice_block blk)