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 4E44FA0032 for ; Fri, 18 Feb 2022 13:40:30 +0100 (CET) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 46AD440141; Fri, 18 Feb 2022 13:40:30 +0100 (CET) Received: from mail-wm1-f48.google.com (mail-wm1-f48.google.com [209.85.128.48]) by mails.dpdk.org (Postfix) with ESMTP id 737784113F for ; Fri, 18 Feb 2022 13:40:29 +0100 (CET) Received: by mail-wm1-f48.google.com with SMTP id l123-20020a1c2581000000b0037b9d960079so8558480wml.0 for ; Fri, 18 Feb 2022 04:40:29 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=0cGnwgq50XDFD2fF9rnvkI7IQX9QGmeHsCI3ng5Gbiw=; b=jeygkhrifdztJl5mHdXHnpB1ZOYSMwU9ijdTnT7MmNbVSbpRd9Yf7CCVQZHZNbARWp 15KgjvM3UiivxhdVEC2u3l92xaEqBlrHY5TeaBQ9iEmDQ2Brr45FU4+S7DdX7LLH4+yD DwobE8UjQXTOAQ7RVobNgHXvKoMgPu0X1DAy4J2GPzpkKEIM/bYMQJGXQTjBla3EyQQQ 2MWxsnwar4O+KG5CWyzG6x93QWwEodfySgkSGepiZjvq/v3hwiG/TZ5MPuD/aoQe1una Og/qmcg0+jWN6NU9EiRAInQU+/a9kGVxW8saAlfncEMxqP5qJLCvz39Sr5Z/nxCTgxzu E1DQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=0cGnwgq50XDFD2fF9rnvkI7IQX9QGmeHsCI3ng5Gbiw=; b=Dhy7A+ew71xhTYiZ2VHzd0sRoSghQdKdmSle2EeX+6MWLWPvkm5bXzO8TTfcLOyFtB 9Y7AzEH2eXkTUYi2VyOWukL3zxZJ+7+znWqH4+7Q/e+J2rdp8YwxO1f8GyKvkXoPTid5 S1nMCn/K6siQiezBVlsE/2g2Z0AwS38dWWNMFO2/o1yi5OJhC2ExA4cnVDLm5f+t2kXu zmd6lM3M/NUxVXbObm/o271j2jg6eLpTmU+lwskrUpYIC1Zvg4HJLU1vZejthfOMj9uV D4h9efE0qaob3WSbQVWONpYC8WhJjUPtZjq64jl0GG4IjNPykCahvBLrDQ7efR24frxl HkbA== X-Gm-Message-State: AOAM5312oDg2jS48sIVV8r8QOOKuAEyL4ESVLfYWb4wWND8AMGDWLpe+ HjmINv4FOG+cZZGJqETRdVXuwsPoF1SNYw== X-Google-Smtp-Source: ABdhPJwcNXqXuK3k8nhRIEl6DaP7IoPe10st5Tadn5f6ldZgJgImStm/hmeEUV54KH1pjyxrbGd8kg== X-Received: by 2002:a1c:4b09:0:b0:37c:522:c736 with SMTP id y9-20020a1c4b09000000b0037c0522c736mr7060145wma.145.1645188029197; Fri, 18 Feb 2022 04:40:29 -0800 (PST) Received: from localhost ([2a01:4b00:f41a:3600:360b:9754:2e3a:c344]) by smtp.gmail.com with ESMTPSA id a8sm1271020wra.0.2022.02.18.04.40.28 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 18 Feb 2022 04:40:28 -0800 (PST) From: luca.boccassi@gmail.com 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 20.11.5 Date: Fri, 18 Feb 2022 12:37:47 +0000 Message-Id: <20220218123931.1749595-18-luca.boccassi@gmail.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220218123931.1749595-1-luca.boccassi@gmail.com> References: <20220218123931.1749595-1-luca.boccassi@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 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 20.11.5 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/20/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/bluca/dpdk-stable This queued commit can be viewed at: https://github.com/bluca/dpdk-stable/commit/1c64873e8d9c9260ac7d9e2705a77ff862e493f7 Thanks. Luca Boccassi --- >From 1c64873e8d9c9260ac7d9e2705a77ff862e493f7 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_rxtx.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/net/mlx5/mlx5_rxtx.h b/drivers/net/mlx5/mlx5_rxtx.h index b2a891c8f6..630ab1d989 100644 --- a/drivers/net/mlx5/mlx5_rxtx.h +++ b/drivers/net/mlx5/mlx5_rxtx.h @@ -890,7 +890,7 @@ mprq_buf_to_pkt(struct mlx5_rxq_data *rxq, struct rte_mbuf *pkt, uint32_t len, buf_len, shinfo); /* Set mbuf head-room. */ SET_DATA_OFF(pkt, RTE_PKTMBUF_HEADROOM); - MLX5_ASSERT(pkt->ol_flags == EXT_ATTACHED_MBUF); + MLX5_ASSERT(pkt->ol_flags & EXT_ATTACHED_MBUF); MLX5_ASSERT(rte_pktmbuf_tailroom(pkt) >= len - (hdrm_overlap > 0 ? hdrm_overlap : 0)); DATA_LEN(pkt) = len; -- 2.30.2 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2022-02-18 12:37:38.851713514 +0000 +++ 0018-net-mlx5-fix-assertion-on-flags-set-in-packet-mbuf.patch 2022-02-18 12:37:37.534788436 +0000 @@ -1 +1 @@ -From 0c7606b75be4f56a109f61f3cf2c7a819e760cd2 Mon Sep 17 00:00:00 2001 +From 1c64873e8d9c9260ac7d9e2705a77ff862e493f7 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 0c7606b75be4f56a109f61f3cf2c7a819e760cd2 ] + @@ -12 +13,0 @@ -Cc: stable@dpdk.org @@ -17 +18 @@ - drivers/net/mlx5/mlx5_rx.h | 2 +- + drivers/net/mlx5/mlx5_rxtx.h | 2 +- @@ -20,5 +21,5 @@ -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 -@@ -543,7 +543,7 @@ mprq_buf_to_pkt(struct mlx5_rxq_data *rxq, struct rte_mbuf *pkt, uint32_t len, +diff --git a/drivers/net/mlx5/mlx5_rxtx.h b/drivers/net/mlx5/mlx5_rxtx.h +index b2a891c8f6..630ab1d989 100644 +--- a/drivers/net/mlx5/mlx5_rxtx.h ++++ b/drivers/net/mlx5/mlx5_rxtx.h +@@ -890,7 +890,7 @@ mprq_buf_to_pkt(struct mlx5_rxq_data *rxq, struct rte_mbuf *pkt, uint32_t len, @@ -28,2 +29,2 @@ -- MLX5_ASSERT(pkt->ol_flags == RTE_MBUF_F_EXTERNAL); -+ MLX5_ASSERT(pkt->ol_flags & RTE_MBUF_F_EXTERNAL); +- MLX5_ASSERT(pkt->ol_flags == EXT_ATTACHED_MBUF); ++ MLX5_ASSERT(pkt->ol_flags & EXT_ATTACHED_MBUF);