From patchwork Sun Sep 22 05:12:28 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Pavan Nikhilesh Bhagavatula X-Patchwork-Id: 59536 X-Patchwork-Delegate: jerinj@marvell.com 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 82AD22E83; Sun, 22 Sep 2019 07:12:37 +0200 (CEST) Received: from mx0b-0016f401.pphosted.com (mx0b-0016f401.pphosted.com [67.231.156.173]) by dpdk.org (Postfix) with ESMTP id 5F2842C6A for ; Sun, 22 Sep 2019 07:12:35 +0200 (CEST) Received: from pps.filterd (m0045851.ppops.net [127.0.0.1]) by mx0b-0016f401.pphosted.com (8.16.0.42/8.16.0.42) with SMTP id x8M5Accu019125 for ; Sat, 21 Sep 2019 22:12:34 -0700 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=marvell.com; h=from : to : cc : subject : date : message-id : mime-version : content-transfer-encoding : content-type; s=pfpt0818; bh=0liXuXb/yb2cIWqsYwJ1dSs+zehGqPsNZAywE6D8sWc=; b=yNSgFilh2bgcD5PxpvDHw8Vj1HqC3ngT6CXtCkPFrPvWnwXxRVQSddvlaZ2vaSNRnyQw SbegWA1bm0R6emyrgn2ezTpfDRheOlB4uSJayNJffUGC4sMBqkxOjJAbhhUuIU5dXHDP 3a4WteHHsAps+fNAXOC5r6A0JRCyuHQIt0Wh4x8aA49zfUgEUDX3Cw5JMm1QyYbU0UJZ UAn34IxsQzfmlu/OV8xubyw3o29AmNSl9o2lNJxigEDDIg/MimLYPJMVCz6AfWGmgZPC WBSTRxOCgRAfHJXfnRFJyhGv1i6TpE/7a7O9z/5Xou7xbrovsn1L6UVlQKtlra4hlLIY GQ== Received: from sc-exch01.marvell.com ([199.233.58.181]) by mx0b-0016f401.pphosted.com with ESMTP id 2v5kckhu21-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-SHA384 bits=256 verify=NOT) for ; Sat, 21 Sep 2019 22:12:34 -0700 Received: from SC-EXCH03.marvell.com (10.93.176.83) by SC-EXCH01.marvell.com (10.93.176.81) with Microsoft SMTP Server (TLS) id 15.0.1367.3; Sat, 21 Sep 2019 22:12:32 -0700 Received: from maili.marvell.com (10.93.176.43) by SC-EXCH03.marvell.com (10.93.176.83) with Microsoft SMTP Server id 15.0.1367.3 via Frontend Transport; Sat, 21 Sep 2019 22:12:32 -0700 Received: from BG-LT7430.marvell.com (unknown [10.28.17.22]) by maili.marvell.com (Postfix) with ESMTP id 73EC43F703F; Sat, 21 Sep 2019 22:12:30 -0700 (PDT) From: To: CC: , Pavan Nikhilesh Date: Sun, 22 Sep 2019 10:42:28 +0530 Message-ID: <20190922051229.13928-1-pbhagavatula@marvell.com> X-Mailer: git-send-email 2.17.1 MIME-Version: 1.0 X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10434:6.0.70,1.0.8 definitions=2019-09-22_02:2019-09-20,2019-09-22 signatures=0 Subject: [dpdk-dev] [PATCH] app/test-eventdev: add options to set mbuf and pkt size 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" From: Pavan Nikhilesh Add options to set mbuf size and max packet size which allow the user to enable jumbo frames and Rx/Tx scatter gather. Packet mbuf size can be modified by using `--mbuf_sz=N`. Max packet size can be modified by using `--max_pkt_sz=N`. These options are only applicable `pipeline_atq` and `pipeline_queue` tests. Signed-off-by: Pavan Nikhilesh --- app/test-eventdev/evt_common.h | 30 ++++++++++--------- app/test-eventdev/evt_options.c | 28 ++++++++++++++++- app/test-eventdev/evt_options.h | 2 ++ app/test-eventdev/test_pipeline_common.c | 38 ++++++++++++++++++++++-- 4 files changed, 80 insertions(+), 18 deletions(-) diff --git a/app/test-eventdev/evt_common.h b/app/test-eventdev/evt_common.h index 1c3522ff4..f9d7378d3 100644 --- a/app/test-eventdev/evt_common.h +++ b/app/test-eventdev/evt_common.h @@ -47,28 +47,30 @@ struct evt_options { char test_name[EVT_TEST_NAME_MAX_LEN]; bool plcores[RTE_MAX_LCORE]; bool wlcores[RTE_MAX_LCORE]; - uint8_t sched_type_list[EVT_MAX_STAGES]; - uint32_t nb_flows; - int socket_id; int pool_sz; + int socket_id; int nb_stages; int verbose_level; - uint64_t nb_pkts; + uint8_t dev_id; + uint8_t timdev_cnt; uint8_t nb_timer_adptrs; - uint64_t nb_timers; - uint64_t timer_tick_nsec; - uint64_t optm_timer_tick_nsec; - uint64_t max_tmo_nsec; - uint64_t expiry_nsec; + uint8_t timdev_use_burst; + uint8_t sched_type_list[EVT_MAX_STAGES]; + uint16_t mbuf_sz; uint16_t wkr_deq_dep; - uint8_t dev_id; + uint32_t nb_flows; uint32_t tx_first; - uint32_t fwd_latency:1; - uint32_t q_priority:1; + uint32_t max_pkt_sz; uint32_t deq_tmo_nsec; + uint32_t q_priority:1; + uint32_t fwd_latency:1; + uint64_t nb_pkts; + uint64_t nb_timers; + uint64_t expiry_nsec; + uint64_t max_tmo_nsec; + uint64_t timer_tick_nsec; + uint64_t optm_timer_tick_nsec; enum evt_prod_type prod_type; - uint8_t timdev_use_burst; - uint8_t timdev_cnt; }; static inline bool diff --git a/app/test-eventdev/evt_options.c b/app/test-eventdev/evt_options.c index 46c074fea..c60b61a90 100644 --- a/app/test-eventdev/evt_options.c +++ b/app/test-eventdev/evt_options.c @@ -233,6 +233,26 @@ evt_parse_work_lcores(struct evt_options *opt, const char *corelist) return ret; } +static int +evt_parse_mbuf_sz(struct evt_options *opt, const char *arg) +{ + int ret; + + ret = parser_read_uint16(&(opt->mbuf_sz), arg); + + return ret; +} + +static int +evt_parse_max_pkt_sz(struct evt_options *opt, const char *arg) +{ + int ret; + + ret = parser_read_uint32(&(opt->max_pkt_sz), arg); + + return ret; +} + static void usage(char *program) { @@ -262,7 +282,9 @@ usage(char *program) "\t--nb_timer_adptrs : number of timer adapters to use.\n" "\t--timer_tick_nsec : timer tick interval in ns.\n" "\t--max_tmo_nsec : max timeout interval in ns.\n" - "\t--expiry_nsec : event timer expiry ns.\n" + "\t--expiry_nsec : event timer expiry ns.\n" + "\t--mbuf_sz : packet mbuf size.\n" + "\t--max_pkt_sz : max packet size.\n" ); printf("available tests:\n"); evt_test_dump_names(); @@ -332,6 +354,8 @@ static struct option lgopts[] = { { EVT_TIMER_TICK_NSEC, 1, 0, 0 }, { EVT_MAX_TMO_NSEC, 1, 0, 0 }, { EVT_EXPIRY_NSEC, 1, 0, 0 }, + { EVT_MBUF_SZ, 1, 0, 0 }, + { EVT_MAX_PKT_SZ, 1, 0, 0 }, { EVT_HELP, 0, 0, 0 }, { NULL, 0, 0, 0 } }; @@ -364,6 +388,8 @@ evt_opts_parse_long(int opt_idx, struct evt_options *opt) { EVT_TIMER_TICK_NSEC, evt_parse_timer_tick_nsec}, { EVT_MAX_TMO_NSEC, evt_parse_max_tmo_nsec}, { EVT_EXPIRY_NSEC, evt_parse_expiry_nsec}, + { EVT_MBUF_SZ, evt_parse_mbuf_sz}, + { EVT_MAX_PKT_SZ, evt_parse_max_pkt_sz}, }; for (i = 0; i < RTE_DIM(parsermap); i++) { diff --git a/app/test-eventdev/evt_options.h b/app/test-eventdev/evt_options.h index 845d3199a..cb1d3760d 100644 --- a/app/test-eventdev/evt_options.h +++ b/app/test-eventdev/evt_options.h @@ -40,6 +40,8 @@ #define EVT_TIMER_TICK_NSEC ("timer_tick_nsec") #define EVT_MAX_TMO_NSEC ("max_tmo_nsec") #define EVT_EXPIRY_NSEC ("expiry_nsec") +#define EVT_MBUF_SZ ("mbuf_sz") +#define EVT_MAX_PKT_SZ ("max_pkt_sz") #define EVT_HELP ("help") void evt_options_default(struct evt_options *opt); diff --git a/app/test-eventdev/test_pipeline_common.c b/app/test-eventdev/test_pipeline_common.c index 16c49b860..497cb667d 100644 --- a/app/test-eventdev/test_pipeline_common.c +++ b/app/test-eventdev/test_pipeline_common.c @@ -165,7 +165,6 @@ pipeline_ethdev_setup(struct evt_test *test, struct evt_options *opt) struct rte_eth_conf port_conf = { .rxmode = { .mq_mode = ETH_MQ_RX_RSS, - .max_rx_pkt_len = RTE_ETHER_MAX_LEN, }, .rx_adv_conf = { .rss_conf = { @@ -175,12 +174,21 @@ pipeline_ethdev_setup(struct evt_test *test, struct evt_options *opt) }, }; - RTE_SET_USED(opt); if (!rte_eth_dev_count_avail()) { evt_err("No ethernet ports found."); return -ENODEV; } + if (opt->max_pkt_sz < RTE_ETHER_MIN_LEN) { + evt_err("max_pkt_sz can not be less than %d", + RTE_ETHER_MIN_LEN); + return -EINVAL; + } + + port_conf.rxmode.max_rx_pkt_len = opt->max_pkt_sz; + if (opt->max_pkt_sz > RTE_ETHER_MAX_LEN) + port_conf.rxmode.offloads |= DEV_RX_OFFLOAD_JUMBO_FRAME; + t->internal_port = 1; RTE_ETH_FOREACH_DEV(i) { struct rte_eth_dev_info dev_info; @@ -404,12 +412,36 @@ int pipeline_mempool_setup(struct evt_test *test, struct evt_options *opt) { struct test_pipeline *t = evt_test_priv(test); + int i; + + if (!opt->mbuf_sz) + opt->mbuf_sz = RTE_MBUF_DEFAULT_BUF_SIZE; + + if (!opt->max_pkt_sz) + opt->max_pkt_sz = RTE_ETHER_MAX_LEN; + + RTE_ETH_FOREACH_DEV(i) { + struct rte_eth_dev_info dev_info; + uint16_t data_size = 0; + + memset(&dev_info, 0, sizeof(dev_info)); + rte_eth_dev_info_get(i, &dev_info); + if (dev_info.rx_desc_lim.nb_mtu_seg_max != UINT16_MAX && + dev_info.rx_desc_lim.nb_mtu_seg_max != 0) { + data_size = opt->max_pkt_sz / + dev_info.rx_desc_lim.nb_mtu_seg_max; + data_size += RTE_PKTMBUF_HEADROOM; + + if (data_size > opt->mbuf_sz) + opt->mbuf_sz = data_size; + } + } t->pool = rte_pktmbuf_pool_create(test->name, /* mempool name */ opt->pool_sz, /* number of elements*/ 512, /* cache size*/ 0, - RTE_MBUF_DEFAULT_BUF_SIZE, + opt->mbuf_sz, opt->socket_id); /* flags */ if (t->pool == NULL) {