From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from dpdk.org (dpdk.org [92.243.14.124]) by inbox.dpdk.org (Postfix) with ESMTP id 07459A04B5; Mon, 26 Oct 2020 06:24:59 +0100 (CET) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 744764C96; Mon, 26 Oct 2020 06:21:51 +0100 (CET) Received: from out2-smtp.messagingengine.com (out2-smtp.messagingengine.com [66.111.4.26]) by dpdk.org (Postfix) with ESMTP id 41AC337AF for ; Mon, 26 Oct 2020 06:21:43 +0100 (CET) Received: from compute2.internal (compute2.nyi.internal [10.202.2.42]) by mailout.nyi.internal (Postfix) with ESMTP id E77305C00D0; Mon, 26 Oct 2020 01:21:42 -0400 (EDT) Received: from mailfrontend2 ([10.202.2.163]) by compute2.internal (MEProxy); Mon, 26 Oct 2020 01:21:42 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=monjalon.net; h= from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; s=fm2; bh=qmQlG5XoH6PaW vCT6wNZX/8TiXpVBn0+JAWrwPDTlAY=; b=puDXtvNG0A23G5dB4BXmoo3JtVfeq z9qTdEMcnhqXni0ZncPrZPQeOu2mI3ksyV9Eh5eU4ZPSy7r+4Fr4sCrMKZGMJqCH jcNyqMaK2KTuqZEhvLNWRn4XMB2rTmQr2NgShXb+blaJcA8QLRn/GWsbya+rdMPJ ay3MBbx1A8SRWzzBRpoYTih4MH4yRpXcT03oJb7t3PgJVR+rPLPlro11LjYj5FbL ArbjoOmpOK4vQzZng4DFR3k44rLDqTXGyj16GRepQj5ZT2NO5uPWYCqEkEctAYgK By02tMUF/zzjIZrpQosKUWXbsZmUbqd0r/Boj+/GL+xIU1xWhqp5PREjw== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:content-transfer-encoding:date:from :in-reply-to:message-id:mime-version:references:subject:to :x-me-proxy:x-me-proxy:x-me-sender:x-me-sender:x-sasl-enc; s= fm1; bh=qmQlG5XoH6PaWvCT6wNZX/8TiXpVBn0+JAWrwPDTlAY=; b=LZm0QoNO L8M8w6tDRYpnd40dUPHl3Hvlt42SxnirZnCudbHPSKJy38gv27cYQM/0GmZzC61M s1be6YnWhPRubp78gtCgFYCT0SBW1fgM6SNjlz2LWmhKKpDEQpDP8o7IgIloBD1U 6AGSzjz4VlISPlYliYr9VNEf/0zkA6lOb4uBZg+HqoE5lDhbcWaXGAjSKv6VQYtb 5JfURa34uoxroULzXmSt/uC07pidwDGSL2IBOyCEJkDfa5W0a5EeCZ5UOub4BXF+ WNVtDDlQSzvHBd5Qb3QdZZBddxk4IM8S6tQGmvDjx2X1Aanj2Uc6EH2+4OYjO9V9 yZ28qyLZhc+cCw== X-ME-Sender: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedujedrkeehgdekgecutefuodetggdotefrodftvf curfhrohhfihhlvgemucfhrghsthforghilhdpqfgfvfdpuffrtefokffrpgfnqfghnecu uegrihhlohhuthemuceftddtnecusecvtfgvtghiphhivghnthhsucdlqddutddtmdenuc fjughrpefhvffufffkofgjfhgggfestdekredtredttdenucfhrhhomhepvfhhohhmrghs ucfoohhnjhgrlhhonhcuoehthhhomhgrshesmhhonhhjrghlohhnrdhnvghtqeenucggtf frrghtthgvrhhnpedvhefgiedvjeegtdevheefhfetleefgfeivefgffevfeejgedtgfeu tdehtdegveenucfkphepjeejrddufeegrddvtdefrddukeegnecuvehluhhsthgvrhfuih iivgepjeenucfrrghrrghmpehmrghilhhfrhhomhepthhhohhmrghssehmohhnjhgrlhho nhdrnhgvth X-ME-Proxy: Received: from xps.monjalon.net (184.203.134.77.rev.sfr.net [77.134.203.184]) by mail.messagingengine.com (Postfix) with ESMTPA id B2F9E3064610; Mon, 26 Oct 2020 01:21:41 -0400 (EDT) From: Thomas Monjalon To: dev@dpdk.org Cc: ferruh.yigit@intel.com, david.marchand@redhat.com, bruce.richardson@intel.com, olivier.matz@6wind.com, andrew.rybchenko@oktetlabs.ru, akhil.goyal@nxp.com, David Hunt Date: Mon, 26 Oct 2020 06:21:00 +0100 Message-Id: <20201026052105.1561859-11-thomas@monjalon.net> X-Mailer: git-send-email 2.28.0 In-Reply-To: <20201026052105.1561859-1-thomas@monjalon.net> References: <20201026052105.1561859-1-thomas@monjalon.net> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [dpdk-dev] [PATCH 10/15] test/distributor: switch sequence to dynamic mbuf field X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Sender: "dev" The test used the deprecated mbuf field udata64. It is moved to a dynamic field in order to allow removal of udata64. Signed-off-by: Thomas Monjalon --- app/test/test_distributor.c | 27 ++++++++++++++++++++++----- 1 file changed, 22 insertions(+), 5 deletions(-) diff --git a/app/test/test_distributor.c b/app/test/test_distributor.c index eb889b91d1..074a06f4a2 100644 --- a/app/test/test_distributor.c +++ b/app/test/test_distributor.c @@ -10,6 +10,7 @@ #include #include #include +#include #include #include @@ -17,6 +18,10 @@ #define BURST 32 #define BIG_BATCH 1024 +static int seq_dynfield_offset; +#define SEQ_FIELD(mbuf) \ + (*RTE_MBUF_DYNFIELD(mbuf, seq_dynfield_offset, uint32_t *)) + struct worker_params { char name[64]; struct rte_distributor *dist; @@ -578,7 +583,7 @@ handle_and_mark_work(void *arg) __atomic_fetch_add(&worker_stats[id].handled_packets, num, __ATOMIC_RELAXED); for (i = 0; i < num; i++) - buf[i]->udata64 += id + 1; + SEQ_FIELD(buf[i]) += id + 1; num = rte_distributor_get_pkt(db, id, buf, buf, num); } @@ -631,10 +636,10 @@ sanity_mark_test(struct worker_params *wp, struct rte_mempool *p) << shift; } /* Assign a sequence number to each packet. The sequence is shifted, - * so that lower bits of the udate64 will hold mark from worker. + * so that lower bits will hold mark from worker. */ for (i = 0; i < buf_count; i++) - bufs[i]->udata64 = i << seq_shift; + SEQ_FIELD(bufs[i]) = i << seq_shift; count = 0; for (i = 0; i < buf_count/burst; i++) { @@ -660,8 +665,8 @@ sanity_mark_test(struct worker_params *wp, struct rte_mempool *p) /* Sort returned packets by sent order (sequence numbers). */ for (i = 0; i < buf_count; i++) { - seq = returns[i]->udata64 >> seq_shift; - id = returns[i]->udata64 - (seq << seq_shift); + seq = SEQ_FIELD(returns[i]) >> seq_shift; + id = SEQ_FIELD(returns[i]) - (seq << seq_shift); sorted[seq] = id; } @@ -805,6 +810,18 @@ test_distributor(void) static struct rte_mempool *p; int i; + static const struct rte_mbuf_dynfield seq_dynfield_desc = { + .name = "test_distributor_dynfield_seq", + .size = sizeof(uint32_t), + .align = __alignof__(uint32_t), + }; + seq_dynfield_offset = + rte_mbuf_dynfield_register(&seq_dynfield_desc); + if (seq_dynfield_offset < 0) { + printf("Error registering mbuf field\n"); + return TEST_FAILED; + } + if (rte_lcore_count() < 2) { printf("Not enough cores for distributor_autotest, expecting at least 2\n"); return TEST_SKIPPED; -- 2.28.0