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 1B390A034E for ; Mon, 21 Feb 2022 16:38:15 +0100 (CET) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 16054410E0; Mon, 21 Feb 2022 16:38:15 +0100 (CET) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by mails.dpdk.org (Postfix) with ESMTP id B196C4013F for ; Mon, 21 Feb 2022 16:38:13 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1645457893; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=qLJgbFGZ/yj3rA8yqVwGHJw/5olO+GgO9GeyjTK/SQQ=; b=jTAS3LseJRsq8QIo0Xky+BWXx2ukWHAHC0HlZxFR2sx4zzaswxzjFfF16UeRqdKEcziO4K pVhvYMMnV+JCdfZovz84fUOYOckR0pNYPC0NjONNyNq2ZAOi7A939mTgrfMfj1J1ANwzyo 9eY81fvvZXgP8dpGeh1IEYWz5GYue/g= Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-584-6Q4x0RoMMzObPPtvZ90m9A-1; Mon, 21 Feb 2022 10:38:10 -0500 X-MC-Unique: 6Q4x0RoMMzObPPtvZ90m9A-1 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 9971A100C660; Mon, 21 Feb 2022 15:38:09 +0000 (UTC) Received: from rh.Home (unknown [10.39.195.12]) by smtp.corp.redhat.com (Postfix) with ESMTP id 8E1297E2EF; Mon, 21 Feb 2022 15:38:08 +0000 (UTC) From: Kevin Traynor To: Lior Margalit Cc: Viacheslav Ovsiienko , dpdk stable Subject: patch 'net/mlx5: fix assertion on flags set in packet mbuf' has been queued to stable release 21.11.1 Date: Mon, 21 Feb 2022 15:33:53 +0000 Message-Id: <20220221153625.152324-44-ktraynor@redhat.com> In-Reply-To: <20220221153625.152324-1-ktraynor@redhat.com> References: <20220221153625.152324-1-ktraynor@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=ktraynor@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" 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, FYI, your patch has been queued to stable release 21.11.1 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 02/26/22. So please shout if anyone has objections. Also note that after the patch there's a diff of the upstream commit vs the patch applied to the branch. This will indicate if there was any rebasing needed to apply to the stable branch. If there were code changes for rebasing (ie: not only metadata diffs), please double check that the rebase was correctly done. Queued patches are on a temporary branch at: https://github.com/kevintraynor/dpdk-stable This queued commit can be viewed at: https://github.com/kevintraynor/dpdk-stable/commit/032e27c0b27fa089a70abc502f84590768d90e58 Thanks. Kevin --- >From 032e27c0b27fa089a70abc502f84590768d90e58 Mon Sep 17 00:00:00 2001 From: Lior Margalit Date: Thu, 23 Dec 2021 10:15:41 +0200 Subject: [PATCH] net/mlx5: fix assertion on flags set in packet mbuf [ upstream commit 0c7606b75be4f56a109f61f3cf2c7a819e760cd2 ] Fixed the assertion on the flags set in pkt->ol_flags for vectorized MPRQ. With vectorized MPRQ the CQs are processed before copying the MPRQ bufs so the valid assertion is that the expected flag is set and not that the pkt->ol_flags equlas this flag alone. Fixes: 0f20acbf5eda ("net/mlx5: implement vectorized MPRQ burst") Signed-off-by: Lior Margalit Acked-by: Viacheslav Ovsiienko --- drivers/net/mlx5/mlx5_rx.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/net/mlx5/mlx5_rx.h b/drivers/net/mlx5/mlx5_rx.h index adb759c235..c178f9a24b 100644 --- a/drivers/net/mlx5/mlx5_rx.h +++ b/drivers/net/mlx5/mlx5_rx.h @@ -544,5 +544,5 @@ mprq_buf_to_pkt(struct mlx5_rxq_data *rxq, struct rte_mbuf *pkt, uint32_t len, /* Set mbuf head-room. */ SET_DATA_OFF(pkt, RTE_PKTMBUF_HEADROOM); - MLX5_ASSERT(pkt->ol_flags == RTE_MBUF_F_EXTERNAL); + MLX5_ASSERT(pkt->ol_flags & RTE_MBUF_F_EXTERNAL); MLX5_ASSERT(rte_pktmbuf_tailroom(pkt) >= len - (hdrm_overlap > 0 ? hdrm_overlap : 0)); -- 2.34.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2022-02-21 15:22:45.598420777 +0000 +++ 0044-net-mlx5-fix-assertion-on-flags-set-in-packet-mbuf.patch 2022-02-21 15:22:44.088704119 +0000 @@ -1 +1 @@ -From 0c7606b75be4f56a109f61f3cf2c7a819e760cd2 Mon Sep 17 00:00:00 2001 +From 032e27c0b27fa089a70abc502f84590768d90e58 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 0c7606b75be4f56a109f61f3cf2c7a819e760cd2 ] + @@ -12 +13,0 @@ -Cc: stable@dpdk.org