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 705A6A00C3 for ; Wed, 23 Feb 2022 17:06:57 +0100 (CET) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 614CE41145; Wed, 23 Feb 2022 17:06:57 +0100 (CET) Received: from NAM02-SN1-obe.outbound.protection.outlook.com (mail-sn1anam02on2068.outbound.protection.outlook.com [40.107.96.68]) by mails.dpdk.org (Postfix) with ESMTP id CC51041145 for ; Wed, 23 Feb 2022 17:06:55 +0100 (CET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=WL4JZN3ta7qbS4/oxbBcrC+1zij5+iYQ7rHsieFTjBUIGrWAxSyD5CwIBlWbrp23yaf1qX/086L6P514TeZfPajn/v/xN+ENmlW5AH6FMSeE3XX4nGg1+FNvNADZ+1C80MTbUdZFLJ0wTzALxQe1LuNo/xiOp1PtioSVaH5nvf6IotsKib56Pis/wGFqD9kGBt3wTWG/dfMiPLPe+2u0e6avRd/ENIj8JJd4AfCYZcOFei5mt/vdM2vDXjD5nKvcDA8ELKPpFn9b/hHpbH3b9xxu/NUt7DshF24oHRMjq99wF/XN0RUUpLHBd+ypaiiomp1jT3c3S1IhCA+h597PMw== 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-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=0JyqbHVBISrvVXkZ0j15znG5sI1aF901mBf2FZZV6cM=; b=YeETaEx7wNhB+1mOlpFX8ZJYex4uo1jTBCzNNfXQNmpxstthcW3a79i1wmvXwyqxx4TvRqo1skXVnd5EShoHO45D6+4GDGMj+ALob3AuQ9+S5g269yhFYqaERW1FHBT1at2346mWANRE2DXBdpd/1rO90Q2zf1Efq5veEHTS7qE1RQEkVWjekUGmDGA38WGuC7ys9R8xTAs7EomLhbEj3p4NxS1uelwrg0NXEn/dW0O1tL5o/9R2UFdcop28qKBuLenebeoBRpW3jomc6jggagylcQ4iGp9lnEHU+T8u5wBMQdiws1dHHypb6IJjFCfkesGZnRgh4Zx/zWiqcBwg2A== 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=0JyqbHVBISrvVXkZ0j15znG5sI1aF901mBf2FZZV6cM=; b=ntprSsqs3c3cWoZXgx59EjZPlIWQoGEu1PfEcuxdDZmZUGaWWDDReTOR6+HyPRfte9NNT3+v2TbD0HckMofSSSg9oX7S9vYN3PuybJEP+39ingd3HseEhrl2llLLDPgI/4fyBeZ5xSR4HpWtDkiAr4m4AI6B/fKUeLTb/V1oZKlQW7LftGP71FQ3sxFMMlpGcjYFu0NTJec/V4DuCBcKmxnpOWLec+G35KYkaleJkiYLcQN3186NnYyK90p++UDq0FotAuLcQNCdIVDICbJR9EdLr92/fM9MVMfxoJnS6KDtOH1bw14gOiKtc7LqlJ44U7zg6BsvF8SLjlPBUI79aA== Received: from DM5PR12MB4661.namprd12.prod.outlook.com (2603:10b6:4:aa::32) by CH2PR12MB4149.namprd12.prod.outlook.com (2603:10b6:610:7c::13) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4995.24; Wed, 23 Feb 2022 16:06:54 +0000 Received: from DM5PR12MB4661.namprd12.prod.outlook.com ([fe80::d1c7:72a3:d491:b6f]) by DM5PR12MB4661.namprd12.prod.outlook.com ([fe80::d1c7:72a3:d491:b6f%4]) with mapi id 15.20.5017.022; Wed, 23 Feb 2022 16:06:53 +0000 From: Michael Baum To: Luca Boccassi , "stable@dpdk.org" CC: Matan Azrad , Slava Ovsiienko , Alexander Kozyrev Subject: RE: [PATCH 20.11 0/5] mlx5: some fixes Thread-Topic: [PATCH 20.11 0/5] mlx5: some fixes Thread-Index: AQHYJ/kTH+vGeaMkJ0W0ZRBEHelDbqyhTn7g Date: Wed, 23 Feb 2022 16:06:53 +0000 Message-ID: References: <20220221194635.2458173-1-michaelba@nvidia.com> <0e6ff0d6796fd80691bc1f1e1d9a5bfaecb5d97c.camel@debian.org> In-Reply-To: <0e6ff0d6796fd80691bc1f1e1d9a5bfaecb5d97c.camel@debian.org> Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: authentication-results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=nvidia.com; x-ms-publictraffictype: Email x-ms-office365-filtering-correlation-id: 95129a90-7a2e-48bc-996c-08d9f6e6825b x-ms-traffictypediagnostic: CH2PR12MB4149:EE_ x-microsoft-antispam-prvs: x-ms-exchange-senderadcheck: 1 x-ms-exchange-antispam-relay: 0 x-microsoft-antispam: BCL:0; x-microsoft-antispam-message-info: w9+XqEXlNYKqKjVs+lry4p6Bx/RBJ7lPxaYez9Tv3KmXud3BikCYt+SiqX97QqkITU6cEVG6Gi3Dmu5Hep8XDLFToVqxXXLYWPsAyQjtY8twZMVFhXamojcfdVZYcDDyrOLJ8a+mXThU+xH6iOpmQNdJEzUUk703RMqEB3y1Nyo91SooUhS964w8WbzGbElDZzYu5xhGH5b0XkyDoHLb/AkzS9TLJkDPptxO3N5sC0DJXAfxEJYpmzbJfsAHFHFxuoROAhT3djYg+RPy6ZTOLmxdOvgl4nmMOkBUF7HEEPoIK7HBZDxcrszq0Luu1wdqKBEzHkHjcSYXShCa3/7XNLpDDAxkZaFE+eFQ3mCfq3fVOXi9dJNiucb0P+7eIvXpjLKQ4NYkt/DMybbIvvYBJMjxhgCWpB99NN7LsjP6R3btyI0uOWxnc2hLED6uC07N9wY9xJK469eOt+NlU49u2M3OZHKfLUd7c8yrB9Jur8YR/eNEdmjxodufBoRsWFWnGnp1iIQACvASbabtjyZ95lTYtXyFMXGqACfehmIDQWoN7WzT84XoPHserynsP6Qi6m0uOFYslmDDjPggs/4hbqWVKD1ojnNVw9RBH8jhozutniVysjnyOpjfzq3FKsIu+B/6Eva2QNZjwADrVrXqWfd/PCStwdRU08uITHeQZ3S3UNqrKbBnI5HyEbTdrND6n1zBnnU9Av/fLTz2ONJZGwHw3h9yddsRTewMwR7OlLPPaNdiJ2mR5OQyHr2LjyB1tz3Mzg9rDZMRW0UPSrxd92hUg/Jr44pRyy9txHwwpkM= x-forefront-antispam-report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:DM5PR12MB4661.namprd12.prod.outlook.com; PTR:; CAT:NONE; SFS:(13230001)(4636009)(366004)(4326008)(52536014)(38100700002)(83380400001)(38070700005)(5660300002)(55016003)(2906002)(8936002)(33656002)(26005)(54906003)(53546011)(76116006)(966005)(71200400001)(186003)(66556008)(66946007)(9686003)(66476007)(122000001)(8676002)(110136005)(316002)(7696005)(107886003)(6506007)(64756008)(66446008)(86362001)(508600001); DIR:OUT; SFP:1101; x-ms-exchange-antispam-messagedata-chunkcount: 1 x-ms-exchange-antispam-messagedata-0: =?us-ascii?Q?G7FXIP0gAdjzwt86LXCiWuYZVYs/dt0hhbRD+e+bnnJZC8OHlJwFLtd9tiRn?= =?us-ascii?Q?9d2Q8/xGYl/LnSoPsnaJS/L8WnM5abZJBMFwvEEBp9CEx9/BGx4ixFNPPHEo?= =?us-ascii?Q?hSc+Ur/BCzbi0Ak+Eek7U25Hjgg/TX/FUCuZ9BA9PqBEv/R9zPfO1FT0VDex?= =?us-ascii?Q?XgUTMS8oviVXj944KqmNOUhb/0OCQmyaCh399ELpk0kKdsXzKri8uHVoYfN0?= =?us-ascii?Q?hHMT25RTZxCNQbgw2NpismgqB7/Ny9SSD3YtfXm1v2uftVooJGzwkg6XlfIy?= =?us-ascii?Q?WTa7JEvmQN9FVHKRa43+q7xA96l+lmBD7OohgEqXdlPuNFw3ya4HVvta4TSh?= =?us-ascii?Q?tRsindDNng4xrA5mhj9MwV97G/NWy/cBICOnTBXNfBtMAx7YoPu+tijy+im/?= =?us-ascii?Q?rEATdok30aoaKYczOJprx9YFOpLqwtbrigbrYZ3DKr3QnvgdYU5v3hFuWKn8?= =?us-ascii?Q?/5/RBHWfvZGB3XW69+edelGevZVlGvQ7oGCfDkpUaY/tMFnB8XBfqVPIM1rE?= =?us-ascii?Q?f6S/U4WNgZKYbRtsbHgzUHAQg9cI6pDWoKcO2vCXeZED+gHgogwmWtaEsXom?= =?us-ascii?Q?AT87cY5cGOqM2nt4P/71cIUf4kmnM/cuWoCn4JILmZraWXgHxdFrkC8FAsLv?= =?us-ascii?Q?DOOoj4AnpvCU5DMPDA1UyE6D7fMJunoOcdsgbK/AsdtqvrF+rHUfM0s1VTMA?= =?us-ascii?Q?cXzAy4bII7fdiVOXSVSSGj73tFJgk/xTy0SiB4zWXt/ujR+J4/2J1XEN8RVN?= =?us-ascii?Q?VHtLMik6qiFKlgu/rHa2H6Q944yY/jORBuFhFTQMYovMMDOXwq4A+xKHGD8h?= =?us-ascii?Q?oJfo9Da84PAWaO+EIi/ixUGb5MU1mtLLanpOzSY9LQdW1eR6K3gHaQvVZ9C9?= =?us-ascii?Q?1Mm+wBxECtXywpKXOhl51bIqB7nKbgTrBga2Kmh/j4xgkyHMvs1YiuCZHy0o?= =?us-ascii?Q?DVmHwcDFS5+cybwLqCqBlmEBIZNuorWyyDGfY9ocSh5P/Gk1llLbA7R3ahDh?= =?us-ascii?Q?H8J4nD+aUTVTfeIXh/yb985HVEyMC6vZi/3PBcT94WryzdHdlcga3AI/3JAz?= =?us-ascii?Q?+MmhKq7EzCe2MTJXCHTKQadkwzLXHwtxjt4LkmjrxiFtcCQOdNyFL8r0TNfN?= =?us-ascii?Q?MzjbAkbnl5w4UhdRli5k8vnG4FwI4Tw/c4mxEtvHC+1y4gXHsunP10g+4PNM?= =?us-ascii?Q?Qy9l7ZSPXqHOA1kcnym88SdgwCTZHLTZe/9GPWqbhrpMmO1G/s84DeoiSXIS?= =?us-ascii?Q?893aCDIDEw2HVf6P15OSgbvqS1vYh7bsRGZjf7c3NIOQ1EyfvEXF9GY/Loye?= =?us-ascii?Q?cE5vknfwt5h3jkxokX9zNdy71JnlmMZ6iPLyGMMYkd3GoKtgaLVJVHkrLvF6?= =?us-ascii?Q?ABbjAfqDz2DSXnIhSvGL/lskAvopamZFgNiCxM0OK9XVsfzJs3dALC8cEL/W?= =?us-ascii?Q?QvkLjxjQprBXO/aKJG97XKNHuVdOh1XAdswZMDZ7aEa+eFNO3it51N0wsx/Q?= =?us-ascii?Q?Em2aDMDe0FkJcW8e/uOeALvUll1RcSYFtFveYYbuAS5e/8ftGHxPg/fvutXH?= =?us-ascii?Q?Vyp3fP8GxVFb2YxF5bWsHw0DXdJyK/jl9RAnG5+hs0opLIO0lGvzSaADAu/5?= =?us-ascii?Q?ot8ABGgZk6HJOoiD/vE4dX4=3D?= 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: DM5PR12MB4661.namprd12.prod.outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 95129a90-7a2e-48bc-996c-08d9f6e6825b X-MS-Exchange-CrossTenant-originalarrivaltime: 23 Feb 2022 16:06:53.8650 (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: XjnaZaKCFucXUM3fKoNk7kgdRfC5LKettluWRATDOPWBBx/s2YI++tDkZKnrv9rPJcAjE6ZtqYHOiVEWQDltIQ== X-MS-Exchange-Transport-CrossTenantHeadersStamped: CH2PR12MB4149 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 Hi > -----Original Message----- > From: Luca Boccassi > Sent: Tuesday, February 22, 2022 4:33 PM > To: Michael Baum ; stable@dpdk.org > Cc: Matan Azrad ; Slava Ovsiienko > ; Alexander Kozyrev > Subject: Re: [PATCH 20.11 0/5] mlx5: some fixes >=20 > External email: Use caution opening links or attachments >=20 >=20 > On Mon, 2022-02-21 at 21:46 +0200, Michael Baum wrote: > > Backport some fixes to 20.11.5 > > > > The upstream commits: > > - 10599cf83e common/mlx5: add minimum WQE size for striding RQ > > - 8928997a13 common/mlx5: fix error handling in multi-class probe > > - 147f6fb42b net/mlx5: fix memory socket selection in ASO management > > - 34776af600 net/mlx5: fix MPRQ stride devargs adjustment > > - 0947ed380f net/mlx5: improve stride parameter names > > > > The following commit [1] sent by Alexander Kozyrev fixes one of them > > [2], so I integrated it inside. > > > > [1] 728b6447e7 net/mlx5: fix MPRQ WQE size assertion > > > > [2] 34776af600 net/mlx5: fix MPRQ stride devargs adjustment > > > > Cc: akozyrev@nvidia.com > > > > Michael Baum (5): > > common/mlx5: add minimum WQE size for striding RQ > > net/mlx5: improve stride parameter names > > net/mlx5: fix MPRQ stride devargs adjustment > > net/mlx5: fix memory socket selection in ASO management > > common/mlx5: fix error handling in multi-class probe > > > > drivers/common/mlx5/mlx5_common_pci.c | 7 +- > > drivers/common/mlx5/mlx5_devx_cmds.c | 28 +++ > > drivers/common/mlx5/mlx5_devx_cmds.h | 1 + > > drivers/common/mlx5/mlx5_prm.h | 38 +++- > > drivers/net/mlx5/linux/mlx5_os.c | 48 ++--- > > drivers/net/mlx5/linux/mlx5_verbs.c | 4 +- > > drivers/net/mlx5/mlx5.c | 4 +- > > drivers/net/mlx5/mlx5.h | 12 +- > > drivers/net/mlx5/mlx5_defs.h | 4 +- > > drivers/net/mlx5/mlx5_devx.c | 4 +- > > drivers/net/mlx5/mlx5_flow_age.c | 27 ++- > > drivers/net/mlx5/mlx5_rxq.c | 249 +++++++++++++++++--------- > > drivers/net/mlx5/mlx5_rxtx.c | 22 +-- > > drivers/net/mlx5/mlx5_rxtx.h | 10 +- > > drivers/net/mlx5/mlx5_rxtx_vec.c | 8 +- > > 15 files changed, 290 insertions(+), 176 deletions(-) > > >=20 > The second patch does not apply: >=20 > --- a/drivers/net/mlx5/mlx5_rxq.c > +++ b/drivers/net/mlx5/mlx5_rxq.c > @@@ -205,9 -205,9 +205,15 @@@ rxq_alloc_elts_sprq(struct mlx5_rxq_ctr > { > const unsigned int sges_n =3D 1 << rxq_ctrl->rxq.sges_n; > unsigned int elts_n =3D mlx5_rxq_mprq_enabled(&rxq_ctrl->rxq) ? > ++<<<<<<< HEAD > + (1 << rxq_ctrl->rxq.elts_n) * (1 << rxq_ctrl->rxq.strd_nu= m_n) : > + (1 << rxq_ctrl->rxq.elts_n); > + bool has_vec_support =3D mlx5_rxq_check_vec_support(&rxq_ctrl->rx= q) > > 0; > ++=3D=3D=3D=3D=3D=3D=3D > + RTE_BIT32(rxq_ctrl->rxq.elts_n) * > + RTE_BIT32(rxq_ctrl->rxq.log_strd_num) : > + RTE_BIT32(rxq_ctrl->rxq.elts_n); > ++>>>>>>> net/mlx5: improve stride parameter names > unsigned int i; > int err; >=20 > Did you test it with the 20.11 branch from the staging area at > https://github.com/bluca/dpdk-stable.git ? I'm sorry, I made a mistake in the branch. I'm sending v2. >=20 > -- > Kind regards, > Luca Boccassi