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 1142DA0548 for ; Sun, 20 Jun 2021 16:05:06 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id D04064003F; Sun, 20 Jun 2021 16:05:05 +0200 (CEST) Received: from NAM02-DM3-obe.outbound.protection.outlook.com (mail-dm3nam07on2041.outbound.protection.outlook.com [40.107.95.41]) by mails.dpdk.org (Postfix) with ESMTP id 1C4834003F for ; Sun, 20 Jun 2021 16:05:05 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=OflG/FsXazwYFRhOVFSG+9TeGYLvU3MKg0azNeWU5ut5AI3e3VgZlhiRIxFU4d2kfWEggjaCpMdoCvg9mgUiss8f7bJSLkZE3c/G0h2E3S0xsP1IIF5Zk7WXPDducBujlLK+M+e599l3QqprgUO0ZeHLC5JrjGPX9mKD2tSLE50yEmT0zLYEIHe6IHxNUdwrpSuOved5rWAwrvWOAycz47lNJhatpS72mWsE/nZV/CFM255PHEwkEsKYZjneR9qRejKUdhUF4w62zFwKlIVy4YGq1aIJ9VnJtHKn7MWlm0YfUn0B4u3rEO+hkLxYj6SsRqFUD7OoHBW5fDHp4ZEd5w== 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=OnAL7JXQvoYIe+zwrHF0HxIRTKp4+prYWd/5QqG6ask=; b=JU3JfvX1zTRS8GHp0/XykC4+flhsNixwMSspjbv/kVvhuqIOOHiPDTf6jEbUR4KgB9gRhUqHCA7UaqUJcXpsi3DqgDebm6qUgXsZ2lNN8hROOL6EiFy1U9DdxYqUgYvuOpFkNXEx7F+TZwCJMcWIGwlsZAmVJINnG6BgTYBeHX8rBg7RYx5BETguWFgeIbL9jwLPKCdxeFHIKooQr68LS3VrKwPexpSL97i4CkYwefciV7tDaWRB6xHkoQ8+blq33u4icuDrMDc+Us6EIvjocjd66HnIraohoB0Ik1hR4cP7IJOfcYPzV5ej/ZbEG/p76fZMtLP26/nugEeqlC0mxw== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=nvidia.com; dmarc=pass action=none header.from=nvidia.com; dkim=pass header.d=nvidia.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=Nvidia.com; s=selector2; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=OnAL7JXQvoYIe+zwrHF0HxIRTKp4+prYWd/5QqG6ask=; b=b0Q9bbSS+1NaLBKXK6kZxnNZbU1LFXksLBhMe2do86s2oR/j1C7HjLrwi/TGNIgUlOpeARhqJAhPipWdv28wlk3WqYIwn/MwzRG6d0RrVKvWHOXqHxtY5spxH5xo4finCyP9/gb2dDJrVF0F1Y1rVjbEkzQFDVzDt5ZHBXL3F2GeN000F8otvKhdibtDyidrimISqbltIFdnJlZFm4+TSShGnz6zQNZyRYaXhm9AFJyM1Tb2YkUIZpyu3fr8hBrH4wcx1LAvxDzLwPX/M+ImgmTawMGSbDJGGkeaaj730gywOKBgdlYxLKKx7rAt0AroWj2RP9NK3Pw6cceW+eWRNw== Received: from DM4PR12MB5373.namprd12.prod.outlook.com (2603:10b6:5:39a::17) by DM4PR12MB5390.namprd12.prod.outlook.com (2603:10b6:5:39a::12) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4242.23; Sun, 20 Jun 2021 14:05:03 +0000 Received: from DM4PR12MB5373.namprd12.prod.outlook.com ([fe80::ac75:9b9a:a03f:1676]) by DM4PR12MB5373.namprd12.prod.outlook.com ([fe80::ac75:9b9a:a03f:1676%3]) with mapi id 15.20.4242.023; Sun, 20 Jun 2021 14:05:03 +0000 From: "Xueming(Steven) Li" To: Qi Zhang , "bluca@debian.org" CC: "vitaliy.zakharchenko@intel.com" , "arjun.anantharam@intel.com" , "stable@dpdk.org" , Ngai-mint Kwan Thread-Topic: [dpdk-stable] [DPDK 20.11] net/iavf: fix error handling for unsupported promisc config Thread-Index: AQHXXmLEP7OJQznQJUSSMEnwJxx3o6sc/PCw Date: Sun, 20 Jun 2021 14:05:03 +0000 Message-ID: References: <20210611014343.133471-1-qi.z.zhang@intel.com> In-Reply-To: <20210611014343.133471-1-qi.z.zhang@intel.com> Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: authentication-results: intel.com; dkim=none (message not signed) header.d=none;intel.com; dmarc=none action=none header.from=nvidia.com; x-originating-ip: [180.174.129.228] x-ms-publictraffictype: Email x-ms-office365-filtering-correlation-id: 4f5e8bb2-3ce2-4d14-98c3-08d933f466ba x-ms-traffictypediagnostic: DM4PR12MB5390: x-microsoft-antispam-prvs: x-ms-oob-tlc-oobclassifiers: OLM:6790; x-ms-exchange-senderadcheck: 1 x-microsoft-antispam: BCL:0; x-microsoft-antispam-message-info: ppzl3N+hC4OlHedppJ1DEyhbol+zHosEFkeZxJJHCQinOonnV5SBkrUNQeirM1XgpnBJajVbbo889H+fDT8EN2llem4y08BkCqzA3gsckTUzl0T7yxYkpQlTxTiDemUhez5W6HQ6gZNE7eBT5Yqz7uGcw0Cn1OR2RFMg2629ghymsR67l+++5pedBc1Um91vJCTPl7U2L5xLPzTeU3o7uQ6+fkhg/kUjGF95ipNF9J9zY4wnxEfk6G0BIkRdB7N9AcRBNwlpZ9Whpgv9VU2dXoaCL2sRsiTXlcsJB5j5qUvv4sUurSxWsWycxsnBloVpx2eLV28DihmSf9sAxvV9tVSkUtudpCtJWABYQREHET5yaayLFPttncE5JSrSdCQ3w3PMaRQmTnpRONfWLPg4i6wAhUXcaP03rRxJPBUnp2FRDKXxk9KPxXzAQqOePz46uQn1fXk0N7DUsRS1T5ZcnRUczOsbB9mjhqzY3lMkPKfumWizPDYfYPg7qTInoYtmPhrJVs4AoyK7dKqbFf+yyEL1BeuvpTYVaqIVHbvZC5kL5tTej5aQ5YYMxxjIDQC7Wa/u1U64aSCh72Vy7LQe40RJPQrMRGys23x7D/7NYOhus3zRiGrvZkVhp+ygKQQXHIXbPKw3QJcn2/tMJJY+fanM0xPlww3SgrMZhKdbLU2rYxkt7W9IjQIejgCeA6Ar/yOsn6HnLYx1+7vvEHJegQVYQHv+1IGFiTmtrq9yzjA= x-forefront-antispam-report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:DM4PR12MB5373.namprd12.prod.outlook.com; PTR:; CAT:NONE; SFS:(4636009)(39860400002)(396003)(346002)(376002)(136003)(366004)(66946007)(33656002)(52536014)(8936002)(76116006)(55016002)(38100700002)(86362001)(9686003)(64756008)(66446008)(83380400001)(8676002)(122000001)(66476007)(66556008)(316002)(478600001)(966005)(71200400001)(186003)(26005)(6506007)(53546011)(7696005)(5660300002)(54906003)(110136005)(2906002)(4326008); DIR:OUT; SFP:1101; x-ms-exchange-antispam-messagedata-chunkcount: 1 x-ms-exchange-antispam-messagedata-0: =?us-ascii?Q?BqurR76VHjazn+8mPxS9i+KcIbPjeCS6tfbzLF3YGulI/F3pt7QsqM8/liQF?= =?us-ascii?Q?k4kkBbAXLzqk+YTR8L3rVFQvC8kkEWsan45QN2bUSeeEFCSSYVEYq+iWynsh?= =?us-ascii?Q?MP/GcnNMdvNpK6htK0AFqhgCmAKK889zT6tlA1JlXcsPBnmbyRLYxuIST0zq?= =?us-ascii?Q?APIHIZRC3L8u2PNWwMhgypztwDigqL59ITbVxJcBy/YCWINU0ntEmSY4ylts?= =?us-ascii?Q?nBx1Gj124i1A6wGo1toO5HDZjbqA8MpeLWuone6CGMvPte90v69VhkC96cKt?= =?us-ascii?Q?Lb+PLH4UU6OER1OPmgbXc5geldfw+fxI42QIL9inT+6IvGIe71ols/H91HfG?= =?us-ascii?Q?lZt1HZDnmY1+OWcqMllDP7r84+eh5ShRpqLicOkjcirVZ0cHOU2bENQXaaQv?= =?us-ascii?Q?ATc519KY07FzQow2dxltFbRuqMZjla4Azoi0CNIiIACa18bwY6EIJ48y2wX9?= =?us-ascii?Q?nuVTpTgQiU4CMZWnlHnOps1RjlacfNz0X5d8oWkzYXfZPd2N433A6GStT+UO?= =?us-ascii?Q?AooCLx0Anypv5RuJk/9OS3zpImwZj2k9frHmS1B4rii4HE5SPkJmaJwj3Q6W?= =?us-ascii?Q?m2XA4kdb2uIWJntdn+t9ycclGZHVLiXLi8uqFkaQnYYhziLpHDImpEXxuTRh?= =?us-ascii?Q?awltLLYL66iY/HUnaSQdZxZ9N3Xhe4fP38IshpGHZ/u+w9CGEzZlOxOBKFu4?= =?us-ascii?Q?YBWIUutjm/44LKIvud6xDaos3LPVMKdImYFX7ME/euuXr38JmtWIrbwTfAjV?= =?us-ascii?Q?vvvxqyB53X90Tq3WiRLiSUiyt4VB3hcv1cnct5DhzhOje4MjPvB1urbUVn+b?= =?us-ascii?Q?U6i7AI9hg1yI3nHy8JR9sNEu/sRILib/VqADD9OChKw6KD74h7cREwc4iCMW?= =?us-ascii?Q?Hb5lymGv0pv+Kx20ZvWIoBe5oLqN3a04UF+1DIVaAGah3cPT39+InLQ1el4U?= =?us-ascii?Q?PxbGYd1DJzmyhxXrE/KUcOzAhUKupV3TjU65vrhwtgFsQAqqNqohwV1oyGCg?= =?us-ascii?Q?xJvKFHRXXch7JC5w+5agPEnQ55mrKV9Y+CwrooFi2P6NdmxGY6WBe5UPNAW7?= =?us-ascii?Q?vb0ddnav5wO8mJ4gdihDZ7XyWztHVviPbsvi4rmcKcwuYeUVMqRz0G/DWja+?= =?us-ascii?Q?KvwTVazY+FmTv0fcZ/TBWWazueF1r4AqFZtIpjJYDSkG+PhNCCx894esBDq1?= =?us-ascii?Q?VfDtcolHcE9gdqpUDesiO8qc64+T8CR8yBvrBAXA4urqo+w4dRwuPG/zgYEY?= =?us-ascii?Q?twazVGpH56YyyPL2bVmpk3p7JUsWLRGAEnqkUqWnEXgEbU//Gh5utMEk+SkV?= =?us-ascii?Q?EUoACD1OkKPaR5l6blKsyO1u?= x-ms-exchange-transport-forked: True Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-AuthSource: DM4PR12MB5373.namprd12.prod.outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 4f5e8bb2-3ce2-4d14-98c3-08d933f466ba X-MS-Exchange-CrossTenant-originalarrivaltime: 20 Jun 2021 14:05:03.6982 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: 43083d15-7273-40c1-b7db-39efd9ccc17a X-MS-Exchange-CrossTenant-mailboxtype: HOSTED X-MS-Exchange-CrossTenant-userprincipalname: 5KVzCkT6cMK9y8267B7AnofB+waOK2x6KidW70MGoGWa+7Mf8CUJ632gZm41ySCVH8+xKrMmvSROWNFwJcEV2w== X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM4PR12MB5390 Subject: Re: [dpdk-stable] [DPDK 20.11] net/iavf: fix error handling for unsupported promisc config 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 Qi, Two upstream tag in this commit message, the first one not found in upstrea= m branch, could you please check? BTW, the patch can't be applied to 20.11 work queue branch, could you pleas= e rebase on latest version? https://github.com/steevenlee/dpdk/commits/20.11 Best Regards, Xueming > -----Original Message----- > From: stable On Behalf Of Qi Zhang > Sent: Friday, June 11, 2021 9:44 AM > To: bluca@debian.org > Cc: vitaliy.zakharchenko@intel.com; arjun.anantharam@intel.com; stable@dp= dk.org; Qi Zhang ; Ngai-mint > Kwan > Subject: [dpdk-stable] [DPDK 20.11] net/iavf: fix error handling for unsu= pported promisc config >=20 > [ upstream commit 308f75b5c9cc5ca3e972dbc84375bdee353c3156 ] [ upstream c= ommit > 0c35eecfe8b54bbdf59c30a803404acfdcc4f7eb ] >=20 > 1. The VIRTCHNL_STATUS_ERR_NOT_SUPPORTED should be esculated to upper > with -ENOTSUP in iavf_execute_vf_cmd. > 2. fix error code check in iavf_config_promisc 3. change vf->cmd_ret_val = from unsigned to signed as it will compare with > negtive value. >=20 > Signed-off-by: Qi Zhang > Signed-off-by: Ngai-mint Kwan > --- > drivers/net/iavf/iavf.h | 2 +- > drivers/net/iavf/iavf_vchnl.c | 16 +++++++++++----- > 2 files changed, 12 insertions(+), 6 deletions(-) >=20 > diff --git a/drivers/net/iavf/iavf.h b/drivers/net/iavf/iavf.h index 0196= f74721..4bcb407b20 100644 > --- a/drivers/net/iavf/iavf.h > +++ b/drivers/net/iavf/iavf.h > @@ -136,7 +136,7 @@ struct iavf_info { > uint64_t supported_rxdid; > uint8_t *proto_xtr; /* proto xtr type for all queues */ > volatile enum virtchnl_ops pend_cmd; /* pending command not finished */ > - uint32_t cmd_retval; /* return value of the cmd response from PF */ > + int cmd_retval; /* return value of the cmd response from PF */ > uint8_t *aq_resp; /* buffer to store the adminq response from PF */ >=20 > /* Event from pf */ > diff --git a/drivers/net/iavf/iavf_vchnl.c b/drivers/net/iavf/iavf_vchnl.= c index 3d52a8c402..219245d040 100644 > --- a/drivers/net/iavf/iavf_vchnl.c > +++ b/drivers/net/iavf/iavf_vchnl.c > @@ -228,12 +228,18 @@ iavf_execute_vf_cmd(struct iavf_adapter *adapter, s= truct iavf_cmd_info *args) > /* If don't read msg or read sys event, continue */ > } while (i++ < MAX_TRY_TIMES); > /* If there's no response is received, clear command */ > - if (i >=3D MAX_TRY_TIMES || > - vf->cmd_retval !=3D VIRTCHNL_STATUS_SUCCESS) { > - err =3D -1; > + if (i >=3D MAX_TRY_TIMES) { > PMD_DRV_LOG(ERR, "No response or return failure (%d)" > " for cmd %d", vf->cmd_retval, args->ops); > _clear_cmd(vf); > + err =3D -EIO; > + } else if (vf->cmd_retval =3D=3D VIRTCHNL_STATUS_ERR_NOT_SUPPORTED) { > + PMD_DRV_LOG(ERR, "Cmd %d not supported", args->ops); > + err =3D -ENOTSUP; > + } else if (vf->cmd_retval !=3D VIRTCHNL_STATUS_SUCCESS) { > + PMD_DRV_LOG(ERR, "Return failure %d for cmd %d", > + vf->cmd_retval, args->ops); > + err =3D -EINVAL; > } > break; > } > @@ -1099,8 +1105,8 @@ iavf_config_promisc(struct iavf_adapter *adapter, > PMD_DRV_LOG(ERR, > "fail to execute command CONFIG_PROMISCUOUS_MODE"); >=20 > - if (err =3D=3D IAVF_NOT_SUPPORTED) > - return -ENOTSUP; > + if (err =3D=3D -ENOTSUP) > + return err; >=20 > return -EAGAIN; > } > -- > 2.26.2