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 7CF16A0535 for ; Thu, 23 Jan 2020 08:58:03 +0100 (CET) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 6D9923253; Thu, 23 Jan 2020 08:58:03 +0100 (CET) Received: from EUR04-DB3-obe.outbound.protection.outlook.com (mail-eopbgr60088.outbound.protection.outlook.com [40.107.6.88]) by dpdk.org (Postfix) with ESMTP id E56983253; Thu, 23 Jan 2020 08:58:02 +0100 (CET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=QQWJMdYBng67XSgMVoqcDoi7Nogikhc+w3JToeAJkq22yPoSi2kz61F2O8vsQxIQ3x7gavErxzAvsgTUf5qize4JLtbhq7hOibhUAJNGhZW39aEUYohTCLfJtWJXtuLpFuqv6Efv4su892SJRHQeG3HXh/onyqY54zLw/9M6m4Fs7lIAvSqoz8LceHSnkHKOMIOICqBYUP/nnQvIaLDUN/kOFmBsa267gHhE9O/tGZcmhvfVTpy/lc3mM8dhOrFhKYi9pWOSUH2I43E8FI95joFI5J4hUA0hDt+62RKDj1OByojW4+WPXtaDRk+8n0k1rPr8SooNunXVr/ZEFbIpmw== 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=15cAVWPHFz6rsUnZGrYTbxEJBYnUTwax/XUYdAeyjDY=; b=OyXuQZIgRVxnCAlrzUnrxP+EhWj9FEdcfwB8DYo4lEj9vlEH+T86LGRMGwWWqkhqDkhTifMZtoRCvWzlyl0OCGEENjbQ4CHekfKyw4X8O8uG0qkb99tNBlCE3qBUGSgtMO+ECfZSCpdWsSSRhi3qAtnyVmbduH4WoZRw2g2n4bpIpMPIsUYUK/axA95LeyqsQzJMku95xLg6PEsP3OyawupA0rNEoHdF7bycdLEZNOpNzrGt+BugpUMWndt64DwkWtrn8sjdCccHAMdUJtz0/4D1B41EgtgccOLfKnD+NSyadjqlrOP3vdnSr+Q5yf6x8IXc6tU2l5fAAvOf2Q7mzg== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=mellanox.com; dmarc=pass action=none header.from=mellanox.com; dkim=pass header.d=mellanox.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=Mellanox.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=15cAVWPHFz6rsUnZGrYTbxEJBYnUTwax/XUYdAeyjDY=; b=j7QA/imAAUET427zS5sZIFtpFDsHHuOHQOFsCCuAEbUAVv3tGTC3rDBUkKhom+C9dndFyWh7mTpJIb4s2AQRk4cnaS9Z+9rNiLMD97xOqMRj6vC3clz9ypvINUZA76iE5tlyMwfvI0Piz6v+LbO/rSgFEwD1T6iileIUQSUp7Tc= Received: from AM4PR05MB3265.eurprd05.prod.outlook.com (10.171.188.154) by AM4PR05MB3492.eurprd05.prod.outlook.com (10.171.187.161) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.2665.20; Thu, 23 Jan 2020 07:58:02 +0000 Received: from AM4PR05MB3265.eurprd05.prod.outlook.com ([fe80::68eb:ad79:71f4:110f]) by AM4PR05MB3265.eurprd05.prod.outlook.com ([fe80::68eb:ad79:71f4:110f%3]) with mapi id 15.20.2644.027; Thu, 23 Jan 2020 07:58:02 +0000 From: Slava Ovsiienko To: Dekel Peled , Matan Azrad CC: Raslan Darawsheh , Ori Kam , "dev@dpdk.org" , "stable@dpdk.org" Thread-Topic: [PATCH 09/11] net/mlx5: fix the set VLAN VID action validation Thread-Index: AQHV0TB2V7xP8pRUZk+Jrlda19ah6qf340PA Date: Thu, 23 Jan 2020 07:58:02 +0000 Message-ID: References: <56b43c8675246d3d66ea761b97f6dff8f8417390.1579703134.git.dekelp@mellanox.com> In-Reply-To: <56b43c8675246d3d66ea761b97f6dff8f8417390.1579703134.git.dekelp@mellanox.com> Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: authentication-results: spf=none (sender IP is ) smtp.mailfrom=viacheslavo@mellanox.com; x-originating-ip: [95.164.10.10] x-ms-publictraffictype: Email x-ms-office365-filtering-ht: Tenant x-ms-office365-filtering-correlation-id: 6a78402d-f198-4803-d423-08d79fd9f87f x-ms-traffictypediagnostic: AM4PR05MB3492:|AM4PR05MB3492: x-ld-processed: a652971c-7d2e-4d9b-a6a4-d149256f461b,ExtFwd x-ms-exchange-transport-forked: True x-microsoft-antispam-prvs: x-ms-oob-tlc-oobclassifiers: OLM:4941; x-forefront-prvs: 029174C036 x-forefront-antispam-report: SFV:NSPM; SFS:(10009020)(4636009)(396003)(136003)(39860400002)(376002)(346002)(366004)(189003)(199004)(450100002)(81166006)(8676002)(81156014)(2906002)(316002)(54906003)(110136005)(8936002)(4326008)(55016002)(9686003)(186003)(26005)(7696005)(53546011)(6506007)(5660300002)(66556008)(66476007)(66946007)(76116006)(64756008)(66446008)(52536014)(86362001)(71200400001)(478600001)(33656002)(6636002); DIR:OUT; SFP:1101; SCL:1; SRVR:AM4PR05MB3492; H:AM4PR05MB3265.eurprd05.prod.outlook.com; FPR:; SPF:None; LANG:en; PTR:InfoNoRecords; MX:1; A:1; received-spf: None (protection.outlook.com: mellanox.com does not designate permitted sender hosts) x-ms-exchange-senderadcheck: 1 x-microsoft-antispam: BCL:0; x-microsoft-antispam-message-info: X15mbTkfX4CVHpsuLzEkLV/JA4vNLCpsir/UOQK5Ze2EC3xSBsTrJcEU1b+LjnHr5uLX75UP3DvwNhXQc5ODj+FGS1rNJAzW6KF8Lyb26s/07ZFEgkMi3Wv6UfqYCn4jPe+cFUrwJBbai8caRLMCy54s7l5NFQTo0odaSKwFS7Nbgc353j0G0B56aNPCVstaTW2D/iH5HAYUz4ZWxgRrmLwOcO1bYyBQyAiQ5ETnzhVxBp0D+hpz6+5aAvi4V46AON+4WbUzp0edP8KRJra3sHbBmKsMIkoypDS6XwD7hBuUiZrLeZotD9guURtej+Qx7+oiVMrykIlpYViSRPRePZSwu9KHickDW52LkE0GOhF0GJr6vEoxGByz1oXFtVAbBhew04K512WcY1uAA9eOAmsrhLA36z8ntu8YFmJkLnhlAykhRsnMsHPGahLx143q x-ms-exchange-antispam-messagedata: 6poQw+mQs5ucyi5xVyON/Ko2SFIOaBRPDf7obRnw46cwDXjNNJZi3UDSY4kIZGJsE6GV6e0vKMHEBbycXyjh3sfLPMl5ECkBJh+/0HNu2vzz4ebaufQafX4EEqDYkPkKCauek0q19+ESoqYUOIZBmw== Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 X-OriginatorOrg: Mellanox.com X-MS-Exchange-CrossTenant-Network-Message-Id: 6a78402d-f198-4803-d423-08d79fd9f87f X-MS-Exchange-CrossTenant-originalarrivaltime: 23 Jan 2020 07:58:02.0581 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: a652971c-7d2e-4d9b-a6a4-d149256f461b X-MS-Exchange-CrossTenant-mailboxtype: HOSTED X-MS-Exchange-CrossTenant-userprincipalname: TKtPu6aA7/OIG7holyBZ/RYcrpbT8jGn3Fr2RHDIFTxLNJRIWmfCDWpCQzfjosjBbK3158WkdPWoZls0c8vWoC1S7MLAaa+oX9vcxyLigoI= X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM4PR05MB3492 Subject: Re: [dpdk-stable] [PATCH 09/11] net/mlx5: fix the set VLAN VID action validation 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" > -----Original Message----- > From: Dekel Peled > Sent: Wednesday, January 22, 2020 16:27 > To: Matan Azrad ; Slava Ovsiienko > > Cc: Raslan Darawsheh ; Ori Kam > ; dev@dpdk.org; stable@dpdk.org > Subject: [PATCH 09/11] net/mlx5: fix the set VLAN VID action validation >=20 > Validation function of 'set VLAN VID' action checks twice for existing sa= me > action in flow rule. >=20 > This patch updates the validation function logic, to check the same > restrictions more efficiently. >=20 > Fixes: 5f163d520cff ("net/mlx5: support modify VLAN ID on existing VLAN > header") > Fixes: b8c0372bc5ac ("net/mlx5: fix set VLAN ID/PCP in new header") > Cc: stable@dpdk.org >=20 > Signed-off-by: Dekel Peled > Acked-by: Ori Kam Acked-by: Viacheslav Ovsiienko > --- > drivers/net/mlx5/mlx5_flow_dv.c | 32 ++++++++------------------------ > 1 file changed, 8 insertions(+), 24 deletions(-) >=20 > diff --git a/drivers/net/mlx5/mlx5_flow_dv.c > b/drivers/net/mlx5/mlx5_flow_dv.c index de4b765..4b6a92c 100644 > --- a/drivers/net/mlx5/mlx5_flow_dv.c > +++ b/drivers/net/mlx5/mlx5_flow_dv.c > @@ -1815,10 +1815,10 @@ struct field_modify_info modify_tcp[] =3D { > * > * @param[in] item_flags > * Holds the items detected in this rule. > + * @param[in] action_flags > + * Holds the actions detected until now. > * @param[in] actions > * Pointer to the list of actions remaining in the flow rule. > - * @param[in] attr > - * Pointer to flow attributes > * @param[out] error > * Pointer to error structure. > * > @@ -1838,33 +1838,17 @@ struct field_modify_info modify_tcp[] =3D { > return rte_flow_error_set(error, EINVAL, > RTE_FLOW_ERROR_TYPE_ACTION, > action, > "VLAN VID value is too big"); > - /* there is an of_push_vlan action before us */ > - if (action_flags & MLX5_FLOW_ACTION_OF_PUSH_VLAN) { > - if (mlx5_flow_find_action(actions + 1, > - > RTE_FLOW_ACTION_TYPE_OF_SET_VLAN_VID)) > - return rte_flow_error_set(error, ENOTSUP, > - RTE_FLOW_ERROR_TYPE_ACTION, > action, > - "Multiple VLAN VID modifications are > " > - "not supported"); > - else > - return 0; > - } > - > - /* > - * Action is on an existing VLAN header: > - * Need to verify this is a single modify CID action. > - * Rule mast include a match on outer VLAN. > - */ > + if (!(action_flags & MLX5_FLOW_ACTION_OF_PUSH_VLAN) && > + !(item_flags & MLX5_FLOW_LAYER_OUTER_VLAN)) > + return rte_flow_error_set(error, ENOTSUP, > + RTE_FLOW_ERROR_TYPE_ACTION, > action, > + "set VLAN VID action must follow > push" > + " VLAN action or match on VLAN > item"); > if (action_flags & MLX5_FLOW_ACTION_OF_SET_VLAN_VID) > return rte_flow_error_set(error, ENOTSUP, > RTE_FLOW_ERROR_TYPE_ACTION, > action, > "Multiple VLAN VID modifications > are " > "not supported"); > - if (!(item_flags & MLX5_FLOW_LAYER_OUTER_VLAN)) > - return rte_flow_error_set(error, EINVAL, > - RTE_FLOW_ERROR_TYPE_ACTION, > action, > - "match on VLAN is required in order > " > - "to set VLAN VID"); > if (action_flags & MLX5_FLOW_ACTION_PORT_ID) > return rte_flow_error_set(error, EINVAL, > RTE_FLOW_ERROR_TYPE_ACTION, > action, > -- > 1.8.3.1