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 7858C41C3C; Wed, 8 Feb 2023 09:49:04 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 6133A40141; Wed, 8 Feb 2023 09:49:04 +0100 (CET) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by mails.dpdk.org (Postfix) with ESMTP id 0F829400D6 for ; Wed, 8 Feb 2023 09:49:02 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1675846142; 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=2YKjJYqCIhopAU/3ZXeketZLTEOrs3PSm9c1aNIIK0A=; b=icZTAQ6nzkzlsFetKUWubH/RUclszGHDbv0VdukVl81laMSKTQ6R5v/MDR40h+ynwH0aGY A7heXZ31cmuPrR7SsPc7hSP/HV2Y8HgnwkWGB7/3rdXEegUu86lYLPXDGkHEsjokgj+xSq LguUP3bKMr5Lke+aulwzj1W6FzQe2gY= Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-7-iHCudSBSNLewFzfsxv7mnw-1; Wed, 08 Feb 2023 03:45:48 -0500 X-MC-Unique: iHCudSBSNLewFzfsxv7mnw-1 Received: from smtp.corp.redhat.com (int-mx09.intmail.prod.int.rdu2.redhat.com [10.11.54.9]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 2D0A4857D07; Wed, 8 Feb 2023 08:45:48 +0000 (UTC) Received: from ringo.redhat.com (unknown [10.39.208.30]) by smtp.corp.redhat.com (Postfix) with ESMTP id 83535492C3C; Wed, 8 Feb 2023 08:45:46 +0000 (UTC) From: Robin Jarry To: dev@dpdk.org Cc: Robin Jarry , =?UTF-8?q?Morten=20Br=C3=B8rup?= , Konstantin Ananyev , Kevin Laatz , Aman Singh , Yuying Zhang Subject: [RESEND PATCH v9 4/5] app/testpmd: report lcore usage Date: Wed, 8 Feb 2023 09:45:06 +0100 Message-Id: <20230208084507.1328625-5-rjarry@redhat.com> In-Reply-To: <20230208084507.1328625-1-rjarry@redhat.com> References: <20221123102612.1688865-1-rjarry@redhat.com> <20230208084507.1328625-1-rjarry@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.9 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com 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 List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org The --record-core-cycles option already accounts for busy cycles. One turn of packet_fwd_t is considered "busy" if there was at least one received or transmitted packet. Rename core_cycles to busy_cycles in struct fwd_stream to make it more explicit. Add total_cycles to struct fwd_lcore. Add cycles accounting in noisy_vnf where it was missing. When --record-core-cycles is specified, register a callback with rte_lcore_register_usage_cb() and update total_cycles every turn of lcore loop based on a starting tsc value. In the callback, resolve the proper struct fwd_lcore based on lcore_id and return the lcore total_cycles and the sum of busy_cycles of all its fwd_streams. This makes the cycles counters available in rte_lcore_dump() and the lcore telemetry API: testpmd> dump_lcores lcore 3, socket 0, role RTE, cpuset 3 lcore 4, socket 0, role RTE, cpuset 4, busy cycles 1228584096/9239923140 lcore 5, socket 0, role RTE, cpuset 5, busy cycles 1255661768/9218141538 --> /eal/lcore/info,4 { "/eal/lcore/info": { "lcore_id": 4, "socket": 0, "role": "RTE", "cpuset": [ 4 ], "busy_cycles": 10623340318, "total_cycles": 55331167354 } } Signed-off-by: Robin Jarry Acked-by: Morten Brørup Acked-by: Konstantin Ananyev Reviewed-by: Kevin Laatz --- Notes: v8 -> v9: Fixed accounting of total cycles app/test-pmd/noisy_vnf.c | 8 +++++++- app/test-pmd/testpmd.c | 42 ++++++++++++++++++++++++++++++++++++---- app/test-pmd/testpmd.h | 25 +++++++++++++++--------- 3 files changed, 61 insertions(+), 14 deletions(-) diff --git a/app/test-pmd/noisy_vnf.c b/app/test-pmd/noisy_vnf.c index c65ec6f06a5c..ce5a3e5e6987 100644 --- a/app/test-pmd/noisy_vnf.c +++ b/app/test-pmd/noisy_vnf.c @@ -144,6 +144,7 @@ pkt_burst_noisy_vnf(struct fwd_stream *fs) struct noisy_config *ncf = noisy_cfg[fs->rx_port]; struct rte_mbuf *pkts_burst[MAX_PKT_BURST]; struct rte_mbuf *tmp_pkts[MAX_PKT_BURST]; + uint64_t start_tsc = 0; uint16_t nb_deqd = 0; uint16_t nb_rx = 0; uint16_t nb_tx = 0; @@ -153,6 +154,8 @@ pkt_burst_noisy_vnf(struct fwd_stream *fs) bool needs_flush = false; uint64_t now; + get_start_cycles(&start_tsc); + nb_rx = rte_eth_rx_burst(fs->rx_port, fs->rx_queue, pkts_burst, nb_pkt_per_burst); inc_rx_burst_stats(fs, nb_rx); @@ -169,7 +172,7 @@ pkt_burst_noisy_vnf(struct fwd_stream *fs) inc_tx_burst_stats(fs, nb_tx); fs->tx_packets += nb_tx; fs->fwd_dropped += drop_pkts(pkts_burst, nb_rx, nb_tx); - return; + goto end; } fifo_free = rte_ring_free_count(ncf->f); @@ -219,6 +222,9 @@ pkt_burst_noisy_vnf(struct fwd_stream *fs) fs->fwd_dropped += drop_pkts(tmp_pkts, nb_deqd, sent); ncf->prev_time = rte_get_timer_cycles(); } +end: + if (nb_rx > 0 || nb_tx > 0) + get_end_cycles(fs, start_tsc); } #define NOISY_STRSIZE 256 diff --git a/app/test-pmd/testpmd.c b/app/test-pmd/testpmd.c index e366f81a0f46..eeb96aefa80b 100644 --- a/app/test-pmd/testpmd.c +++ b/app/test-pmd/testpmd.c @@ -2053,7 +2053,7 @@ fwd_stats_display(void) fs->rx_bad_outer_ip_csum; if (record_core_cycles) - fwd_cycles += fs->core_cycles; + fwd_cycles += fs->busy_cycles; } for (i = 0; i < cur_fwd_config.nb_fwd_ports; i++) { pt_id = fwd_ports_ids[i]; @@ -2145,7 +2145,7 @@ fwd_stats_display(void) else total_pkts = total_recv; - printf("\n CPU cycles/packet=%.2F (total cycles=" + printf("\n CPU cycles/packet=%.2F (busy cycles=" "%"PRIu64" / total %s packets=%"PRIu64") at %"PRIu64 " MHz Clock\n", (double) fwd_cycles / total_pkts, @@ -2184,8 +2184,10 @@ fwd_stats_reset(void) memset(&fs->rx_burst_stats, 0, sizeof(fs->rx_burst_stats)); memset(&fs->tx_burst_stats, 0, sizeof(fs->tx_burst_stats)); - fs->core_cycles = 0; + fs->busy_cycles = 0; } + for (i = 0; i < cur_fwd_config.nb_fwd_lcores; i++) + fwd_lcores[i]->total_cycles = 0; } static void @@ -2248,6 +2250,7 @@ static void run_pkt_fwd_on_lcore(struct fwd_lcore *fc, packet_fwd_t pkt_fwd) { struct fwd_stream **fsm; + uint64_t start_tsc; streamid_t nb_fs; streamid_t sm_id; #ifdef RTE_LIB_BITRATESTATS @@ -2262,6 +2265,7 @@ run_pkt_fwd_on_lcore(struct fwd_lcore *fc, packet_fwd_t pkt_fwd) #endif fsm = &fwd_streams[fc->stream_idx]; nb_fs = fc->stream_nb; + start_tsc = rte_rdtsc(); do { for (sm_id = 0; sm_id < nb_fs; sm_id++) if (!fsm[sm_id]->disabled) @@ -2284,10 +2288,36 @@ run_pkt_fwd_on_lcore(struct fwd_lcore *fc, packet_fwd_t pkt_fwd) latencystats_lcore_id == rte_lcore_id()) rte_latencystats_update(); #endif - + if (record_core_cycles) + fc->total_cycles = rte_rdtsc() - start_tsc; } while (! fc->stopped); } +static int +lcore_usage_callback(unsigned int lcore_id, struct rte_lcore_usage *usage) +{ + struct fwd_stream **fsm; + struct fwd_lcore *fc; + streamid_t nb_fs; + streamid_t sm_id; + + fc = lcore_to_fwd_lcore(lcore_id); + if (fc == NULL) + return -1; + + fsm = &fwd_streams[fc->stream_idx]; + nb_fs = fc->stream_nb; + usage->busy_cycles = 0; + usage->total_cycles = fc->total_cycles; + + for (sm_id = 0; sm_id < nb_fs; sm_id++) { + if (!fsm[sm_id]->disabled) + usage->busy_cycles += fsm[sm_id]->busy_cycles; + } + + return 0; +} + static int start_pkt_forward_on_core(void *fwd_arg) { @@ -4527,6 +4557,10 @@ main(int argc, char** argv) rte_stats_bitrate_reg(bitrate_data); } #endif + + if (record_core_cycles) + rte_lcore_register_usage_cb(lcore_usage_callback); + #ifdef RTE_LIB_CMDLINE if (init_cmdline() != 0) rte_exit(EXIT_FAILURE, diff --git a/app/test-pmd/testpmd.h b/app/test-pmd/testpmd.h index 7d24d25970d2..6ec2f6879b47 100644 --- a/app/test-pmd/testpmd.h +++ b/app/test-pmd/testpmd.h @@ -174,7 +174,7 @@ struct fwd_stream { #ifdef RTE_LIB_GRO unsigned int gro_times; /**< GRO operation times */ #endif - uint64_t core_cycles; /**< used for RX and TX processing */ + uint64_t busy_cycles; /**< used with --record-core-cycles */ struct pkt_burst_stats rx_burst_stats; struct pkt_burst_stats tx_burst_stats; struct fwd_lcore *lcore; /**< Lcore being scheduled. */ @@ -360,6 +360,7 @@ struct fwd_lcore { streamid_t stream_nb; /**< number of streams in "fwd_streams" */ lcoreid_t cpuid_idx; /**< index of logical core in CPU id table */ volatile char stopped; /**< stop forwarding when set */ + uint64_t total_cycles; /**< used with --record-core-cycles */ }; /* @@ -785,16 +786,17 @@ is_proc_primary(void) return rte_eal_process_type() == RTE_PROC_PRIMARY; } -static inline unsigned int -lcore_num(void) +static inline struct fwd_lcore * +lcore_to_fwd_lcore(uint16_t lcore_id) { unsigned int i; - for (i = 0; i < RTE_MAX_LCORE; ++i) - if (fwd_lcores_cpuids[i] == rte_lcore_id()) - return i; + for (i = 0; i < cur_fwd_config.nb_fwd_lcores; ++i) { + if (fwd_lcores_cpuids[i] == lcore_id) + return fwd_lcores[i]; + } - rte_panic("lcore_id of current thread not found in fwd_lcores_cpuids\n"); + return NULL; } void @@ -803,7 +805,12 @@ parse_fwd_portlist(const char *port); static inline struct fwd_lcore * current_fwd_lcore(void) { - return fwd_lcores[lcore_num()]; + struct fwd_lcore *fc = lcore_to_fwd_lcore(rte_lcore_id()); + + if (fc == NULL) + rte_panic("lcore_id of current thread not found in fwd_lcores_cpuids\n"); + + return fc; } /* Mbuf Pools */ @@ -839,7 +846,7 @@ static inline void get_end_cycles(struct fwd_stream *fs, uint64_t start_tsc) { if (record_core_cycles) - fs->core_cycles += rte_rdtsc() - start_tsc; + fs->busy_cycles += rte_rdtsc() - start_tsc; } static inline void -- 2.39.1