Skip to contentSkip to conversation

ethdev: add PFCP header to flow API

dpdk-dev Applied Xiao Zhang 3 participants 6 messages Feb 20, 2020 – Mar 10, 2020

lore
Share & tools
lore

Xiao Zhang

author
#0 lore raw

This patch adds the new flow item RTE_FLOW_ITEM_TYPE_PFCP to flow API to match a PFCP header.
Add sample PFCP rules for testpmd guide. Since Session Endpoint Identifier (SEID) only will be present in PFCP Session header and PFCP Session headers shall be identified when the S field is equal to 1, when create rules for PFCP Session header with certain SEID the S field need be set 1.

---
 app/test-pmd/cmdline_flow.c                 | 37 +++++++++++++++++++++++++++++
 doc/guides/prog_guide/rte_flow.rst          | 11 +++++++++
 doc/guides/testpmd_app_ug/testpmd_funcs.rst | 20 ++++++++++++++++
 lib/librte_ethdev/rte_flow.c                |  1 +
 lib/librte_ethdev/rte_flow.h                | 31 ++++++++++++++++++++++++
 5 files changed, 100 insertions(+)
app/test-pmd/cmdline_flow.c +37 -0
index c2cc4c5..0b735cd 100644
@@ -220,6 +220,9 @@ enum index {
 	ITEM_L2TPV3OIP_SESSION_ID,
 	ITEM_ESP,
 	ITEM_ESP_SPI,
+	ITEM_PFCP,
+	ITEM_PFCP_S_FIELD,
+	ITEM_PFCP_SEID,
 
 	/* Validate/create actions. */
 	ACTIONS,
@@ -768,6 +771,7 @@ static const enum index next_item[] = {
 	ITEM_TAG,
 	ITEM_L2TPV3OIP,
 	ITEM_ESP,
+	ITEM_PFCP,
 	END_SET,
 	ZERO,
 };
@@ -1046,6 +1050,13 @@ static const enum index item_esp[] = {
 	ZERO,
 };
 
+static const enum index item_pfcp[] = {
+	ITEM_PFCP_S_FIELD,
+	ITEM_PFCP_SEID,
+	ITEM_NEXT,
+	ZERO,
+};
+
 static const enum index next_set_raw[] = {
 	SET_RAW_INDEX,
 	ITEM_ETH,
@@ -2699,6 +2710,26 @@ static const struct token token_list[] = {
 		.args = ARGS(ARGS_ENTRY_HTON(struct rte_flow_item_esp,
 				hdr.spi)),
 	},
+	[ITEM_PFCP] = {
+		.name = "pfcp",
+		.help = "match pfcp header",
+		.priv = PRIV_ITEM(PFCP, sizeof(struct rte_flow_item_pfcp)),
+		.next = NEXT(item_pfcp),
+		.call = parse_vc,
+	},
+	[ITEM_PFCP_S_FIELD] = {
+		.name = "s_field",
+		.help = "S field",
+		.next = NEXT(item_pfcp, NEXT_ENTRY(UNSIGNED), item_param),
+		.args = ARGS(ARGS_ENTRY_HTON(struct rte_flow_item_pfcp,
+				s_field)),
+	},
+	[ITEM_PFCP_SEID] = {
+		.name = "seid",
+		.help = "session endpoint identifier",
+		.next = NEXT(item_pfcp, NEXT_ENTRY(UNSIGNED), item_param),
+		.args = ARGS(ARGS_ENTRY_HTON(struct rte_flow_item_pfcp, seid)),
+	},
 	/* Validate/create actions. */
 	[ACTIONS] = {
 		.name = "actions",
@@ -6444,6 +6475,9 @@ flow_item_default_mask(const struct rte_flow_item *item)
 	case RTE_FLOW_ITEM_TYPE_ESP:
 		mask = &rte_flow_item_esp_mask;
 		break;
+	case RTE_FLOW_ITEM_TYPE_PFCP:
+		mask = &rte_flow_item_pfcp_mask;
+		break;
 	default:
 		break;
 	}
@@ -6541,6 +6575,9 @@ cmd_set_raw_parsed(const struct buffer *in)
 			size = sizeof(struct rte_flow_item_esp);
 			proto = 0x32;
 			break;
+		case RTE_FLOW_ITEM_TYPE_PFCP:
+			size = sizeof(struct rte_flow_item_pfcp);
+			break;
 		default:
 			printf("Error - Not supported item\n");
 			*total_size = 0;
doc/guides/prog_guide/rte_flow.rst +11 -0
index 371819e..2851cee 100644
@@ -1344,6 +1344,17 @@ Matches a L2TPv3 over IP header.
 - ``session_id``: L2TPv3 over IP session identifier.
 - Default ``mask`` matches session_id only.
 
+Item: ``PFCP``
+^^^^^^^^^^^^
+
+Matches a PFCP Header.
+
+- ``s_field``: S field.
+- ``msg_type``: message type.
+- ``msg_len``: message length.
+- ``seid``: session endpoint identifier.
+- Default ``mask`` matches s_field and seid.
+
 Actions
 ~~~~~~~
 
doc/guides/testpmd_app_ug/testpmd_funcs.rst +20 -0
index 5103ff9..3d05d5f 100644
@@ -3987,6 +3987,11 @@ This section lists supported pattern items and their attributes, if any.
 
   - ``session_id {unsigned}``: L2TPv3 over IP session identifier.
 
+- ``pfcp``: match PFCP header.
+
+  - ``s_field {unsigned}``: S field.
+  - ``seid {unsigned}``: session endpoint identifier.
+
 Actions list
 ^^^^^^^^^^^^
 
@@ -4822,6 +4827,21 @@ ESP rules can be created by the following commands::
  testpmd> flow create 0 ingress pattern eth / ipv6 / udp / esp spi is 1 / end
         actions queue index 3 / end
 
+Sample PFCP rules
+~~~~~~~~~~~~~~~~
+
+PFCP rules can be created by the following commands(s_field need to be 1
+if seid is set)::
+
+ testpmd> flow create 0 ingress pattern eth / ipv4 / pfcp s_field is 0 / end
+        actions queue index 3 / end
+ testpmd> flow create 0 ingress pattern eth / ipv4 / pfcp s_field is 1
+        seid is 1 / end actions queue index 3 / end
+ testpmd> flow create 0 ingress pattern eth / ipv6 / pfcp s_field is 0 / end
+        actions queue index 3 / end
+ testpmd> flow create 0 ingress pattern eth / ipv6 / pfcp s_field is 1
+        seid is 1 / end actions queue index 3 / end
+
 BPF Functions
 --------------
 
lib/librte_ethdev/rte_flow.c +1 -0
index 885a7ff..a5ac1c7 100644
@@ -94,6 +94,7 @@ static const struct rte_flow_desc_data rte_flow_desc_item[] = {
 	MK_FLOW_ITEM(AH, sizeof(struct rte_flow_item_ah)),
 	MK_FLOW_ITEM(HIGIG2, sizeof(struct rte_flow_item_higig2_hdr)),
 	MK_FLOW_ITEM(L2TPV3OIP, sizeof(struct rte_flow_item_l2tpv3oip)),
+	MK_FLOW_ITEM(PFCP, sizeof(struct rte_flow_item_pfcp)),
 };
 
 /** Generate flow_action[] entry. */
lib/librte_ethdev/rte_flow.h +31 -0
index 5625dc4..9addf1c 100644
@@ -520,6 +520,13 @@ enum rte_flow_item_type {
 	 */
 	RTE_FLOW_ITEM_TYPE_L2TPV3OIP,
 
+	/**
+	 * Matches PFCP Header.
+	 * See struct rte_flow_item_pfcp.
+	 *
+	 */
+	RTE_FLOW_ITEM_TYPE_PFCP,
+
 };
 
 /**
@@ -1509,6 +1516,30 @@ static const struct rte_flow_item_ah rte_flow_item_ah_mask = {
 #endif
 
 /**
+ * @warning
+ * @b EXPERIMENTAL: this structure may change without prior notice
+ *
+ * RTE_FLOW_ITEM_TYPE_PFCP
+ *
+ * Match PFCP Header
+ *
+ */
+struct rte_flow_item_pfcp {
+	uint8_t s_field;
+	uint8_t msg_type;
+	uint16_t msg_len;
+	uint64_t seid;
+};
+
+/** Default mask for RTE_FLOW_ITEM_TYPE_PFCP. */
+#ifndef __cplusplus
+static const struct rte_flow_item_pfcp rte_flow_item_pfcp_mask = {
+	.s_field = 0x01,
+	.seid = 0xffffffffffffffff,
+};
+#endif
+
+/**
  * Matching pattern item definition.
  *
  * A pattern is formed by stacking items starting from the lowest protocol
Signature · 1 line
2.7.4
#1 lore raw

Hi Xiao,

Sorry for delayed response.

Thanks,
Ori

Quoted 217 lines

-----Original Message-----
From: dev <[email protected]> On Behalf Of Xiao Zhang
Sent: Thursday, February 20, 2020 6:02 AM
To: [email protected]
Cc: [email protected]; [email protected]; Xiao Zhang <[email protected]>
Subject: [dpdk-dev] ethdev: add PFCP header to flow API

This patch adds the new flow item RTE_FLOW_ITEM_TYPE_PFCP to flow API to match a PFCP header.
Add sample PFCP rules for testpmd guide. Since Session Endpoint Identifier (SEID) only will be present in PFCP Session header and PFCP Session headers shall be identified when the S field is equal to 1, when create rules for PFCP Session header with certain SEID the S field need be set 1.

---
 app/test-pmd/cmdline_flow.c                 | 37
+++++++++++++++++++++++++++++
 doc/guides/prog_guide/rte_flow.rst          | 11 +++++++++
 doc/guides/testpmd_app_ug/testpmd_funcs.rst | 20 ++++++++++++++++
 lib/librte_ethdev/rte_flow.c                |  1 +
 lib/librte_ethdev/rte_flow.h                | 31 ++++++++++++++++++++++++
 5 files changed, 100 insertions(+)
app/test-pmd/cmdline_flow.c +31 -0
index c2cc4c5..0b735cd 100644
@@ -220,6 +220,9 @@ enum index {
 	ITEM_L2TPV3OIP_SESSION_ID,
 	ITEM_ESP,
 	ITEM_ESP_SPI,
+	ITEM_PFCP,
+	ITEM_PFCP_S_FIELD,
+	ITEM_PFCP_SEID,
 
 	/* Validate/create actions. */
 	ACTIONS,
@@ -768,6 +771,7 @@ static const enum index next_item[] = {
 	ITEM_TAG,
 	ITEM_L2TPV3OIP,
 	ITEM_ESP,
+	ITEM_PFCP,
 	END_SET,
 	ZERO,
 };
@@ -1046,6 +1050,13 @@ static const enum index item_esp[] = {
 	ZERO,
 };
 
+static const enum index item_pfcp[] = {
+	ITEM_PFCP_S_FIELD,
+	ITEM_PFCP_SEID,
+	ITEM_NEXT,
+	ZERO,
+};
+
 static const enum index next_set_raw[] = {
 	SET_RAW_INDEX,
 	ITEM_ETH,
@@ -2699,6 +2710,26 @@ static const struct token token_list[] = {
 		.args = ARGS(ARGS_ENTRY_HTON(struct rte_flow_item_esp,
 				hdr.spi)),
 	},
+	[ITEM_PFCP] = {
+		.name = "pfcp",
+		.help = "match pfcp header",
+		.priv = PRIV_ITEM(PFCP, sizeof(struct rte_flow_item_pfcp)),
+		.next = NEXT(item_pfcp),
+		.call = parse_vc,
+	},
+	[ITEM_PFCP_S_FIELD] = {
+		.name = "s_field",
+		.help = "S field",
+		.next = NEXT(item_pfcp, NEXT_ENTRY(UNSIGNED),
 item_param),
+		.args = ARGS(ARGS_ENTRY_HTON(struct rte_flow_item_pfcp,
+				s_field)),
+	},
+	[ITEM_PFCP_SEID] = {
+		.name = "seid",
+		.help = "session endpoint identifier",
+		.next = NEXT(item_pfcp, NEXT_ENTRY(UNSIGNED),
 item_param),
+		.args = ARGS(ARGS_ENTRY_HTON(struct rte_flow_item_pfcp,
 seid)),
+	},
app/test-pmd/cmdline_flow.c +3 -0
 	/* Validate/create actions. */
 	[ACTIONS] = {
 		.name = "actions",
@@ -6444,6 +6475,9 @@ flow_item_default_mask(const struct rte_flow_item
 *item)
 	case RTE_FLOW_ITEM_TYPE_ESP:
 		mask = &rte_flow_item_esp_mask;
 		break;
+	case RTE_FLOW_ITEM_TYPE_PFCP:
+		mask = &rte_flow_item_pfcp_mask;
+		break;
 	default:
 		break;
app/test-pmd/cmdline_flow.c +3 -0
 	}
@@ -6541,6 +6575,9 @@ cmd_set_raw_parsed(const struct buffer *in)
 			size = sizeof(struct rte_flow_item_esp);
 			proto = 0x32;
 			break;
+		case RTE_FLOW_ITEM_TYPE_PFCP:
+			size = sizeof(struct rte_flow_item_pfcp);
+			break;
 		default:
 			printf("Error - Not supported item\n");
 			*total_size = 0;
doc/guides/prog_guide/rte_flow.rst +11 -0
index 371819e..2851cee 100644
@@ -1344,6 +1344,17 @@ Matches a L2TPv3 over IP header.
 - ``session_id``: L2TPv3 over IP session identifier.
 - Default ``mask`` matches session_id only.
 
+Item: ``PFCP``
+^^^^^^^^^^^^
+
+Matches a PFCP Header.
+
+- ``s_field``: S field.
+- ``msg_type``: message type.
+- ``msg_len``: message length.
+- ``seid``: session endpoint identifier.
+- Default ``mask`` matches s_field and seid.
+
 Actions
 ~~~~~~~
 
doc/guides/testpmd_app_ug/testpmd_funcs.rst +0 -0
index 5103ff9..3d05d5f 100644
@@ -3987,6 +3987,11 @@ This section lists supported pattern items and their

attributes, if any.

- ``session_id {unsigned}``: L2TPv3 over IP session identifier.

+- ``pfcp``: match PFCP header.

doc/guides/testpmd_app_ug/testpmd_funcs.rst +4 -0
+
+  - ``s_field {unsigned}``: S field.
+  - ``seid {unsigned}``: session endpoint identifier.
+
 Actions list
 ^^^^^^^^^^^^
@@ -4822,6 +4827,21 @@ ESP rules can be created by the following

commands::
testpmd> flow create 0 ingress pattern eth / ipv6 / udp / esp spi is 1 / end
actions queue index 3 / end

doc/guides/testpmd_app_ug/testpmd_funcs.rst +15 -0
+Sample PFCP rules
+~~~~~~~~~~~~~~~~
+
+PFCP rules can be created by the following commands(s_field need to be 1
+if seid is set)::
+
+ testpmd> flow create 0 ingress pattern eth / ipv4 / pfcp s_field is 0 / end
+        actions queue index 3 / end
+ testpmd> flow create 0 ingress pattern eth / ipv4 / pfcp s_field is 1
+        seid is 1 / end actions queue index 3 / end
+ testpmd> flow create 0 ingress pattern eth / ipv6 / pfcp s_field is 0 / end
+        actions queue index 3 / end
+ testpmd> flow create 0 ingress pattern eth / ipv6 / pfcp s_field is 1
+        seid is 1 / end actions queue index 3 / end
+
 BPF Functions
 --------------
lib/librte_ethdev/rte_flow.c +1 -0
index 885a7ff..a5ac1c7 100644
@@ -94,6 +94,7 @@ static const struct rte_flow_desc_data
 rte_flow_desc_item[] = {
 	MK_FLOW_ITEM(AH, sizeof(struct rte_flow_item_ah)),
 	MK_FLOW_ITEM(HIGIG2, sizeof(struct rte_flow_item_higig2_hdr)),
 	MK_FLOW_ITEM(L2TPV3OIP, sizeof(struct rte_flow_item_l2tpv3oip)),
+	MK_FLOW_ITEM(PFCP, sizeof(struct rte_flow_item_pfcp)),
 };
 

/** Generate flow_action[] entry. */

lib/librte_ethdev/rte_flow.h +11 -0
index 5625dc4..9addf1c 100644
@@ -520,6 +520,13 @@ enum rte_flow_item_type {
 	 */
 	RTE_FLOW_ITEM_TYPE_L2TPV3OIP,
 
+	/**
+	 * Matches PFCP Header.
+	 * See struct rte_flow_item_pfcp.
+	 *
+	 */
+	RTE_FLOW_ITEM_TYPE_PFCP,
+
 };
 
 /**
@@ -1509,6 +1516,30 @@ static const struct rte_flow_item_ah
 rte_flow_item_ah_mask = {
 #endif
 
 /**
+ * @warning
+ * @b EXPERIMENTAL: this structure may change without prior notice
+ *
+ * RTE_FLOW_ITEM_TYPE_PFCP

lib/librte_ethdev/rte_flow.h static const struct rte_flow_item_ah · line 1533

Quoted 10 lines
lib/librte_ethdev/rte_flow.h +10 -0
+ *
+ * Match PFCP Header
+ *
+ */
+struct rte_flow_item_pfcp {
+	uint8_t s_field;
+	uint8_t msg_type;
+	uint16_t msg_len;
+	uint64_t seid;
+};

I think this should be in BE format.

Quoted 15 lines
lib/librte_ethdev/rte_flow.h +10 -0
+
+/** Default mask for RTE_FLOW_ITEM_TYPE_PFCP. */
+#ifndef __cplusplus
+static const struct rte_flow_item_pfcp rte_flow_item_pfcp_mask = {
+	.s_field = 0x01,
+	.seid = 0xffffffffffffffff,
+};
+#endif
+
+/**
  * Matching pattern item definition.
  *

* A pattern is formed by stacking items starting from the lowest protocol
--
2.7.4

#2 lore raw
Quoted 241 lines

-----Original Message-----
From: Ori Kam [mailto:[email protected]]
Sent: Tuesday, March 3, 2020 4:49 PM
To: Zhang, Xiao <[email protected]>; [email protected]
Cc: [email protected]; Yigit, Ferruh <[email protected]>
Subject: RE: [dpdk-dev] ethdev: add PFCP header to flow API

Hi Xiao,

Sorry for delayed response.

Thanks,
Ori

Quoted 225 lines

-----Original Message-----
From: dev <[email protected]> On Behalf Of Xiao Zhang
Sent: Thursday, February 20, 2020 6:02 AM
To: [email protected]
Cc: [email protected]; [email protected]; Xiao Zhang <[email protected]>
Subject: [dpdk-dev] ethdev: add PFCP header to flow API

This patch adds the new flow item RTE_FLOW_ITEM_TYPE_PFCP to flow API to match a PFCP header.
Add sample PFCP rules for testpmd guide. Since Session Endpoint Identifier (SEID) only will be present in PFCP Session header and PFCP Session headers shall be identified when the S field is equal to 1, when create rules for PFCP Session header with certain SEID the S field need be set 1.

---
 app/test-pmd/cmdline_flow.c                 | 37
+++++++++++++++++++++++++++++
 doc/guides/prog_guide/rte_flow.rst          | 11 +++++++++
 doc/guides/testpmd_app_ug/testpmd_funcs.rst | 20 ++++++++++++++++
 lib/librte_ethdev/rte_flow.c                |  1 +
 lib/librte_ethdev/rte_flow.h                | 31 ++++++++++++++++++++++++
 5 files changed, 100 insertions(+)
app/test-pmd/cmdline_flow.c +31 -0
index c2cc4c5..0b735cd 100644
@@ -220,6 +220,9 @@ enum index {
 	ITEM_L2TPV3OIP_SESSION_ID,
 	ITEM_ESP,
 	ITEM_ESP_SPI,
+	ITEM_PFCP,
+	ITEM_PFCP_S_FIELD,
+	ITEM_PFCP_SEID,
 
 	/* Validate/create actions. */
 	ACTIONS,
@@ -768,6 +771,7 @@ static const enum index next_item[] = {
 	ITEM_TAG,
 	ITEM_L2TPV3OIP,
 	ITEM_ESP,
+	ITEM_PFCP,
 	END_SET,
 	ZERO,
 };
@@ -1046,6 +1050,13 @@ static const enum index item_esp[] = {
 	ZERO,
 };
 
+static const enum index item_pfcp[] = {
+	ITEM_PFCP_S_FIELD,
+	ITEM_PFCP_SEID,
+	ITEM_NEXT,
+	ZERO,
+};
+
 static const enum index next_set_raw[] = {
 	SET_RAW_INDEX,
 	ITEM_ETH,
@@ -2699,6 +2710,26 @@ static const struct token token_list[] = {
 		.args = ARGS(ARGS_ENTRY_HTON(struct rte_flow_item_esp,
 				hdr.spi)),
 	},
+	[ITEM_PFCP] = {
+		.name = "pfcp",
+		.help = "match pfcp header",
+		.priv = PRIV_ITEM(PFCP, sizeof(struct rte_flow_item_pfcp)),
+		.next = NEXT(item_pfcp),
+		.call = parse_vc,
+	},
+	[ITEM_PFCP_S_FIELD] = {
+		.name = "s_field",
+		.help = "S field",
+		.next = NEXT(item_pfcp, NEXT_ENTRY(UNSIGNED),
 item_param),
+		.args = ARGS(ARGS_ENTRY_HTON(struct rte_flow_item_pfcp,
+				s_field)),
+	},
+	[ITEM_PFCP_SEID] = {
+		.name = "seid",
+		.help = "session endpoint identifier",
+		.next = NEXT(item_pfcp, NEXT_ENTRY(UNSIGNED),
 item_param),
+		.args = ARGS(ARGS_ENTRY_HTON(struct rte_flow_item_pfcp,
 seid)),
+	},
app/test-pmd/cmdline_flow.c +0 -0
 	/* Validate/create actions. */
 	[ACTIONS] = {
 		.name = "actions",
@@ -6444,6 +6475,9 @@ flow_item_default_mask(const struct

rte_flow_item
*item)

app/test-pmd/cmdline_flow.c +6 -0
 	case RTE_FLOW_ITEM_TYPE_ESP:
 		mask = &rte_flow_item_esp_mask;
 		break;
+	case RTE_FLOW_ITEM_TYPE_PFCP:
+		mask = &rte_flow_item_pfcp_mask;
+		break;
 	default:
 		break;
 	}
@@ -6541,6 +6575,9 @@ cmd_set_raw_parsed(const struct buffer *in)
 			size = sizeof(struct rte_flow_item_esp);
 			proto = 0x32;
 			break;
+		case RTE_FLOW_ITEM_TYPE_PFCP:
+			size = sizeof(struct rte_flow_item_pfcp);
+			break;
 		default:
 			printf("Error - Not supported item\n");
 			*total_size = 0;
doc/guides/prog_guide/rte_flow.rst +11 -0
index 371819e..2851cee 100644
@@ -1344,6 +1344,17 @@ Matches a L2TPv3 over IP header.
 - ``session_id``: L2TPv3 over IP session identifier.
 - Default ``mask`` matches session_id only.
 
+Item: ``PFCP``
+^^^^^^^^^^^^
+
+Matches a PFCP Header.
+
+- ``s_field``: S field.
+- ``msg_type``: message type.
+- ``msg_len``: message length.
+- ``seid``: session endpoint identifier.
+- Default ``mask`` matches s_field and seid.
+
 Actions
 ~~~~~~~
 
doc/guides/testpmd_app_ug/testpmd_funcs.rst +0 -0
index 5103ff9..3d05d5f 100644
@@ -3987,6 +3987,11 @@ This section lists supported pattern items and

their attributes, if any.

- ``session_id {unsigned}``: L2TPv3 over IP session identifier.

+- ``pfcp``: match PFCP header.

doc/guides/testpmd_app_ug/testpmd_funcs.rst +4 -0
+
+  - ``s_field {unsigned}``: S field.
+  - ``seid {unsigned}``: session endpoint identifier.
+
 Actions list
 ^^^^^^^^^^^^
@@ -4822,6 +4827,21 @@ ESP rules can be created by the following

commands::
testpmd> flow create 0 ingress pattern eth / ipv6 / udp / esp spi is 1 / end
actions queue index 3 / end

doc/guides/testpmd_app_ug/testpmd_funcs.rst +19 -0
+Sample PFCP rules
+~~~~~~~~~~~~~~~~
+
+PFCP rules can be created by the following commands(s_field need to
+be 1 if seid is set)::
+
+ testpmd> flow create 0 ingress pattern eth / ipv4 / pfcp s_field is
+ testpmd> 0 / end
+        actions queue index 3 / end
+ testpmd> flow create 0 ingress pattern eth / ipv4 / pfcp s_field is
+ testpmd> 1
+        seid is 1 / end actions queue index 3 / end
+ testpmd> flow create 0 ingress pattern eth / ipv6 / pfcp s_field is
+ testpmd> 0 / end
+        actions queue index 3 / end
+ testpmd> flow create 0 ingress pattern eth / ipv6 / pfcp s_field is
+ testpmd> 1
+        seid is 1 / end actions queue index 3 / end
+
 BPF Functions
 --------------
(quoted diff) +0 -0

b/lib/librte_ethdev/rte_flow.c index 885a7ff..a5ac1c7 100644

lib/librte_ethdev/rte_flow.c +1 -0
@@ -94,6 +94,7 @@ static const struct rte_flow_desc_data
 rte_flow_desc_item[] = {
 	MK_FLOW_ITEM(AH, sizeof(struct rte_flow_item_ah)),
 	MK_FLOW_ITEM(HIGIG2, sizeof(struct rte_flow_item_higig2_hdr)),
 	MK_FLOW_ITEM(L2TPV3OIP, sizeof(struct rte_flow_item_l2tpv3oip)),
+	MK_FLOW_ITEM(PFCP, sizeof(struct rte_flow_item_pfcp)),
 };
 

/** Generate flow_action[] entry. */

(quoted diff) +0 -0

b/lib/librte_ethdev/rte_flow.h index 5625dc4..9addf1c 100644

lib/librte_ethdev/rte_flow.h +7 -0
@@ -520,6 +520,13 @@ enum rte_flow_item_type {
 	 */
 	RTE_FLOW_ITEM_TYPE_L2TPV3OIP,
 
+	/**
+	 * Matches PFCP Header.
+	 * See struct rte_flow_item_pfcp.
+	 *
+	 */
+	RTE_FLOW_ITEM_TYPE_PFCP,
+
 };
 
 /**
@@ -1509,6 +1516,30 @@ static const struct rte_flow_item_ah

rte_flow_item_ah_mask = { #endif

/**
+ * @warning
+ * @b EXPERIMENTAL: this structure may change without prior notice
+ *
+ * RTE_FLOW_ITEM_TYPE_PFCP
+ *
+ * Match PFCP Header
+ *
+ */

Quoted 8 lines

lib/librte_ethdev/rte_flow.h static const struct rte_flow_item_ah rte_flow_item_ah_mask = { · line 1532

Quoted 6 lines
lib/librte_ethdev/rte_flow.h +6 -0
+struct rte_flow_item_pfcp {
+	uint8_t s_field;
+	uint8_t msg_type;
+	uint16_t msg_len;
+	uint64_t seid;
+};

I think this should be in BE format.

Yes, I changed the type to BE format in v2 patch. Thanks for reviewing.

Quoted 16 lines
Quoted 16 lines
lib/librte_ethdev/rte_flow.h +9 -0
+
+/** Default mask for RTE_FLOW_ITEM_TYPE_PFCP. */ #ifndef __cplusplus
+static const struct rte_flow_item_pfcp rte_flow_item_pfcp_mask = {
+	.s_field = 0x01,
+	.seid = 0xffffffffffffffff,
+};
+#endif
+
+/**
  * Matching pattern item definition.
  *
  * A pattern is formed by stacking items starting from the lowest

protocol
--
2.7.4

author
#3 lore raw

PATCH v2 1/1 ethdev: add PFCP header to flow API

In reply to Xiao Zhang

This patch adds the new flow item RTE_FLOW_ITEM_TYPE_PFCP to flow API to match a PFCP header.
Add sample PFCP rules for testpmd guide. Since Session Endpoint Identifier (SEID) only will be present in PFCP Session header and PFCP Session headers shall be identified when the S field is equal to 1, when create rules for PFCP Session header with certain SEID the S field need be set 1.

---
v2 - change type of msg_len and seid to BE format.

---
 app/test-pmd/cmdline_flow.c                 | 37 +++++++++++++++++++++++++++++
 doc/guides/prog_guide/rte_flow.rst          | 11 +++++++++
 doc/guides/testpmd_app_ug/testpmd_funcs.rst | 20 ++++++++++++++++
 lib/librte_ethdev/rte_flow.c                |  1 +
 lib/librte_ethdev/rte_flow.h                | 31 ++++++++++++++++++++++++
 5 files changed, 100 insertions(+)
app/test-pmd/cmdline_flow.c +37 -0
index c2cc4c5..0b735cd 100644
@@ -220,6 +220,9 @@ enum index {
 	ITEM_L2TPV3OIP_SESSION_ID,
 	ITEM_ESP,
 	ITEM_ESP_SPI,
+	ITEM_PFCP,
+	ITEM_PFCP_S_FIELD,
+	ITEM_PFCP_SEID,
 
 	/* Validate/create actions. */
 	ACTIONS,
@@ -768,6 +771,7 @@ static const enum index next_item[] = {
 	ITEM_TAG,
 	ITEM_L2TPV3OIP,
 	ITEM_ESP,
+	ITEM_PFCP,
 	END_SET,
 	ZERO,
 };
@@ -1046,6 +1050,13 @@ static const enum index item_esp[] = {
 	ZERO,
 };
 
+static const enum index item_pfcp[] = {
+	ITEM_PFCP_S_FIELD,
+	ITEM_PFCP_SEID,
+	ITEM_NEXT,
+	ZERO,
+};
+
 static const enum index next_set_raw[] = {
 	SET_RAW_INDEX,
 	ITEM_ETH,
@@ -2699,6 +2710,26 @@ static const struct token token_list[] = {
 		.args = ARGS(ARGS_ENTRY_HTON(struct rte_flow_item_esp,
 				hdr.spi)),
 	},
+	[ITEM_PFCP] = {
+		.name = "pfcp",
+		.help = "match pfcp header",
+		.priv = PRIV_ITEM(PFCP, sizeof(struct rte_flow_item_pfcp)),
+		.next = NEXT(item_pfcp),
+		.call = parse_vc,
+	},
+	[ITEM_PFCP_S_FIELD] = {
+		.name = "s_field",
+		.help = "S field",
+		.next = NEXT(item_pfcp, NEXT_ENTRY(UNSIGNED), item_param),
+		.args = ARGS(ARGS_ENTRY_HTON(struct rte_flow_item_pfcp,
+				s_field)),
+	},
+	[ITEM_PFCP_SEID] = {
+		.name = "seid",
+		.help = "session endpoint identifier",
+		.next = NEXT(item_pfcp, NEXT_ENTRY(UNSIGNED), item_param),
+		.args = ARGS(ARGS_ENTRY_HTON(struct rte_flow_item_pfcp, seid)),
+	},
 	/* Validate/create actions. */
 	[ACTIONS] = {
 		.name = "actions",
@@ -6444,6 +6475,9 @@ flow_item_default_mask(const struct rte_flow_item *item)
 	case RTE_FLOW_ITEM_TYPE_ESP:
 		mask = &rte_flow_item_esp_mask;
 		break;
+	case RTE_FLOW_ITEM_TYPE_PFCP:
+		mask = &rte_flow_item_pfcp_mask;
+		break;
 	default:
 		break;
 	}
@@ -6541,6 +6575,9 @@ cmd_set_raw_parsed(const struct buffer *in)
 			size = sizeof(struct rte_flow_item_esp);
 			proto = 0x32;
 			break;
+		case RTE_FLOW_ITEM_TYPE_PFCP:
+			size = sizeof(struct rte_flow_item_pfcp);
+			break;
 		default:
 			printf("Error - Not supported item\n");
 			*total_size = 0;
doc/guides/prog_guide/rte_flow.rst +11 -0
index 371819e..2851cee 100644
@@ -1344,6 +1344,17 @@ Matches a L2TPv3 over IP header.
 - ``session_id``: L2TPv3 over IP session identifier.
 - Default ``mask`` matches session_id only.
 
+Item: ``PFCP``
+^^^^^^^^^^^^
+
+Matches a PFCP Header.
+
+- ``s_field``: S field.
+- ``msg_type``: message type.
+- ``msg_len``: message length.
+- ``seid``: session endpoint identifier.
+- Default ``mask`` matches s_field and seid.
+
 Actions
 ~~~~~~~
 
doc/guides/testpmd_app_ug/testpmd_funcs.rst +20 -0
index 5103ff9..3d05d5f 100644
@@ -3987,6 +3987,11 @@ This section lists supported pattern items and their attributes, if any.
 
   - ``session_id {unsigned}``: L2TPv3 over IP session identifier.
 
+- ``pfcp``: match PFCP header.
+
+  - ``s_field {unsigned}``: S field.
+  - ``seid {unsigned}``: session endpoint identifier.
+
 Actions list
 ^^^^^^^^^^^^
 
@@ -4822,6 +4827,21 @@ ESP rules can be created by the following commands::
  testpmd> flow create 0 ingress pattern eth / ipv6 / udp / esp spi is 1 / end
         actions queue index 3 / end
 
+Sample PFCP rules
+~~~~~~~~~~~~~~~~
+
+PFCP rules can be created by the following commands(s_field need to be 1
+if seid is set)::
+
+ testpmd> flow create 0 ingress pattern eth / ipv4 / pfcp s_field is 0 / end
+        actions queue index 3 / end
+ testpmd> flow create 0 ingress pattern eth / ipv4 / pfcp s_field is 1
+        seid is 1 / end actions queue index 3 / end
+ testpmd> flow create 0 ingress pattern eth / ipv6 / pfcp s_field is 0 / end
+        actions queue index 3 / end
+ testpmd> flow create 0 ingress pattern eth / ipv6 / pfcp s_field is 1
+        seid is 1 / end actions queue index 3 / end
+
 BPF Functions
 --------------
 
lib/librte_ethdev/rte_flow.c +1 -0
index 885a7ff..a5ac1c7 100644
@@ -94,6 +94,7 @@ static const struct rte_flow_desc_data rte_flow_desc_item[] = {
 	MK_FLOW_ITEM(AH, sizeof(struct rte_flow_item_ah)),
 	MK_FLOW_ITEM(HIGIG2, sizeof(struct rte_flow_item_higig2_hdr)),
 	MK_FLOW_ITEM(L2TPV3OIP, sizeof(struct rte_flow_item_l2tpv3oip)),
+	MK_FLOW_ITEM(PFCP, sizeof(struct rte_flow_item_pfcp)),
 };
 
 /** Generate flow_action[] entry. */
lib/librte_ethdev/rte_flow.h +31 -0
index 5625dc4..b43238b 100644
@@ -520,6 +520,13 @@ enum rte_flow_item_type {
 	 */
 	RTE_FLOW_ITEM_TYPE_L2TPV3OIP,
 
+	/**
+	 * Matches PFCP Header.
+	 * See struct rte_flow_item_pfcp.
+	 *
+	 */
+	RTE_FLOW_ITEM_TYPE_PFCP,
+
 };
 
 /**
@@ -1509,6 +1516,30 @@ static const struct rte_flow_item_ah rte_flow_item_ah_mask = {
 #endif
 
 /**
+ * @warning
+ * @b EXPERIMENTAL: this structure may change without prior notice
+ *
+ * RTE_FLOW_ITEM_TYPE_PFCP
+ *
+ * Match PFCP Header
+ *
+ */
+struct rte_flow_item_pfcp {
+	uint8_t s_field;
+	uint8_t msg_type;
+	rte_be16_t msg_len;
+	rte_be64_t seid;
+};
+
+/** Default mask for RTE_FLOW_ITEM_TYPE_PFCP. */
+#ifndef __cplusplus
+static const struct rte_flow_item_pfcp rte_flow_item_pfcp_mask = {
+	.s_field = 0x01,
+	.seid = RTE_BE64(0xffffffffffffffff),
+};
+#endif
+
+/**
  * Matching pattern item definition.
  *
  * A pattern is formed by stacking items starting from the lowest protocol
Signature · 1 line
2.7.4
Acked-by on v2 1/1
#4 lore raw
Quoted 243 lines

-----Original Message-----
From: Xiao Zhang <[email protected]>
Sent: Friday, March 6, 2020 8:39 AM
To: [email protected]
Cc: Ori Kam <[email protected]>; [email protected]; Xiao Zhang <[email protected]>
Subject: [v2] ethdev: add PFCP header to flow API

This patch adds the new flow item RTE_FLOW_ITEM_TYPE_PFCP to flow API to match a PFCP header.
Add sample PFCP rules for testpmd guide. Since Session Endpoint Identifier (SEID) only will be present in PFCP Session header and PFCP Session headers shall be identified when the S field is equal to 1, when create rules for PFCP Session header with certain SEID the S field need be set 1.

---
v2 - change type of msg_len and seid to BE format.

---
 app/test-pmd/cmdline_flow.c                 | 37
+++++++++++++++++++++++++++++
 doc/guides/prog_guide/rte_flow.rst          | 11 +++++++++
 doc/guides/testpmd_app_ug/testpmd_funcs.rst | 20 ++++++++++++++++
 lib/librte_ethdev/rte_flow.c                |  1 +
 lib/librte_ethdev/rte_flow.h                | 31 ++++++++++++++++++++++++
 5 files changed, 100 insertions(+)
app/test-pmd/cmdline_flow.c +31 -0
index c2cc4c5..0b735cd 100644
@@ -220,6 +220,9 @@ enum index {
 	ITEM_L2TPV3OIP_SESSION_ID,
 	ITEM_ESP,
 	ITEM_ESP_SPI,
+	ITEM_PFCP,
+	ITEM_PFCP_S_FIELD,
+	ITEM_PFCP_SEID,
 
 	/* Validate/create actions. */
 	ACTIONS,
@@ -768,6 +771,7 @@ static const enum index next_item[] = {
 	ITEM_TAG,
 	ITEM_L2TPV3OIP,
 	ITEM_ESP,
+	ITEM_PFCP,
 	END_SET,
 	ZERO,
 };
@@ -1046,6 +1050,13 @@ static const enum index item_esp[] = {
 	ZERO,
 };
 
+static const enum index item_pfcp[] = {
+	ITEM_PFCP_S_FIELD,
+	ITEM_PFCP_SEID,
+	ITEM_NEXT,
+	ZERO,
+};
+
 static const enum index next_set_raw[] = {
 	SET_RAW_INDEX,
 	ITEM_ETH,
@@ -2699,6 +2710,26 @@ static const struct token token_list[] = {
 		.args = ARGS(ARGS_ENTRY_HTON(struct rte_flow_item_esp,
 				hdr.spi)),
 	},
+	[ITEM_PFCP] = {
+		.name = "pfcp",
+		.help = "match pfcp header",
+		.priv = PRIV_ITEM(PFCP, sizeof(struct rte_flow_item_pfcp)),
+		.next = NEXT(item_pfcp),
+		.call = parse_vc,
+	},
+	[ITEM_PFCP_S_FIELD] = {
+		.name = "s_field",
+		.help = "S field",
+		.next = NEXT(item_pfcp, NEXT_ENTRY(UNSIGNED),
 item_param),
+		.args = ARGS(ARGS_ENTRY_HTON(struct rte_flow_item_pfcp,
+				s_field)),
+	},
+	[ITEM_PFCP_SEID] = {
+		.name = "seid",
+		.help = "session endpoint identifier",
+		.next = NEXT(item_pfcp, NEXT_ENTRY(UNSIGNED),
 item_param),
+		.args = ARGS(ARGS_ENTRY_HTON(struct rte_flow_item_pfcp,
 seid)),
+	},
app/test-pmd/cmdline_flow.c +3 -0
 	/* Validate/create actions. */
 	[ACTIONS] = {
 		.name = "actions",
@@ -6444,6 +6475,9 @@ flow_item_default_mask(const struct rte_flow_item
 *item)
 	case RTE_FLOW_ITEM_TYPE_ESP:
 		mask = &rte_flow_item_esp_mask;
 		break;
+	case RTE_FLOW_ITEM_TYPE_PFCP:
+		mask = &rte_flow_item_pfcp_mask;
+		break;
 	default:
 		break;
app/test-pmd/cmdline_flow.c +3 -0
 	}
@@ -6541,6 +6575,9 @@ cmd_set_raw_parsed(const struct buffer *in)
 			size = sizeof(struct rte_flow_item_esp);
 			proto = 0x32;
 			break;
+		case RTE_FLOW_ITEM_TYPE_PFCP:
+			size = sizeof(struct rte_flow_item_pfcp);
+			break;
 		default:
 			printf("Error - Not supported item\n");
 			*total_size = 0;
doc/guides/prog_guide/rte_flow.rst +11 -0
index 371819e..2851cee 100644
@@ -1344,6 +1344,17 @@ Matches a L2TPv3 over IP header.
 - ``session_id``: L2TPv3 over IP session identifier.
 - Default ``mask`` matches session_id only.
 
+Item: ``PFCP``
+^^^^^^^^^^^^
+
+Matches a PFCP Header.
+
+- ``s_field``: S field.
+- ``msg_type``: message type.
+- ``msg_len``: message length.
+- ``seid``: session endpoint identifier.
+- Default ``mask`` matches s_field and seid.
+
 Actions
 ~~~~~~~
 
doc/guides/testpmd_app_ug/testpmd_funcs.rst +0 -0
index 5103ff9..3d05d5f 100644
@@ -3987,6 +3987,11 @@ This section lists supported pattern items and their

attributes, if any.

- ``session_id {unsigned}``: L2TPv3 over IP session identifier.

+- ``pfcp``: match PFCP header.

doc/guides/testpmd_app_ug/testpmd_funcs.rst +4 -0
+
+  - ``s_field {unsigned}``: S field.
+  - ``seid {unsigned}``: session endpoint identifier.
+
 Actions list
 ^^^^^^^^^^^^
@@ -4822,6 +4827,21 @@ ESP rules can be created by the following

commands::
testpmd> flow create 0 ingress pattern eth / ipv6 / udp / esp spi is 1 / end
actions queue index 3 / end

doc/guides/testpmd_app_ug/testpmd_funcs.rst +15 -0
+Sample PFCP rules
+~~~~~~~~~~~~~~~~
+
+PFCP rules can be created by the following commands(s_field need to be 1
+if seid is set)::
+
+ testpmd> flow create 0 ingress pattern eth / ipv4 / pfcp s_field is 0 / end
+        actions queue index 3 / end
+ testpmd> flow create 0 ingress pattern eth / ipv4 / pfcp s_field is 1
+        seid is 1 / end actions queue index 3 / end
+ testpmd> flow create 0 ingress pattern eth / ipv6 / pfcp s_field is 0 / end
+        actions queue index 3 / end
+ testpmd> flow create 0 ingress pattern eth / ipv6 / pfcp s_field is 1
+        seid is 1 / end actions queue index 3 / end
+
 BPF Functions
 --------------
lib/librte_ethdev/rte_flow.c +1 -0
index 885a7ff..a5ac1c7 100644
@@ -94,6 +94,7 @@ static const struct rte_flow_desc_data
 rte_flow_desc_item[] = {
 	MK_FLOW_ITEM(AH, sizeof(struct rte_flow_item_ah)),
 	MK_FLOW_ITEM(HIGIG2, sizeof(struct rte_flow_item_higig2_hdr)),
 	MK_FLOW_ITEM(L2TPV3OIP, sizeof(struct rte_flow_item_l2tpv3oip)),
+	MK_FLOW_ITEM(PFCP, sizeof(struct rte_flow_item_pfcp)),
 };
 

/** Generate flow_action[] entry. */

lib/librte_ethdev/rte_flow.h +31 -0
index 5625dc4..b43238b 100644
@@ -520,6 +520,13 @@ enum rte_flow_item_type {
 	 */
 	RTE_FLOW_ITEM_TYPE_L2TPV3OIP,
 
+	/**
+	 * Matches PFCP Header.
+	 * See struct rte_flow_item_pfcp.
+	 *
+	 */
+	RTE_FLOW_ITEM_TYPE_PFCP,
+
 };
 
 /**
@@ -1509,6 +1516,30 @@ static const struct rte_flow_item_ah
 rte_flow_item_ah_mask = {
 #endif
 
 /**
+ * @warning
+ * @b EXPERIMENTAL: this structure may change without prior notice
+ *
+ * RTE_FLOW_ITEM_TYPE_PFCP
+ *
+ * Match PFCP Header
+ *
+ */
+struct rte_flow_item_pfcp {
+	uint8_t s_field;
+	uint8_t msg_type;
+	rte_be16_t msg_len;
+	rte_be64_t seid;
+};
+
+/** Default mask for RTE_FLOW_ITEM_TYPE_PFCP. */
+#ifndef __cplusplus
+static const struct rte_flow_item_pfcp rte_flow_item_pfcp_mask = {
+	.s_field = 0x01,
+	.seid = RTE_BE64(0xffffffffffffffff),
+};
+#endif
+
+/**
  * Matching pattern item definition.
  *
Quoted 3 lines

* A pattern is formed by stacking items starting from the lowest protocol
--
2.7.4

Thanks,
Ori

Applied
#5 lore raw
Quoted 18 lines · Ori Kam
Quoted 18 lines

-----Original Message-----
From: Xiao Zhang <[email protected]>
Sent: Friday, March 6, 2020 8:39 AM
To: [email protected]
Cc: Ori Kam <[email protected]>; [email protected]; Xiao Zhang <[email protected]>
Subject: [v2] ethdev: add PFCP header to flow API

This patch adds the new flow item RTE_FLOW_ITEM_TYPE_PFCP to flow API to match a PFCP header.
Add sample PFCP rules for testpmd guide. Since Session Endpoint Identifier (SEID) only will be present in PFCP Session header and PFCP Session headers shall be identified when the S field is equal to 1, when create rules for PFCP Session header with certain SEID the S field need be set 1.

Quoted 4 lines
Quoted 1 line

Applied to dpdk-next-net/master, thanks.