[3/3,v4] app/testpmd: support hardware offload to drop error packets
diff mbox series

Message ID 20201015132343.4050-3-nipun.gupta@nxp.com
State Deferred
Delegated to: Ferruh Yigit
Headers show
Series
  • [1/3,v4] ethdev: add Rx offload to drop error packets
Related show

Checks

Context Check Description
ci/iol-mellanox-Performance success Performance Testing PASS
ci/iol-testing success Testing PASS
ci/iol-intel-Performance success Performance Testing PASS
ci/travis-robot warning Travis build: failed
ci/iol-intel-Functional success Functional Testing PASS
ci/iol-broadcom-Performance success Performance Testing PASS
ci/iol-broadcom-Functional success Functional Testing PASS
ci/checkpatch warning coding style issues

Commit Message

Nipun Gupta Oct. 15, 2020, 1:23 p.m. UTC
From: Nipun Gupta <nipun.gupta@nxp.com>

With DEV_RX_OFFLOAD_ERR_PKT_DROP now defined as an offload
capability, and separate RTE_DEV_RX_ERR_PKT_DROP_OFFLOAD_ALL
capability to drop all error packets in hardware, testpmd
showcases this with a new added configuration option
'enable-hw-drop-err-all'.

Signed-off-by: Nipun Gupta <nipun.gupta@nxp.com>
---
 app/test-pmd/config.c                 | 35 +++++++++++++++++++++
 app/test-pmd/parameters.c             |  7 +++++
 app/test-pmd/testpmd.c                |  8 +++++
 app/test-pmd/testpmd.h                |  1 +
 doc/guides/nics/features.rst          | 44 +++++++++++++++++++++++++++
 doc/guides/testpmd_app_ug/run_app.rst |  4 +++
 6 files changed, 99 insertions(+)

Comments

Dharmik Thakkar Oct. 29, 2020, 5:22 p.m. UTC | #1
Hi Nipun,

Some nits. Looks good otherwise.

