From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <dev-bounces@dpdk.org>
Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124])
by inbox.dpdk.org (Postfix) with ESMTP id 5D36D45CE2;
Tue, 12 Nov 2024 03:03:16 +0100 (CET)
Received: from mails.dpdk.org (localhost [127.0.0.1])
by mails.dpdk.org (Postfix) with ESMTP id B46AB42D72;
Tue, 12 Nov 2024 03:02:33 +0100 (CET)
Received: from linux.microsoft.com (linux.microsoft.com [13.77.154.182])
by mails.dpdk.org (Postfix) with ESMTP id 3E80B427CE
for <dev@dpdk.org>; Tue, 12 Nov 2024 03:02:21 +0100 (CET)
Received: by linux.microsoft.com (Postfix, from userid 1213)
id CA6A423834C1; Mon, 11 Nov 2024 18:02:19 -0800 (PST)
DKIM-Filter: OpenDKIM Filter v2.11.0 linux.microsoft.com CA6A423834C1
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linux.microsoft.com;
s=default; t=1731376939;
bh=AkHtuc67+zKG4nF3hOBkIHhTl/VfBm28WLIW7gmN/Ok=;
h=From:To:Cc:Subject:Date:In-Reply-To:References:From;
b=iE72FLck7Qp2k3kfKHSqpup+mwjV/InvkSY4WGue0D3ut3v66uFI+2mv0+vK1cKlR
ePYpdCnlcDaPFTx+V/QsBFzyaGDMav4PmF6RrOLxmAsncz21cziFUyVyc7QE6cvS8C
rxVhOmw4RdzTOh11nzWsPrCBSw1DaDMZl+z0y3kQ=
From: Andre Muezerie <andremue@linux.microsoft.com>
To: dev@dpdk.org
Cc: Konstantin Ananyev <konstantin.ananyev@huawei.com>
Subject: [PATCH v7 07/21] rcu: remove use of VLAs for Windows built code
Date: Mon, 11 Nov 2024 18:01:59 -0800
Message-Id: <1731376933-19275-8-git-send-email-andremue@linux.microsoft.com>
X-Mailer: git-send-email 1.8.3.1
In-Reply-To: <1731376933-19275-1-git-send-email-andremue@linux.microsoft.com>
References: <1713397319-26135-1-git-send-email-roretzla@linux.microsoft.com>
<1731376933-19275-1-git-send-email-andremue@linux.microsoft.com>
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: dev@dpdk.org
X-Mailman-Version: 2.1.29
Precedence: list
List-Id: DPDK patches and discussions <dev.dpdk.org>
List-Unsubscribe: <https://mails.dpdk.org/options/dev>,
<mailto:dev-request@dpdk.org?subject=unsubscribe>
List-Archive: <http://mails.dpdk.org/archives/dev/>
List-Post: <mailto:dev@dpdk.org>
List-Help: <mailto:dev-request@dpdk.org?subject=help>
List-Subscribe: <https://mails.dpdk.org/listinfo/dev>,
<mailto:dev-request@dpdk.org?subject=subscribe>
Errors-To: dev-bounces@dpdk.org
From: Konstantin Ananyev <konstantin.ananyev@huawei.com>
1) ./lib/rcu/rte_rcu_qsbr.c:359:9
: warning: ISO C90 forbids variable length array ‘data’ [-Wvla]
2) ./lib/rcu/rte_rcu_qsbr.c:422:9
: warning: ISO C90 forbids variable length array ‘data’ [-Wvla]
In both cases we allocate VLA for one element from RCU deferred queue.
Right now, size of element in RCU queue is not limited by API.
The approach is to introduce some reasonable limitation on RCU DQ
element size.
Choose 128B for now.
With that in place we can replace both VLA occurencies with fixed size
array.
Note that such change need to be treated as API change.
So can be applied only at 24.11.
Signed-off-by: Konstantin Ananyev <konstantin.ananyev@huawei.com>
---
lib/rcu/rte_rcu_qsbr.c | 7 ++++---
lib/rcu/rte_rcu_qsbr.h | 5 +++++
2 files changed, 9 insertions(+), 3 deletions(-)
diff --git a/lib/rcu/rte_rcu_qsbr.c b/lib/rcu/rte_rcu_qsbr.c
index 40d7c566c8..09a14a15f1 100644
--- a/lib/rcu/rte_rcu_qsbr.c
+++ b/lib/rcu/rte_rcu_qsbr.c
@@ -245,7 +245,8 @@ rte_rcu_qsbr_dq_create(const struct rte_rcu_qsbr_dq_parameters *params)
if (params == NULL || params->free_fn == NULL ||
params->v == NULL || params->name == NULL ||
params->size == 0 || params->esize == 0 ||
- (params->esize % 4 != 0)) {
+ (params->esize % 4 != 0) ||
+ params->esize > RTE_QSBR_ESIZE_MAX) {
RCU_LOG(ERR, "Invalid input parameter");
rte_errno = EINVAL;
@@ -323,7 +324,7 @@ int rte_rcu_qsbr_dq_enqueue(struct rte_rcu_qsbr_dq *dq, void *e)
return 1;
}
- char data[dq->esize];
+ char data[RTE_QSBR_ESIZE_MAX + __RTE_QSBR_TOKEN_SIZE];
dq_elem = (__rte_rcu_qsbr_dq_elem_t *)data;
/* Start the grace period */
dq_elem->token = rte_rcu_qsbr_start(dq->v);
@@ -386,7 +387,7 @@ rte_rcu_qsbr_dq_reclaim(struct rte_rcu_qsbr_dq *dq, unsigned int n,
cnt = 0;
- char data[dq->esize];
+ char data[RTE_QSBR_ESIZE_MAX + __RTE_QSBR_TOKEN_SIZE];
/* Check reader threads quiescent state and reclaim resources */
while (cnt < n &&
rte_ring_dequeue_bulk_elem_start(dq->r, &data,
diff --git a/lib/rcu/rte_rcu_qsbr.h b/lib/rcu/rte_rcu_qsbr.h
index 550fadf56a..abcbd78914 100644
--- a/lib/rcu/rte_rcu_qsbr.h
+++ b/lib/rcu/rte_rcu_qsbr.h
@@ -86,6 +86,11 @@ struct __rte_cache_aligned rte_rcu_qsbr_cnt {
#define __RTE_QSBR_CNT_MAX ((uint64_t)~0)
#define __RTE_QSBR_TOKEN_SIZE sizeof(uint64_t)
+/**
+ * Max allowable size (in bytes) of each element in the defer queue
+ */
+#define RTE_QSBR_ESIZE_MAX (2 * RTE_CACHE_LINE_MIN_SIZE)
+
/* RTE Quiescent State variable structure.
* This structure has two elements that vary in size based on the
* 'max_threads' parameter.
--
2.34.1