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 B2456A0555 for ; Wed, 25 May 2022 18:29:55 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 547BF42B81; Wed, 25 May 2022 18:29:55 +0200 (CEST) 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 642A042B7C for ; Wed, 25 May 2022 18:29:52 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1653496191; 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=7n6ofILBWm+aT5FQz3/XqOht94X6efR00/d9bGt6Q/k=; b=DhEwxY6u6mQcZKthWUJ54a/eKadGFjR3+CPgjCs4ygHW9OFHzVva0/dzruEFZ6qLm1EmEe DbD8T+R2fZn2f94BwNfEgqtIcmQz5FjRzOcts1S+W2lKueBTsu6tx1E1M6HnO2qafnThTw IARuTLdKl4f6xV/9RXEt/jHHqkE+A4E= Received: from mimecast-mx02.redhat.com (mx3-rdu2.redhat.com [66.187.233.73]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-602-YlsXQzdIOkOvABw5cd1TRg-1; Wed, 25 May 2022 12:29:48 -0400 X-MC-Unique: YlsXQzdIOkOvABw5cd1TRg-1 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.rdu2.redhat.com [10.11.54.4]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 470B3395AFE2; Wed, 25 May 2022 16:29:48 +0000 (UTC) Received: from rh.Home (unknown [10.39.193.216]) by smtp.corp.redhat.com (Postfix) with ESMTP id 61A5E2026D07; Wed, 25 May 2022 16:29:47 +0000 (UTC) From: Kevin Traynor To: Ruifeng Wang Cc: Ajit Khaparde , dpdk stable Subject: patch 'net/bnxt: fix reordering in NEON Rx' has been queued to stable release 21.11.2 Date: Wed, 25 May 2022 17:28:28 +0100 Message-Id: <20220525162847.711753-36-ktraynor@redhat.com> In-Reply-To: <20220525162847.711753-1-ktraynor@redhat.com> References: <20220525162847.711753-1-ktraynor@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.78 on 10.11.54.4 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-default=true 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.2 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 05/30/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/b174adfcae894bb4a9d0c9c76e5c7ccb39c3d13f Thanks. Kevin --- >From b174adfcae894bb4a9d0c9c76e5c7ccb39c3d13f Mon Sep 17 00:00:00 2001 From: Ruifeng Wang Date: Wed, 13 Apr 2022 18:31:56 +0800 Subject: [PATCH] net/bnxt: fix reordering in NEON Rx [ upstream commit e7f2effc9220dc5d71b0bb550bcc903badc7bac4 ] Rx descriptor contains a valid bit which indicates readiness of the rest of descriptor words. Hence, the word contains valid bit must be read prior to other words. In NEON vector path, two contiguous 8B descriptor are loaded to a single NEON register. Given vector load ensures no 16B atomicity, read of the word that includes valid bit could be reordered after read of other words. In this case, data could be invalid. Reloaded lower 64b after read barrier. This ensures what fetched is correct. Also fixed comments that not pertains to Arm platform architecture. Fixes: deae85145c64 ("net/bnxt: handle multiple packets per loop in vector Rx") Signed-off-by: Ruifeng Wang Reviewed-by: Ajit Khaparde --- drivers/net/bnxt/bnxt_rxtx_vec_neon.c | 17 +++++++++++++++-- 1 file changed, 15 insertions(+), 2 deletions(-) diff --git a/drivers/net/bnxt/bnxt_rxtx_vec_neon.c b/drivers/net/bnxt/bnxt_rxtx_vec_neon.c index f15e2d3b4e..611fbadb08 100644 --- a/drivers/net/bnxt/bnxt_rxtx_vec_neon.c +++ b/drivers/net/bnxt/bnxt_rxtx_vec_neon.c @@ -236,13 +236,20 @@ recv_burst_vec_neon(void *rx_queue, struct rte_mbuf **rx_pkts, uint16_t nb_pkts) /* - * Load the four current descriptors into SSE registers in - * reverse order to ensure consistent state. + * Load the four current descriptors into NEON registers. + * IO barriers are used to ensure consistent state. */ rxcmp1[3] = vld1q_u32((void *)&cpr->cp_desc_ring[cons + 7]); rte_io_rmb(); + /* Reload lower 64b of descriptors to make it ordered after info3_v. */ + rxcmp1[3] = vreinterpretq_u32_u64(vld1q_lane_u64 + ((void *)&cpr->cp_desc_ring[cons + 7], + vreinterpretq_u64_u32(rxcmp1[3]), 0)); rxcmp[3] = vld1q_u32((void *)&cpr->cp_desc_ring[cons + 6]); rxcmp1[2] = vld1q_u32((void *)&cpr->cp_desc_ring[cons + 5]); rte_io_rmb(); + rxcmp1[2] = vreinterpretq_u32_u64(vld1q_lane_u64 + ((void *)&cpr->cp_desc_ring[cons + 5], + vreinterpretq_u64_u32(rxcmp1[2]), 0)); rxcmp[2] = vld1q_u32((void *)&cpr->cp_desc_ring[cons + 4]); @@ -251,8 +258,14 @@ recv_burst_vec_neon(void *rx_queue, struct rte_mbuf **rx_pkts, uint16_t nb_pkts) rxcmp1[1] = vld1q_u32((void *)&cpr->cp_desc_ring[cons + 3]); rte_io_rmb(); + rxcmp1[1] = vreinterpretq_u32_u64(vld1q_lane_u64 + ((void *)&cpr->cp_desc_ring[cons + 3], + vreinterpretq_u64_u32(rxcmp1[1]), 0)); rxcmp[1] = vld1q_u32((void *)&cpr->cp_desc_ring[cons + 2]); rxcmp1[0] = vld1q_u32((void *)&cpr->cp_desc_ring[cons + 1]); rte_io_rmb(); + rxcmp1[0] = vreinterpretq_u32_u64(vld1q_lane_u64 + ((void *)&cpr->cp_desc_ring[cons + 1], + vreinterpretq_u64_u32(rxcmp1[0]), 0)); rxcmp[0] = vld1q_u32((void *)&cpr->cp_desc_ring[cons + 0]); -- 2.34.3 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2022-05-25 17:26:59.436679355 +0100 +++ 0036-net-bnxt-fix-reordering-in-NEON-Rx.patch 2022-05-25 17:26:58.615828402 +0100 @@ -1 +1 @@ -From e7f2effc9220dc5d71b0bb550bcc903badc7bac4 Mon Sep 17 00:00:00 2001 +From b174adfcae894bb4a9d0c9c76e5c7ccb39c3d13f Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit e7f2effc9220dc5d71b0bb550bcc903badc7bac4 ] + @@ -21 +22,0 @@ -Cc: stable@dpdk.org @@ -30 +31 @@ -index 779e23ac4f..32f8e59b3a 100644 +index f15e2d3b4e..611fbadb08 100644 @@ -33 +34 @@ -@@ -232,13 +232,20 @@ recv_burst_vec_neon(void *rx_queue, struct rte_mbuf **rx_pkts, uint16_t nb_pkts) +@@ -236,13 +236,20 @@ recv_burst_vec_neon(void *rx_queue, struct rte_mbuf **rx_pkts, uint16_t nb_pkts) @@ -56 +57 @@ -@@ -247,8 +254,14 @@ recv_burst_vec_neon(void *rx_queue, struct rte_mbuf **rx_pkts, uint16_t nb_pkts) +@@ -251,8 +258,14 @@ recv_burst_vec_neon(void *rx_queue, struct rte_mbuf **rx_pkts, uint16_t nb_pkts)