From patchwork Fri May 3 05:48:28 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Suanming.Mou" X-Patchwork-Id: 53234 X-Patchwork-Delegate: thomas@monjalon.net Return-Path: X-Original-To: patchwork@dpdk.org Delivered-To: patchwork@dpdk.org Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 35C371F28; Fri, 3 May 2019 05:45:53 +0200 (CEST) Received: from huawei.com (szxga05-in.huawei.com [45.249.212.191]) by dpdk.org (Postfix) with ESMTP id 6651FB62 for ; Fri, 3 May 2019 05:45:51 +0200 (CEST) Received: from DGGEMS404-HUB.china.huawei.com (unknown [172.30.72.59]) by Forcepoint Email with ESMTP id 4CBE5233B639C01F35E5 for ; Fri, 3 May 2019 11:45:49 +0800 (CST) Received: from huawei.com (10.175.100.202) by DGGEMS404-HUB.china.huawei.com (10.3.19.204) with Microsoft SMTP Server id 14.3.439.0; Fri, 3 May 2019 11:45:48 +0800 From: Suanming.Mou To: CC: , Date: Fri, 3 May 2019 05:48:28 +0000 Message-ID: <1556862508-61677-1-git-send-email-mousuanming@huawei.com> X-Mailer: git-send-email 1.8.3.4 In-Reply-To: <1556800505-59917-1-git-send-email-mousuanming@huawei.com> References: <1556800505-59917-1-git-send-email-mousuanming@huawei.com> MIME-Version: 1.0 X-Originating-IP: [10.175.100.202] X-CFilter-Loop: Reflected Subject: [dpdk-dev] [PATCH v8] app/pdump: add pudmp exits with primary support 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" When primary app exits, the residual running pdump will stop the primary app to restart. Add pdump exits with primary support. Signed-off-by: Suanming.Mou Reviewed-by: Anatoly Burakov Reviewed-by: Vipin Varghese --- V8: * reword the print info in monitor_primary. * add release_19_05.rst update. * add `Reviewed-by` tag. app/pdump/main.c | 47 +++++++++++++++++++++++++++++++++- doc/guides/rel_notes/release_19_05.rst | 4 +++ doc/guides/tools/pdump.rst | 2 ++ 3 files changed, 52 insertions(+), 1 deletion(-) diff --git a/app/pdump/main.c b/app/pdump/main.c index 3d20854..f92098f 100644 --- a/app/pdump/main.c +++ b/app/pdump/main.c @@ -13,6 +13,7 @@ #include #include +#include #include #include #include @@ -65,6 +66,8 @@ #define SIZE 256 #define BURST_SIZE 32 #define NUM_VDEVS 2 +/* Enough to set it to 500ms for exiting. */ +#define MONITOR_INTERVAL (500 * 1000) /* true if x is a power of 2 */ #define POWEROF2(x) ((((x)-1) & (x)) == 0) @@ -413,6 +416,21 @@ struct parse_val { } static void +monitor_primary(void *arg __rte_unused) +{ + if (quit_signal) + return; + + if (rte_eal_primary_proc_alive(NULL)) { + rte_eal_alarm_set(MONITOR_INTERVAL, monitor_primary, NULL); + return; + } + + printf("Primary process is no longer active, exiting...\n"); + quit_signal = 1; +} + +static void print_pdump_stats(void) { int i; @@ -537,6 +555,20 @@ struct parse_val { } static void +disable_primary_monitor(void) +{ + int ret; + + /* + * Don't worry about it is primary exit case. The alarm cancel + * function will take care about that. Ignore the ENOENT case. + */ + ret = rte_eal_alarm_cancel(monitor_primary, NULL); + if (ret < 0) + printf("Fail to disable monitor:%d\n", ret); +} + +static void signal_handler(int sig_num) { if (sig_num == SIGINT) { @@ -910,6 +942,17 @@ struct parse_val { ; } +static void +enable_primary_monitor(void) +{ + int ret; + + /* Once primary exits, so will pdump. */ + ret = rte_eal_alarm_set(MONITOR_INTERVAL, monitor_primary, NULL); + if (ret < 0) + printf("Fail to enable monitor:%d\n", ret); +} + int main(int argc, char **argv) { @@ -950,11 +993,13 @@ struct parse_val { rte_exit(EXIT_FAILURE, "Invalid argument\n"); } - /* create mempool, ring and vdevs info */ + /* create mempool, ring, vdevs info and primary monitor */ create_mp_ring_vdev(); enable_pdump(); + enable_primary_monitor(); dump_packets(); + disable_primary_monitor(); cleanup_pdump_resources(); /* dump debug stats */ print_pdump_stats(); diff --git a/doc/guides/rel_notes/release_19_05.rst b/doc/guides/rel_notes/release_19_05.rst index 468e325..7c4b39e 100644 --- a/doc/guides/rel_notes/release_19_05.rst +++ b/doc/guides/rel_notes/release_19_05.rst @@ -200,6 +200,10 @@ New Features Improved testpmd application performance on ARM platform. For ``macswap`` forwarding mode, NEON intrinsics were used to do swap to save CPU cycles. +* **Updated the pdump application.** + + Add support for pdump to exit with primary process. + Removed Items ------------- diff --git a/doc/guides/tools/pdump.rst b/doc/guides/tools/pdump.rst index 53cd2b4..62b4a5e 100644 --- a/doc/guides/tools/pdump.rst +++ b/doc/guides/tools/pdump.rst @@ -26,6 +26,8 @@ a DPDK secondary process and is capable of enabling packet capture on dpdk ports Once the libpcap development files are installed, the libpcap based PMD can be enabled by setting CONFIG_RTE_LIBRTE_PMD_PCAP=y and recompiling the DPDK. + * The ``dpdk-pdump`` tool runs as a DPDK secondary process. It exits when + the primary application exits. Running the Application -----------------------