> On Oct 15, 2020, at 8:23 AM, Nipun.gupta@nxp.com <nipun.gupta@nxp.com> wrote:
> 
> From: Nipun Gupta <nipun.gupta@nxp.com>
> 
> With DEV_RX_OFFLOAD_ERR_PKT_DROP now defined as an offload
> capability, and separate RTE_DEV_RX_ERR_PKT_DROP_OFFLOAD_ALL
> capability to drop all error packets in hardware, testpmd
> showcases this with a new added configuration option
> 'enable-hw-drop-err-all'.
> 
> Signed-off-by: Nipun Gupta <nipun.gupta@nxp.com>
> ---
> app/test-pmd/config.c                 | 35 +++++++++++++++++++++
> app/test-pmd/parameters.c             |  7 +++++
> app/test-pmd/testpmd.c                |  8 +++++
> app/test-pmd/testpmd.h                |  1 +
> doc/guides/nics/features.rst          | 44 +++++++++++++++++++++++++++
> doc/guides/testpmd_app_ug/run_app.rst |  4 +++
> 6 files changed, 99 insertions(+)
> 
> diff --git a/app/test-pmd/config.c b/app/test-pmd/config.c
> index e73dc66c8..14ef4e468 100644
> --- a/app/test-pmd/config.c
> +++ b/app/test-pmd/config.c
> @@ -1027,6 +1027,41 @@ port_offload_cap_display(portid_t port_id)
> 			printf("off\n");
> 	}
> 
> +	if (dev_info.rx_offload_capa & DEV_RX_OFFLOAD_ERR_PKT_DROP) {
> +		if (dev_info.rx_err_drop_offload_capa &
> +			RTE_DEV_RX_ERR_PKT_DROP_OFFLOAD_L1_FCS) {
> +			printf("RX L1 FCS Error pkt drop:      ");
> +			if (ports[port_id].dev_conf.err_pkt_drop_conf.l1_fcs)
> +				printf("on\n");
> +			else
> +				printf("off\n");
> +		}
> +		if (dev_info.rx_err_drop_offload_capa &
> +			RTE_DEV_RX_ERR_PKT_DROP_OFFLOAD_L3_CSUM) {
> +			printf("RX L3 Csum Error pkt drop:     ");
> +			if (ports[port_id].dev_conf.err_pkt_drop_conf.l3_csum)
> +				printf("on\n");
> +			else
> +				printf("off\n");
> +		}
> +		if (dev_info.rx_err_drop_offload_capa &
> +			RTE_DEV_RX_ERR_PKT_DROP_OFFLOAD_L4_CSUM) {
> +			printf("RX L4 Csum Error pkt drop:     ");
> +			if (ports[port_id].dev_conf.err_pkt_drop_conf.l4_csum)
> +				printf("on\n");
> +			else
> +				printf("off\n");
> +		}
> +		if (dev_info.rx_err_drop_offload_capa &
> +			RTE_DEV_RX_ERR_PKT_DROP_OFFLOAD_ALL) {
> +			printf("RX all Error pkt drop:         ");
> +			if (ports[port_id].dev_conf.err_pkt_drop_conf.all)
> +				printf("on\n");
> +			else
> +				printf("off\n");
> +		}
> +	}
> +
> 	if (dev_info.tx_offload_capa & DEV_TX_OFFLOAD_VLAN_INSERT) {
> 		printf("VLAN insert:                   ");
> 		if (ports[port_id].dev_conf.txmode.offloads &
> diff --git a/app/test-pmd/parameters.c b/app/test-pmd/parameters.c
> index 1ead59579..508612426 100644
> --- a/app/test-pmd/parameters.c
> +++ b/app/test-pmd/parameters.c
> @@ -142,6 +142,7 @@ usage(char* progname)
> 	printf("  --enable-hw-vlan-strip: enable hardware vlan strip.\n");
> 	printf("  --enable-hw-vlan-extend: enable hardware vlan extend.\n");
> 	printf("  --enable-hw-qinq-strip: enable hardware qinq strip.\n");
> +	printf("  --enable-hw-drop-err-all: enable hardware packet drop for all error packets.\n");
> 	printf("  --enable-drop-en: enable per queue packet drop.\n");
> 	printf("  --disable-rss: disable rss.\n");
> 	printf("  --port-topology=<paired|chained|loop>: set port topology (paired "
> @@ -631,6 +632,7 @@ launch_args_parse(int argc, char** argv)
> 		{ "enable-hw-vlan-strip",       0, 0, 0 },
> 		{ "enable-hw-vlan-extend",      0, 0, 0 },
> 		{ "enable-hw-qinq-strip",       0, 0, 0 },
> +		{ "enable-hw-drop-err-all",     0, 0, 0 },
> 		{ "enable-drop-en",            0, 0, 0 },
> 		{ "disable-rss",                0, 0, 0 },
> 		{ "port-topology",              1, 0, 0 },
> @@ -1283,6 +1285,11 @@ launch_args_parse(int argc, char** argv)
> 				rmv_interrupt = 0;
> 			if (!strcmp(lgopts[opt_idx].name, "flow-isolate-all"))
> 				flow_isolate_all = 1;
> +			if (!strcmp(lgopts[opt_idx].name,
> +					"enable-hw-drop-err-all")) {
> +				rx_err_pkt_drop_all = 1;
> +			}

{ } can be removed.

> +
> 			if (!strcmp(lgopts[opt_idx].name, "tx-offloads")) {
> 				char *end = NULL;
> 				n = strtoull(optarg, &end, 16);
> diff --git a/app/test-pmd/testpmd.c b/app/test-pmd/testpmd.c
> index ccba71c07..c9e7397e6 100644
> --- a/app/test-pmd/testpmd.c
> +++ b/app/test-pmd/testpmd.c
> @@ -359,6 +359,11 @@ uint8_t lsc_interrupt = 1; /* enabled by default */
>  */
> uint8_t rmv_interrupt = 1; /* enabled by default */
> 
> +/*
> + * Drop all RX error packets on HW itself.
> + */
> +uint8_t rx_err_pkt_drop_all = 0; /* disabled by default */

= 0 can be removed.

> +
> uint8_t hot_plug = 0; /**< hotplug disabled by default. */
> 
> /* After attach, port setup is called on event or by iterator */
> @@ -3359,6 +3364,9 @@ init_port_config(void)
> 		    (rte_eth_devices[pid].data->dev_flags &
> 		     RTE_ETH_DEV_INTR_RMV))
> 			port->dev_conf.intr_conf.rmv = 1;
> +
> +		if (rx_err_pkt_drop_all)
> +			port->dev_conf.err_pkt_drop_conf.all = 1;
> 	}
> }
> 
> diff --git a/app/test-pmd/testpmd.h b/app/test-pmd/testpmd.h
> index c7e7e41a9..eab154ed4 100644
> --- a/app/test-pmd/testpmd.h
> +++ b/app/test-pmd/testpmd.h
> @@ -314,6 +314,7 @@ extern uint8_t no_device_start; /**<set by "--disable-device-start" parameter */
> extern volatile int test_done; /* stop packet forwarding when set to 1. */
> extern uint8_t lsc_interrupt; /**< disabled by "--no-lsc-interrupt" parameter */
> extern uint8_t rmv_interrupt; /**< disabled by "--no-rmv-interrupt" parameter */
> +extern uint8_t rx_err_pkt_drop_all; /**< enabled by "--enable-hw-drop-err-all" parameter */
> extern uint32_t event_print_mask;
> /**< set by "--print-event xxxx" and "--mask-event xxxx parameters */
> extern bool setup_on_probe_event; /**< disabled by port setup-on iterator */
> diff --git a/doc/guides/nics/features.rst b/doc/guides/nics/features.rst
> index dd8c9555b..cb7fdfd8b 100644
> --- a/doc/guides/nics/features.rst
> +++ b/doc/guides/nics/features.rst
> @@ -606,6 +606,50 @@ Supports inner packet L4 checksum.
>   ``tx_offload_capa,tx_queue_offload_capa:DEV_TX_OFFLOAD_OUTER_UDP_CKSUM``.
> 
> 
> +.. _nic_features_l1_fcs_rx_error_packet_drop:
> +
> +L1 FCS Error Packet drop on Rx
> +------------------------------
> +
> +Supports dropping of packets having L1 FCS error on Rx.
> +
> +* **[uses]     user config**: ``dev_conf.err_pkt_drop_conf.l1_fcs``.
> +* **[provides] rte_eth_dev_info**: ``rx_err_drop_offload_capa:RTE_DEV_RX_ERR_PKT_DROP_OFFLOAD_L1_FCS``.
> +
> +
> +.. _nic_features_l3_csum_rx_error_packet_drop:
> +
> +L3 checksum Error Packet drop on Rx
> +-----------------------------------
> +
> +Supports dropping of packets having L3 Checksum error on Rx.
> +
> +* **[uses]     user config**: ``dev_conf.err_pkt_drop_conf.l3_csum``.
> +* **[provides] rte_eth_dev_info**: ``rx_err_drop_offload_capa:RTE_DEV_RX_ERR_PKT_DROP_OFFLOAD_L3_CSUM``.
> +
> +
> +.. _nic_features_l4_csum_rx_error_packet_drop:
> +
> +L4 Checksum Error Packet drop on Rx
> +-----------------------------------
> +
> +Supports dropping of packets having L1 FCS error on Rx.
> +
> +* **[uses]     user config**: ``dev_conf.err_pkt_drop_conf.l4_csum``.
> +* **[provides] rte_eth_dev_info**: ``rx_err_drop_offload_capa:RTE_DEV_RX_ERR_PKT_DROP_OFFLOAD_L4_CSUM``.
> +
> +
> +.. _nic_features_all_rx_error_packet_drop:
> +
> +All/any Error Packet drop on Rx
> +-------------------------------
> +
> +Supports dropping of packets having any of the errors like L1 FSC, L3/L4 Checksum on Rx.

s/FSC/FCS

> +
> +* **[uses]     user config**: ``dev_conf.err_pkt_drop_conf.all``.
> +* **[provides] rte_eth_dev_info**: ``rx_err_drop_offload_capa:RTE_DEV_RX_ERR_PKT_DROP_OFFLOAD_ALL``.
> +
> +
> .. _nic_features_packet_type_parsing:
> 
> Packet type parsing
> diff --git a/doc/guides/testpmd_app_ug/run_app.rst b/doc/guides/testpmd_app_ug/run_app.rst
> index e2539f693..20f2f8083 100644
> --- a/doc/guides/testpmd_app_ug/run_app.rst
> +++ b/doc/guides/testpmd_app_ug/run_app.rst
> @@ -213,6 +213,10 @@ The command line options are:
> 
>     Enable hardware QINQ strip.
> 
> +*  ``--enable-hw-drop-err-all``
> +
> +    Enable hardware packet drop for any error packets
> +
> *   ``--enable-drop-en``
> 
>     Enable per-queue packet drop for packets with no descriptors.
> — 
> 2.17.1
> 

Reviewed-by: Dharmik Thakkar <dharmik.thakkar@arm.com>
Nipun Gupta Oct. 31, 2020, 6:16 p.m. UTC | #2
> -----Original Message-----
> From: Dharmik Thakkar <Dharmik.Thakkar@arm.com>
> Sent: Thursday, October 29, 2020 10:52 PM
> To: Nipun Gupta <nipun.gupta@nxp.com>
> Cc: dev <dev@dpdk.org>; thomas@monjalon.net; Ferruh Yigit
> <ferruh.yigit@intel.com>; arybchenko@solarflare.com; Hemant Agrawal
> <hemant.agrawal@nxp.com>; Sachin Saxena <sachin.saxena@nxp.com>; Rohit
> Raj <rohit.raj@nxp.com>; Jerin Jacob <jerinjacobk@gmail.com>; Stephen
> Hemminger <stephen@networkplumber.org>; asafp@nvidia.com; nd
> <nd@arm.com>
> Subject: Re: [dpdk-dev] [PATCH 3/3 v4] app/testpmd: support hardware offload
> to drop error packets
> 
> Hi Nipun,
> 
> Some nits. Looks good otherwise.
> 
> > On Oct 15, 2020, at 8:23 AM, Nipun.gupta@nxp.com <nipun.gupta@nxp.com>
> wrote:
> >
> > From: Nipun Gupta <nipun.gupta@nxp.com>
> >
> > With DEV_RX_OFFLOAD_ERR_PKT_DROP now defined as an offload
> > capability, and separate RTE_DEV_RX_ERR_PKT_DROP_OFFLOAD_ALL
> > capability to drop all error packets in hardware, testpmd
> > showcases this with a new added configuration option
> > 'enable-hw-drop-err-all'.
> >
> > Signed-off-by: Nipun Gupta <nipun.gupta@nxp.com>
> > ---
> > app/test-pmd/config.c                 | 35 +++++++++++++++++++++
> > app/test-pmd/parameters.c             |  7 +++++
> > app/test-pmd/testpmd.c                |  8 +++++
> > app/test-pmd/testpmd.h                |  1 +
> > doc/guides/nics/features.rst          | 44 +++++++++++++++++++++++++++
> > doc/guides/testpmd_app_ug/run_app.rst |  4 +++
> > 6 files changed, 99 insertions(+)
> >
> > diff --git a/app/test-pmd/config.c b/app/test-pmd/config.c
> > index e73dc66c8..14ef4e468 100644
> > --- a/app/test-pmd/config.c
> > +++ b/app/test-pmd/config.c
> > @@ -1027,6 +1027,41 @@ port_offload_cap_display(portid_t port_id)
> > 			printf("off\n");
> > 	}
> >
> > +	if (dev_info.rx_offload_capa & DEV_RX_OFFLOAD_ERR_PKT_DROP) {
> > +		if (dev_info.rx_err_drop_offload_capa &
> > +			RTE_DEV_RX_ERR_PKT_DROP_OFFLOAD_L1_FCS) {
> > +			printf("RX L1 FCS Error pkt drop:      ");
> > +			if (ports[port_id].dev_conf.err_pkt_drop_conf.l1_fcs)
> > +				printf("on\n");
> > +			else
> > +				printf("off\n");
> > +		}
> > +		if (dev_info.rx_err_drop_offload_capa &
> > +			RTE_DEV_RX_ERR_PKT_DROP_OFFLOAD_L3_CSUM) {
> > +			printf("RX L3 Csum Error pkt drop:     ");
> > +			if (ports[port_id].dev_conf.err_pkt_drop_conf.l3_csum)
> > +				printf("on\n");
> > +			else
> > +				printf("off\n");
> > +		}
> > +		if (dev_info.rx_err_drop_offload_capa &
> > +			RTE_DEV_RX_ERR_PKT_DROP_OFFLOAD_L4_CSUM) {
> > +			printf("RX L4 Csum Error pkt drop:     ");
> > +			if (ports[port_id].dev_conf.err_pkt_drop_conf.l4_csum)
> > +				printf("on\n");
> > +			else
> > +				printf("off\n");
> > +		}
> > +		if (dev_info.rx_err_drop_offload_capa &
> > +			RTE_DEV_RX_ERR_PKT_DROP_OFFLOAD_ALL) {
> > +			printf("RX all Error pkt drop:         ");
> > +			if (ports[port_id].dev_conf.err_pkt_drop_conf.all)
> > +				printf("on\n");
> > +			else
> > +				printf("off\n");
> > +		}
> > +	}
> > +
> > 	if (dev_info.tx_offload_capa & DEV_TX_OFFLOAD_VLAN_INSERT) {
> > 		printf("VLAN insert:                   ");
> > 		if (ports[port_id].dev_conf.txmode.offloads &
> > diff --git a/app/test-pmd/parameters.c b/app/test-pmd/parameters.c
> > index 1ead59579..508612426 100644
> > --- a/app/test-pmd/parameters.c
> > +++ b/app/test-pmd/parameters.c
> > @@ -142,6 +142,7 @@ usage(char* progname)
> > 	printf("  --enable-hw-vlan-strip: enable hardware vlan strip.\n");
> > 	printf("  --enable-hw-vlan-extend: enable hardware vlan extend.\n");
> > 	printf("  --enable-hw-qinq-strip: enable hardware qinq strip.\n");
> > +	printf("  --enable-hw-drop-err-all: enable hardware packet drop for all
> error packets.\n");
> > 	printf("  --enable-drop-en: enable per queue packet drop.\n");
> > 	printf("  --disable-rss: disable rss.\n");
> > 	printf("  --port-topology=<paired|chained|loop>: set port topology
> (paired "
> > @@ -631,6 +632,7 @@ launch_args_parse(int argc, char** argv)
> > 		{ "enable-hw-vlan-strip",       0, 0, 0 },
> > 		{ "enable-hw-vlan-extend",      0, 0, 0 },
> > 		{ "enable-hw-qinq-strip",       0, 0, 0 },
> > +		{ "enable-hw-drop-err-all",     0, 0, 0 },
> > 		{ "enable-drop-en",            0, 0, 0 },
> > 		{ "disable-rss",                0, 0, 0 },
> > 		{ "port-topology",              1, 0, 0 },
> > @@ -1283,6 +1285,11 @@ launch_args_parse(int argc, char** argv)
> > 				rmv_interrupt = 0;
> > 			if (!strcmp(lgopts[opt_idx].name, "flow-isolate-all"))
> > 				flow_isolate_all = 1;
> > +			if (!strcmp(lgopts[opt_idx].name,
> > +					"enable-hw-drop-err-all")) {
> > +				rx_err_pkt_drop_all = 1;
> > +			}
> 
> { } can be removed.

Agree.

> 
> > +
> > 			if (!strcmp(lgopts[opt_idx].name, "tx-offloads")) {
> > 				char *end = NULL;
> > 				n = strtoull(optarg, &end, 16);
> > diff --git a/app/test-pmd/testpmd.c b/app/test-pmd/testpmd.c
> > index ccba71c07..c9e7397e6 100644
> > --- a/app/test-pmd/testpmd.c
> > +++ b/app/test-pmd/testpmd.c
> > @@ -359,6 +359,11 @@ uint8_t lsc_interrupt = 1; /* enabled by default */
> >  */
> > uint8_t rmv_interrupt = 1; /* enabled by default */
> >
> > +/*
> > + * Drop all RX error packets on HW itself.
> > + */
> > +uint8_t rx_err_pkt_drop_all = 0; /* disabled by default */
> 
> = 0 can be removed.

This is on all the other default disabled parameters too probably to show that they
are disabled by default. So I would prefer to keep it like this.

> 
> > +
> > uint8_t hot_plug = 0; /**< hotplug disabled by default. */
> >
> > /* After attach, port setup is called on event or by iterator */
> > @@ -3359,6 +3364,9 @@ init_port_config(void)
> > 		    (rte_eth_devices[pid].data->dev_flags &
> > 		     RTE_ETH_DEV_INTR_RMV))
> > 			port->dev_conf.intr_conf.rmv = 1;
> > +
> > +		if (rx_err_pkt_drop_all)
> > +			port->dev_conf.err_pkt_drop_conf.all = 1;
> > 	}
> > }
> >
> > diff --git a/app/test-pmd/testpmd.h b/app/test-pmd/testpmd.h
> > index c7e7e41a9..eab154ed4 100644
> > --- a/app/test-pmd/testpmd.h
> > +++ b/app/test-pmd/testpmd.h
> > @@ -314,6 +314,7 @@ extern uint8_t no_device_start; /**<set by "--disable-
> device-start" parameter */
> > extern volatile int test_done; /* stop packet forwarding when set to 1. */
> > extern uint8_t lsc_interrupt; /**< disabled by "--no-lsc-interrupt" parameter */
> > extern uint8_t rmv_interrupt; /**< disabled by "--no-rmv-interrupt" parameter
> */
> > +extern uint8_t rx_err_pkt_drop_all; /**< enabled by "--enable-hw-drop-err-
> all" parameter */
> > extern uint32_t event_print_mask;
> > /**< set by "--print-event xxxx" and "--mask-event xxxx parameters */
> > extern bool setup_on_probe_event; /**< disabled by port setup-on iterator */
> > diff --git a/doc/guides/nics/features.rst b/doc/guides/nics/features.rst
> > index dd8c9555b..cb7fdfd8b 100644
> > --- a/doc/guides/nics/features.rst
> > +++ b/doc/guides/nics/features.rst
> > @@ -606,6 +606,50 @@ Supports inner packet L4 checksum.
> >
> ``tx_offload_capa,tx_queue_offload_capa:DEV_TX_OFFLOAD_OUTER_UDP_CK
> SUM``.
> >
> >
> > +.. _nic_features_l1_fcs_rx_error_packet_drop:
> > +
> > +L1 FCS Error Packet drop on Rx
> > +------------------------------
> > +
> > +Supports dropping of packets having L1 FCS error on Rx.
> > +
> > +* **[uses]     user config**: ``dev_conf.err_pkt_drop_conf.l1_fcs``.
> > +* **[provides] rte_eth_dev_info**:
> ``rx_err_drop_offload_capa:RTE_DEV_RX_ERR_PKT_DROP_OFFLOAD_L1_FCS``.
> > +
> > +
> > +.. _nic_features_l3_csum_rx_error_packet_drop:
> > +
> > +L3 checksum Error Packet drop on Rx
> > +-----------------------------------
> > +
> > +Supports dropping of packets having L3 Checksum error on Rx.
> > +
> > +* **[uses]     user config**: ``dev_conf.err_pkt_drop_conf.l3_csum``.
> > +* **[provides] rte_eth_dev_info**:
> ``rx_err_drop_offload_capa:RTE_DEV_RX_ERR_PKT_DROP_OFFLOAD_L3_CSUM
> ``.
> > +
> > +
> > +.. _nic_features_l4_csum_rx_error_packet_drop:
> > +
> > +L4 Checksum Error Packet drop on Rx
> > +-----------------------------------
> > +
> > +Supports dropping of packets having L1 FCS error on Rx.
> > +
> > +* **[uses]     user config**: ``dev_conf.err_pkt_drop_conf.l4_csum``.
> > +* **[provides] rte_eth_dev_info**:
> ``rx_err_drop_offload_capa:RTE_DEV_RX_ERR_PKT_DROP_OFFLOAD_L4_CSUM
> ``.
> > +
> > +
> > +.. _nic_features_all_rx_error_packet_drop:
> > +
> > +All/any Error Packet drop on Rx
> > +-------------------------------
> > +
> > +Supports dropping of packets having any of the errors like L1 FSC, L3/L4
> Checksum on Rx.
> 
> s/FSC/FCS

Will update in the next spin.

Thanks,
Nipun

> 
> > +
> > +* **[uses]     user config**: ``dev_conf.err_pkt_drop_conf.all``.
> > +* **[provides] rte_eth_dev_info**:
> ``rx_err_drop_offload_capa:RTE_DEV_RX_ERR_PKT_DROP_OFFLOAD_ALL``.
> > +
> > +
> > .. _nic_features_packet_type_parsing:
> >
> > Packet type parsing
> > diff --git a/doc/guides/testpmd_app_ug/run_app.rst
> b/doc/guides/testpmd_app_ug/run_app.rst
> > index e2539f693..20f2f8083 100644
> > --- a/doc/guides/testpmd_app_ug/run_app.rst
> > +++ b/doc/guides/testpmd_app_ug/run_app.rst
> > @@ -213,6 +213,10 @@ The command line options are:
> >
> >     Enable hardware QINQ strip.
> >
> > +*  ``--enable-hw-drop-err-all``
> > +
> > +    Enable hardware packet drop for any error packets
> > +
> > *   ``--enable-drop-en``
> >
> >     Enable per-queue packet drop for packets with no descriptors.
> > —
> > 2.17.1
> >
> 
> Reviewed-by: Dharmik Thakkar <dharmik.thakkar@arm.com>
>

Patch
diff mbox series

diff --git a/app/test-pmd/config.c b/app/test-pmd/config.c
index e73dc66c8..14ef4e468 100644
--- a/app/test-pmd/config.c
+++ b/app/test-pmd/config.c
@@ -1027,6 +1027,41 @@  port_offload_cap_display(portid_t port_id)
 			printf("off\n");
 	}
 
+	if (dev_info.rx_offload_capa & DEV_RX_OFFLOAD_ERR_PKT_DROP) {
+		if (dev_info.rx_err_drop_offload_capa &
+			RTE_DEV_RX_ERR_PKT_DROP_OFFLOAD_L1_FCS) {
+			printf("RX L1 FCS Error pkt drop:      ");
+			if (ports[port_id].dev_conf.err_pkt_drop_conf.l1_fcs)
+				printf("on\n");
+			else
+				printf("off\n");
+		}
+		if (dev_info.rx_err_drop_offload_capa &
+			RTE_DEV_RX_ERR_PKT_DROP_OFFLOAD_L3_CSUM) {
+			printf("RX L3 Csum Error pkt drop:     ");
+			if (ports[port_id].dev_conf.err_pkt_drop_conf.l3_csum)
+				printf("on\n");
+			else
+				printf("off\n");
+		}
+		if (dev_info.rx_err_drop_offload_capa &
+			RTE_DEV_RX_ERR_PKT_DROP_OFFLOAD_L4_CSUM) {
+			printf("RX L4 Csum Error pkt drop:     ");
+			if (ports[port_id].dev_conf.err_pkt_drop_conf.l4_csum)
+				printf("on\n");
+			else
+				printf("off\n");
+		}
+		if (dev_info.rx_err_drop_offload_capa &
+			RTE_DEV_RX_ERR_PKT_DROP_OFFLOAD_ALL) {
+			printf("RX all Error pkt drop:         ");
+			if (ports[port_id].dev_conf.err_pkt_drop_conf.all)
+				printf("on\n");
+			else
+				printf("off\n");
+		}
+	}
+
 	if (dev_info.tx_offload_capa & DEV_TX_OFFLOAD_VLAN_INSERT) {
 		printf("VLAN insert:                   ");
 		if (ports[port_id].dev_conf.txmode.offloads &
diff --git a/app/test-pmd/parameters.c b/app/test-pmd/parameters.c
index 1ead59579..508612426 100644
--- a/app/test-pmd/parameters.c
+++ b/app/test-pmd/parameters.c
@@ -142,6 +142,7 @@  usage(char* progname)
 	printf("  --enable-hw-vlan-strip: enable hardware vlan strip.\n");
 	printf("  --enable-hw-vlan-extend: enable hardware vlan extend.\n");
 	printf("  --enable-hw-qinq-strip: enable hardware qinq strip.\n");
+	printf("  --enable-hw-drop-err-all: enable hardware packet drop for all error packets.\n");
 	printf("  --enable-drop-en: enable per queue packet drop.\n");
 	printf("  --disable-rss: disable rss.\n");
 	printf("  --port-topology=<paired|chained|loop>: set port topology (paired "
@@ -631,6 +632,7 @@  launch_args_parse(int argc, char** argv)
 		{ "enable-hw-vlan-strip",       0, 0, 0 },
 		{ "enable-hw-vlan-extend",      0, 0, 0 },
 		{ "enable-hw-qinq-strip",       0, 0, 0 },
+		{ "enable-hw-drop-err-all",     0, 0, 0 },
 		{ "enable-drop-en",            0, 0, 0 },
 		{ "disable-rss",                0, 0, 0 },
 		{ "port-topology",              1, 0, 0 },
@@ -1283,6 +1285,11 @@  launch_args_parse(int argc, char** argv)
 				rmv_interrupt = 0;
 			if (!strcmp(lgopts[opt_idx].name, "flow-isolate-all"))
 				flow_isolate_all = 1;
+			if (!strcmp(lgopts[opt_idx].name,
+					"enable-hw-drop-err-all")) {
+				rx_err_pkt_drop_all = 1;
+			}
+
 			if (!strcmp(lgopts[opt_idx].name, "tx-offloads")) {
 				char *end = NULL;
 				n = strtoull(optarg, &end, 16);
diff --git a/app/test-pmd/testpmd.c b/app/test-pmd/testpmd.c
index ccba71c07..c9e7397e6 100644
--- a/app/test-pmd/testpmd.c
+++ b/app/test-pmd/testpmd.c
@@ -359,6 +359,11 @@  uint8_t lsc_interrupt = 1; /* enabled by default */
  */
 uint8_t rmv_interrupt = 1; /* enabled by default */
 
+/*
+ * Drop all RX error packets on HW itself.
+ */
+uint8_t rx_err_pkt_drop_all = 0; /* disabled by default */
+
 uint8_t hot_plug = 0; /**< hotplug disabled by default. */
 
 /* After attach, port setup is called on event or by iterator */
@@ -3359,6 +3364,9 @@  init_port_config(void)
 		    (rte_eth_devices[pid].data->dev_flags &
 		     RTE_ETH_DEV_INTR_RMV))
 			port->dev_conf.intr_conf.rmv = 1;
+
+		if (rx_err_pkt_drop_all)
+			port->dev_conf.err_pkt_drop_conf.all = 1;
 	}
 }
 
diff --git a/app/test-pmd/testpmd.h b/app/test-pmd/testpmd.h
index c7e7e41a9..eab154ed4 100644
--- a/app/test-pmd/testpmd.h
+++ b/app/test-pmd/testpmd.h
@@ -314,6 +314,7 @@  extern uint8_t no_device_start; /**<set by "--disable-device-start" parameter */
 extern volatile int test_done; /* stop packet forwarding when set to 1. */
 extern uint8_t lsc_interrupt; /**< disabled by "--no-lsc-interrupt" parameter */
 extern uint8_t rmv_interrupt; /**< disabled by "--no-rmv-interrupt" parameter */
+extern uint8_t rx_err_pkt_drop_all; /**< enabled by "--enable-hw-drop-err-all" parameter */
 extern uint32_t event_print_mask;
 /**< set by "--print-event xxxx" and "--mask-event xxxx parameters */
 extern bool setup_on_probe_event; /**< disabled by port setup-on iterator */
diff --git a/doc/guides/nics/features.rst b/doc/guides/nics/features.rst
index dd8c9555b..cb7fdfd8b 100644
--- a/doc/guides/nics/features.rst
+++ b/doc/guides/nics/features.rst
@@ -606,6 +606,50 @@  Supports inner packet L4 checksum.
   ``tx_offload_capa,tx_queue_offload_capa:DEV_TX_OFFLOAD_OUTER_UDP_CKSUM``.
 
 
+.. _nic_features_l1_fcs_rx_error_packet_drop:
+
+L1 FCS Error Packet drop on Rx
+------------------------------
+
+Supports dropping of packets having L1 FCS error on Rx.
+
+* **[uses]     user config**: ``dev_conf.err_pkt_drop_conf.l1_fcs``.
+* **[provides] rte_eth_dev_info**: ``rx_err_drop_offload_capa:RTE_DEV_RX_ERR_PKT_DROP_OFFLOAD_L1_FCS``.
+
+
+.. _nic_features_l3_csum_rx_error_packet_drop:
+
+L3 checksum Error Packet drop on Rx
+-----------------------------------
+
+Supports dropping of packets having L3 Checksum error on Rx.
+
+* **[uses]     user config**: ``dev_conf.err_pkt_drop_conf.l3_csum``.
+* **[provides] rte_eth_dev_info**: ``rx_err_drop_offload_capa:RTE_DEV_RX_ERR_PKT_DROP_OFFLOAD_L3_CSUM``.
+
+
+.. _nic_features_l4_csum_rx_error_packet_drop:
+
+L4 Checksum Error Packet drop on Rx
+-----------------------------------
+
+Supports dropping of packets having L1 FCS error on Rx.
+
+* **[uses]     user config**: ``dev_conf.err_pkt_drop_conf.l4_csum``.
+* **[provides] rte_eth_dev_info**: ``rx_err_drop_offload_capa:RTE_DEV_RX_ERR_PKT_DROP_OFFLOAD_L4_CSUM``.
+
+
+.. _nic_features_all_rx_error_packet_drop:
+
+All/any Error Packet drop on Rx
+-------------------------------
+
+Supports dropping of packets having any of the errors like L1 FSC, L3/L4 Checksum on Rx.
+
+* **[uses]     user config**: ``dev_conf.err_pkt_drop_conf.all``.
+* **[provides] rte_eth_dev_info**: ``rx_err_drop_offload_capa:RTE_DEV_RX_ERR_PKT_DROP_OFFLOAD_ALL``.
+
+
 .. _nic_features_packet_type_parsing:
 
 Packet type parsing
diff --git a/doc/guides/testpmd_app_ug/run_app.rst b/doc/guides/testpmd_app_ug/run_app.rst
index e2539f693..20f2f8083 100644
--- a/doc/guides/testpmd_app_ug/run_app.rst
+++ b/doc/guides/testpmd_app_ug/run_app.rst
@@ -213,6 +213,10 @@  The command line options are:
 
     Enable hardware QINQ strip.
 
+*  ``--enable-hw-drop-err-all``
+
+    Enable hardware packet drop for any error packets
+
 *   ``--enable-drop-en``
 
     Enable per-queue packet drop for packets with no descriptors.