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 62C64A0555 for ; Wed, 19 Feb 2020 14:07:06 +0100 (CET) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 2C3961BF98; Wed, 19 Feb 2020 14:07:06 +0100 (CET) Received: from EUR01-VE1-obe.outbound.protection.outlook.com (mail-eopbgr140080.outbound.protection.outlook.com [40.107.14.80]) by dpdk.org (Postfix) with ESMTP id F361F25B3; Wed, 19 Feb 2020 14:07:02 +0100 (CET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=BPNqvKqWwRKvj/OG75l8vDDWHNcrZDlCl+FKSpuCBFlS+aXxQ1loqLPR3K/aoC78gDB6VEezhV2JYh4stLuOUYh4Vnh9tqT1a0GXLL2S/hGhPGYFamkUjwQDOClDcqthewBWOxF1V+s/tf8meGrMeVHsSns/EvY9M5EBLBfLX56H8LmnW4ePJVix5kwLup/lSgCeyjoINuME+aO+LOsDg99qzEbUk9lZDCcSgRjEmXotWwUdzdh0piShJqjpSUZiFZB6wbq6DJB4p+U9AIOAI1bovDB5UxeRnZuclVofegQfI8swAvWozKu8rKNpxcoI0WE6Pz0MK9nVT5rlhCvobQ== 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=UFa6fRHT6bPTS3TWoBOMqBeiolQM/2FAfPIWOuC0+10=; b=X3JPIZpGLiRIWURuH4zu6smHIfB4ucbGyiVkQOGC+5LCxl5Ga2UfwNTDaQdE9rKyEGtn9R5laWWdHswF0hPqsN0khajuPmvYx7z/JPBNqFZxfLy82HHXaG/8FNCTH0RGIRrfu1M3k4ez3QWAqDajtqgb7H5VcdhMTMcS7JosSOAmpof4Xov2eDpWhUkptBrHg5aB2GUHrMPawC2sE3sykMMLOJkiWU72+ROjHRiDHMVXbt22spUQt6LR6OB37giqqaV8PivP+RpveLH3m4bwqUx437oMxcHG5TBbaCqkdKgHio2H2dUqVyY9GaJlBNBhxHhS8Iq5+wmwrvWgx8Kdkg== 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=UFa6fRHT6bPTS3TWoBOMqBeiolQM/2FAfPIWOuC0+10=; b=tjMwr0sY/52GGqapcDYKiL2ZjVAyWChs/LYfvTvf8s14g1XsKBoyR+6zEjc+SssssRCUduP8VwAI2AzNfIfOO0wSQ+//zkIghbSYAD+CMn7WfzDu29YRRT1GQbKKI8NCZ4YbChU6vnHX+ZU+krCQiJnxUL3jHXvKSwhKElRdR54= Received: from AM0PR05MB6707.eurprd05.prod.outlook.com (10.186.174.145) by AM0PR05MB4770.eurprd05.prod.outlook.com (52.133.60.20) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.2729.31; Wed, 19 Feb 2020 13:07:02 +0000 Received: from AM0PR05MB6707.eurprd05.prod.outlook.com ([fe80::adbd:45ca:54:bba9]) by AM0PR05MB6707.eurprd05.prod.outlook.com ([fe80::adbd:45ca:54:bba9%7]) with mapi id 15.20.2750.016; Wed, 19 Feb 2020 13:07:01 +0000 From: Raslan Darawsheh To: Matan Azrad , "dev@dpdk.org" CC: Slava Ovsiienko , "stable@dpdk.org" Thread-Topic: [dpdk-dev] [PATCH] net/mlx5: fix flow match on GRE key Thread-Index: AQHV5moV60KFq57HxkSstHeJoOVrKagifgoA Date: Wed, 19 Feb 2020 13:07:01 +0000 Message-ID: References: <1582037120-11735-1-git-send-email-matan@mellanox.com> In-Reply-To: <1582037120-11735-1-git-send-email-matan@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=rasland@mellanox.com; x-originating-ip: [212.29.221.74] x-ms-publictraffictype: Email x-ms-office365-filtering-ht: Tenant x-ms-office365-filtering-correlation-id: a8b35b69-ff00-4b69-701e-08d7b53c9c2e x-ms-traffictypediagnostic: AM0PR05MB4770:|AM0PR05MB4770: x-ms-exchange-transport-forked: True x-microsoft-antispam-prvs: x-ms-oob-tlc-oobclassifiers: OLM:7219; x-forefront-prvs: 0318501FAE x-forefront-antispam-report: SFV:NSPM; SFS:(10009020)(4636009)(346002)(366004)(396003)(136003)(39860400002)(376002)(199004)(189003)(9686003)(55016002)(53546011)(71200400001)(4326008)(6506007)(5660300002)(86362001)(450100002)(2906002)(110136005)(54906003)(33656002)(26005)(478600001)(316002)(81166006)(64756008)(8676002)(186003)(8936002)(66446008)(52536014)(66556008)(66946007)(7696005)(81156014)(66476007)(76116006); DIR:OUT; SFP:1101; SCL:1; SRVR:AM0PR05MB4770; H:AM0PR05MB6707.eurprd05.prod.outlook.com; FPR:; SPF:None; LANG:en; PTR:InfoNoRecords; A:1; MX: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: hrnhEBKxD2Z7ZNFGZmR9AXTQBETJ7nCWiW4sUUeZg7t9dwX8iLFf4wnLF5B02sFjAJOSrGVuFi2eXe6Ay1ePWoc+WuXKVVtumATrZZaNGegpwY5sF0ERzVKD7Yk2+Fqha+qZl+/FGGrbdDVAU5k/JNOBXaXVto4ORqrqUmLoAvPyz9im/F5Ttp6D18G8xYTwJTxZXXX5hu4Q0QCgDSLH77wrfmxS/sbfs+7hmoqsZ+ucfDYQPTRR6iOiJmH/jc7b5DVvsP0teAVZZfOBTF9C+IWsPHv8jZRKc/XpJzJLRqIirSYXaorlhqPldX/O+Cj+qNKJwg5dpfvgnCIreJLCyxjVt6GrXaueVbOGt1yzkaPVfTA0NNlRs8n4Y7jjeLrxOgri7zQ1cST5LgJlRGonvcNfyd34ieseBxEjLefDUJnAcbYxIkQA+FhpBmdW0hcy x-ms-exchange-antispam-messagedata: 03CNYlP11/B2OiT4v5FuM+842aoplN+eJLAzF8cijCPLMfkhOpOu8GJCYfpFekBChL37Xdh6/LonkPe2Gwey3aR7uSCxnOXuDZqwbNYbX1/0kWg5tBt+uu4QG0V9SMQJ1MTYD8fxm9Bb89X06ocIMA== 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: a8b35b69-ff00-4b69-701e-08d7b53c9c2e X-MS-Exchange-CrossTenant-originalarrivaltime: 19 Feb 2020 13:07:01.8133 (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: xMSxY4fyQQkdA9dPApA/LURlECQhVRTT9MpRE3er22y6fhjyEnQ1A7+ZDbmQeog5a/EOepBw45a74Z9KebXpDQ== X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM0PR05MB4770 Subject: Re: [dpdk-stable] [dpdk-dev] [PATCH] net/mlx5: fix flow match on GRE key 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, > -----Original Message----- > From: dev On Behalf Of Matan Azrad > Sent: Tuesday, February 18, 2020 4:45 PM > To: dev@dpdk.org > Cc: Slava Ovsiienko ; stable@dpdk.org > Subject: [dpdk-dev] [PATCH] net/mlx5: fix flow match on GRE key >=20 > The RTE_FLOW_ITEM_TYPE_GRE_KEY means that GRE key should > be present on the flow and in addition can explicitly match on the GRE > key field itself. >=20 > When no value is set in this item any GRE key should match the flow. >=20 > The match on GRE key wrongly was not added if the item fields are NULL > while at least the GRE key should be present in the flow. >=20 > Add the GRE key present match when RTE_FLOW_ITEM_TYPE_GRE_KEY is in > the flow item list. >=20 > Fixes: a7a0365565a4 ("net/mlx5: match GRE key and present bits") > Cc: stable@dpdk.org >=20 > Signed-off-by: Matan Azrad > Acked-by: Ori Kam > --- > drivers/net/mlx5/mlx5_flow_dv.c | 6 +++--- > 1 file changed, 3 insertions(+), 3 deletions(-) >=20 > diff --git a/drivers/net/mlx5/mlx5_flow_dv.c > b/drivers/net/mlx5/mlx5_flow_dv.c > index a8c8a58..402250e 100644 > --- a/drivers/net/mlx5/mlx5_flow_dv.c > +++ b/drivers/net/mlx5/mlx5_flow_dv.c > @@ -5593,13 +5593,13 @@ struct field_modify_info modify_tcp[] =3D { > void *misc_v =3D MLX5_ADDR_OF(fte_match_param, key, > misc_parameters); > rte_be32_t gre_key_default_mask =3D RTE_BE32(UINT32_MAX); >=20 > + /* GRE K bit must be on and should already be validated */ > + MLX5_SET(fte_match_set_misc, misc_m, gre_k_present, 1); > + MLX5_SET(fte_match_set_misc, misc_v, gre_k_present, 1); > if (!key_v) > return; > if (!key_m) > key_m =3D &gre_key_default_mask; > - /* GRE K bit must be on and should already be validated */ > - MLX5_SET(fte_match_set_misc, misc_m, gre_k_present, 1); > - MLX5_SET(fte_match_set_misc, misc_v, gre_k_present, 1); > MLX5_SET(fte_match_set_misc, misc_m, gre_key_h, > rte_be_to_cpu_32(*key_m) >> 8); > MLX5_SET(fte_match_set_misc, misc_v, gre_key_h, > -- > 1.8.3.1 Patch applied to next-net-mlx, Kindest regards, Raslan Darawsheh