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 F3AD1A0C47 for ; Tue, 10 Aug 2021 17:43:56 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id ED9844014F; Tue, 10 Aug 2021 17:43:56 +0200 (CEST) Received: from smtp-relay-canonical-1.canonical.com (smtp-relay-canonical-1.canonical.com [185.125.188.121]) by mails.dpdk.org (Postfix) with ESMTP id 25E9C4014F for ; Tue, 10 Aug 2021 17:43:56 +0200 (CEST) Received: from mail-ed1-f71.google.com (mail-ed1-f71.google.com [209.85.208.71]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by smtp-relay-canonical-1.canonical.com (Postfix) with ESMTPS id 0E97F3F107 for ; Tue, 10 Aug 2021 15:43:56 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canonical.com; s=20210705; t=1628610236; bh=6nhMOHDYTQ9VRQxD4i9CGJ1s7cG6cXz012KB03OiKDw=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=X7J6wnd8ATpaDq4dGsyg8NJ/npoDKCW8l48dFK2aF18SktZzYqiIJC01AU4xq/7u9 371LJBhQqX6YkzKtvWoTZGar6etjLO6Fj3ETP4S+nbZbIXX71qphNz7UAi9gksbFpc cRxrh/fOSVoCbAW/ngxfQdzgg0l24eQOchddPHDWGspK5C9LCg6cXlQasllCSkKaVD s+ErnToJiAt8uwPmIXRpi+CjRB3aipJMzGi1sHs6MryAQezFx0/WvTNUuSenqI3lvf 3ttZyXF9GnLJ+2PWpEQWnzJURUa7oT2H+fzJFf+VC2tX25qlfWDO0Ws+K2BrQx8LhH x622uHMzFGjcA== Received: by mail-ed1-f71.google.com with SMTP id s8-20020a0564025208b02903bd8539e1caso10957796edd.22 for ; Tue, 10 Aug 2021 08:43:56 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=6nhMOHDYTQ9VRQxD4i9CGJ1s7cG6cXz012KB03OiKDw=; b=ohCcVpyOB6JjDVhdYmtlouHMCUKL4SSX0qUB/xpAh+F/FrDEHlh1zqFgpcwXq+VhQg rTJ6sqlshW+vRjEVUFao5tFF+mETqj+b+zo49YTT0h/epKfENpfG8+sO5ea8BeSFV/zw FmdqmrR0eJ1gBlXM+YxqEzcmE5lhAyptKa7NBpd3qDJkecZ96PM3GRUG6/ayWa8IKnUu SClaz/g+X3MP1LjSdv3M2V6m/geU6AEcbZuKArAm1/P2jq2f02BhpV8/+bQn9swuNy1y b2H1i7nGQN0r/RLXJbpkvusy0IK+D7fZd0QImSgZPWSK7/uTcN6Vr3MGQrBn9XbRQgkj FsYw== X-Gm-Message-State: AOAM530U85xBDoSLsXaFd91Ln+i/x1/OVQMI00JsF9gRLqmy+Dt1Czmk XxvP6MfJ0ZkV+clTW32ykGcOp6GF68f1vuT/3oNYxkr3DFiI0mE17+eknCRn0C3UmeuOBoMbXVm Nm9wUHoTWKwLTgVM+5PCO14Ti X-Received: by 2002:a17:906:a24c:: with SMTP id bi12mr28513218ejb.530.1628610235573; Tue, 10 Aug 2021 08:43:55 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwnluaFw8/WfSdySZ5kD7rqDSy0zcYnPVZDA5b+S4bgCsMgskOZoP+VhKQJjCEh/Ix2S/+8bg== X-Received: by 2002:a17:906:a24c:: with SMTP id bi12mr28513202ejb.530.1628610235418; Tue, 10 Aug 2021 08:43:55 -0700 (PDT) Received: from Keschdeichel.fritz.box ([2001:67c:1560:8007::aac:c4ad]) by smtp.gmail.com with ESMTPSA id s18sm6979936ejc.52.2021.08.10.08.43.54 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 10 Aug 2021 08:43:55 -0700 (PDT) From: christian.ehrhardt@canonical.com To: Sarosh Arif Cc: dpdk stable Date: Tue, 10 Aug 2021 17:39:46 +0200 Message-Id: <20210810154022.749358-66-christian.ehrhardt@canonical.com> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20210810154022.749358-1-christian.ehrhardt@canonical.com> References: <20210810154022.749358-1-christian.ehrhardt@canonical.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [dpdk-stable] patch 'net/mlx5: fix typo in vectorized Rx comments' has been queued to stable release 19.11.10 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 Sender: "stable" Hi, FYI, your patch has been queued to stable release 19.11.10 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 08/12/21. 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/cpaelzer/dpdk-stable-queue This queued commit can be viewed at: https://github.com/cpaelzer/dpdk-stable-queue/commit/c9440cf1b76dd36df14f8ddb5e1170bd7df56166 Thanks. Christian Ehrhardt --- >From c9440cf1b76dd36df14f8ddb5e1170bd7df56166 Mon Sep 17 00:00:00 2001 From: Sarosh Arif Date: Tue, 8 Jun 2021 16:08:50 +0500 Subject: [PATCH] net/mlx5: fix typo in vectorized Rx comments [ upstream commit 6e695b0cda4728ec37bd0aa2310d4b967f4ca86d ] Change "returing" to "returning". Fixes: 2e542da70937 ("net/mlx5: add Altivec Rx") Fixes: 570acdb1da8a ("net/mlx5: add vectorized Rx/Tx burst for ARM") Fixes: 3c2ddbd413e3 ("net/mlx5: separate shareable vector functions") Signed-off-by: Sarosh Arif --- drivers/net/mlx5/mlx5_rxtx_vec_altivec.h | 2 +- drivers/net/mlx5/mlx5_rxtx_vec_neon.h | 2 +- drivers/net/mlx5/mlx5_rxtx_vec_sse.h | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/drivers/net/mlx5/mlx5_rxtx_vec_altivec.h b/drivers/net/mlx5/mlx5_rxtx_vec_altivec.h index 7160d202dd..acbc329674 100644 --- a/drivers/net/mlx5/mlx5_rxtx_vec_altivec.h +++ b/drivers/net/mlx5/mlx5_rxtx_vec_altivec.h @@ -674,7 +674,7 @@ rxq_burst_v(struct mlx5_rxq_data *rxq, struct rte_mbuf **pkts, uint16_t pkts_n, /* * A. load first Qword (8bytes) in one loop. - * B. copy 4 mbuf pointers from elts ring to returing pkts. + * B. copy 4 mbuf pointers from elts ring to returning pkts. * C. load remaining CQE data and extract necessary fields. * Final 16bytes cqes[] extracted from original 64bytes CQE has the * following structure: diff --git a/drivers/net/mlx5/mlx5_rxtx_vec_neon.h b/drivers/net/mlx5/mlx5_rxtx_vec_neon.h index d72675281f..51ad62dd7f 100644 --- a/drivers/net/mlx5/mlx5_rxtx_vec_neon.h +++ b/drivers/net/mlx5/mlx5_rxtx_vec_neon.h @@ -497,7 +497,7 @@ rxq_burst_v(struct mlx5_rxq_data *rxq, struct rte_mbuf **pkts, uint16_t pkts_n, * there's no instruction to count trailing zeros. __builtin_clzl() is * used instead. * - * A. copy 4 mbuf pointers from elts ring to returing pkts. + * A. copy 4 mbuf pointers from elts ring to returning pkts. * B. load 64B CQE and extract necessary fields * Final 16bytes cqes[] extracted from original 64bytes CQE has the * following structure: diff --git a/drivers/net/mlx5/mlx5_rxtx_vec_sse.h b/drivers/net/mlx5/mlx5_rxtx_vec_sse.h index a9d9e8e7d9..2a983c12a1 100644 --- a/drivers/net/mlx5/mlx5_rxtx_vec_sse.h +++ b/drivers/net/mlx5/mlx5_rxtx_vec_sse.h @@ -481,7 +481,7 @@ rxq_burst_v(struct mlx5_rxq_data *rxq, struct rte_mbuf **pkts, uint16_t pkts_n, assert(rxq->decompressed == 0); /* * A. load first Qword (8bytes) in one loop. - * B. copy 4 mbuf pointers from elts ring to returing pkts. + * B. copy 4 mbuf pointers from elts ring to returning pkts. * C. load remained CQE data and extract necessary fields. * Final 16bytes cqes[] extracted from original 64bytes CQE has the * following structure: -- 2.32.0 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2021-08-10 15:11:15.580119957 +0200 +++ 0066-net-mlx5-fix-typo-in-vectorized-Rx-comments.patch 2021-08-10 15:11:13.066638446 +0200 @@ -1 +1 @@ -From 6e695b0cda4728ec37bd0aa2310d4b967f4ca86d Mon Sep 17 00:00:00 2001 +From c9440cf1b76dd36df14f8ddb5e1170bd7df56166 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 6e695b0cda4728ec37bd0aa2310d4b967f4ca86d ] + @@ -11 +12,0 @@ -Cc: stable@dpdk.org @@ -21 +22 @@ -index 648c59e2c2..101f49b051 100644 +index 7160d202dd..acbc329674 100644 @@ -24 +25 @@ -@@ -840,7 +840,7 @@ rxq_cq_process_v(struct mlx5_rxq_data *rxq, volatile struct mlx5_cqe *cq, +@@ -674,7 +674,7 @@ rxq_burst_v(struct mlx5_rxq_data *rxq, struct rte_mbuf **pkts, uint16_t pkts_n, @@ -34 +35 @@ -index 4d1710b837..77979c939c 100644 +index d72675281f..51ad62dd7f 100644 @@ -37 +38 @@ -@@ -593,7 +593,7 @@ rxq_cq_process_v(struct mlx5_rxq_data *rxq, volatile struct mlx5_cqe *cq, +@@ -497,7 +497,7 @@ rxq_burst_v(struct mlx5_rxq_data *rxq, struct rte_mbuf **pkts, uint16_t pkts_n, @@ -47 +48 @@ -index 661fa7273c..7fee4355cf 100644 +index a9d9e8e7d9..2a983c12a1 100644 @@ -50,2 +51,2 @@ -@@ -565,7 +565,7 @@ rxq_cq_process_v(struct mlx5_rxq_data *rxq, volatile struct mlx5_cqe *cq, - const __m128i flow_mark_adj = _mm_set_epi32(rxq->mark * (-1), 0, 0, 0); +@@ -481,7 +481,7 @@ rxq_burst_v(struct mlx5_rxq_data *rxq, struct rte_mbuf **pkts, uint16_t pkts_n, + assert(rxq->decompressed == 0);