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 6B539A0588 for ; Mon, 30 Mar 2020 15:22:06 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 38D2C1C02D; Mon, 30 Mar 2020 15:22:06 +0200 (CEST) Received: from EUR05-DB8-obe.outbound.protection.outlook.com (mail-db8eur05on2076.outbound.protection.outlook.com [40.107.20.76]) by dpdk.org (Postfix) with ESMTP id 58991FFA; Mon, 30 Mar 2020 15:22:03 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=ONN8W1fTOCJK2Y6kIcgzeLo71Qyn3JlzuZp7aET4Wjrguq2rd4M+iVukLcGRhws11sDqu6UvDMtW6OpK20Mt3qGu5WNS8FGtA4tK+ioR05ENnif41GBSAN/R6H5ldIzkLflUsatZ+OHUCpeD+AxUic7FShQaKJqG8SZLu4OO8EWP7Iv9i1qxeTEuU2pEHWYjRlzWj/LZs/qcajFDY4OlJRD4iqYiQ8w4BsWrzHQTpwlYlRdjvsMY4Saje9Yx/eijyerCdfPukNRoP13AhdY6ILBcWS+nLqRAQ704OAKzww4pAbWIreCyxQZU7hHFwBhoFje4MvSjCALS47BLcRhelQ== 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=M/uBYz/8n/BjfkPs9I9HKveYOIWpwdGw3I94DhpiM3w=; b=Fg7QxzdfsdRRo/C1eXJUG3s+8KY3HT9n0XGKI6oQ2zbcj/XDewQLRA8P4lSd8yUBcHDvB6l4Ksb4BcdpOu3lcS2CW8BC3ho40bQpmtqNGWC4GFyJpxhQKz9JLeQP6Z9N+R0soCMLN9Y5xVXcpNVaNJSBPji+zt81eGrhNXI6nkc362aGUncGBHI/DBS4cD4Ig9V4su7N7wJPUOUV5S4fO7//JkCrvaoetk71z4N9U5SG2+GnH2PsjkOYu7LeNRL3zy9/apAoDnCMCfoOD1yWxGFZhpKCNrMdoew/mkExRFHmQsAJMV5C3+DVUUdXhvwoa59n9kyjWdHKut/4Sdr8kw== 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=M/uBYz/8n/BjfkPs9I9HKveYOIWpwdGw3I94DhpiM3w=; b=b6gN5yKocszSS51BxKO/rSe/i/+drCKHpF2Erg95lKGOG9O3m0EzSx2Bby0y6D7o4clIb5PNO+s1Irh0O+Jfcm6Ths7DmQFM8vk/5+wss/czbOQAeq3kfk5yoUk/AgXP+dZ908V4UankQoyOqEd/msJrMrKzkbTYVG+lTA0Lw5g= Received: from AM0PR05MB6707.eurprd05.prod.outlook.com (10.186.174.145) by AM0PR05MB4308.eurprd05.prod.outlook.com (52.134.124.27) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.2856.19; Mon, 30 Mar 2020 13:22: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.2856.019; Mon, 30 Mar 2020 13:22:02 +0000 From: Raslan Darawsheh To: Dekel Peled , Matan Azrad , Slava Ovsiienko CC: "dev@dpdk.org" , "stable@dpdk.org" Thread-Topic: [PATCH] common/mlx5: fix RSS key copy to TIR context Thread-Index: AQHWBasUVwZZrWXnrUSC/wiWV6Nv3qhhIPSg Date: Mon, 30 Mar 2020 13:22:02 +0000 Message-ID: References: <47a603b080cf3ede11ae867068a7be81fd755db6.1585472631.git.dekelp@mellanox.com> In-Reply-To: <47a603b080cf3ede11ae867068a7be81fd755db6.1585472631.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=rasland@mellanox.com; x-originating-ip: [188.161.229.130] x-ms-publictraffictype: Email x-ms-office365-filtering-ht: Tenant x-ms-office365-filtering-correlation-id: 77f4819c-62ac-4e6c-1a23-08d7d4ad5569 x-ms-traffictypediagnostic: AM0PR05MB4308:|AM0PR05MB4308: x-ms-exchange-transport-forked: True x-microsoft-antispam-prvs: x-ms-oob-tlc-oobclassifiers: OLM:2582; x-forefront-prvs: 0358535363 x-forefront-antispam-report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:AM0PR05MB6707.eurprd05.prod.outlook.com; PTR:; CAT:NONE; SFTY:; SFS:(10009020)(4636009)(136003)(39860400002)(346002)(366004)(396003)(376002)(2906002)(76116006)(66946007)(66446008)(66476007)(66556008)(64756008)(6506007)(7696005)(5660300002)(4326008)(450100002)(53546011)(86362001)(478600001)(8936002)(8676002)(81156014)(52536014)(81166006)(316002)(9686003)(55016002)(110136005)(54906003)(6636002)(71200400001)(186003)(33656002)(26005); DIR:OUT; SFP:1101; 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: 1hA9RJbbsAoCx3CaRVmNW8Y0r2YlBYFFFKFjmnK38zyOZU4KcVJiXjDcOZ2y9PrWa04O+dX4HJosDrWJuVT3YtUpun/h3qcFqPzaKR50PCg6e9fxW3RHQtyGjH2w4aL4k4i09o6B1/8Sg4VDIXHIPnmW8gqWPJf1hDwLB6pVTp8IfdRfulwkuyKhdGlGrzw+BKKIV3Zwl/2oBlkyuFmO7Gqa5WAGqAmKQ/AM4qP0Ub8OOuYTVC6nMMOtBR5doM7wadyOWWfbdkfRREGTgg0wx+DL+hfmP5zr4EgPfXf8OjwDt9TE30IbyqjAUDxdSKb45beyATbXgDZjGaX+oXFnZrNYm7eq1eCmvuLkN/7rW2cSEqwFssz2XTgHUa4W8rrdgZsE/GpGqPD7KyOk2MLnUjpa5iWJaXSf22BDa9iFOvXGHMXtog7TZYYGuRoKKVBy x-ms-exchange-antispam-messagedata: 7dM0Zcp6bg8CbyBQEXTF0b7sq1o7qm9hfzOfnsiOTbg5sxkEJTxLUmoNRbWh0QtFMGEb7H6fGxNc1WEw1sUMEGZVs6K7CkbBRwljTqbVt869DxIuMkXPY08NT3cYDBD9n1fzwqnqYrdsAT577THwCA== 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: 77f4819c-62ac-4e6c-1a23-08d7d4ad5569 X-MS-Exchange-CrossTenant-originalarrivaltime: 30 Mar 2020 13:22:02.2381 (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: JfoyAHJDoKE2STsbS3vJBAI8Je/MnAjOyf5c98XlQip6XTeQ2HzwfdQLQrUq3uNZOeWDFXPA2sUPQyTmBqQV5Q== X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM0PR05MB4308 Subject: Re: [dpdk-stable] [PATCH] common/mlx5: fix RSS key copy to TIR context 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: Dekel Peled > Sent: Sunday, March 29, 2020 12:18 PM > To: Matan Azrad ; Slava Ovsiienko > ; Raslan Darawsheh > Cc: dev@dpdk.org; stable@dpdk.org > Subject: [PATCH] common/mlx5: fix RSS key copy to TIR context >=20 > In function mlx5_devx_cmd_create_tir(), the 40 bytes of RSS key are > copied in 10 iterations, 4 bytes each time using the MLX5_SET macro. > As result the RSS key is copied into TIR context in swapped byte order. > This patch fixes the issue, using memcpy() to copy the RSS key as is. > The struct member mlx5_devx_tir_attr.rx_hash_toeplitz_key is updated > to byte array type. >=20 > Fixes: c3aea272eed8 ("net/mlx5: create advanced Rx object via DevX") > Cc: stable@dpdk.org >=20 > Signed-off-by: Dekel Peled > Acked-by: Matan Azrad > --- > drivers/common/mlx5/mlx5_devx_cmds.c | 9 +++------ > drivers/common/mlx5/mlx5_devx_cmds.h | 2 +- > drivers/net/mlx5/mlx5_rxq.c | 3 ++- > drivers/vdpa/mlx5/mlx5_vdpa_steer.c | 14 ++++++++++---- > 4 files changed, 16 insertions(+), 12 deletions(-) >=20 > diff --git a/drivers/common/mlx5/mlx5_devx_cmds.c > b/drivers/common/mlx5/mlx5_devx_cmds.c > index 1157a44..67c8a8c 100644 > --- a/drivers/common/mlx5/mlx5_devx_cmds.c > +++ b/drivers/common/mlx5/mlx5_devx_cmds.c > @@ -759,9 +759,8 @@ struct mlx5_devx_obj * > { > uint32_t in[MLX5_ST_SZ_DW(create_tir_in)] =3D {0}; > uint32_t out[MLX5_ST_SZ_DW(create_tir_out)] =3D {0}; > - void *tir_ctx, *outer, *inner; > + void *tir_ctx, *outer, *inner, *rss_key; > struct mlx5_devx_obj *tir =3D NULL; > - int i; >=20 > tir =3D rte_calloc(__func__, 1, sizeof(*tir), 0); > if (!tir) { > @@ -784,10 +783,8 @@ struct mlx5_devx_obj * > MLX5_SET(tirc, tir_ctx, rx_hash_fn, tir_attr->rx_hash_fn); > MLX5_SET(tirc, tir_ctx, self_lb_block, tir_attr->self_lb_block); > MLX5_SET(tirc, tir_ctx, transport_domain, tir_attr- > >transport_domain); > - for (i =3D 0; i < 10; i++) { > - MLX5_SET(tirc, tir_ctx, rx_hash_toeplitz_key[i], > - tir_attr->rx_hash_toeplitz_key[i]); > - } > + rss_key =3D MLX5_ADDR_OF(tirc, tir_ctx, rx_hash_toeplitz_key); > + memcpy(rss_key, tir_attr->rx_hash_toeplitz_key, > MLX5_RSS_HASH_KEY_LEN); > outer =3D MLX5_ADDR_OF(tirc, tir_ctx, rx_hash_field_selector_outer); > MLX5_SET(rx_hash_field_select, outer, l3_prot_type, > tir_attr->rx_hash_field_selector_outer.l3_prot_type); > diff --git a/drivers/common/mlx5/mlx5_devx_cmds.h > b/drivers/common/mlx5/mlx5_devx_cmds.h > index 20bb294..f7802e6 100644 > --- a/drivers/common/mlx5/mlx5_devx_cmds.h > +++ b/drivers/common/mlx5/mlx5_devx_cmds.h > @@ -183,7 +183,7 @@ struct mlx5_devx_tir_attr { > uint32_t rx_hash_fn:4; > uint32_t self_lb_block:2; > uint32_t transport_domain:24; > - uint32_t rx_hash_toeplitz_key[10]; > + uint8_t rx_hash_toeplitz_key[MLX5_RSS_HASH_KEY_LEN]; > struct mlx5_rx_hash_field_select rx_hash_field_selector_outer; > struct mlx5_rx_hash_field_select rx_hash_field_selector_inner; > }; > diff --git a/drivers/net/mlx5/mlx5_rxq.c b/drivers/net/mlx5/mlx5_rxq.c > index 8a6b410..97ce206 100644 > --- a/drivers/net/mlx5/mlx5_rxq.c > +++ b/drivers/net/mlx5/mlx5_rxq.c > @@ -2519,7 +2519,8 @@ struct mlx5_hrxq * > tir_attr.transport_domain =3D priv->sh->td->id; > else > tir_attr.transport_domain =3D priv->sh->tdn; > - memcpy(tir_attr.rx_hash_toeplitz_key, rss_key, > rss_key_len); > + memcpy(tir_attr.rx_hash_toeplitz_key, rss_key, > + MLX5_RSS_HASH_KEY_LEN); > tir_attr.indirect_table =3D ind_tbl->rqt->id; > if (dev->data->dev_conf.lpbk_mode) > tir_attr.self_lb_block =3D > diff --git a/drivers/vdpa/mlx5/mlx5_vdpa_steer.c > b/drivers/vdpa/mlx5/mlx5_vdpa_steer.c > index 36017f1..9f8af4c 100644 > --- a/drivers/vdpa/mlx5/mlx5_vdpa_steer.c > +++ b/drivers/vdpa/mlx5/mlx5_vdpa_steer.c > @@ -144,10 +144,16 @@ > .transport_domain =3D priv->td->id, > .indirect_table =3D priv->steer.rqt->id, > .rx_hash_symmetric =3D 1, > - .rx_hash_toeplitz_key =3D { 0x2cc681d1, 0x5bdbf4f7, > 0xfca28319, > - 0xdb1a3e94, 0x6b9e38d9, > 0x2c9c03d1, > - 0xad9944a7, 0xd9563d59, > 0x063c25f3, > - 0xfc1fdc2a }, > + .rx_hash_toeplitz_key =3D { 0x2c, 0xc6, 0x81, 0xd1, > + 0x5b, 0xdb, 0xf4, 0xf7, > + 0xfc, 0xa2, 0x83, 0x19, > + 0xdb, 0x1a, 0x3e, 0x94, > + 0x6b, 0x9e, 0x38, 0xd9, > + 0x2c, 0x9c, 0x03, 0xd1, > + 0xad, 0x99, 0x44, 0xa7, > + 0xd9, 0x56, 0x3d, 0x59, > + 0x06, 0x3c, 0x25, 0xf3, > + 0xfc, 0x1f, 0xdc, 0x2a }, > }; > struct { > size_t size; > -- > 1.8.3.1 Patch applied to next-net-mlx,=20 Kindest regards, Raslan Darawsheh