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 EB1DBA04F1 for ; Mon, 6 Jan 2020 15:50:32 +0100 (CET) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id C60F11D690; Mon, 6 Jan 2020 15:50:32 +0100 (CET) Received: from EUR03-AM5-obe.outbound.protection.outlook.com (mail-eopbgr30086.outbound.protection.outlook.com [40.107.3.86]) by dpdk.org (Postfix) with ESMTP id 8DB0F1D687; Mon, 6 Jan 2020 15:50:29 +0100 (CET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=AbEu/TNGQ4/u02Luz1CKVclRdtVBF9rtmEDlRN7P7NkXLLdCVzbtdnUIKVoi6EPp/yLgw6TT+Y4FKfvNvVQ57xjraImszxFG58ps/p+782Bd6JY5Z24mFVC75yLgQck1C/vyxXUxiWHNK0eY9vkHhNJWSfjfhj1NBNuesi9K1IjnPY6uJAe/aU+yVkpWIIEUTzbGeSvu7j5SpL8jwgQVAp6jENHwgdu5QdOrBVyc4Zth+Q2CTyRMtyQ9zxqMoCmo/05T3CZ93glor1sXLXO+N6fl6Dxt2AFumzaciqEttqyFi7All1Yn/6UK1i1GsTf7qnf0V1aaINmk2qiU3wgc/A== 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=gIXXZWjQ25V5nJnZbztHJrvAXmgNomQV3KwPoXQnAO0=; b=T61jHmbxg49W+90MkpsvFRnTZ2lluPTCXCUt8axTnMEKzkb4VEqfkZYNjHSgTGPxax0siOVR1pGGCJD7zCH1jfVJmAhy6ChoAal27nxmOCtHVHPVWaEr5n8mBBXXTvDGRsA3Yv+3LAeCQ70CAJZIDupF3A5vaCtwlNcftwGniTmlvB7g8sxe1kpOn754lrdoYp+Apipa4sAGILegoexHe6dahBR8cqXbMmCJxlrqyGXelOj3CTNveFGgZ51paMz9xd/B4JeG1Xis9YstWyToO7lJMz/FcyfslEmXKMCG/H9N5QYa4IcQuhmpQFFWGTjMU6emu57Ep5bhdtAFXfk7aQ== 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=gIXXZWjQ25V5nJnZbztHJrvAXmgNomQV3KwPoXQnAO0=; b=BnLyZQXqBOtItjBPRSNlTr+Vrwad1xJesMvPf8m6xhu3r8Yq4YCUQHTuyEDwHIoq9mIArdAxhwfr8jqnM2+WgMVJF8wkVkY1A8JgBnRfm33EgYlyWGDdGIvW+b0x51L+Tv3e8tM8LWa+svPX1vOgQ07YFHRPGAMktJiAjvFayOA= Received: from AM0PR0502MB4019.eurprd05.prod.outlook.com (52.133.39.139) by AM0PR0502MB3953.eurprd05.prod.outlook.com (52.133.33.10) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.2602.11; Mon, 6 Jan 2020 14:50:28 +0000 Received: from AM0PR0502MB4019.eurprd05.prod.outlook.com ([fe80::e495:9258:db09:1de8]) by AM0PR0502MB4019.eurprd05.prod.outlook.com ([fe80::e495:9258:db09:1de8%7]) with mapi id 15.20.2602.015; Mon, 6 Jan 2020 14:50:28 +0000 From: Matan Azrad To: Slava Ovsiienko , "dev@dpdk.org" CC: Raslan Darawsheh , Ori Kam , "stable@dpdk.org" Thread-Topic: [PATCH] net/mlx5: fix matcher metadata register c0 field setup Thread-Index: AQHVtwn22Kf7jpkK3kquObj2fJloN6fd0spg Date: Mon, 6 Jan 2020 14:50:28 +0000 Message-ID: References: <1576828138-13063-1-git-send-email-viacheslavo@mellanox.com> In-Reply-To: <1576828138-13063-1-git-send-email-viacheslavo@mellanox.com> Accept-Language: en-US, he-IL Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: authentication-results: spf=none (sender IP is ) smtp.mailfrom=matan@mellanox.com; x-originating-ip: [193.47.165.251] x-ms-publictraffictype: Email x-ms-office365-filtering-ht: Tenant x-ms-office365-filtering-correlation-id: 081d14dc-a775-4e70-7703-08d792b7c56e x-ms-traffictypediagnostic: AM0PR0502MB3953:|AM0PR0502MB3953: 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:7219; x-forefront-prvs: 0274272F87 x-forefront-antispam-report: SFV:NSPM; SFS:(10009020)(4636009)(39860400002)(346002)(366004)(376002)(136003)(396003)(199004)(189003)(9686003)(76116006)(64756008)(66446008)(66946007)(66476007)(450100002)(66556008)(4326008)(478600001)(33656002)(55016002)(54906003)(316002)(6506007)(81166006)(8936002)(7696005)(71200400001)(2906002)(81156014)(5660300002)(52536014)(186003)(8676002)(86362001)(110136005)(26005); DIR:OUT; SFP:1101; SCL:1; SRVR:AM0PR0502MB3953; H:AM0PR0502MB4019.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: /TVba4AQoh2U32J/Nh5ff6ujZ2FAO9WQ9K12IRBoOvPGrbh68wS2LSNqlb2hAxLj7/T3sZBZcFfZW0njybqQVM49/Oc2Ssoi2er3/1Jqe/bUbIGDI4PV7zSr9WknovVSsWYeKfu0k8RdrvbQKsdE0/o4X+eCsBFQyyz0MFWM86e8mPPH8ZG9kwEkC8uiepkjMJ2w+dt9It9Xskfr67H6i2dHbLb0dGHXe5kv+ke+E+/RX0ULE9Kz1ZZrllwMh9snotMXCuyWsmmI9vmm2ZwUtI3pCaFGeU6MFqC3GmQ/7otno8hfMu1thKWQYh/cYeYX7m4EH/DtkESoy7WjcDELwgA5JjnzeWBrh9fIu6uFbyUh9e9FlETH1QFNLrFu3iykUT+jxbF6h5dJ2iGMPoTFTzAS8bq+P+lvJyhXELs3ozq4vZor5AtMNQB3Va4eHLGo 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: 081d14dc-a775-4e70-7703-08d792b7c56e X-MS-Exchange-CrossTenant-originalarrivaltime: 06 Jan 2020 14:50:28.4506 (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: QcaaFc839DHSQn/OxeG3gEqOLQslv/n89EjUQ5hZLnHSwiZY60nhZ5k4heAo10SU0AH15uhAi0LmEYSSYfB0NA== X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM0PR0502MB3953 Subject: Re: [dpdk-stable] [PATCH] net/mlx5: fix matcher metadata register c0 field setup 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" From: Viacheslav Ovsiienko > The metadata register c0 field in the matcher might be split into two > independent fields - the source vport index and META item value. These > fields have no permanent assigned bits, the configuration is queried from= the > kernel drivers. >=20 > MLX5_SET configures the specified 32-bit field as whole entity. > For metadata register c0 we should take into account the provided mask in > order to configure the specified subfield bits only. >=20 > Fixes: acfcd5c52f94 ("net/mlx5: update meta register matcher set") > Cc: stable@dpdk.org >=20 > Signed-off-by: Viacheslav Ovsiienko > --- > drivers/net/mlx5/mlx5_flow_dv.c | 15 +++++++++++++-- > 1 file changed, 13 insertions(+), 2 deletions(-) >=20 > diff --git a/drivers/net/mlx5/mlx5_flow_dv.c > b/drivers/net/mlx5/mlx5_flow_dv.c index 4c16281..893db3e 100644 > --- a/drivers/net/mlx5/mlx5_flow_dv.c > +++ b/drivers/net/mlx5/mlx5_flow_dv.c > @@ -5742,6 +5742,7 @@ struct field_modify_info modify_tcp[] =3D { > MLX5_ADDR_OF(fte_match_param, matcher, > misc_parameters_2); > void *misc2_v =3D > MLX5_ADDR_OF(fte_match_param, key, > misc_parameters_2); > + uint32_t temp; >=20 > data &=3D mask; > switch (reg_type) { > @@ -5754,8 +5755,18 @@ struct field_modify_info modify_tcp[] =3D { > MLX5_SET(fte_match_set_misc2, misc2_v, metadata_reg_b, > data); > break; > case REG_C_0: > - MLX5_SET(fte_match_set_misc2, misc2_m, > metadata_reg_c_0, mask); > - MLX5_SET(fte_match_set_misc2, misc2_v, > metadata_reg_c_0, data); > + /* > + * The metadata register C0 field might be divided into > + * source vport index and META item value, we should set > + * this field accorfing to specified mask, not as whole one. > + */ Typo - accorfing =3D> according. > + temp =3D MLX5_GET(fte_match_set_misc2, misc2_m, > metadata_reg_c_0); > + temp |=3D mask; > + MLX5_SET(fte_match_set_misc2, misc2_m, > metadata_reg_c_0, temp); > + temp =3D MLX5_GET(fte_match_set_misc2, misc2_v, > metadata_reg_c_0); > + temp &=3D ~mask; > + temp |=3D data; > + MLX5_SET(fte_match_set_misc2, misc2_v, > metadata_reg_c_0, temp); > break; > case REG_C_1: > MLX5_SET(fte_match_set_misc2, misc2_m, > metadata_reg_c_1, mask); Raslan, please fix the typo in integration. Acked-by: Matan Azrad