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 4B6A1A04B1 for ; Thu, 5 Nov 2020 13:41:05 +0100 (CET) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 43478C7F0; Thu, 5 Nov 2020 13:41:04 +0100 (CET) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [63.128.21.124]) by dpdk.org (Postfix) with ESMTP id 74F36C7F0 for ; Thu, 5 Nov 2020 13:41:02 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1604580061; 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=6mXmcmBlSshSknBmbIq+ESgBGnHlZqIuUYx6PAeNOFw=; b=dmHoOlazsnN7bVWKBHxYDsu2Ldm45QSA9ulgCH8Dv2tm6VdouF5EFZo/lIh98pGXhaD9JB kmzRqWuGY5lrz/jf4XKvCwNYf5QGttnlpNQ7uTQfGXLzvhDEAZJguj5rYLt8evuV/7A6T5 tAubyq/a02FCbzFHw7GPEj66hE001pg= Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-496-xhYAsW0KP6qcTwCds6axCA-1; Thu, 05 Nov 2020 07:40:56 -0500 X-MC-Unique: xhYAsW0KP6qcTwCds6axCA-1 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 6E51B1074643; Thu, 5 Nov 2020 12:40:55 +0000 (UTC) Received: from rh.redhat.com (ovpn-113-249.ams2.redhat.com [10.36.113.249]) by smtp.corp.redhat.com (Postfix) with ESMTP id 360FA5C3E1; Thu, 5 Nov 2020 12:40:53 +0000 (UTC) From: Kevin Traynor To: Bruce Richardson Cc: Wei Ling , Ferruh Yigit , dpdk stable Date: Thu, 5 Nov 2020 12:39:22 +0000 Message-Id: <20201105124015.306404-15-ktraynor@redhat.com> In-Reply-To: <20201105124015.306404-1-ktraynor@redhat.com> References: <20201105124015.306404-1-ktraynor@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 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" Subject: [dpdk-stable] patch 'app/testpmd: fix name of bitrate library in meson build' has been queued to LTS release 18.11.11 X-BeenThere: stable@dpdk.org X-Mailman-Version: 2.1.15 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 Sender: "stable" Hi, FYI, your patch has been queued to LTS release 18.11.11 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 11/10/20. 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-queue This queued commit can be viewed at: https://github.com/kevintraynor/dpdk-stable-queue/commit/1bde6247b23c54adb47fa48a5373270ca05a32b4 Thanks. Kevin. --- >From 1bde6247b23c54adb47fa48a5373270ca05a32b4 Mon Sep 17 00:00:00 2001 From: Bruce Richardson Date: Wed, 2 Sep 2020 17:24:27 +0100 Subject: [PATCH] app/testpmd: fix name of bitrate library in meson build [ upstream commit 54f89e3df4b16e9079c9d343870d16757429b68b ] The bitrate library in DPDK is actually in a "bitratestats" directory, so that is used by meson for the macro and library name. Therefore, we need to update references to RTE_LIBRTE_BITRATE to RTE_LIBRTE_BITRATESTATS in testpmd to have it found. Rather than supporting both defines, since make is being removed, we can just replace all instances of the former define with the latter. To ensure testpmd links ok when this is done, we also need to add bitratestats to the list of library dependencies. Fixes: 5b9656b157d3 ("lib: build with meson") Signed-off-by: Bruce Richardson Tested-by: Wei Ling Reviewed-by: Ferruh Yigit --- app/test-pmd/meson.build | 3 +++ app/test-pmd/parameters.c | 4 ++-- app/test-pmd/testpmd.c | 12 ++++++------ app/test-pmd/testpmd.h | 2 +- 4 files changed, 12 insertions(+), 9 deletions(-) diff --git a/app/test-pmd/meson.build b/app/test-pmd/meson.build index adeeeeedba..9bac278594 100644 --- a/app/test-pmd/meson.build +++ b/app/test-pmd/meson.build @@ -31,4 +31,7 @@ sources = files('cmdline.c', deps += ['ethdev', 'gro', 'gso', 'cmdline', 'metrics', 'meter', 'bus_pci'] +if dpdk_conf.has('RTE_LIBRTE_BITRATESTATS') + deps += 'bitratestats' +endif if dpdk_conf.has('RTE_LIBRTE_PDUMP') deps += 'pdump' diff --git a/app/test-pmd/parameters.c b/app/test-pmd/parameters.c index 57028c313f..3be2993a7a 100644 --- a/app/test-pmd/parameters.c +++ b/app/test-pmd/parameters.c @@ -595,5 +595,5 @@ launch_args_parse(int argc, char** argv) { "latencystats", 1, 0, 0 }, #endif -#ifdef RTE_LIBRTE_BITRATE +#ifdef RTE_LIBRTE_BITRATESTATS { "bitrate-stats", 1, 0, 0 }, #endif @@ -906,5 +906,5 @@ launch_args_parse(int argc, char** argv) } #endif -#ifdef RTE_LIBRTE_BITRATE +#ifdef RTE_LIBRTE_BITRATESTATS if (!strcmp(lgopts[opt_idx].name, "bitrate-stats")) { n = atoi(optarg); diff --git a/app/test-pmd/testpmd.c b/app/test-pmd/testpmd.c index 018bd32ec6..8ccbfe6c92 100644 --- a/app/test-pmd/testpmd.c +++ b/app/test-pmd/testpmd.c @@ -56,5 +56,5 @@ #include #include -#ifdef RTE_LIBRTE_BITRATE +#ifdef RTE_LIBRTE_BITRATESTATS #include #endif @@ -459,5 +459,5 @@ unsigned int num_sockets = 0; unsigned int socket_ids[RTE_MAX_NUMA_NODES]; -#ifdef RTE_LIBRTE_BITRATE +#ifdef RTE_LIBRTE_BITRATESTATS /* Bitrate statistics */ struct rte_stats_bitrates *bitrate_data; @@ -1551,5 +1551,5 @@ run_pkt_fwd_on_lcore(struct fwd_lcore *fc, packet_fwd_t pkt_fwd) streamid_t nb_fs; streamid_t sm_id; -#ifdef RTE_LIBRTE_BITRATE +#ifdef RTE_LIBRTE_BITRATESTATS uint64_t tics_per_1sec; uint64_t tics_datum; @@ -1566,5 +1566,5 @@ run_pkt_fwd_on_lcore(struct fwd_lcore *fc, packet_fwd_t pkt_fwd) for (sm_id = 0; sm_id < nb_fs; sm_id++) (*pkt_fwd)(fsm[sm_id]); -#ifdef RTE_LIBRTE_BITRATE +#ifdef RTE_LIBRTE_BITRATESTATS if (bitrate_enabled != 0 && bitrate_lcore_id == rte_lcore_id()) { @@ -3158,5 +3158,5 @@ main(int argc, char** argv) /* Bitrate/latency stats disabled by default */ -#ifdef RTE_LIBRTE_BITRATE +#ifdef RTE_LIBRTE_BITRATESTATS bitrate_enabled = 0; #endif @@ -3248,5 +3248,5 @@ main(int argc, char** argv) /* Setup bitrate stats */ -#ifdef RTE_LIBRTE_BITRATE +#ifdef RTE_LIBRTE_BITRATESTATS if (bitrate_enabled != 0) { bitrate_data = rte_stats_bitrate_create(); diff --git a/app/test-pmd/testpmd.h b/app/test-pmd/testpmd.h index 37d61b8040..cd68d6360e 100644 --- a/app/test-pmd/testpmd.h +++ b/app/test-pmd/testpmd.h @@ -417,5 +417,5 @@ extern lcoreid_t latencystats_lcore_id; #endif -#ifdef RTE_LIBRTE_BITRATE +#ifdef RTE_LIBRTE_BITRATESTATS extern lcoreid_t bitrate_lcore_id; extern uint8_t bitrate_enabled; -- 2.26.2 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2020-11-05 12:38:54.547525796 +0000 +++ 0015-app-testpmd-fix-name-of-bitrate-library-in-meson-bui.patch 2020-11-05 12:38:54.179895972 +0000 @@ -1 +1 @@ -From 54f89e3df4b16e9079c9d343870d16757429b68b Mon Sep 17 00:00:00 2001 +From 1bde6247b23c54adb47fa48a5373270ca05a32b4 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 54f89e3df4b16e9079c9d343870d16757429b68b ] + @@ -17 +18,0 @@ -Cc: stable@dpdk.org @@ -30 +31 @@ -index ea56e547bb..f52ab148f6 100644 +index adeeeeedba..9bac278594 100644 @@ -33 +34 @@ -@@ -26,4 +26,7 @@ sources = files('5tswap.c', +@@ -31,4 +31,7 @@ sources = files('cmdline.c', @@ -42 +43 @@ -index 784515314e..8c2aa13dd3 100644 +index 57028c313f..3be2993a7a 100644 @@ -45 +46 @@ -@@ -617,5 +617,5 @@ launch_args_parse(int argc, char** argv) +@@ -595,5 +595,5 @@ launch_args_parse(int argc, char** argv) @@ -52 +53 @@ -@@ -992,5 +992,5 @@ launch_args_parse(int argc, char** argv) +@@ -906,5 +906,5 @@ launch_args_parse(int argc, char** argv) @@ -60 +61 @@ -index fb286b86e5..ee3dd27d81 100644 +index 018bd32ec6..8ccbfe6c92 100644 @@ -63 +64 @@ -@@ -55,5 +55,5 @@ +@@ -56,5 +56,5 @@ @@ -70 +71 @@ -@@ -489,5 +489,5 @@ unsigned int num_sockets = 0; +@@ -459,5 +459,5 @@ unsigned int num_sockets = 0; @@ -77 +78 @@ -@@ -2065,5 +2065,5 @@ run_pkt_fwd_on_lcore(struct fwd_lcore *fc, packet_fwd_t pkt_fwd) +@@ -1551,5 +1551,5 @@ run_pkt_fwd_on_lcore(struct fwd_lcore *fc, packet_fwd_t pkt_fwd) @@ -84 +85 @@ -@@ -2080,5 +2080,5 @@ run_pkt_fwd_on_lcore(struct fwd_lcore *fc, packet_fwd_t pkt_fwd) +@@ -1566,5 +1566,5 @@ run_pkt_fwd_on_lcore(struct fwd_lcore *fc, packet_fwd_t pkt_fwd) @@ -91 +92 @@ -@@ -3708,5 +3708,5 @@ main(int argc, char** argv) +@@ -3158,5 +3158,5 @@ main(int argc, char** argv) @@ -98 +99 @@ -@@ -3802,5 +3802,5 @@ main(int argc, char** argv) +@@ -3248,5 +3248,5 @@ main(int argc, char** argv) @@ -106 +107 @@ -index a8ae5cceb1..f139fe7a0a 100644 +index 37d61b8040..cd68d6360e 100644 @@ -109 +110 @@ -@@ -404,5 +404,5 @@ extern lcoreid_t latencystats_lcore_id; +@@ -417,5 +417,5 @@ extern lcoreid_t latencystats_lcore_id;