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 D99D3A0350 for ; Tue, 22 Feb 2022 15:32:50 +0100 (CET) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id D1AA440DF4; Tue, 22 Feb 2022 15:32:50 +0100 (CET) Received: from mail-wr1-f41.google.com (mail-wr1-f41.google.com [209.85.221.41]) by mails.dpdk.org (Postfix) with ESMTP id 6E89840DF4 for ; Tue, 22 Feb 2022 15:32:49 +0100 (CET) Received: by mail-wr1-f41.google.com with SMTP id h6so33636474wrb.9 for ; Tue, 22 Feb 2022 06:32:49 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:message-id:subject:from:to:cc:date:in-reply-to :references:content-transfer-encoding:user-agent:mime-version; bh=+88pHl5IJwieNcme3T556TsHHTSHZntqUNoQc2ihLqI=; b=6Iu2YC2mjWLgUG3YGPV91UVqrzHetnmC0D7NSSBUuprn74yS8n/4LrOHs/QVu0oa85 IiPnqEPiDSxikK1PRkStbPT0BE5al+U7D7W0Ys4PYj0pTcVfZYzMlTuSvRONjtgCoS10 i6rMYykVGBrN7i2iUb9aqFjrIlgaCcgZBG853+PT1hKn/Fo/Ed9rCTuQWxXbCim50KvV De1kmntK1hi1DfAY4SCzhxlmF03FnEz9oFcGp7dIU7LPZ8mHR5DnyBHpox+4ejPxEEyI e4ClPR7sideQncHl1AxtXePvfw4r8XadQCCvHsDY0M0mNZd3ufPT8RxBwfennxkgQY0i s3mA== X-Gm-Message-State: AOAM533r4egluAHL9WEsNPUqRPmWDEtK8jn5BU5ESL5CeBzPF2ztW6/5 OoWp/IeGuSTvL78uogkrtrfOp29FBfeZ+w== X-Google-Smtp-Source: ABdhPJzBZRp+NWKPNaHgOQZVKAgTsrpN0/ghGvRpFZBnL6fhJ16AByZw+MqH+9HDtiSJ03bDZwTsXw== X-Received: by 2002:a05:6000:2a2:b0:1e8:cbe2:16d7 with SMTP id l2-20020a05600002a200b001e8cbe216d7mr19948469wry.351.1645540369054; Tue, 22 Feb 2022 06:32:49 -0800 (PST) Received: from localhost ([2a01:4b00:f41a:3600:360b:9754:2e3a:c344]) by smtp.gmail.com with ESMTPSA id l18sm2152267wrq.72.2022.02.22.06.32.48 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 22 Feb 2022 06:32:48 -0800 (PST) Message-ID: <0e6ff0d6796fd80691bc1f1e1d9a5bfaecb5d97c.camel@debian.org> Subject: Re: [PATCH 20.11 0/5] mlx5: some fixes From: Luca Boccassi To: Michael Baum , stable@dpdk.org Cc: Matan Azrad , Viacheslav Ovsiienko , akozyrev@nvidia.com Date: Tue, 22 Feb 2022 14:32:47 +0000 In-Reply-To: <20220221194635.2458173-1-michaelba@nvidia.com> References: <20220221194635.2458173-1-michaelba@nvidia.com> Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable User-Agent: Evolution 3.38.3-1+plugin MIME-Version: 1.0 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 On Mon, 2022-02-21 at 21:46 +0200, Michael Baum wrote: > Backport some fixes to 20.11.5 >=20 > The upstream commits: > =C2=A0- 10599cf83e common/mlx5: add minimum WQE size for striding RQ > =C2=A0- 8928997a13 common/mlx5: fix error handling in multi-class probe > =C2=A0- 147f6fb42b net/mlx5: fix memory socket selection in ASO manageme= nt > =C2=A0- 34776af600 net/mlx5: fix MPRQ stride devargs adjustment > =C2=A0- 0947ed380f net/mlx5: improve stride parameter names >=20 > The following commit [1] sent by Alexander Kozyrev fixes one of them > [2], so I integrated it inside. >=20 > [1] 728b6447e7 net/mlx5: fix MPRQ WQE size assertion >=20 > [2] 34776af600 net/mlx5: fix MPRQ stride devargs adjustment >=20 > Cc: akozyrev@nvidia.com >=20 > Michael Baum (5): > =C2=A0=C2=A0common/mlx5: add minimum WQE size for striding RQ > =C2=A0=C2=A0net/mlx5: improve stride parameter names > =C2=A0=C2=A0net/mlx5: fix MPRQ stride devargs adjustment > =C2=A0=C2=A0net/mlx5: fix memory socket selection in ASO management > =C2=A0=C2=A0common/mlx5: fix error handling in multi-class probe >=20 > =C2=A0drivers/common/mlx5/mlx5_common_pci.c | 7 +- > =C2=A0drivers/common/mlx5/mlx5_devx_cmds.c | 28 +++ > =C2=A0drivers/common/mlx5/mlx5_devx_cmds.h | 1 + > =C2=A0drivers/common/mlx5/mlx5_prm.h | 38 +++- > =C2=A0drivers/net/mlx5/linux/mlx5_os.c | 48 ++--- > =C2=A0drivers/net/mlx5/linux/mlx5_verbs.c | 4 +- > =C2=A0drivers/net/mlx5/mlx5.c | 4 +- > =C2=A0drivers/net/mlx5/mlx5.h | 12 +- > =C2=A0drivers/net/mlx5/mlx5_defs.h | 4 +- > =C2=A0drivers/net/mlx5/mlx5_devx.c | 4 +- > =C2=A0drivers/net/mlx5/mlx5_flow_age.c | 27 ++- > =C2=A0drivers/net/mlx5/mlx5_rxq.c | 249 +++++++++++++++++------= --- > =C2=A0drivers/net/mlx5/mlx5_rxtx.c | 22 +-- > =C2=A0drivers/net/mlx5/mlx5_rxtx.h | 10 +- > =C2=A0drivers/net/mlx5/mlx5_rxtx_vec.c | 8 +- > =C2=A015 files changed, 290 insertions(+), 176 deletions(-) >=20 The second patch does not apply: --- 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_num_= n) : + (1 << rxq_ctrl->rxq.elts_n); + bool has_vec_support =3D mlx5_rxq_check_vec_support(&rxq_ctrl->rxq)= > 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; Did you test it with the 20.11 branch from the staging area at https://github.com/bluca/dpdk-stable.git ? --=20 Kind regards, Luca Boccassi