diff mbox series

[v5,2/3] app/testpmd: support metadata as flow rule item

Message ID 1539777829-64412-3-git-send-email-dekelp@mellanox.com (mailing list archive)
State Superseded, archived
Delegated to: Ferruh Yigit
Headers
Series support meadata as flow rule criteria |

Checks

Context Check Description
ci/Intel-compilation success Compilation OK
ci/checkpatch success coding style OK

Commit Message

Dekel Peled Oct. 17, 2018, 12:03 p.m. UTC 
  As described in [1], this series adds option to set metadata value
as match pattern when creating a new flow rule.

This patch introduces additional options in testpmd commands.
New item type "meta" "data", new offload flag "match_metadata".

[1] "ethdev: support metadata as flow rule criteria"

Signed-off-by: Dekel Peled <dekelp@mellanox.com>
---
 app/test-pmd/cmdline.c                      | 10 +++++-----
 app/test-pmd/cmdline_flow.c                 | 25 +++++++++++++++++++++++++
 app/test-pmd/testpmd.c                      |  4 ++++
 doc/guides/testpmd_app_ug/testpmd_funcs.rst |  6 +++++-
 4 files changed, 39 insertions(+), 6 deletions(-)

Comments

Ori Kam Oct. 18, 2018, 12:26 p.m. UTC | #1 
> -----Original Message-----
> From: dev <dev-bounces@dpdk.org> On Behalf Of Dekel Peled
> Sent: Wednesday, October 17, 2018 3:04 PM
> To: wenzhuo.lu@intel.com; jingjing.wu@intel.com;
> bernard.iremonger@intel.com; olivier.matz@6wind.com; Adrien Mazarguil
> <adrien.mazarguil@6wind.com>; Thomas Monjalon <thomas@monjalon.net>;
> ferruh.yigit@intel.com; arybchenko@solarflare.com
> Cc: Shahaf Shuler <shahafs@mellanox.com>; dev@dpdk.org; Ori Kam
> <orika@mellanox.com>
> Subject: [dpdk-dev] [PATCH v5 2/3] app/testpmd: support metadata as flow rule
> item
> 
> As described in [1], this series adds option to set metadata value
> as match pattern when creating a new flow rule.
> 
> This patch introduces additional options in testpmd commands.
> New item type "meta" "data", new offload flag "match_metadata".
> 
> [1] "ethdev: support metadata as flow rule criteria"
> 
> Signed-off-by: Dekel Peled <dekelp@mellanox.com>
> ---
>  app/test-pmd/cmdline.c                      | 10 +++++-----
>  app/test-pmd/cmdline_flow.c                 | 25 +++++++++++++++++++++++++
>  app/test-pmd/testpmd.c                      |  4 ++++
>  doc/guides/testpmd_app_ug/testpmd_funcs.rst |  6 +++++-
>  4 files changed, 39 insertions(+), 6 deletions(-)
> 
> diff --git a/app/test-pmd/cmdline.c b/app/test-pmd/cmdline.c
> index 6e14345..28bbd80 100644
> --- a/app/test-pmd/cmdline.c
> +++ b/app/test-pmd/cmdline.c
> @@ -18124,7 +18124,8 @@ struct cmd_config_per_port_tx_offload_result {
>  			  "sctp_cksum#tcp_tso#udp_tso#outer_ipv4_cksum#"
>  			  "qinq_insert#vxlan_tnl_tso#gre_tnl_tso#"
>  			  "ipip_tnl_tso#geneve_tnl_tso#macsec_insert#"
> -			  "mt_lockfree#multi_segs#mbuf_fast_free#security");
> +			  "mt_lockfree#multi_segs#mbuf_fast_free#security#"
> +			  "match_metadata");
>  cmdline_parse_token_string_t cmd_config_per_port_tx_offload_result_on_off
> =
>  	TOKEN_STRING_INITIALIZER
>  		(struct cmd_config_per_port_tx_offload_result,
> @@ -18205,8 +18206,8 @@ struct cmd_config_per_port_tx_offload_result {
>  		    "sctp_cksum|tcp_tso|udp_tso|outer_ipv4_cksum|"
>  		    "qinq_insert|vxlan_tnl_tso|gre_tnl_tso|"
>  		    "ipip_tnl_tso|geneve_tnl_tso|macsec_insert|"
> -		    "mt_lockfree|multi_segs|mbuf_fast_free|security "
> -		    "on|off",
> +		    "mt_lockfree|multi_segs|mbuf_fast_free|security|"
> +		    "match_metadata on|off",
>  	.tokens = {
>  		(void *)&cmd_config_per_port_tx_offload_result_port,
>  		(void *)&cmd_config_per_port_tx_offload_result_config,
> @@ -18309,8 +18310,7 @@ struct cmd_config_per_queue_tx_offload_result {
>  		    "sctp_cksum|tcp_tso|udp_tso|outer_ipv4_cksum|"
>  		    "qinq_insert|vxlan_tnl_tso|gre_tnl_tso|"
>  		    "ipip_tnl_tso|geneve_tnl_tso|macsec_insert|"
> -		    "mt_lockfree|multi_segs|mbuf_fast_free|security "
> -		    "on|off",
> +		    "mt_lockfree|multi_segs|mbuf_fast_free|security on|off",

Is this relevant for your patch?

>  	.tokens = {
>  		(void *)&cmd_config_per_queue_tx_offload_result_port,
>  		(void *)&cmd_config_per_queue_tx_offload_result_port_id,
> diff --git a/app/test-pmd/cmdline_flow.c b/app/test-pmd/cmdline_flow.c
> index 1c72ad9..7ee9b7c 100644
> --- a/app/test-pmd/cmdline_flow.c
> +++ b/app/test-pmd/cmdline_flow.c
> @@ -178,6 +178,8 @@ enum index {
>  	ITEM_ICMP6_ND_OPT_SLA_ETH_SLA,
>  	ITEM_ICMP6_ND_OPT_TLA_ETH,
>  	ITEM_ICMP6_ND_OPT_TLA_ETH_TLA,
> +	ITEM_META,
> +	ITEM_META_DATA,
> 
>  	/* Validate/create actions. */
>  	ACTIONS,
> @@ -599,6 +601,7 @@ struct parse_action_priv {
>  	ITEM_ICMP6_ND_OPT,
>  	ITEM_ICMP6_ND_OPT_SLA_ETH,
>  	ITEM_ICMP6_ND_OPT_TLA_ETH,
> +	ITEM_META,
>  	ZERO,
>  };
> 
> @@ -819,6 +822,12 @@ struct parse_action_priv {
>  	ZERO,
>  };
> 
> +static const enum index item_meta[] = {
> +	ITEM_META_DATA,
> +	ITEM_NEXT,
> +	ZERO,
> +};
> +
>  static const enum index next_action[] = {
>  	ACTION_END,
>  	ACTION_VOID,
> @@ -2087,6 +2096,22 @@ static int comp_vc_action_rss_queue(struct context
> *, const struct token *,
>  		.args = ARGS(ARGS_ENTRY_HTON
>  			     (struct rte_flow_item_icmp6_nd_opt_tla_eth, tla)),
>  	},
> +	[ITEM_META] = {
> +		.name = "meta",
> +		.help = "match metadata header",
> +		.priv = PRIV_ITEM(META, sizeof(struct rte_flow_item_meta)),
> +		.next = NEXT(item_meta),
> +		.call = parse_vc,
> +	},
> +	[ITEM_META_DATA] = {
> +		.name = "data",
> +		.help = "metadata value",
> +		.next = NEXT(item_meta, NEXT_ENTRY(UNSIGNED),
> item_param),

Do you support all the options? (mask, last ...)

> +		.args = ARGS(ARGS_ENTRY_MASK_HTON(struct

This means that the value is in network byte order.

> rte_flow_item_meta,
> +							data,
> +							"\xff\xff\xff\xff"
> +							"\xff\xff\xff\xff")),
> +	},
> 
>  	/* Validate/create actions. */
>  	[ACTIONS] = {
> diff --git a/app/test-pmd/testpmd.c b/app/test-pmd/testpmd.c
> index d550bda..75e960a 100644
> --- a/app/test-pmd/testpmd.c
> +++ b/app/test-pmd/testpmd.c
> @@ -1060,6 +1060,10 @@ struct extmem_param {
>  		      DEV_TX_OFFLOAD_MBUF_FAST_FREE))
>  			port->dev_conf.txmode.offloads &=
>  				~DEV_TX_OFFLOAD_MBUF_FAST_FREE;
> +		if (!(port->dev_info.tx_offload_capa &
> +			DEV_TX_OFFLOAD_MATCH_METADATA))
> +			port->dev_conf.txmode.offloads &=
> +				~DEV_TX_OFFLOAD_MATCH_METADATA;
>  		if (numa_support) {
>  			if (port_numa[pid] != NUMA_NO_CONFIG)
>  				port_per_socket[port_numa[pid]]++;
> diff --git a/doc/guides/testpmd_app_ug/testpmd_funcs.rst
> b/doc/guides/testpmd_app_ug/testpmd_funcs.rst
> index 8d60bf0..c97f26b 100644
> --- a/doc/guides/testpmd_app_ug/testpmd_funcs.rst
> +++ b/doc/guides/testpmd_app_ug/testpmd_funcs.rst
> @@ -3671,11 +3671,15 @@ This section lists supported pattern items and their
> attributes, if any.
> 
>    - ``sla {MAC-48}``: source Ethernet LLA.
> 
> -- ``icmp6_nd_opt_sla_eth``: match ICMPv6 neighbor discovery target Ethernet
> +- ``icmp6_nd_opt_tla_eth``: match ICMPv6 neighbor discovery target Ethernet
>    link-layer address option.

Is this relevant to your patch?

> 
>    - ``tla {MAC-48}``: target Ethernet LLA.
> 
> +- ``meta``: match application specific metadata.
> +
> +  - ``data``: metadata value.

Should show what value to add.
Also missing the documentations for enabling the offload.

> +
>  Actions list
>  ^^^^^^^^^^^^
> 
> --
> 1.8.3.1
Thanks,
Ori
Dekel Peled Oct. 21, 2018, 1:49 p.m. UTC | #2 
Thanks, PSB.

> -----Original Message-----
> From: Ori Kam
> Sent: Thursday, October 18, 2018 3:26 PM
> To: Dekel Peled <dekelp@mellanox.com>; wenzhuo.lu@intel.com;
> jingjing.wu@intel.com; bernard.iremonger@intel.com;
> olivier.matz@6wind.com; Adrien Mazarguil <adrien.mazarguil@6wind.com>;
> Thomas Monjalon <thomas@monjalon.net>; ferruh.yigit@intel.com;
> arybchenko@solarflare.com
> Cc: Shahaf Shuler <shahafs@mellanox.com>; dev@dpdk.org
> Subject: RE: [dpdk-dev] [PATCH v5 2/3] app/testpmd: support metadata as
> flow rule item
> 
> 
> 
> > -----Original Message-----
> > From: dev <dev-bounces@dpdk.org> On Behalf Of Dekel Peled
> > Sent: Wednesday, October 17, 2018 3:04 PM
> > To: wenzhuo.lu@intel.com; jingjing.wu@intel.com;
> > bernard.iremonger@intel.com; olivier.matz@6wind.com; Adrien Mazarguil
> > <adrien.mazarguil@6wind.com>; Thomas Monjalon
> <thomas@monjalon.net>;
> > ferruh.yigit@intel.com; arybchenko@solarflare.com
> > Cc: Shahaf Shuler <shahafs@mellanox.com>; dev@dpdk.org; Ori Kam
> > <orika@mellanox.com>
> > Subject: [dpdk-dev] [PATCH v5 2/3] app/testpmd: support metadata as
> > flow rule item
> >
> > As described in [1], this series adds option to set metadata value as
> > match pattern when creating a new flow rule.
> >
> > This patch introduces additional options in testpmd commands.
> > New item type "meta" "data", new offload flag "match_metadata".
> >
> > [1] "ethdev: support metadata as flow rule criteria"
> >
> > Signed-off-by: Dekel Peled <dekelp@mellanox.com>
> > ---
> >  app/test-pmd/cmdline.c                      | 10 +++++-----
> >  app/test-pmd/cmdline_flow.c                 | 25 +++++++++++++++++++++++++
> >  app/test-pmd/testpmd.c                      |  4 ++++
> >  doc/guides/testpmd_app_ug/testpmd_funcs.rst |  6 +++++-
> >  4 files changed, 39 insertions(+), 6 deletions(-)
> >
> > diff --git a/app/test-pmd/cmdline.c b/app/test-pmd/cmdline.c index
> > 6e14345..28bbd80 100644
> > --- a/app/test-pmd/cmdline.c
> > +++ b/app/test-pmd/cmdline.c
> > @@ -18124,7 +18124,8 @@ struct
> cmd_config_per_port_tx_offload_result {
> >
> "sctp_cksum#tcp_tso#udp_tso#outer_ipv4_cksum#"
> >  			  "qinq_insert#vxlan_tnl_tso#gre_tnl_tso#"
> >  			  "ipip_tnl_tso#geneve_tnl_tso#macsec_insert#"
> > -
> "mt_lockfree#multi_segs#mbuf_fast_free#security");
> > +
> "mt_lockfree#multi_segs#mbuf_fast_free#security#"
> > +			  "match_metadata");
> >  cmdline_parse_token_string_t
> > cmd_config_per_port_tx_offload_result_on_off
> > =
> >  	TOKEN_STRING_INITIALIZER
> >  		(struct cmd_config_per_port_tx_offload_result,
> > @@ -18205,8 +18206,8 @@ struct
> cmd_config_per_port_tx_offload_result {
> >  		    "sctp_cksum|tcp_tso|udp_tso|outer_ipv4_cksum|"
> >  		    "qinq_insert|vxlan_tnl_tso|gre_tnl_tso|"
> >  		    "ipip_tnl_tso|geneve_tnl_tso|macsec_insert|"
> > -		    "mt_lockfree|multi_segs|mbuf_fast_free|security "
> > -		    "on|off",
> > +		    "mt_lockfree|multi_segs|mbuf_fast_free|security|"
> > +		    "match_metadata on|off",
> >  	.tokens = {
> >  		(void *)&cmd_config_per_port_tx_offload_result_port,
> >  		(void *)&cmd_config_per_port_tx_offload_result_config,
> > @@ -18309,8 +18310,7 @@ struct
> cmd_config_per_queue_tx_offload_result {
> >  		    "sctp_cksum|tcp_tso|udp_tso|outer_ipv4_cksum|"
> >  		    "qinq_insert|vxlan_tnl_tso|gre_tnl_tso|"
> >  		    "ipip_tnl_tso|geneve_tnl_tso|macsec_insert|"
> > -		    "mt_lockfree|multi_segs|mbuf_fast_free|security "
> > -		    "on|off",
> > +		    "mt_lockfree|multi_segs|mbuf_fast_free|security
> on|off",
> 
> Is this relevant for your patch?

Removed.

> 
> >  	.tokens = {
> >  		(void *)&cmd_config_per_queue_tx_offload_result_port,
> >  		(void *)&cmd_config_per_queue_tx_offload_result_port_id,
> > diff --git a/app/test-pmd/cmdline_flow.c b/app/test-pmd/cmdline_flow.c
> > index 1c72ad9..7ee9b7c 100644
> > --- a/app/test-pmd/cmdline_flow.c
> > +++ b/app/test-pmd/cmdline_flow.c
> > @@ -178,6 +178,8 @@ enum index {
> >  	ITEM_ICMP6_ND_OPT_SLA_ETH_SLA,
> >  	ITEM_ICMP6_ND_OPT_TLA_ETH,
> >  	ITEM_ICMP6_ND_OPT_TLA_ETH_TLA,
> > +	ITEM_META,
> > +	ITEM_META_DATA,
> >
> >  	/* Validate/create actions. */
> >  	ACTIONS,
> > @@ -599,6 +601,7 @@ struct parse_action_priv {
> >  	ITEM_ICMP6_ND_OPT,
> >  	ITEM_ICMP6_ND_OPT_SLA_ETH,
> >  	ITEM_ICMP6_ND_OPT_TLA_ETH,
> > +	ITEM_META,
> >  	ZERO,
> >  };
> >
> > @@ -819,6 +822,12 @@ struct parse_action_priv {
> >  	ZERO,
> >  };
> >
> > +static const enum index item_meta[] = {
> > +	ITEM_META_DATA,
> > +	ITEM_NEXT,
> > +	ZERO,
> > +};
> > +
> >  static const enum index next_action[] = {
> >  	ACTION_END,
> >  	ACTION_VOID,
> > @@ -2087,6 +2096,22 @@ static int comp_vc_action_rss_queue(struct
> > context *, const struct token *,
> >  		.args = ARGS(ARGS_ENTRY_HTON
> >  			     (struct rte_flow_item_icmp6_nd_opt_tla_eth,
> tla)),
> >  	},
> > +	[ITEM_META] = {
> > +		.name = "meta",
> > +		.help = "match metadata header",
> > +		.priv = PRIV_ITEM(META, sizeof(struct
> rte_flow_item_meta)),
> > +		.next = NEXT(item_meta),
> > +		.call = parse_vc,
> > +	},
> > +	[ITEM_META_DATA] = {
> > +		.name = "data",
> > +		.help = "metadata value",
> > +		.next = NEXT(item_meta, NEXT_ENTRY(UNSIGNED),
> > item_param),
> 
> Do you support all the options? (mask, last ...)

Changed to provide 'is' option only.

> 
> > +		.args = ARGS(ARGS_ENTRY_MASK_HTON(struct
> 
> This means that the value is in network byte order.

Yes, will note in variables type.

> 
> > rte_flow_item_meta,
> > +							data,
> > +							"\xff\xff\xff\xff"
> > +							"\xff\xff\xff\xff")),
> > +	},
> >
> >  	/* Validate/create actions. */
> >  	[ACTIONS] = {
> > diff --git a/app/test-pmd/testpmd.c b/app/test-pmd/testpmd.c index
> > d550bda..75e960a 100644
> > --- a/app/test-pmd/testpmd.c
> > +++ b/app/test-pmd/testpmd.c
> > @@ -1060,6 +1060,10 @@ struct extmem_param {
> >  		      DEV_TX_OFFLOAD_MBUF_FAST_FREE))
> >  			port->dev_conf.txmode.offloads &=
> >  				~DEV_TX_OFFLOAD_MBUF_FAST_FREE;
> > +		if (!(port->dev_info.tx_offload_capa &
> > +			DEV_TX_OFFLOAD_MATCH_METADATA))
> > +			port->dev_conf.txmode.offloads &=
> > +				~DEV_TX_OFFLOAD_MATCH_METADATA;
> >  		if (numa_support) {
> >  			if (port_numa[pid] != NUMA_NO_CONFIG)
> >  				port_per_socket[port_numa[pid]]++;
> > diff --git a/doc/guides/testpmd_app_ug/testpmd_funcs.rst
> > b/doc/guides/testpmd_app_ug/testpmd_funcs.rst
> > index 8d60bf0..c97f26b 100644
> > --- a/doc/guides/testpmd_app_ug/testpmd_funcs.rst
> > +++ b/doc/guides/testpmd_app_ug/testpmd_funcs.rst
> > @@ -3671,11 +3671,15 @@ This section lists supported pattern items and
> > their attributes, if any.
> >
> >    - ``sla {MAC-48}``: source Ethernet LLA.
> >
> > -- ``icmp6_nd_opt_sla_eth``: match ICMPv6 neighbor discovery target
> > Ethernet
> > +- ``icmp6_nd_opt_tla_eth``: match ICMPv6 neighbor discovery target
> > +Ethernet
> >    link-layer address option.
> 
> Is this relevant to your patch?

Removed.

> 
> >
> >    - ``tla {MAC-48}``: target Ethernet LLA.
> >
> > +- ``meta``: match application specific metadata.
> > +
> > +  - ``data``: metadata value.
> 
> Should show what value to add.
> Also missing the documentations for enabling the offload.

Added.

> 
> > +
> >  Actions list
> >  ^^^^^^^^^^^^
> >
> > --
> > 1.8.3.1
> Thanks,
> Ori
diff mbox series

Patch

diff --git a/app/test-pmd/cmdline.c b/app/test-pmd/cmdline.c
index 6e14345..28bbd80 100644
--- a/app/test-pmd/cmdline.c
+++ b/app/test-pmd/cmdline.c
@@ -18124,7 +18124,8 @@  struct cmd_config_per_port_tx_offload_result {
 			  "sctp_cksum#tcp_tso#udp_tso#outer_ipv4_cksum#"
 			  "qinq_insert#vxlan_tnl_tso#gre_tnl_tso#"
 			  "ipip_tnl_tso#geneve_tnl_tso#macsec_insert#"
-			  "mt_lockfree#multi_segs#mbuf_fast_free#security");
+			  "mt_lockfree#multi_segs#mbuf_fast_free#security#"
+			  "match_metadata");
 cmdline_parse_token_string_t cmd_config_per_port_tx_offload_result_on_off =
 	TOKEN_STRING_INITIALIZER
 		(struct cmd_config_per_port_tx_offload_result,
@@ -18205,8 +18206,8 @@  struct cmd_config_per_port_tx_offload_result {
 		    "sctp_cksum|tcp_tso|udp_tso|outer_ipv4_cksum|"
 		    "qinq_insert|vxlan_tnl_tso|gre_tnl_tso|"
 		    "ipip_tnl_tso|geneve_tnl_tso|macsec_insert|"
-		    "mt_lockfree|multi_segs|mbuf_fast_free|security "
-		    "on|off",
+		    "mt_lockfree|multi_segs|mbuf_fast_free|security|"
+		    "match_metadata on|off",
 	.tokens = {
 		(void *)&cmd_config_per_port_tx_offload_result_port,
 		(void *)&cmd_config_per_port_tx_offload_result_config,
@@ -18309,8 +18310,7 @@  struct cmd_config_per_queue_tx_offload_result {
 		    "sctp_cksum|tcp_tso|udp_tso|outer_ipv4_cksum|"
 		    "qinq_insert|vxlan_tnl_tso|gre_tnl_tso|"
 		    "ipip_tnl_tso|geneve_tnl_tso|macsec_insert|"
-		    "mt_lockfree|multi_segs|mbuf_fast_free|security "
-		    "on|off",
+		    "mt_lockfree|multi_segs|mbuf_fast_free|security on|off",
 	.tokens = {
 		(void *)&cmd_config_per_queue_tx_offload_result_port,
 		(void *)&cmd_config_per_queue_tx_offload_result_port_id,
diff --git a/app/test-pmd/cmdline_flow.c b/app/test-pmd/cmdline_flow.c
index 1c72ad9..7ee9b7c 100644
--- a/app/test-pmd/cmdline_flow.c
+++ b/app/test-pmd/cmdline_flow.c
@@ -178,6 +178,8 @@  enum index {
 	ITEM_ICMP6_ND_OPT_SLA_ETH_SLA,
 	ITEM_ICMP6_ND_OPT_TLA_ETH,
 	ITEM_ICMP6_ND_OPT_TLA_ETH_TLA,
+	ITEM_META,
+	ITEM_META_DATA,
 
 	/* Validate/create actions. */
 	ACTIONS,
@@ -599,6 +601,7 @@  struct parse_action_priv {
 	ITEM_ICMP6_ND_OPT,
 	ITEM_ICMP6_ND_OPT_SLA_ETH,
 	ITEM_ICMP6_ND_OPT_TLA_ETH,
+	ITEM_META,
 	ZERO,
 };
 
@@ -819,6 +822,12 @@  struct parse_action_priv {
 	ZERO,
 };
 
+static const enum index item_meta[] = {
+	ITEM_META_DATA,
+	ITEM_NEXT,
+	ZERO,
+};
+
 static const enum index next_action[] = {
 	ACTION_END,
 	ACTION_VOID,
@@ -2087,6 +2096,22 @@  static int comp_vc_action_rss_queue(struct context *, const struct token *,
 		.args = ARGS(ARGS_ENTRY_HTON
 			     (struct rte_flow_item_icmp6_nd_opt_tla_eth, tla)),
 	},
+	[ITEM_META] = {
+		.name = "meta",
+		.help = "match metadata header",
+		.priv = PRIV_ITEM(META, sizeof(struct rte_flow_item_meta)),
+		.next = NEXT(item_meta),
+		.call = parse_vc,
+	},
+	[ITEM_META_DATA] = {
+		.name = "data",
+		.help = "metadata value",
+		.next = NEXT(item_meta, NEXT_ENTRY(UNSIGNED), item_param),
+		.args = ARGS(ARGS_ENTRY_MASK_HTON(struct rte_flow_item_meta,
+							data,
+							"\xff\xff\xff\xff"
+							"\xff\xff\xff\xff")),
+	},
 
 	/* Validate/create actions. */
 	[ACTIONS] = {
diff --git a/app/test-pmd/testpmd.c b/app/test-pmd/testpmd.c
index d550bda..75e960a 100644
--- a/app/test-pmd/testpmd.c
+++ b/app/test-pmd/testpmd.c
@@ -1060,6 +1060,10 @@  struct extmem_param {
 		      DEV_TX_OFFLOAD_MBUF_FAST_FREE))
 			port->dev_conf.txmode.offloads &=
 				~DEV_TX_OFFLOAD_MBUF_FAST_FREE;
+		if (!(port->dev_info.tx_offload_capa &
+			DEV_TX_OFFLOAD_MATCH_METADATA))
+			port->dev_conf.txmode.offloads &=
+				~DEV_TX_OFFLOAD_MATCH_METADATA;
 		if (numa_support) {
 			if (port_numa[pid] != NUMA_NO_CONFIG)
 				port_per_socket[port_numa[pid]]++;
diff --git a/doc/guides/testpmd_app_ug/testpmd_funcs.rst b/doc/guides/testpmd_app_ug/testpmd_funcs.rst
index 8d60bf0..c97f26b 100644
--- a/doc/guides/testpmd_app_ug/testpmd_funcs.rst
+++ b/doc/guides/testpmd_app_ug/testpmd_funcs.rst
@@ -3671,11 +3671,15 @@  This section lists supported pattern items and their attributes, if any.
 
   - ``sla {MAC-48}``: source Ethernet LLA.
 
-- ``icmp6_nd_opt_sla_eth``: match ICMPv6 neighbor discovery target Ethernet
+- ``icmp6_nd_opt_tla_eth``: match ICMPv6 neighbor discovery target Ethernet
   link-layer address option.
 
   - ``tla {MAC-48}``: target Ethernet LLA.
 
+- ``meta``: match application specific metadata.
+
+  - ``data``: metadata value.
+
 Actions list
 ^^^^^^^^^^^^