From patchwork Fri Jun 23 11:15:01 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bruce Richardson X-Patchwork-Id: 128951 X-Patchwork-Delegate: thomas@monjalon.net Return-Path: X-Original-To: patchwork@inbox.dpdk.org Delivered-To: patchwork@inbox.dpdk.org Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id E23BD42D2F; Fri, 23 Jun 2023 13:15:28 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id D29C542D3C; Fri, 23 Jun 2023 13:15:28 +0200 (CEST) Received: from mga09.intel.com (mga09.intel.com [134.134.136.24]) by mails.dpdk.org (Postfix) with ESMTP id 6DCD442D3E for ; Fri, 23 Jun 2023 13:15:26 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1687518926; x=1719054926; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=T13DabFwCehEN2odYg3WeXsCTBcbCGMl9/BMNW8KwHU=; b=Os1WkhPiYe/cJEWWPDzUIZYu8wXv/iKbWmpFL5OAuE3QizWlBHZWtTPJ fz+dnsW0hoEespV6jsrl6+yhjbyA+9lgDlC+/Ct4xBo+FNaGDbd+03+6J +jE1oLMJMX1EPv4gJf8zK8Qf9x4fkZK/SLjOxQfxWYUirWr1Cf5hj636n VdSxHVJiZVxibwJD9ZVihUg29IDd6dvnF8/VZerM0QLcRHiFvAaof5blZ NkXUrn8YVxaXBERZMA9Ntfe6n1LFHA2boCsbAmSIk3VNRGPhTgCNfInfV wc6O4bEWp0yjyOMMzzCWjyOM9dU9Bw7RovIoiBbBkzFzgfCF2pEblLArH A==; X-IronPort-AV: E=McAfee;i="6600,9927,10749"; a="363295935" X-IronPort-AV: E=Sophos;i="6.01,151,1684825200"; d="scan'208";a="363295935" Received: from fmsmga004.fm.intel.com ([10.253.24.48]) by orsmga102.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 23 Jun 2023 04:15:25 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10749"; a="785307437" X-IronPort-AV: E=Sophos;i="6.01,151,1684825200"; d="scan'208";a="785307437" Received: from silpixa00401385.ir.intel.com ([10.237.214.14]) by fmsmga004.fm.intel.com with ESMTP; 23 Jun 2023 04:15:23 -0700 From: Bruce Richardson To: dev@dpdk.org Cc: Bruce Richardson Subject: [PATCH v3 1/8] examples/l3fwd: make eventdev an optional dependency Date: Fri, 23 Jun 2023 12:15:01 +0100 Message-Id: <20230623111508.786020-2-bruce.richardson@intel.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230623111508.786020-1-bruce.richardson@intel.com> References: <20230622134840.3225975-1-bruce.richardson@intel.com> <20230623111508.786020-1-bruce.richardson@intel.com> MIME-Version: 1.0 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 With l3fwd being a very commonly used example app, and built as part of our CI tests, we need to ensure it's buildable with just about all supported DPDK configurations. To enable l3fwd application to be built when the eventdev library is disabled, we need to compile in the eventdev support conditionally. Thankfully, the eventdev support is pretty self-contained, with only the main.c file having more than a couple of ifdefs. Signed-off-by: Bruce Richardson --- examples/l3fwd/l3fwd_em.c | 2 ++ examples/l3fwd/l3fwd_fib.c | 2 ++ examples/l3fwd/l3fwd_lpm.c | 2 ++ examples/l3fwd/main.c | 65 ++++++++++++++++++++++++++++++-------- examples/l3fwd/meson.build | 13 +++++--- 5 files changed, 66 insertions(+), 18 deletions(-) diff --git a/examples/l3fwd/l3fwd_em.c b/examples/l3fwd/l3fwd_em.c index 476ac0c54f..40e102b38a 100644 --- a/examples/l3fwd/l3fwd_em.c +++ b/examples/l3fwd/l3fwd_em.c @@ -663,6 +663,7 @@ em_main_loop(__rte_unused void *dummy) return 0; } +#ifdef RTE_LIB_EVENTDEV static __rte_always_inline void em_event_loop_single(struct l3fwd_event_resources *evt_rsrc, const uint8_t flags) @@ -959,6 +960,7 @@ em_event_main_loop_tx_q_burst_vector(__rte_unused void *dummy) em_event_loop_vector(evt_rsrc, L3FWD_EVENT_TX_ENQ); return 0; } +#endif /* Initialize exact match (hash) parameters. 8< */ void diff --git a/examples/l3fwd/l3fwd_fib.c b/examples/l3fwd/l3fwd_fib.c index edc0dd69b9..8760016545 100644 --- a/examples/l3fwd/l3fwd_fib.c +++ b/examples/l3fwd/l3fwd_fib.c @@ -253,6 +253,7 @@ fib_main_loop(__rte_unused void *dummy) return 0; } +#ifdef RTE_LIB_EVENTDEV /* One eventdev loop for single and burst using fib. */ static __rte_always_inline void fib_event_loop(struct l3fwd_event_resources *evt_rsrc, @@ -635,6 +636,7 @@ fib_event_main_loop_tx_q_burst_vector(__rte_unused void *dummy) fib_event_loop_vector(evt_rsrc, L3FWD_EVENT_TX_ENQ); return 0; } +#endif /* Function to setup fib. 8< */ void diff --git a/examples/l3fwd/l3fwd_lpm.c b/examples/l3fwd/l3fwd_lpm.c index 4ac1925c84..a484a33089 100644 --- a/examples/l3fwd/l3fwd_lpm.c +++ b/examples/l3fwd/l3fwd_lpm.c @@ -226,6 +226,7 @@ lpm_main_loop(__rte_unused void *dummy) return 0; } +#ifdef RTE_LIB_EVENTDEV static __rte_always_inline uint16_t lpm_process_event_pkt(const struct lcore_conf *lconf, struct rte_mbuf *mbuf) { @@ -554,6 +555,7 @@ lpm_event_main_loop_tx_q_burst_vector(__rte_unused void *dummy) lpm_event_loop_vector(evt_rsrc, L3FWD_EVENT_TX_ENQ); return 0; } +#endif void setup_lpm(const int socketid) diff --git a/examples/l3fwd/main.c b/examples/l3fwd/main.c index a4f061537e..6063eb1399 100644 --- a/examples/l3fwd/main.c +++ b/examples/l3fwd/main.c @@ -135,8 +135,10 @@ static struct rte_eth_conf port_conf = { uint32_t max_pkt_len; -static struct rte_mempool *pktmbuf_pool[RTE_MAX_ETHPORTS][NB_SOCKETS]; +#ifdef RTE_LIB_EVENTDEV static struct rte_mempool *vector_pool[RTE_MAX_ETHPORTS]; +#endif +static struct rte_mempool *pktmbuf_pool[RTE_MAX_ETHPORTS][NB_SOCKETS]; static uint8_t lkp_per_socket[NB_SOCKETS]; struct l3fwd_lkp_mode { @@ -398,8 +400,10 @@ print_usage(const char *prgname) " [--parse-ptype]" " [--per-port-pool]" " [--mode]" +#ifdef RTE_LIB_EVENTDEV " [--eventq-sched]" " [--event-vector [--event-vector-size SIZE] [--event-vector-tmo NS]]" +#endif " [-E]" " [-L]\n\n" @@ -422,6 +426,7 @@ print_usage(const char *prgname) " --per-port-pool: Use separate buffer pool per port\n" " --mode: Packet transfer mode for I/O, poll or eventdev\n" " Default mode = poll\n" +#ifdef RTE_LIB_EVENTDEV " --eventq-sched: Event queue synchronization method\n" " ordered, atomic or parallel.\n" " Default: atomic\n" @@ -432,6 +437,7 @@ print_usage(const char *prgname) " --event-vector: Enable event vectorization.\n" " --event-vector-size: Max vector size if event vectorization is enabled.\n" " --event-vector-tmo: Max timeout to form vector in nanoseconds if event vectorization is enabled\n" +#endif " -E : Enable exact match, legacy flag please use --lookup=em instead\n" " -L : Enable longest prefix match, legacy flag please use --lookup=lpm instead\n" " --rule_ipv4=FILE: Specify the ipv4 rules entries file.\n" @@ -559,14 +565,16 @@ parse_eth_dest(const char *optarg) } static void -parse_mode(const char *optarg) +parse_mode(const char *optarg __rte_unused) { +#ifdef RTE_LIB_EVENTDEV struct l3fwd_event_resources *evt_rsrc = l3fwd_get_eventdev_rsrc(); if (!strcmp(optarg, "poll")) evt_rsrc->enabled = false; else if (!strcmp(optarg, "eventdev")) evt_rsrc->enabled = true; +#endif } static void @@ -601,6 +609,7 @@ parse_queue_size(const char *queue_size_arg, uint16_t *queue_size, int rx) *queue_size = value; } +#ifdef RTE_LIB_EVENTDEV static void parse_eventq_sched(const char *optarg) { @@ -631,6 +640,7 @@ parse_event_eth_rx_queues(const char *eth_rx_queues) evt_rsrc->eth_rx_queues = num_eth_rx_queues; } +#endif static int parse_lookup(const char *optarg) @@ -756,9 +766,11 @@ parse_args(int argc, char **argv) int option_index; char *prgname = argv[0]; uint8_t lcore_params = 0; +#ifdef RTE_LIB_EVENTDEV uint8_t eventq_sched = 0; uint8_t eth_rx_q = 0; struct l3fwd_event_resources *evt_rsrc = l3fwd_get_eventdev_rsrc(); +#endif argvopt = argv; @@ -850,6 +862,7 @@ parse_args(int argc, char **argv) parse_mode(optarg); break; +#ifdef RTE_LIB_EVENTDEV case CMD_LINE_OPT_EVENTQ_SYNC_NUM: parse_eventq_sched(optarg); eventq_sched = 1; @@ -860,6 +873,20 @@ parse_args(int argc, char **argv) eth_rx_q = 1; break; + case CMD_LINE_OPT_ENABLE_VECTOR_NUM: + printf("event vectorization is enabled\n"); + evt_rsrc->vector_enabled = 1; + break; + + case CMD_LINE_OPT_VECTOR_SIZE_NUM: + evt_rsrc->vector_size = strtol(optarg, NULL, 10); + break; + + case CMD_LINE_OPT_VECTOR_TMO_NS_NUM: + evt_rsrc->vector_tmo_ns = strtoull(optarg, NULL, 10); + break; +#endif + case CMD_LINE_OPT_LOOKUP_NUM: if (lookup_mode != L3FWD_LOOKUP_DEFAULT) { fprintf(stderr, "Only one lookup mode is allowed at a time!\n"); @@ -875,16 +902,6 @@ parse_args(int argc, char **argv) return -1; break; - case CMD_LINE_OPT_ENABLE_VECTOR_NUM: - printf("event vectorization is enabled\n"); - evt_rsrc->vector_enabled = 1; - break; - case CMD_LINE_OPT_VECTOR_SIZE_NUM: - evt_rsrc->vector_size = strtol(optarg, NULL, 10); - break; - case CMD_LINE_OPT_VECTOR_TMO_NS_NUM: - evt_rsrc->vector_tmo_ns = strtoull(optarg, NULL, 10); - break; case CMD_LINE_OPT_RULE_IPV4_NUM: l3fwd_set_rule_ipv4_name(optarg); break; @@ -900,6 +917,8 @@ parse_args(int argc, char **argv) } } + RTE_SET_USED(lcore_params); /* needed if no eventdev block */ +#ifdef RTE_LIB_EVENTDEV if (evt_rsrc->enabled && lcore_params) { fprintf(stderr, "lcore config is not valid when event mode is selected\n"); return -1; @@ -927,6 +946,7 @@ parse_args(int argc, char **argv) "vector timeout set to default (%" PRIu64 " ns)\n", evt_rsrc->vector_tmo_ns); } +#endif /* * Nothing is selected, pick longest-prefix match @@ -962,7 +982,9 @@ print_ethaddr(const char *name, const struct rte_ether_addr *eth_addr) int init_mem(uint16_t portid, unsigned int nb_mbuf) { +#ifdef RTE_LIB_EVENTDEV struct l3fwd_event_resources *evt_rsrc = l3fwd_get_eventdev_rsrc(); +#endif struct lcore_conf *qconf; int socketid; unsigned lcore_id; @@ -1007,6 +1029,7 @@ init_mem(uint16_t portid, unsigned int nb_mbuf) } } +#ifdef RTE_LIB_EVENTDEV if (evt_rsrc->vector_enabled && vector_pool[portid] == NULL) { unsigned int nb_vec; @@ -1025,6 +1048,7 @@ init_mem(uint16_t portid, unsigned int nb_mbuf) printf("Allocated vector pool for port %d\n", portid); } +#endif qconf = &lcore_conf[lcore_id]; qconf->ipv4_lookup_struct = @@ -1406,6 +1430,7 @@ l3fwd_service_enable(uint32_t service_id) return 0; } +#ifdef RTE_LIB_EVENTDEV static void l3fwd_event_service_setup(void) { @@ -1458,16 +1483,20 @@ l3fwd_event_service_setup(void) l3fwd_service_enable(service_id); } } +#endif int main(int argc, char **argv) { +#ifdef RTE_LIB_EVENTDEV struct l3fwd_event_resources *evt_rsrc; + int i; +#endif struct lcore_conf *qconf; uint16_t queueid, portid; unsigned int lcore_id; uint8_t queue; - int i, ret; + int ret; /* init EAL */ ret = rte_eal_init(argc, argv); @@ -1487,7 +1516,9 @@ main(int argc, char **argv) *(uint64_t *)(val_eth + portid) = dest_eth_addr[portid]; } +#ifdef RTE_LIB_EVENTDEV evt_rsrc = l3fwd_get_eventdev_rsrc(); +#endif /* parse application arguments (after the EAL ones) */ ret = parse_args(argc, argv); if (ret < 0) @@ -1499,6 +1530,7 @@ main(int argc, char **argv) /* Add the config file rules */ l3fwd_lkp.read_config_files(); +#ifdef RTE_LIB_EVENTDEV evt_rsrc->per_port_pool = per_port_pool; evt_rsrc->pkt_pool = pktmbuf_pool; evt_rsrc->vec_pool = vector_pool; @@ -1514,6 +1546,7 @@ main(int argc, char **argv) l3fwd_lkp.main_loop = evt_rsrc->ops.lpm_event_loop; l3fwd_event_service_setup(); } else +#endif l3fwd_poll_resource_setup(); /* start ports */ @@ -1562,6 +1595,8 @@ main(int argc, char **argv) ret = 0; /* launch per-lcore init on every lcore */ rte_eal_mp_remote_launch(l3fwd_lkp.main_loop, NULL, CALL_MAIN); + +#ifdef RTE_LIB_EVENTDEV if (evt_rsrc->enabled) { for (i = 0; i < evt_rsrc->rx_adptr.nb_rx_adptr; i++) rte_event_eth_rx_adapter_stop( @@ -1589,7 +1624,9 @@ main(int argc, char **argv) rte_event_dev_stop(evt_rsrc->event_d_id); rte_event_dev_close(evt_rsrc->event_d_id); - } else { + } else +#endif + { rte_eal_mp_wait_lcore(); RTE_ETH_FOREACH_DEV(portid) { diff --git a/examples/l3fwd/meson.build b/examples/l3fwd/meson.build index b40244a941..8375b87425 100644 --- a/examples/l3fwd/meson.build +++ b/examples/l3fwd/meson.build @@ -7,14 +7,19 @@ # DPDK instance, use 'make' allow_experimental_apis = true -deps += ['acl', 'hash', 'lpm', 'fib', 'eventdev'] +deps += ['acl', 'hash', 'lpm', 'fib'] sources = files( 'l3fwd_acl.c', 'l3fwd_em.c', - 'l3fwd_event.c', - 'l3fwd_event_internal_port.c', - 'l3fwd_event_generic.c', 'l3fwd_fib.c', 'l3fwd_lpm.c', 'main.c', ) +if dpdk_conf.has('RTE_LIB_EVENTDEV') + sources += files( + 'l3fwd_event.c', + 'l3fwd_event_internal_port.c', + 'l3fwd_event_generic.c', + ) + deps += 'eventdev' +endif From patchwork Fri Jun 23 11:15:02 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Bruce Richardson X-Patchwork-Id: 128952 X-Patchwork-Delegate: thomas@monjalon.net Return-Path: X-Original-To: patchwork@inbox.dpdk.org Delivered-To: patchwork@inbox.dpdk.org Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id 2730E42D2F; Fri, 23 Jun 2023 13:15:56 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 173FA42D29; Fri, 23 Jun 2023 13:15:56 +0200 (CEST) Received: from mga09.intel.com (mga09.intel.com [134.134.136.24]) by mails.dpdk.org (Postfix) with ESMTP id DD5A740ED7 for ; Fri, 23 Jun 2023 13:15:54 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1687518955; x=1719054955; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=WHmbUKsWuPJkaEZ3Ni3kXoit2QAgoc+CYAP7+i7JmDU=; b=j2/5ZNmoiOyIt+SzB9Adhn8AcT3UEKg2Tjabs7f2ZhkqO8M0rhGEfXk7 i8AAFeph16ibZL5YoLWil6wvjpFSMQi+0+RNVNrsvkPi6XHYzp43Es7SU PEl4aIBsk3zGlTY/VbSM5lzVgmdgQ9vxUSMsHuFwWNR8+PcMBZuQrPAvZ raJoeASqO5Y5KhBLw72z2rXh7tI56YLOLwG3BsXTH3LdTkiYWfm3Z0jT6 Jw+ATwgkx3LoKVDUcnn0klWxskmWk2G4WIcYh4rsf7IcGXMdyD7+PoqG4 dvF0dVv0hROD8RbB9zpS622/3ZFhronU+2NuP1kknodX82rYhoba9CJd2 g==; X-IronPort-AV: E=McAfee;i="6600,9927,10749"; a="363295943" X-IronPort-AV: E=Sophos;i="6.01,151,1684825200"; d="scan'208";a="363295943" Received: from fmsmga004.fm.intel.com ([10.253.24.48]) by orsmga102.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 23 Jun 2023 04:15:27 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10749"; a="785307449" X-IronPort-AV: E=Sophos;i="6.01,151,1684825200"; d="scan'208";a="785307449" Received: from silpixa00401385.ir.intel.com ([10.237.214.14]) by fmsmga004.fm.intel.com with ESMTP; 23 Jun 2023 04:15:26 -0700 From: Bruce Richardson To: dev@dpdk.org Cc: Bruce Richardson , =?utf-8?q?Morten_Br=C3=B8?= =?utf-8?q?rup?= Subject: [PATCH v3 2/8] build: make most device classes optional Date: Fri, 23 Jun 2023 12:15:02 +0100 Message-Id: <20230623111508.786020-3-bruce.richardson@intel.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230623111508.786020-1-bruce.richardson@intel.com> References: <20230622134840.3225975-1-bruce.richardson@intel.com> <20230623111508.786020-1-bruce.richardson@intel.com> MIME-Version: 1.0 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 Apart from ethdev and cryptodev, which have lots of components and tests which depend on them, we can make the device class libraries optional without too much work. This patch marks: * bbdev, * compressdev, * dmadev, * eventdev, * mldev, * rawdev, * regexdev optional, and ensures that DPDK - including tests - can be built with these components disabled. Signed-off-by: Bruce Richardson Acked-by: Morten Brørup --- app/test/meson.build | 33 +++++++++++++++++++++------------ lib/meson.build | 7 +++++++ 2 files changed, 28 insertions(+), 12 deletions(-) diff --git a/app/test/meson.build b/app/test/meson.build index 3e0a2360a3..379effd10b 100644 --- a/app/test/meson.build +++ b/app/test/meson.build @@ -41,19 +41,12 @@ test_sources = files( 'test_devargs.c', 'test_distributor.c', 'test_distributor_perf.c', - 'test_dmadev.c', - 'test_dmadev_api.c', 'test_eal_flags.c', 'test_eal_fs.c', 'test_efd.c', 'test_efd_perf.c', 'test_errno.c', 'test_ethdev_link.c', - 'test_event_crypto_adapter.c', - 'test_event_eth_rx_adapter.c', - 'test_event_ring.c', - 'test_event_timer_adapter.c', - 'test_eventdev.c', 'test_external_mem.c', 'test_fbarray.c', 'test_fib.c', @@ -103,7 +96,6 @@ test_sources = files( 'test_power_intel_uncore.c', 'test_prefetch.c', 'test_rand_perf.c', - 'test_rawdev.c', 'test_rcu_qsbr.c', 'test_rcu_qsbr_perf.c', 'test_reciprocal_division.c', @@ -127,7 +119,6 @@ test_sources = files( 'test_sched.c', 'test_security.c', 'test_security_inline_macsec.c', - 'test_security_inline_proto.c', 'test_seqlock.c', 'test_service_cores.c', 'test_spinlock.c', @@ -186,7 +177,6 @@ fast_tests = [ ['eal_fs_autotest', true, true], ['errno_autotest', true, true], ['ethdev_link_status', true, true], - ['event_ring_autotest', true, true], ['fib_autotest', true, true], ['fib6_autotest', true, true], ['func_reentrancy_autotest', false, true], @@ -232,7 +222,6 @@ fast_tests = [ ['version_autotest', true, true], ['crc_autotest', true, true], ['distributor_autotest', false, true], - ['eventdev_common_autotest', true, true], ['fbarray_autotest', true, true], ['hash_readwrite_func_autotest', false, true], ['ipsec_autotest', true, true], @@ -319,7 +308,6 @@ driver_test_names = [ 'cryptodev_sw_snow3g_autotest', 'cryptodev_sw_zuc_autotest', 'cryptodev_uadk_autotest', - 'dmadev_autotest', ] dump_test_names = [] @@ -357,6 +345,25 @@ if dpdk_conf.has('RTE_EVENT_SKELETON') test_deps += 'event_skeleton' endif +if dpdk_conf.has('RTE_LIB_DMADEV') + test_sources += ['test_dmadev.c', 'test_dmadev_api.c'] + driver_test_names += 'dmadev_autotest' +endif +if dpdk_conf.has('RTE_LIB_EVENTDEV') + test_sources += [ + 'test_event_eth_rx_adapter.c', + 'test_event_ring.c', + 'test_event_timer_adapter.c', + 'test_eventdev.c', + ] + fast_tests += [ + ['event_ring_autotest', true, true], + ['eventdev_common_autotest', true, true], + ] + if dpdk_conf.has('RTE_LIB_CRYPTODEV') + test_sources += 'test_event_crypto_adapter.c' + endif +endif if dpdk_conf.has('RTE_LIB_FLOW_CLASSIFY') test_sources += 'test_flow_classify.c' fast_tests += [['flow_classify_autotest', false, true]] @@ -408,6 +415,7 @@ if dpdk_conf.has('RTE_LIB_EVENTDEV') and dpdk_conf.has('RTE_NET_RING') test_sources += 'test_pmd_ring.c' test_sources += 'test_event_eth_tx_adapter.c' test_sources += 'sample_packet_forward.c' + test_sources += 'test_security_inline_proto.c' fast_tests += [['ring_pmd_autotest', true, true]] perf_test_names += 'ring_pmd_perf_autotest' fast_tests += [['event_eth_tx_adapter_autotest', false, true]] @@ -430,6 +438,7 @@ if dpdk_conf.has('RTE_NET_NULL') fast_tests += [['vdev_autotest', true, true]] endif if dpdk_conf.has('RTE_RAW_SKELETON') + test_sources += 'test_rawdev.c' test_deps += 'raw_skeleton' fast_tests += [['rawdev_autotest', true, true]] endif diff --git a/lib/meson.build b/lib/meson.build index fac2f52cad..98a0672a04 100644 --- a/lib/meson.build +++ b/lib/meson.build @@ -68,8 +68,12 @@ libraries = [ ] optional_libs = [ + 'bbdev', 'bitratestats', 'cfgfile', + 'compressdev', + 'dmadev', + 'eventdev', 'flow_classify', 'gpudev', 'graph', @@ -79,11 +83,14 @@ optional_libs = [ 'jobstats', 'latencystats', 'metrics', + 'mldev', 'node', 'pdump', 'pipeline', 'port', 'power', + 'rawdev', + 'regexdev', 'table', 'vhost', ] From patchwork Fri Jun 23 11:15:03 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Bruce Richardson X-Patchwork-Id: 128953 X-Patchwork-Delegate: thomas@monjalon.net Return-Path: X-Original-To: patchwork@inbox.dpdk.org Delivered-To: patchwork@inbox.dpdk.org Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id C76D142D2F; Fri, 23 Jun 2023 13:15:59 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 3E5C142D37; Fri, 23 Jun 2023 13:15:57 +0200 (CEST) Received: from mga09.intel.com (mga09.intel.com [134.134.136.24]) by mails.dpdk.org (Postfix) with ESMTP id 9D00340ED7 for ; Fri, 23 Jun 2023 13:15:55 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1687518955; x=1719054955; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=OkpJaEFO2QrC2+N2CXmw1bL6fr9fQ20/YYri2X5GIgI=; b=iG5i+F7VRIjmQziOu66ZJkXyHDXekhFJYZ8UvmnlknCE4IuAa9dsbc2o 2HR1hpPcwbSP0/o1H6eXMtbY4ZwXWSRvKkGhO/+0DimkaLCc7CHVrZjPW Pv9erJap+OPGubBt9ADsFBpnKflYOYpZjCs7fRI9biLOJ5Esg2LyrSiWp ofCPCcMgYP2NXCowdjEUx7YqL7WT3JydZayrOiSntdl+Lwe5RKfW9vLWj znCGxZ2p6Z4zMulNIqhVwV4D3I0XwfhwjxHUHu/Zmcjsy16JTqjp6z+nP YZ9eBJApUSJBv0xhZNS54zGmeqU/sRQ5M9XP4X5oQvF0g0Suo+QyNjo/c Q==; X-IronPort-AV: E=McAfee;i="6600,9927,10749"; a="363295954" X-IronPort-AV: E=Sophos;i="6.01,151,1684825200"; d="scan'208";a="363295954" Received: from fmsmga004.fm.intel.com ([10.253.24.48]) by orsmga102.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 23 Jun 2023 04:15:29 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10749"; a="785307462" X-IronPort-AV: E=Sophos;i="6.01,151,1684825200"; d="scan'208";a="785307462" Received: from silpixa00401385.ir.intel.com ([10.237.214.14]) by fmsmga004.fm.intel.com with ESMTP; 23 Jun 2023 04:15:28 -0700 From: Bruce Richardson To: dev@dpdk.org Cc: Bruce Richardson , =?utf-8?q?Morten_Br=C3=B8?= =?utf-8?q?rup?= Subject: [PATCH v3 3/8] build: make membership library optional Date: Fri, 23 Jun 2023 12:15:03 +0100 Message-Id: <20230623111508.786020-4-bruce.richardson@intel.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230623111508.786020-1-bruce.richardson@intel.com> References: <20230622134840.3225975-1-bruce.richardson@intel.com> <20230623111508.786020-1-bruce.richardson@intel.com> MIME-Version: 1.0 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 This library is not essential for most DPDK uses, so mark it as optional in the build config. Signed-off-by: Bruce Richardson Acked-by: Morten Brørup --- app/test/meson.build | 9 +++++---- lib/meson.build | 1 + 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/app/test/meson.build b/app/test/meson.build index 379effd10b..9166a1f3d6 100644 --- a/app/test/meson.build +++ b/app/test/meson.build @@ -76,8 +76,6 @@ test_sources = files( 'test_malloc.c', 'test_malloc_perf.c', 'test_mbuf.c', - 'test_member.c', - 'test_member_perf.c', 'test_memcpy.c', 'test_memcpy_perf.c', 'test_memory.c', @@ -227,7 +225,6 @@ fast_tests = [ ['ipsec_autotest', true, true], ['kni_autotest', false, true], ['kvargs_autotest', true, true], - ['member_autotest', true, true], ['power_cpufreq_autotest', false, true], ['power_autotest', true, true], ['power_kvm_vm_autotest', false, true], @@ -265,7 +262,6 @@ perf_test_names = [ 'timer_racecond_autotest', 'efd_autotest', 'hash_functions_autotest', - 'member_perf_autotest', 'efd_perf_autotest', 'lpm6_perf_autotest', 'rib6_slow_autotest', @@ -379,6 +375,11 @@ if dpdk_conf.has('RTE_LIB_METRICS') test_sources += ['test_metrics.c'] fast_tests += [['metrics_autotest', true, true]] endif +if dpdk_conf.has('RTE_LIB_MEMBER') + test_sources += ['test_member.c', 'test_member_perf.c'] + fast_tests += [['member_autotest', true, true]] + perf_test_names += 'member_perf_autotest' +endif if not is_windows and dpdk_conf.has('RTE_LIB_TELEMETRY') test_sources += ['test_telemetry_json.c', 'test_telemetry_data.c'] fast_tests += [['telemetry_json_autotest', true, true]] diff --git a/lib/meson.build b/lib/meson.build index 98a0672a04..de7069a078 100644 --- a/lib/meson.build +++ b/lib/meson.build @@ -82,6 +82,7 @@ optional_libs = [ 'kni', 'jobstats', 'latencystats', + 'member', 'metrics', 'mldev', 'node', From patchwork Fri Jun 23 11:15:04 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Bruce Richardson X-Patchwork-Id: 128955 X-Patchwork-Delegate: thomas@monjalon.net Return-Path: X-Original-To: patchwork@inbox.dpdk.org Delivered-To: patchwork@inbox.dpdk.org Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id 2275F42D2F; Fri, 23 Jun 2023 13:16:11 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 7C3B942D4B; Fri, 23 Jun 2023 13:16:01 +0200 (CEST) Received: from mga09.intel.com (mga09.intel.com [134.134.136.24]) by mails.dpdk.org (Postfix) with ESMTP id 804DA42D35 for ; Fri, 23 Jun 2023 13:15:56 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1687518956; x=1719054956; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=8hcJGdFJ5rZeVd+F0qHQiQnNHybzpbRfvcn6H8yuz/w=; b=mTFAtuoic0f7wvLt1lQQ1SuJrdbg81JttblrGBkcqxpHsSqTWEsLRo1u +aZmCKzjvaSoYf1SaBUojLifh/KEhgQVunTmcXkRHDdSaK7zjQiAV19mH KXeODsAA/L0qelPdEW7L3JBDr4oRwd3ccTVQ/amNFDrHgjDhLHn1KzWTs u8s1FfY5v3Va4NZYijdIhEFYX/N7NZq8fz6nfI+EfmfRAINsWAidWz2FA hZEY2Ds4lVf0DGoP4nH15e+i2lnMSeCcruzJZD/wYUqlbJg1h51rTVy7x aLsoDm6fF7f2zkdE+VijwSSoeSSbVAndUG6gm9XSdWXCltv2xrYUIFwXA w==; X-IronPort-AV: E=McAfee;i="6600,9927,10749"; a="363295967" X-IronPort-AV: E=Sophos;i="6.01,151,1684825200"; d="scan'208";a="363295967" Received: from fmsmga004.fm.intel.com ([10.253.24.48]) by orsmga102.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 23 Jun 2023 04:15:33 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10749"; a="785307469" X-IronPort-AV: E=Sophos;i="6.01,151,1684825200"; d="scan'208";a="785307469" Received: from silpixa00401385.ir.intel.com ([10.237.214.14]) by fmsmga004.fm.intel.com with ESMTP; 23 Jun 2023 04:15:32 -0700 From: Bruce Richardson To: dev@dpdk.org Cc: Bruce Richardson , =?utf-8?q?Morten_Br=C3=B8?= =?utf-8?q?rup?= Subject: [PATCH v3 4/8] build: make bpf library optional Date: Fri, 23 Jun 2023 12:15:04 +0100 Message-Id: <20230623111508.786020-5-bruce.richardson@intel.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230623111508.786020-1-bruce.richardson@intel.com> References: <20230622134840.3225975-1-bruce.richardson@intel.com> <20230623111508.786020-1-bruce.richardson@intel.com> MIME-Version: 1.0 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 This library is not essential for most DPDK uses, so mark it as optional in the build config. Signed-off-by: Bruce Richardson Acked-by: Morten Brørup --- app/test/meson.build | 10 +++++++--- lib/meson.build | 1 + 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/app/test/meson.build b/app/test/meson.build index 9166a1f3d6..4e86e886a5 100644 --- a/app/test/meson.build +++ b/app/test/meson.build @@ -15,7 +15,6 @@ test_sources = files( 'test_barrier.c', 'test_bitops.c', 'test_bitmap.c', - 'test_bpf.c', 'test_byteorder.c', 'test_cksum.c', 'test_cksum_perf.c', @@ -150,8 +149,6 @@ fast_tests = [ ['acl_autotest', true, true], ['atomic_autotest', false, true], ['bitmap_autotest', true, true], - ['bpf_autotest', true, true], - ['bpf_convert_autotest', true, true], ['bitops_autotest', true, true], ['byteorder_autotest', true, true], ['cksum_autotest', true, true], @@ -341,6 +338,13 @@ if dpdk_conf.has('RTE_EVENT_SKELETON') test_deps += 'event_skeleton' endif +if dpdk_conf.has('RTE_LIB_BPF') + test_sources += 'test_bpf.c' + fast_tests += [ + ['bpf_autotest', true, true], + ['bpf_convert_autotest', true, true], + ] +endif if dpdk_conf.has('RTE_LIB_DMADEV') test_sources += ['test_dmadev.c', 'test_dmadev_api.c'] driver_test_names += 'dmadev_autotest' diff --git a/lib/meson.build b/lib/meson.build index de7069a078..47c18ca3b0 100644 --- a/lib/meson.build +++ b/lib/meson.build @@ -70,6 +70,7 @@ libraries = [ optional_libs = [ 'bbdev', 'bitratestats', + 'bpf', 'cfgfile', 'compressdev', 'dmadev', From patchwork Fri Jun 23 11:15:05 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Bruce Richardson X-Patchwork-Id: 128954 X-Patchwork-Delegate: thomas@monjalon.net Return-Path: X-Original-To: patchwork@inbox.dpdk.org Delivered-To: patchwork@inbox.dpdk.org Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id D5FC742D2F; Fri, 23 Jun 2023 13:16:04 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 5BBCC42D35; Fri, 23 Jun 2023 13:16:00 +0200 (CEST) Received: from mga09.intel.com (mga09.intel.com [134.134.136.24]) by mails.dpdk.org (Postfix) with ESMTP id 75ABE40ED7 for ; Fri, 23 Jun 2023 13:15:56 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1687518956; x=1719054956; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=w+IWqm8EJNZR+aKW90ZenK00u24FFyvMbOhkQxdR6mU=; b=ndzlVRiD4PyHXgXKwVogaxil2yZpTbjC+nYRnPKER6X/9+9TLMvr1Rzz kmNAnFcN9RdnLdn4/cCPgDnTaHrV5MKyek4eCS+wqKNFw2Algut2JQGuA p49Bs3ROaGZfSHv5XobIt7NhnSojhphpVrLmwe5Y/9S310TU6GZ7mUeB6 drGLEEFICKE/lwxu6fQ+t9/eNUOCpsMaNvc12ixIC+tFmaZPgglzPvJM7 sisIHwF+B6ZblEi8EBQeRUq+b+uVuD45ijqI0R0AHCK8tDr4urLij/Cmg jdgru3AvJBAPLJRf5qiRJ0Oopprr4+KnceYRP2efiREM/CKbPWldj8Iq2 g==; X-IronPort-AV: E=McAfee;i="6600,9927,10749"; a="363295972" X-IronPort-AV: E=Sophos;i="6.01,151,1684825200"; d="scan'208";a="363295972" Received: from fmsmga004.fm.intel.com ([10.253.24.48]) by orsmga102.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 23 Jun 2023 04:15:34 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10749"; a="785307482" X-IronPort-AV: E=Sophos;i="6.01,151,1684825200"; d="scan'208";a="785307482" Received: from silpixa00401385.ir.intel.com ([10.237.214.14]) by fmsmga004.fm.intel.com with ESMTP; 23 Jun 2023 04:15:33 -0700 From: Bruce Richardson To: dev@dpdk.org Cc: Bruce Richardson , =?utf-8?q?Morten_Br=C3=B8?= =?utf-8?q?rup?= Subject: [PATCH v3 5/8] build: make efd library optional Date: Fri, 23 Jun 2023 12:15:05 +0100 Message-Id: <20230623111508.786020-6-bruce.richardson@intel.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230623111508.786020-1-bruce.richardson@intel.com> References: <20230622134840.3225975-1-bruce.richardson@intel.com> <20230623111508.786020-1-bruce.richardson@intel.com> MIME-Version: 1.0 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 This library is not essential for most DPDK uses, so mark it as optional in the build config. Signed-off-by: Bruce Richardson Acked-by: Morten Brørup --- app/test/meson.build | 8 ++++---- lib/meson.build | 1 + 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/app/test/meson.build b/app/test/meson.build index 4e86e886a5..492dd719de 100644 --- a/app/test/meson.build +++ b/app/test/meson.build @@ -42,8 +42,6 @@ test_sources = files( 'test_distributor_perf.c', 'test_eal_flags.c', 'test_eal_fs.c', - 'test_efd.c', - 'test_efd_perf.c', 'test_errno.c', 'test_ethdev_link.c', 'test_external_mem.c', @@ -257,9 +255,7 @@ perf_test_names = [ 'barrier_autotest', 'hash_multiwriter_autotest', 'timer_racecond_autotest', - 'efd_autotest', 'hash_functions_autotest', - 'efd_perf_autotest', 'lpm6_perf_autotest', 'rib6_slow_autotest', 'fib6_slow_autotest', @@ -368,6 +364,10 @@ if dpdk_conf.has('RTE_LIB_FLOW_CLASSIFY') test_sources += 'test_flow_classify.c' fast_tests += [['flow_classify_autotest', false, true]] endif +if dpdk_conf.has('RTE_LIB_EFD') + test_sources += ['test_efd.c', 'test_efd_perf.c'] + perf_test_names += ['efd_autotest', 'efd_perf_autotest'] +endif if dpdk_conf.has('RTE_LIB_GRAPH') test_sources += 'test_graph.c' fast_tests += [['graph_autotest', true, true]] diff --git a/lib/meson.build b/lib/meson.build index 47c18ca3b0..07cfdef614 100644 --- a/lib/meson.build +++ b/lib/meson.build @@ -74,6 +74,7 @@ optional_libs = [ 'cfgfile', 'compressdev', 'dmadev', + 'efd', 'eventdev', 'flow_classify', 'gpudev', From patchwork Fri Jun 23 11:15:06 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Bruce Richardson X-Patchwork-Id: 128956 X-Patchwork-Delegate: thomas@monjalon.net Return-Path: X-Original-To: patchwork@inbox.dpdk.org Delivered-To: patchwork@inbox.dpdk.org Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id 0686442D2F; Fri, 23 Jun 2023 13:16:17 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id A62A042D3A; Fri, 23 Jun 2023 13:16:02 +0200 (CEST) Received: from mga09.intel.com (mga09.intel.com [134.134.136.24]) by mails.dpdk.org (Postfix) with ESMTP id 83A6F42D42 for ; Fri, 23 Jun 2023 13:15:57 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1687518957; x=1719054957; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=6pxPPdSeMl60P7BntikwXJoYF6Z3d+77WFNhW+7urmA=; b=M20L3eEbxVoT5APfKLGcJhZClnivVV7URgA7SMiqGcR1QjwwdJBbonAW S7zhsHglaEbVkQm7PikxclfkR0Eb2puMimA71Ga/uXbUgbtebISb9F6yH va50/JtMsjuEYLoUDISjn1lyDJXdz46GGkieuytfRZJ8XkYloLZ1aZfn0 TVzEPnmF4Lr8ZRv2r7Cum220u7Xbld7qCOJzdxx2iUu4Qi9qEdSvxXOPg 8T765q7mLwEtkSZBRQ+gF1pV2ebb9ZJYc0HJ8M6WCwSMWXQnqSy/CwlBF fnzuuOxzpAxmBUnTchEt1NvqMceN7VyD1pnb5CEuP5FPWNQxjr5MYgnou w==; X-IronPort-AV: E=McAfee;i="6600,9927,10749"; a="363295977" X-IronPort-AV: E=Sophos;i="6.01,151,1684825200"; d="scan'208";a="363295977" Received: from fmsmga004.fm.intel.com ([10.253.24.48]) by orsmga102.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 23 Jun 2023 04:15:35 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10749"; a="785307490" X-IronPort-AV: E=Sophos;i="6.01,151,1684825200"; d="scan'208";a="785307490" Received: from silpixa00401385.ir.intel.com ([10.237.214.14]) by fmsmga004.fm.intel.com with ESMTP; 23 Jun 2023 04:15:34 -0700 From: Bruce Richardson To: dev@dpdk.org Cc: Bruce Richardson , =?utf-8?q?Morten_Br=C3=B8?= =?utf-8?q?rup?= Subject: [PATCH v3 6/8] build: make distributor library optional Date: Fri, 23 Jun 2023 12:15:06 +0100 Message-Id: <20230623111508.786020-7-bruce.richardson@intel.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230623111508.786020-1-bruce.richardson@intel.com> References: <20230622134840.3225975-1-bruce.richardson@intel.com> <20230623111508.786020-1-bruce.richardson@intel.com> MIME-Version: 1.0 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 This library is not essential for most DPDK uses, so mark it as optional in the build config. Signed-off-by: Bruce Richardson Acked-by: Morten Brørup --- app/test/meson.build | 9 +++++---- lib/meson.build | 1 + 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/app/test/meson.build b/app/test/meson.build index 492dd719de..ff90b9897a 100644 --- a/app/test/meson.build +++ b/app/test/meson.build @@ -38,8 +38,6 @@ test_sources = files( 'test_cycles.c', 'test_debug.c', 'test_devargs.c', - 'test_distributor.c', - 'test_distributor_perf.c', 'test_eal_flags.c', 'test_eal_fs.c', 'test_errno.c', @@ -214,7 +212,6 @@ fast_tests = [ ['user_delay_us', true, true], ['version_autotest', true, true], ['crc_autotest', true, true], - ['distributor_autotest', false, true], ['fbarray_autotest', true, true], ['hash_readwrite_func_autotest', false, true], ['ipsec_autotest', true, true], @@ -263,7 +260,6 @@ perf_test_names = [ 'rcu_qsbr_perf_autotest', 'red_perf', 'pie_perf', - 'distributor_perf_autotest', 'pmd_perf_autotest', 'service_perf_autotest', 'stack_perf_autotest', @@ -364,6 +360,11 @@ if dpdk_conf.has('RTE_LIB_FLOW_CLASSIFY') test_sources += 'test_flow_classify.c' fast_tests += [['flow_classify_autotest', false, true]] endif +if dpdk_conf.has('RTE_LIB_DISTRIBUTOR') + test_sources += ['test_distributor.c', 'test_distributor_perf.c'] + fast_tests += [['distributor_autotest', false, true]] + perf_test_names += 'distributor_perf_autotest' +endif if dpdk_conf.has('RTE_LIB_EFD') test_sources += ['test_efd.c', 'test_efd_perf.c'] perf_test_names += ['efd_autotest', 'efd_perf_autotest'] diff --git a/lib/meson.build b/lib/meson.build index 07cfdef614..757c1a63e9 100644 --- a/lib/meson.build +++ b/lib/meson.build @@ -73,6 +73,7 @@ optional_libs = [ 'bpf', 'cfgfile', 'compressdev', + 'distributor', 'dmadev', 'efd', 'eventdev', From patchwork Fri Jun 23 11:15:07 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Bruce Richardson X-Patchwork-Id: 128958 X-Patchwork-Delegate: thomas@monjalon.net Return-Path: X-Original-To: patchwork@inbox.dpdk.org Delivered-To: patchwork@inbox.dpdk.org Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id 4D13042D2F; Fri, 23 Jun 2023 13:16:29 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id D0F0842D56; Fri, 23 Jun 2023 13:16:04 +0200 (CEST) Received: from mga09.intel.com (mga09.intel.com [134.134.136.24]) by mails.dpdk.org (Postfix) with ESMTP id 82D7A42D3E for ; Fri, 23 Jun 2023 13:15:57 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1687518957; x=1719054957; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=cRyCbKwa2DqkLiDEmG4ydbZF1xuoPFP1QcTaYneCFUM=; b=J6VljclC33WWK2IL0l1DeL4Nk6kIEIHs8FXSn6OMcRnv0qj1U088O5+T BPSWoo29G+GFwoWilO+nTbLpf6q74w7vSQ7KVg6m20yFmCLgW++iYcChm bkyNdBqUURdmKrBpxXACNs//et/r1bFpTR+ZVvEwLAKmb/mjZ4ofxoD4Z 4VDe3px7mQldfN7NCKOokwDSa4amleXqMD9EZrOz4ow2yeE50KUymPvQn ITgwwq7gpjGhOc+1GdQNdR8BzBevLRPSa6wL957y8mofB9rOtCpijZii0 srgGyD5sVm0xWxTzByvq9u3afb7jvexzZyCfsENXs/WGzMKTWM09tFcuB Q==; X-IronPort-AV: E=McAfee;i="6600,9927,10749"; a="363295982" X-IronPort-AV: E=Sophos;i="6.01,151,1684825200"; d="scan'208";a="363295982" Received: from fmsmga004.fm.intel.com ([10.253.24.48]) by orsmga102.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 23 Jun 2023 04:15:36 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10749"; a="785307498" X-IronPort-AV: E=Sophos;i="6.01,151,1684825200"; d="scan'208";a="785307498" Received: from silpixa00401385.ir.intel.com ([10.237.214.14]) by fmsmga004.fm.intel.com with ESMTP; 23 Jun 2023 04:15:35 -0700 From: Bruce Richardson To: dev@dpdk.org Cc: Bruce Richardson , =?utf-8?q?Morten_Br=C3=B8?= =?utf-8?q?rup?= Subject: [PATCH v3 7/8] build: make fragmentation library optional Date: Fri, 23 Jun 2023 12:15:07 +0100 Message-Id: <20230623111508.786020-8-bruce.richardson@intel.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230623111508.786020-1-bruce.richardson@intel.com> References: <20230622134840.3225975-1-bruce.richardson@intel.com> <20230623111508.786020-1-bruce.richardson@intel.com> MIME-Version: 1.0 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 This library is not essential for most DPDK uses, so mark it as optional in the build config. Signed-off-by: Bruce Richardson Acked-by: Morten Brørup --- app/test/meson.build | 6 ++++-- lib/meson.build | 1 + 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/app/test/meson.build b/app/test/meson.build index ff90b9897a..51267d969b 100644 --- a/app/test/meson.build +++ b/app/test/meson.build @@ -56,7 +56,6 @@ test_sources = files( 'test_hash_perf.c', 'test_hash_readwrite_lf_perf.c', 'test_interrupts.c', - 'test_ipfrag.c', 'test_ipsec.c', 'test_ipsec_sad.c', 'test_ipsec_perf.c', @@ -173,7 +172,6 @@ fast_tests = [ ['func_reentrancy_autotest', false, true], ['hash_autotest', true, true], ['interrupt_autotest', true, true], - ['ipfrag_autotest', false, true], ['lcores_autotest', true, true], ['logs_autotest', true, true], ['lpm_autotest', true, true], @@ -376,6 +374,10 @@ if dpdk_conf.has('RTE_LIB_GRAPH') test_sources += 'test_graph_perf.c' perf_test_names += 'graph_perf_autotest' endif +if dpdk_conf.has('RTE_LIB_IP_FRAG') + test_sources += 'test_ipfrag.c' + fast_tests += [['ipfrag_autotest', false, true]] +endif if dpdk_conf.has('RTE_LIB_METRICS') test_sources += ['test_metrics.c'] fast_tests += [['metrics_autotest', true, true]] diff --git a/lib/meson.build b/lib/meson.build index 757c1a63e9..ea351b236a 100644 --- a/lib/meson.build +++ b/lib/meson.build @@ -83,6 +83,7 @@ optional_libs = [ 'gro', 'gso', 'kni', + 'ip_frag', 'jobstats', 'latencystats', 'member', From patchwork Fri Jun 23 11:15:08 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Bruce Richardson X-Patchwork-Id: 128957 X-Patchwork-Delegate: thomas@monjalon.net Return-Path: X-Original-To: patchwork@inbox.dpdk.org Delivered-To: patchwork@inbox.dpdk.org Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id 1DC1042D2F; Fri, 23 Jun 2023 13:16:23 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id C045342D51; Fri, 23 Jun 2023 13:16:03 +0200 (CEST) Received: from mga09.intel.com (mga09.intel.com [134.134.136.24]) by mails.dpdk.org (Postfix) with ESMTP id 8732242D43 for ; Fri, 23 Jun 2023 13:15:57 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1687518957; x=1719054957; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=5e+Qbi2cih7IRXMRE/pl8qkUP5XhIF1YPbuq94Oe39M=; b=AaYYQ35x1VxtiCjQ7hBFm8fMp4+hwG1J0MTxKAcuFIeUD+Juema1m+/Q CC4LhjICeFuZR1d7M8JQNZZCEDEtqw5uIJouhBZXMBeZRhlP/jL+Fd7vb CsKqnNAeOpb+0V8uf27N9Ylg8C7kpoTbk5ZTZxZUz42PF1HcoosTKoYX/ UWVHm/dlZeCArj9YjIwv4CX852HGAeIwaa2pCkP+JwM3gkZ4Cp3KQh/EL ZgL+fK4/3HrSfM/vePe0QtMsAQULWGNH6xDhp5GeYqQjQupvB5u90ZqeD +/UrHfWh64vORQ5Ubn1OLra2EDSE/mQdtMCUpVupohVZypgnTG9UePjbq A==; X-IronPort-AV: E=McAfee;i="6600,9927,10749"; a="363295990" X-IronPort-AV: E=Sophos;i="6.01,151,1684825200"; d="scan'208";a="363295990" Received: from fmsmga004.fm.intel.com ([10.253.24.48]) by orsmga102.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 23 Jun 2023 04:15:38 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10749"; a="785307508" X-IronPort-AV: E=Sophos;i="6.01,151,1684825200"; d="scan'208";a="785307508" Received: from silpixa00401385.ir.intel.com ([10.237.214.14]) by fmsmga004.fm.intel.com with ESMTP; 23 Jun 2023 04:15:37 -0700 From: Bruce Richardson To: dev@dpdk.org Cc: Bruce Richardson , =?utf-8?q?Morten_Br=C3=B8?= =?utf-8?q?rup?= Subject: [PATCH v3 8/8] build: make reorder library optional Date: Fri, 23 Jun 2023 12:15:08 +0100 Message-Id: <20230623111508.786020-9-bruce.richardson@intel.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230623111508.786020-1-bruce.richardson@intel.com> References: <20230622134840.3225975-1-bruce.richardson@intel.com> <20230623111508.786020-1-bruce.richardson@intel.com> MIME-Version: 1.0 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 This library is not essential for most DPDK uses, so mark it as optional in the build config. Signed-off-by: Bruce Richardson Acked-by: Morten Brørup --- app/test/meson.build | 6 ++++-- lib/meson.build | 1 + 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/app/test/meson.build b/app/test/meson.build index 51267d969b..cd8bcee4a4 100644 --- a/app/test/meson.build +++ b/app/test/meson.build @@ -94,7 +94,6 @@ test_sources = files( 'test_reciprocal_division_perf.c', 'test_red.c', 'test_pie.c', - 'test_reorder.c', 'test_rib.c', 'test_rib6.c', 'test_ring.c', @@ -219,7 +218,6 @@ fast_tests = [ ['power_autotest', true, true], ['power_kvm_vm_autotest', false, true], ['power_intel_uncore_autotest', true, true], - ['reorder_autotest', true, true], ['service_autotest', true, true], ['thash_autotest', true, true], ['threads_autotest', true, true], @@ -387,6 +385,10 @@ if dpdk_conf.has('RTE_LIB_MEMBER') fast_tests += [['member_autotest', true, true]] perf_test_names += 'member_perf_autotest' endif +if dpdk_conf.has('RTE_LIB_REORDER') + test_sources += 'test_reorder.c' + fast_tests += [['reorder_autotest', true, true]] +endif if not is_windows and dpdk_conf.has('RTE_LIB_TELEMETRY') test_sources += ['test_telemetry_json.c', 'test_telemetry_data.c'] fast_tests += [['telemetry_json_autotest', true, true]] diff --git a/lib/meson.build b/lib/meson.build index ea351b236a..b46f4e51ff 100644 --- a/lib/meson.build +++ b/lib/meson.build @@ -96,6 +96,7 @@ optional_libs = [ 'power', 'rawdev', 'regexdev', + 'reorder', 'table', 'vhost', ]