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 8076CA0555 for ; Wed, 25 May 2022 18:29:54 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 1A20642B91; Wed, 25 May 2022 18:29:53 +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 F234342B6C for ; Wed, 25 May 2022 18:29:50 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1653496190; 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=u59BPp6E8FkHrR4dX2JWMHKP6djUUvD4ZPN4MKy4Im0=; b=bzllf2gvs0nwl/Sazq2D6l1B9EwDzi8OP2YBrF8LKOa/XCahfACVLmOcfILkL4Oz5Fs06Z Ka8hxXOJqsut8HP9FiBGF4Xb2RCfXgyRv1avKmGhWYrCp1gWLuqxCMGGk9a8z6k9Kw+14c 7ynJoHqMzROTD4nZr5AQVnbW7mboH4s= 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-90-mHbGzEVGOkmquwS-NylGtw-1; Wed, 25 May 2022 12:29:47 -0400 X-MC-Unique: mHbGzEVGOkmquwS-NylGtw-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 0122B28EC118; Wed, 25 May 2022 16:29:47 +0000 (UTC) Received: from rh.Home (unknown [10.39.193.216]) by smtp.corp.redhat.com (Postfix) with ESMTP id 121B42026D64; Wed, 25 May 2022 16:29:45 +0000 (UTC) From: Kevin Traynor To: Nithin Dabilpuram Cc: Jerin Jacob , dpdk stable Subject: patch 'net/cnxk: add barrier after meta batch free in scalar' has been queued to stable release 21.11.2 Date: Wed, 25 May 2022 17:28:27 +0100 Message-Id: <20220525162847.711753-35-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/7d9f5b3b336514d1ddbe269069c9d681cbca6c4a Thanks. Kevin --- >From 7d9f5b3b336514d1ddbe269069c9d681cbca6c4a Mon Sep 17 00:00:00 2001 From: Nithin Dabilpuram Date: Sun, 8 May 2022 13:18:23 +0530 Subject: [PATCH] net/cnxk: add barrier after meta batch free in scalar [ upstream commit 39279dd904fee0d688a2ab00a1d1dbaf89edc76c ] Add barrier after meta batch free in scalar routine when LMT lines are exactly full to make sure that next LMT line user in Tx only starts writing the lines only when previous stoerl's are complete. Fixes: 4382a7ccf781 ("net/cnxk: support Rx security offload on cn10k") Signed-off-by: Nithin Dabilpuram Acked-by: Jerin Jacob --- drivers/net/cnxk/cn10k_rx.h | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/drivers/net/cnxk/cn10k_rx.h b/drivers/net/cnxk/cn10k_rx.h index 9d969cee87..5806392322 100644 --- a/drivers/net/cnxk/cn10k_rx.h +++ b/drivers/net/cnxk/cn10k_rx.h @@ -487,8 +487,9 @@ cn10k_nix_recv_pkts(void *rx_queue, struct rte_mbuf **rx_pkts, uint16_t pkts, /* Free remaining meta buffers if any */ - if (flags & NIX_RX_OFFLOAD_SECURITY_F && loff) { + if (flags & NIX_RX_OFFLOAD_SECURITY_F && loff) nix_sec_flush_meta(laddr, lmt_id + lnum, loff, aura_handle); - plt_io_wmb(); - } + + if (flags & NIX_RX_OFFLOAD_SECURITY_F) + rte_io_wmb(); return nb_pkts; -- 2.34.3 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2022-05-25 17:26:59.416117909 +0100 +++ 0035-net-cnxk-add-barrier-after-meta-batch-free-in-scalar.patch 2022-05-25 17:26:58.614828400 +0100 @@ -1 +1 @@ -From 39279dd904fee0d688a2ab00a1d1dbaf89edc76c Mon Sep 17 00:00:00 2001 +From 7d9f5b3b336514d1ddbe269069c9d681cbca6c4a Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 39279dd904fee0d688a2ab00a1d1dbaf89edc76c ] + @@ -12 +13,0 @@ -Cc: stable@dpdk.org @@ -21 +22 @@ -index e4f5a553a6..94c1f1e84f 100644 +index 9d969cee87..5806392322 100644 @@ -24 +25 @@ -@@ -1008,8 +1008,9 @@ cn10k_nix_recv_pkts(void *rx_queue, struct rte_mbuf **rx_pkts, uint16_t pkts, +@@ -487,8 +487,9 @@ cn10k_nix_recv_pkts(void *rx_queue, struct rte_mbuf **rx_pkts, uint16_t pkts,