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 7C967A0548 for ; Thu, 11 Aug 2022 10:25:56 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id C073B42C0D; Thu, 11 Aug 2022 10:25:45 +0200 (CEST) Received: from mga01.intel.com (mga01.intel.com [192.55.52.88]) by mails.dpdk.org (Postfix) with ESMTP id B08F640141 for ; Wed, 3 Aug 2022 04:53:02 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1659495182; x=1691031182; h=from:to:cc:subject:date:message-id: content-transfer-encoding:mime-version; bh=WB6p8Yc/GB2uM9bHlA3jjAGF0s7jGW8GIr8sjfS57zE=; b=gSz+M/qIhvJU8pns3I8miFiCR4uCapmK/nAUD8k0EaV54SR08AGjK+fu iskcIxY4aNuTDbbxnYtx7K8ItacwPobxTuQcrawMIFI/2M5LNIZGFW5JL 5viTaBeP9JKe3IHX9DsMS40shxrkw71RnJdUbViuLTXTUu64HeKQa9EMs AQtsThx0x5SYiAzO4sojEgme6Rf3aNGEWy+gAdrLCqi91CWqMhbEi4V/w txG9jP2rrHTPq5jzzgWZQBA3eNSyL+4H+M8WCwUTybsh5vsWRDVAccjcV EeGOFG161SMCyHyOu8d6h1pZwb9tN79bUhDYYc8kFW8GkKcsyOrYQNobb w==; X-IronPort-AV: E=McAfee;i="6400,9594,10427"; a="315423605" X-IronPort-AV: E=Sophos;i="5.93,212,1654585200"; d="scan'208";a="315423605" Received: from fmsmga006.fm.intel.com ([10.253.24.20]) by fmsmga101.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 02 Aug 2022 19:53:01 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.93,212,1654585200"; d="scan'208";a="848424866" Received: from orsmsx603.amr.corp.intel.com ([10.22.229.16]) by fmsmga006.fm.intel.com with ESMTP; 02 Aug 2022 19:53:01 -0700 Received: from orsmsx611.amr.corp.intel.com (10.22.229.24) by ORSMSX603.amr.corp.intel.com (10.22.229.16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2375.28; Tue, 2 Aug 2022 19:53:01 -0700 Received: from ORSEDG601.ED.cps.intel.com (10.7.248.6) by orsmsx611.amr.corp.intel.com (10.22.229.24) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2375.28 via Frontend Transport; Tue, 2 Aug 2022 19:53:01 -0700 Received: from NAM02-BN1-obe.outbound.protection.outlook.com (104.47.51.43) by edgegateway.intel.com (134.134.137.102) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.1.2375.28; Tue, 2 Aug 2022 19:53:01 -0700 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=ewgzZHWE3MCH0dL1iQ4aS/Uzu+lsgJNxQAtII2ERO5dtKrZc4D7jcIuFnpKd/sZ41elbhWINvgZjWKvBfrY9JdidCoBLT0OIYFnRdXw/ArvTrpjjUzlT4ZnT/QFMB3KNa/bagG2LGjoqbzDTJUczWwnB0irMBK6Pg9hP4yMFqGg4izq476FCUJHF4kre3N5fVSn/PagXxt56DSvCnUnKJAzFHi0fQ+sNJf2J/dEt/WtAUa/UhWJy8C7GijOqULJP45ilSYDfgk9qztLZJ0jOr21/55hNkMTHgLYIv8jyS8s9nWGTy+6PkM9LAMH6AEt00XeWoSgJK5xNeMbiVDTgnQ== 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-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=/zxHfMdPuKoyZ6iqLXlEHmf63HovzmeP0s4qlW6yXYI=; b=hMjef3mgBZ4F1tGavZOrCEtjjSIPiwkQgq5kYDOtaZwr+VApj0kxPmZbBoQc1uFKjIMF51ciZ5ruBeXaueV5vAPr3XZL4lPwaVmlCbCqZxP4nSR5yX38Nsb5mv6bHNwyNL6vvHe5hUXiY4HbuNqNdhSyeFOpvn/gVrcLlFsZHOPqmtvofhgfJ1QErlgADejR26BYiPPDVOHqUoI+CT8NxRzhrrCzREjbah7tGMVL7VH+mM8Sox8vROI0zQtk+o4xnauk2b/KKYAvXwJCxPIQr8z2SMPFcYBo+HLIpX8JTXrMnfH9CpI7ZFRvTSzX7sbjk8pvi7A3C6KnRCmc8pCtNA== 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 Received: from SJ0PR11MB4893.namprd11.prod.outlook.com (2603:10b6:a03:2ac::17) by BL1PR11MB5956.namprd11.prod.outlook.com (2603:10b6:208:387::11) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5482.15; Wed, 3 Aug 2022 02:52:59 +0000 Received: from SJ0PR11MB4893.namprd11.prod.outlook.com ([fe80::7cf3:6a39:79ac:2695]) by SJ0PR11MB4893.namprd11.prod.outlook.com ([fe80::7cf3:6a39:79ac:2695%6]) with mapi id 15.20.5482.016; Wed, 3 Aug 2022 02:52:59 +0000 From: "Chen, LingliX" To: "stable@dpdk.org" , "lihuisong@huawei.com" CC: "Huang, ZhiminX" , "Jiale, SongX" , "Li, WeiyuanX" , "Jiang, YuX" Subject: FW: [PATCH 19.11] ethdev: fix RSS update when RSS is disabled Thread-Topic: [PATCH 19.11] ethdev: fix RSS update when RSS is disabled Thread-Index: Adim46xBZ4qy+lVISlmmcHwCOQ8GAQ== Date: Wed, 3 Aug 2022 02:52:59 +0000 Message-ID: Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: authentication-results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=intel.com; x-ms-publictraffictype: Email x-ms-office365-filtering-correlation-id: e598cd9a-b36e-4fe5-26a0-08da74fb463f x-ms-traffictypediagnostic: BL1PR11MB5956:EE_ x-ms-exchange-senderadcheck: 1 x-ms-exchange-antispam-relay: 0 x-microsoft-antispam: BCL:0; x-microsoft-antispam-message-info: K9OZCIb4xp7aXzcVGBRIqe5aR0jYS+3eYAz9Q/E4huPG7DkqkmzznOCPKTlP12aOi2cMEUQE8ikI+5WGS0wsvn3lq+159MEHcE3LSIZ5sSkPjrordvBF6/cxiBk4Kr9HX3TzPxnJ3f3LXMnXybR+w3QbVGzlEJ03m9zEED470/Hev8uMNSW173bVahMGPM+O4evDCXv7oHT5V3QNcdKhFbx5sMVaX0Ecn96SEPdqF9BnP/+muVLhSrOFVx6L+DRY8cvnlTXuraCxjM4czBELyW+mxriVHH21uBAuDCLDcev3oV0kf7kiQcMzWamFMNrFAu4YHKTQ6i2As6Zib+c/fkH/yRHoz923BMv4F0zvP37yE3fB4Vo2zqr0JL0bZm6tkw0ceWBAXBmeQa1rt2TQFdsXTTq08zuT/LAfpkCFwLBdufYnrqfD/e/DZ2YpSZkr9rFp1iviRzrepMr1SpviE0ShO1sJUA42Fe6ekFW2hSYtWMCXlnh4yA48jdySombKbyiD27LvO2LdFBLJpY9/Tz0UmgRQtlXXQzq+j1xekcERAH498Cpq7ccSovqCyjJgQwowqyDDr9Yn4/963ryyMQz1GI5mLau4tF6h1tOHk7/Y0Lz28OCSA1RTSJUje0XhDJXhcp1TmAktt74NXS+8IIiykIc1W7Bsj9BeaTGwZ1WFL4SpsXl9mmZW9mn9R4Nlg04RkN5VKwbcOFJnHh7+FFHGqYpX/xIwckiYmabLkHOTv3NBsnS9EuAHEj5rMZelQA4ARkCQqtrI7aieUkGh5rcSnRqeKyFfXT+sD+QlNDY= x-forefront-antispam-report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:SJ0PR11MB4893.namprd11.prod.outlook.com; PTR:; CAT:NONE; SFS:(13230016)(366004)(376002)(346002)(39860400002)(396003)(136003)(9686003)(53546011)(6506007)(26005)(41300700001)(71200400001)(7696005)(186003)(110136005)(55016003)(54906003)(316002)(66446008)(107886003)(4326008)(64756008)(76116006)(8676002)(66556008)(52536014)(66476007)(33656002)(2906002)(478600001)(8936002)(5660300002)(86362001)(82960400001)(66946007)(38100700002)(122000001)(15650500001)(83380400001)(38070700005); DIR:OUT; SFP:1102; x-ms-exchange-antispam-messagedata-chunkcount: 1 x-ms-exchange-antispam-messagedata-0: =?us-ascii?Q?bSTUxjqqqqx/8J5nyVPPqWaPooK9L2Izc9NO4xaxAdqZbYqews17NU9Z5r7t?= =?us-ascii?Q?0ftuBvfbC/eaOZnJO9MgvIgZcekPAUTFwp+s4FefwdM279Dz8lHAPWQ6d8cy?= =?us-ascii?Q?JRsQnNZFnYlmCFxY9bUPv6+rfDeYfR1LInnyNJBmIbV1i34RsGJ9Tt+IjlhW?= =?us-ascii?Q?8xM7ktjkogAM678qGJgI0m8hBwxtmyNtITP5mDjo4CAZ5WhqU3yfXCMKRQ0Y?= =?us-ascii?Q?frXFnnUew/z2RNOboEf3lNUAnzfKJAlhfuz08fovKbG693Rj/zPNOjr6pDmC?= =?us-ascii?Q?Rm89LBZDLN6SrNwjx95zRRl8rTen7heJK6+67dZnXDxYffBM12IcwNtzxh2Z?= =?us-ascii?Q?QPZ9HqtKV6kS3XI2aBOvpTAc755JOTdNmoXzO6wIOpLF+3054pLqMd4QRF0j?= =?us-ascii?Q?60UzluGtjGuWR7DFvaVVbDXoneOfkhbgmBAJ5w5C4FVW+rWoRUOzsIE2KPET?= =?us-ascii?Q?cXYYyUntm5fIPaRbSCvkXvQAccyMxqaydmVj9qBJcriKWf73tLdLyWxOVmn1?= =?us-ascii?Q?x/PHuyhRrJcOzo7BADXloNVzOVZtZwtFEKwoqQ752IU6RspGLNUoFCx9uwGr?= =?us-ascii?Q?f5gwCKyAqFP4vNs5bv3q22B2oFpp/6T/nmQq3XTq3zm6ili4+hUiqyK4AxgO?= =?us-ascii?Q?BBkQXwG9CA69h+DrNvRcld/JUzxwlC+75KDGwt/HyGo+VKqXaqFAiWaYq3Ha?= =?us-ascii?Q?FdLj9wrOIkKXZit71bgOOGzMqj7Z6w92LNwKepYwDzhp4vJFr7O45gNmPOqZ?= =?us-ascii?Q?G0Eb844gJkx8XwqahJyaKnpeaEJ9g/mgrcW5j+UQsqvWLqezuTUJiw4WtSSA?= =?us-ascii?Q?DpnmHqjqNRIeo3ytmoEVxEu/5MBdmNHqWwT3KXAAOefXUCiAfoBCSabSfO8l?= =?us-ascii?Q?MjAfxJxAZyhlKO4lTT3LklKfCfD2x42PV6P4703EGfpUBkHz1t17ty1tpnfv?= =?us-ascii?Q?xQ5uoq6O43oGHzcnF8CMWGQfdrUqpDzR9+ALwQ7ypyyRA2+SOe3oiFupYrti?= =?us-ascii?Q?0DUnREAanNggLrsRT1ncFnZz8atDsKOSMhPMnJo0gtbyxAVjqkC4aoq6jdc7?= =?us-ascii?Q?oPiyKwk+yinrcNTdIKSxS4+PU2Dagc5Xbcv75Pm5+iJRKXSSfZSfLK83GnHZ?= =?us-ascii?Q?vHDedpn86AGVUI3HpwPp9jK67GjkQDohUZEc7JOL9ccC+qdxqttizLl+EfKQ?= =?us-ascii?Q?AeW/Bufl0MD1LrjRqQa174ztxj4Z1QT397HzVyvlI7Z9k7vlA7pVW7WLVQtW?= =?us-ascii?Q?FhKXFCI5lRbtxxFKDKx+XrcdNTjoygJKwWJJja/fwXllAMFpaF0RthQFW+fC?= =?us-ascii?Q?uKKQ8hTpea2GnqX0lR+l1e3YY3g3NiY75kZFPSE8tWfpDTc/utCdRe2P8JDJ?= =?us-ascii?Q?frjGC5n5CDwHpEXzj4paipL8LTr0j9stipLxLHBurA8b6Z9nBFFkTc2EbQzb?= =?us-ascii?Q?qJ62JQAJS6IlL7CV+yXvDkqnAbEEpG31h7271aIc0QqgNM5q/8YMCcoVTrRy?= =?us-ascii?Q?2MTfrwv9Ww4zL7u07HmxZlYWf4yvcjLNDTN9jMhZdDUYQumF0ZEiZ/WeBSMA?= =?us-ascii?Q?jbhaENwBVqnWwJ6dylyau5FCHfNCs6yFO6ZJgyAM?= 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: SJ0PR11MB4893.namprd11.prod.outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: e598cd9a-b36e-4fe5-26a0-08da74fb463f X-MS-Exchange-CrossTenant-originalarrivaltime: 03 Aug 2022 02:52:59.0346 (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: qeCu9ja7906ms0JyLqN0e/c7FfQSxD5dDGxtcFmGbNCulqfQdt3MfthxUh5jgDgwKOpc564tXaPa8PRKC4xZqA== X-MS-Exchange-Transport-CrossTenantHeadersStamped: BL1PR11MB5956 X-OriginatorOrg: intel.com X-Mailman-Approved-At: Thu, 11 Aug 2022 10:25:44 +0200 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 >=20 > -----Original Message----- > From: Huisong Li > Sent: Tuesday, August 2, 2022 7:30 PM > To: stable@dpdk.org; christian.ehrhardt@canonical.com > Cc: liudongdong3@huawei.com; fengchengwen@huawei.com; > huangdaode@huawei.com; Jiang, YuX ; > lihuisong@huawei.com > Subject: [PATCH 19.11] ethdev: fix RSS update when RSS is disabled >=20 > [ upstream commit 93e1ea6dfa99dea359b8d66123576a395c2c0acd ] >=20 > The ETH_MQ_RX_RSS_FLAG flag is a switch to enable RSS. If the flag is not= set > in dev_configure, RSS will be not configured and enabled. > However, RSS hash and reta can still be configured by ethdev ops to enabl= e RSS > if the flag isn't set. The behavior is inconsistent. >=20 > Bugzilla ID: 1056 > Fixes: 99a2dd955fba ("lib: remove librte_ prefix from directory names") >=20 > Signed-off-by: Huisong Li > Signed-off-by: Min Hu (Connor) > Reviewed-by: Ferruh Yigit > --- > lib/librte_ethdev/rte_ethdev.c | 15 +++++++++++++++ > 1 file changed, 15 insertions(+) >=20 > diff --git a/lib/librte_ethdev/rte_ethdev.c b/lib/librte_ethdev/rte_ethde= v.c > index 76699cc10f..eb82e12ea4 100644 > --- a/lib/librte_ethdev/rte_ethdev.c > +++ b/lib/librte_ethdev/rte_ethdev.c > @@ -3504,6 +3504,7 @@ rte_eth_dev_rss_reta_update(uint16_t port_id, > struct rte_eth_rss_reta_entry64 *reta_conf, > uint16_t reta_size) > { > + enum rte_eth_rx_mq_mode mq_mode; > struct rte_eth_dev *dev; > int ret; >=20 > @@ -3521,6 +3522,12 @@ rte_eth_dev_rss_reta_update(uint16_t port_id, > if (ret < 0) > return ret; >=20 > + mq_mode =3D dev->data->dev_conf.rxmode.mq_mode; > + if (!(mq_mode & ETH_MQ_RX_RSS_FLAG)) { > + RTE_ETHDEV_LOG(ERR, "Multi-queue RSS mode isn't enabled.\n"); > + return -ENOTSUP; > + } > + > RTE_FUNC_PTR_OR_ERR_RET(*dev->dev_ops->reta_update, -ENOTSUP); > return eth_err(port_id, (*dev->dev_ops->reta_update)(dev, reta_conf, > reta_size)); > @@ -3553,6 +3560,7 @@ rte_eth_dev_rss_hash_update(uint16_t port_id, { > struct rte_eth_dev *dev; > struct rte_eth_dev_info dev_info =3D { .flow_type_rss_offloads =3D 0, }= ; > + enum rte_eth_rx_mq_mode mq_mode; > int ret; >=20 > RTE_ETH_VALID_PORTID_OR_ERR_RET(port_id, -ENODEV); @@ -3572,6 > +3580,13 @@ rte_eth_dev_rss_hash_update(uint16_t port_id, > dev_info.flow_type_rss_offloads); > return -EINVAL; > } > + > + mq_mode =3D dev->data->dev_conf.rxmode.mq_mode; > + if (!(mq_mode & ETH_MQ_RX_RSS_FLAG)) { > + RTE_ETHDEV_LOG(ERR, "Multi-queue RSS mode isn't enabled.\n"); > + return -ENOTSUP; > + } > + > RTE_FUNC_PTR_OR_ERR_RET(*dev->dev_ops->rss_hash_update, > -ENOTSUP); > return eth_err(port_id, (*dev->dev_ops->rss_hash_update)(dev, > rss_conf)); > -- > 2.22.0 Tested-by: Lingli Chen