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 85FA84624E for ; Mon, 17 Feb 2025 18:05:39 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 7A7F440289; Mon, 17 Feb 2025 18:05:39 +0100 (CET) Received: from mail-wr1-f47.google.com (mail-wr1-f47.google.com [209.85.221.47]) by mails.dpdk.org (Postfix) with ESMTP id 8241B402C6 for ; Mon, 17 Feb 2025 18:05:37 +0100 (CET) Received: by mail-wr1-f47.google.com with SMTP id ffacd0b85a97d-38f31f7732dso1666616f8f.1 for ; Mon, 17 Feb 2025 09:05:37 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1739811937; x=1740416737; darn=dpdk.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=Oy2R8tRRhnq+D8bnLgd7VjYDUeKjz31EUesb97N2Jzg=; b=RxrzTA1zBcEoFBA2UNL8j1qA7jai+542a4u7BRYBCrMTtmMVTPvX8WciA0nFQLk2qu Zz8ySVDKgS3A+QGM+teLcQlXD38RfPidXA6rANKvr/c8BcGb+N8JMOLQxo5Un+jK9Ur8 pHupYYulwg34cMKEQ8fE/4Fuh2XBvSNnQe8dxtBWDb+Srdiq997Yj+b4bDXDLS1l7cM/ 3AqSe810POdpbepZKkHY9VHziBY/hIlWwpQ1gwXqEZsEMUbGE+TfOzSqet1R44fMAaYB Xkgmjk5u/rkaRtJ4XhuxL2O0NBl3EpKXk0uzegD1JzT86dPOPitCWmQ4pgADaXOHs9iv AHZg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1739811937; x=1740416737; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=Oy2R8tRRhnq+D8bnLgd7VjYDUeKjz31EUesb97N2Jzg=; b=L7AgdWAhWiZORLWUhiU8BjRmRGC6xSWhF5E40O1PWFFt9MDXBhpbfTEl7GX4nIwpwc m6YAMvJlCXCU0O+/kU++WQoDc/BBXX9WI5rxVwHjXPfElck468rB1Hk6elCBLgG9v5Nf m7xJybGBGvoY5NVfsnIkxb9cLK2yabG5gNJ/cCdEviBtwWYpru85RdtFbqNOq07HmnhN O8WBmizUd9oHVsyrRMG8HkhJvqrAhoaSwooZZ+aK/8A1HPpLCMYS3lGpRVBMdNfe485j htlZPq1oD1YkccTPbLSL/sTiYxLf7WeHtlVVX8XUVjPMJUyT9Fj/9X/WSXPiBOtyE3+p FK9A== X-Gm-Message-State: AOJu0Yy9S+ND5U+fRve/E7/mJPXMAGoWO2WTHH+J6HVTw3CGTrcKGcZx xzF5yYV1ZEhacRJhBbjBymVPgGt82vpAbL/dBQg2hVi2ma3CXGU1nJpkv9UGA4Q= X-Gm-Gg: ASbGncuK60CMOkm6nyMFuZOSIG0AgcfCbhcJIoak1fpzygLL1yh9KPTAdnJD/k9rv7m EF89Pzpdx40NzOdG7yAQt2477Ahf3+joEeG/6JYSwoKpEPxIBRLaQPfHYdNi6X/49CV/SekvYfg ReK8uFWcth81GwU4s6BSpY/ORoYrLqNLj7+7it9BK8NZWlTZgb1VSmYZU0T+CUAznPty3K3P864 ODIkEypg0bBhTGP66S18ot6w6ud5rCbUEAsR9lbtKl9VWOhGETBhOZxRT/uyWByPBCvwmsfiKwv cjTIyvSB5Pv+qCujC5zuuA== X-Google-Smtp-Source: AGHT+IEfczy0BBolTHIKTIG4z/9lp0tiZHvLqbvKIR0IE6tnehIjWVbr6svZlUGScGqeksvwNndJ1w== X-Received: by 2002:a5d:5888:0:b0:38d:c6b8:9fe1 with SMTP id ffacd0b85a97d-38f33c28898mr10067827f8f.24.1739811937015; Mon, 17 Feb 2025 09:05:37 -0800 (PST) Received: from localhost ([2a01:4b00:d036:ae00:f83c:95e7:29fd:a997]) by smtp.gmail.com with UTF8SMTPSA id ffacd0b85a97d-38f259f8273sm12484168f8f.89.2025.02.17.09.05.36 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 17 Feb 2025 09:05:36 -0800 (PST) From: luca.boccassi@gmail.com To: Nawal Kishor Cc: dpdk stable Subject: patch 'common/cnxk: fix atomic load in batch ops' has been queued to stable release 22.11.8 Date: Mon, 17 Feb 2025 17:03:48 +0000 Message-ID: <20250217170456.1068278-15-luca.boccassi@gmail.com> X-Mailer: git-send-email 2.47.2 In-Reply-To: <20250217170456.1068278-1-luca.boccassi@gmail.com> References: <20250217170456.1068278-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 22.11.8 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/19/25. 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/0872aaa1f0c0d4a849f857367ae1c0f59eddaf1f Thanks. Luca Boccassi --- >From 0872aaa1f0c0d4a849f857367ae1c0f59eddaf1f Mon Sep 17 00:00:00 2001 From: Nawal Kishor Date: Mon, 2 Dec 2024 22:27:39 +0530 Subject: [PATCH] common/cnxk: fix atomic load in batch ops [ upstream commit 73d38682fddd614d95942442c20b3a1de211bb4c ] In roc batch alloc wait code, __ATOMIC_RELAXED is changed to __ATOMIC_ACQUIRE in order to avoid potential out of order loads. Fixes: 50d08d3934ec ("common/cnxk: fix batch alloc completion poll logic") Signed-off-by: Nawal Kishor --- .mailmap | 1 + drivers/common/cnxk/roc_npa.h | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/.mailmap b/.mailmap index 51c2bc9df3..8eb97ded9f 100644 --- a/.mailmap +++ b/.mailmap @@ -986,6 +986,7 @@ Natalie Samsonov Natanael Copa Nathan Law Nathan Skrzypczak +Nawal Kishor Neel Patel Neil Horman Nelio Laranjeiro diff --git a/drivers/common/cnxk/roc_npa.h b/drivers/common/cnxk/roc_npa.h index 46b668a310..3d0821dfe6 100644 --- a/drivers/common/cnxk/roc_npa.h +++ b/drivers/common/cnxk/roc_npa.h @@ -261,7 +261,7 @@ roc_npa_batch_alloc_wait(uint64_t *cache_line, unsigned int wait_us) /* Batch alloc status code is updated in bits [5:6] of the first word * of the 128 byte cache line. */ - while (((__atomic_load_n(cache_line, __ATOMIC_RELAXED) >> 5) & 0x3) == + while (((__atomic_load_n(cache_line, __ATOMIC_ACQUIRE) >> 5) & 0x3) == ALLOC_CCODE_INVAL) if (wait_us && (plt_tsc_cycles() - start) >= ticks) break; -- 2.47.2 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2025-02-17 16:13:17.420757215 +0000 +++ 0015-common-cnxk-fix-atomic-load-in-batch-ops.patch 2025-02-17 16:13:16.798441593 +0000 @@ -1 +1 @@ -From 73d38682fddd614d95942442c20b3a1de211bb4c Mon Sep 17 00:00:00 2001 +From 0872aaa1f0c0d4a849f857367ae1c0f59eddaf1f Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 73d38682fddd614d95942442c20b3a1de211bb4c ] + @@ -10 +11,0 @@ -Cc: stable@dpdk.org @@ -19 +20 @@ -index 1ed47e1cad..8524952d24 100644 +index 51c2bc9df3..8eb97ded9f 100644 @@ -22,2 +23,2 @@ -@@ -1079,6 +1079,7 @@ Natanael Copa - Nathan Brown +@@ -986,6 +986,7 @@ Natalie Samsonov + Natanael Copa @@ -31 +32 @@ -index f7cb4460e7..8525038810 100644 +index 46b668a310..3d0821dfe6 100644 @@ -34 +35 @@ -@@ -255,7 +255,7 @@ roc_npa_batch_alloc_wait(uint64_t *cache_line, unsigned int wait_us) +@@ -261,7 +261,7 @@ roc_npa_batch_alloc_wait(uint64_t *cache_line, unsigned int wait_us)