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 5563AA09E4; Thu, 21 Jan 2021 16:27:21 +0100 (CET) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 0EEE1140D03; Thu, 21 Jan 2021 16:27:21 +0100 (CET) Received: from mail-ot1-f50.google.com (mail-ot1-f50.google.com [209.85.210.50]) by mails.dpdk.org (Postfix) with ESMTP id 72CB3140D02 for ; Thu, 21 Jan 2021 16:27:19 +0100 (CET) Received: by mail-ot1-f50.google.com with SMTP id 34so1941011otd.5 for ; Thu, 21 Jan 2021 07:27:19 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=broadcom.com; s=google; h=mime-version:references:in-reply-to:from:date:message-id:subject:to :cc; bh=KvKJRWoTug9L3d9DWmNtcOxI75nfKk8/eHAT9dk1NHM=; b=WrmJlLv0MPX0715IEGRdg97adWkMj1ySixHJa/8WXh94IDmuRkVsgGfCVvp+WVZIXb 2Db5gHP8Q4NlpbnxGkfSyM2YbwdG0NcfUwoqB7RExqjwcIfDC5ih3062ecu2QEvSqT3P lgqoK8ep91d+J5OwfVrp+a2n5KEAH6Bh2U8po= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to:cc; bh=KvKJRWoTug9L3d9DWmNtcOxI75nfKk8/eHAT9dk1NHM=; b=F/8jLsXVSNUPc4ZCRyrdPdL0Jtp60SU7g41bz1GncvPMi8D7WleJQW6t66fFAMZYiw l7WteJEKx31QJPcS1UnB5BqJFNV4gkoqEqRzwMLMVv45WLn/wS72WRDHzSYGYdNkeUdW ltOdTkZgVQhTneM1HjcSkn4Q50h2zvLrQHZ8y1pjtS3qhD/PhpHcIHVL2k77N0pB/eVO F6NwYIJPY3VzoYpgQFuy39fkJpH6i6eegEfWM8noFwvXIboYc0XR6uIEjQjWbL+s4pcf dCUSwppGG0E+2SgcSULtd0vz5EQzGwSaS0UEK8NfMYOtZaHOKHaCItAmxeUlYsfeGzv/ yoBQ== X-Gm-Message-State: AOAM531whkuCxw3ZLIqj9xhA6Qvc+kKjVbGGWCtDIW0lzHyqxxwWsF2c mtYsRbAEa+8PG2bOSvwSnY5fE6hAlz2HX77OqwzHCDCPBZB7XA== X-Google-Smtp-Source: ABdhPJzjauv0uYOMnCNZz0ZasmWroHuHj8KHcrsU9ULp3pZ44gu/xKUKJrgF3XVeMeDLlee8TOcX75ww0Nvpfpbb2eQ= X-Received: by 2002:a9d:135:: with SMTP id 50mr11156413otu.267.1611242838720; Thu, 21 Jan 2021 07:27:18 -0800 (PST) MIME-Version: 1.0 References: <20210114094537.13661-1-stevex.yang@intel.com> <20210118070428.36998-1-stevex.yang@intel.com> <20210118070428.36998-3-stevex.yang@intel.com> In-Reply-To: <20210118070428.36998-3-stevex.yang@intel.com> From: Lance Richardson Date: Thu, 21 Jan 2021 10:27:07 -0500 Message-ID: To: Steve Yang Cc: dev@dpdk.org, Wenzhuo Lu , Beilei Xing , Bernard Iremonger Content-Type: multipart/signed; protocol="application/pkcs7-signature"; micalg=sha-256; boundary="00000000000011c28b05b96ab527" X-Content-Filtered-By: Mailman/MimeDel 2.1.29 Subject: Re: [dpdk-dev] [PATCH v4 02/22] app/testpmd: fix max rx packet length for VLAN packets 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 Sender: "dev" --00000000000011c28b05b96ab527 Content-Type: text/plain; charset="UTF-8" On Mon, Jan 18, 2021 at 2:08 AM Steve Yang wrote: > > When the max rx packet length is smaller than the sum of mtu size and > ether overhead size, it should be enlarged, otherwise the VLAN packets > will be dropped. > > Removed the rx_offloads assignment for jumbo frame during command line > parsing, and set the correct jumbo frame flag if MTU size is larger than > the default value 'RTE_ETHER_MTU' within 'init_config()'. > > Fixes: 384161e00627 ("app/testpmd: adjust on the fly VLAN configuration") > Fixes: 35b2d13fd6fd ("net: add rte prefix to ether defines") > Fixes: ce17eddefc20 ("ethdev: introduce Rx queue offloads API") > Fixes: 150c9ac2df13 ("app/testpmd: update Rx offload after setting MTU") > > Cc: Wenzhuo Lu > Cc: Beilei Xing > Cc: Bernard Iremonger > > Signed-off-by: Steve Yang > --- > app/test-pmd/cmdline.c | 6 ------ > app/test-pmd/config.c | 2 +- > app/test-pmd/parameters.c | 7 ++----- > app/test-pmd/testpmd.c | 18 ++++++++++++++++++ > 4 files changed, 21 insertions(+), 12 deletions(-) > > diff --git a/app/test-pmd/cmdline.c b/app/test-pmd/cmdline.c > index 2ccbaa039e..65042fcff5 100644 > --- a/app/test-pmd/cmdline.c > +++ b/app/test-pmd/cmdline.c > @@ -1886,7 +1886,6 @@ cmd_config_max_pkt_len_parsed(void *parsed_result, > > RTE_ETH_FOREACH_DEV(pid) { > struct rte_port *port = &ports[pid]; > - uint64_t rx_offloads = port->dev_conf.rxmode.offloads; > > if (!strcmp(res->name, "max-pkt-len")) { > if (res->value < RTE_ETHER_MIN_LEN) { > @@ -1898,11 +1897,6 @@ cmd_config_max_pkt_len_parsed(void *parsed_result, > return; > > port->dev_conf.rxmode.max_rx_pkt_len = res->value; > - if (res->value > RTE_ETHER_MAX_LEN) > - rx_offloads |= DEV_RX_OFFLOAD_JUMBO_FRAME; > - else > - rx_offloads &= ~DEV_RX_OFFLOAD_JUMBO_FRAME; > - port->dev_conf.rxmode.offloads = rx_offloads; > } else { > printf("Unknown parameter\n"); > return; > diff --git a/app/test-pmd/config.c b/app/test-pmd/config.c > index 3f6c8642b1..1195f054f3 100644 > --- a/app/test-pmd/config.c > +++ b/app/test-pmd/config.c > @@ -1434,7 +1434,7 @@ port_mtu_set(portid_t port_id, uint16_t mtu) > * device supports jumbo frame. > */ > eth_overhead = dev_info.max_rx_pktlen - dev_info.max_mtu; > - if (mtu > RTE_ETHER_MAX_LEN - eth_overhead) { > + if (mtu > RTE_ETHER_MTU) { > rte_port->dev_conf.rxmode.offloads |= > DEV_RX_OFFLOAD_JUMBO_FRAME; > rte_port->dev_conf.rxmode.max_rx_pkt_len = > diff --git a/app/test-pmd/parameters.c b/app/test-pmd/parameters.c > index 414a0068fb..df5eb10d84 100644 > --- a/app/test-pmd/parameters.c > +++ b/app/test-pmd/parameters.c > @@ -834,12 +834,9 @@ launch_args_parse(int argc, char** argv) > } > if (!strcmp(lgopts[opt_idx].name, "max-pkt-len")) { > n = atoi(optarg); > - if (n >= RTE_ETHER_MIN_LEN) { > + if (n >= RTE_ETHER_MIN_LEN) > rx_mode.max_rx_pkt_len = (uint32_t) n; > - if (n > RTE_ETHER_MAX_LEN) > - rx_offloads |= > - DEV_RX_OFFLOAD_JUMBO_FRAME; > - } else > + else > rte_exit(EXIT_FAILURE, > "Invalid max-pkt-len=%d - should be > %d\n", > n, RTE_ETHER_MIN_LEN); > diff --git a/app/test-pmd/testpmd.c b/app/test-pmd/testpmd.c > index 2b60f6c5d3..c256e719ae 100644 > --- a/app/test-pmd/testpmd.c > +++ b/app/test-pmd/testpmd.c > @@ -1410,6 +1410,7 @@ init_config(void) > struct rte_gro_param gro_param; > uint32_t gso_types; > uint16_t data_size; > + uint16_t eth_overhead; > bool warning = 0; > int k; > int ret; > @@ -1446,6 +1447,23 @@ init_config(void) > rte_exit(EXIT_FAILURE, > "rte_eth_dev_info_get() failed\n"); > > + /* Update the max_rx_pkt_len to have MTU as RTE_ETHER_MTU */ > + if (port->dev_info.max_mtu != UINT16_MAX && > + port->dev_info.max_rx_pktlen > port->dev_info.max_mtu) > + eth_overhead = port->dev_info.max_rx_pktlen - > + port->dev_info.max_mtu; > + else > + eth_overhead = > + RTE_ETHER_HDR_LEN + RTE_ETHER_CRC_LEN; > + > + if (port->dev_conf.rxmode.max_rx_pkt_len <= > + (uint32_t)(RTE_ETHER_MTU + eth_overhead)) > + port->dev_conf.rxmode.max_rx_pkt_len = > + RTE_ETHER_MTU + eth_overhead; > + else > + port->dev_conf.rxmode.offloads |= > + DEV_RX_OFFLOAD_JUMBO_FRAME; > + > if (!(port->dev_info.tx_offload_capa & > DEV_TX_OFFLOAD_MBUF_FAST_FREE)) > port->dev_conf.txmode.offloads &= > -- > 2.17.1 > Moving the setting of DEV_RX_OFFLOAD_JUMBO_FRAME from cmd_config_max_pkt_len_parsed() to init_config() doesn't seem to be correct for the case where max_rx_pkt_len is changed from the command line via "port config all max-pkt-len". The init_config() function is only called when testpmd is started, but the DEV_RX_OFFLOAD_JUMBO_FRAME setting needs to be recomputed whenever max_rx_pkt_len changes. (Of course this won't matter when DEV_RX_OFFLOAD_JUMBO_FRAME is removed, which seems like a great idea, but for now this is impacting some test automation with 21.02-rc1.) --00000000000011c28b05b96ab527--