* |WARNING| pw118950-118972 [PATCH] [v2, 25/25] net/nfp: support new tunnel solution
@ 2022-10-22 8:59 dpdklab
0 siblings, 0 replies; only message in thread
From: dpdklab @ 2022-10-22 8:59 UTC (permalink / raw)
To: test-report; +Cc: dpdk-test-reports
[-- Attachment #1: Type: text/plain, Size: 42825 bytes --]
Test-Label: iol-testing
Test-Status: WARNING
http://dpdk.org/patch/118950
_apply patch failure_
Submitter: Chaoyong He <chaoyong.he@corigine.com>
Date: Saturday, October 22 2022 08:24:29
Applied on: CommitID:269f027453ae7a9ac1bf0d6786388f598a139314
Apply patch set 118950-118972 failed:
Checking patch doc/guides/nics/features/nfp.ini...
error: while searching for:
tcp = Y
udp = Y
vlan = Y
[rte_flow actions]
count = Y
error: patch failed: doc/guides/nics/features/nfp.ini:35
Checking patch drivers/net/nfp/flower/nfp_flower_cmsg.h...
error: while searching for:
uint8_t ipv6_dst[16];
};
struct nfp_fl_act_head {
uint8_t jump_id;
uint8_t len_lw;
error: patch failed: drivers/net/nfp/flower/nfp_flower_cmsg.h:324
Checking patch drivers/net/nfp/nfp_flow.c...
error: drivers/net/nfp/nfp_flow.c: does not exist in index
Applying patch doc/guides/nics/features/nfp.ini with 1 reject...
Rejected hunk #1.
Applying patch drivers/net/nfp/flower/nfp_flower_cmsg.h with 1 reject...
Rejected hunk #1.
diff a/doc/guides/nics/features/nfp.ini b/doc/guides/nics/features/nfp.ini (rejected hunks)
@@ -35,6 +35,7 @@ sctp = Y
tcp = Y
udp = Y
vlan = Y
+vxlan = Y
[rte_flow actions]
count = Y
diff a/drivers/net/nfp/flower/nfp_flower_cmsg.h b/drivers/net/nfp/flower/nfp_flower_cmsg.h (rejected hunks)
@@ -324,6 +324,41 @@ struct nfp_flower_ipv6 {
uint8_t ipv6_dst[16];
};
+struct nfp_flower_tun_ipv4 {
+ rte_be32_t src;
+ rte_be32_t dst;
+};
+
+struct nfp_flower_tun_ip_ext {
+ uint8_t tos;
+ uint8_t ttl;
+};
+
+/*
+ * Flow Frame IPv4 UDP TUNNEL --> Tunnel details (5W/20B)
+ * -----------------------------------------------------------------
+ * 3 2 1
+ * 1 0 9 8 7 6 5 4 3 2 1 0 9 8 7 6 5 4 3 2 1 0 9 8 7 6 5 4 3 2 1 0
+ * +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
+ * | ipv4_addr_src |
+ * +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
+ * | ipv4_addr_dst |
+ * +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
+ * | Reserved | tos | ttl |
+ * +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
+ * | Reserved |
+ * +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
+ * | VNI | Reserved |
+ * +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
+ */
+struct nfp_flower_ipv4_udp_tun {
+ struct nfp_flower_tun_ipv4 ipv4;
+ rte_be16_t reserved1;
+ struct nfp_flower_tun_ip_ext ip_ext;
+ rte_be32_t reserved2;
+ rte_be32_t tun_id;
+};
+
struct nfp_fl_act_head {
uint8_t jump_id;
uint8_t len_lw;
Checking patch drivers/net/nfp/flower/nfp_flower_cmsg.h...
error: while searching for:
rte_be32_t dst;
};
struct nfp_flower_tun_ip_ext {
uint8_t tos;
uint8_t ttl;
error: patch failed: drivers/net/nfp/flower/nfp_flower_cmsg.h:329
error: while searching for:
rte_be32_t tun_id;
};
struct nfp_fl_act_head {
uint8_t jump_id;
uint8_t len_lw;
error: patch failed: drivers/net/nfp/flower/nfp_flower_cmsg.h:359
Checking patch drivers/net/nfp/nfp_flow.c...
error: drivers/net/nfp/nfp_flow.c: does not exist in index
Applying patch drivers/net/nfp/flower/nfp_flower_cmsg.h with 2 rejects...
Rejected hunk #1.
Rejected hunk #2.
diff a/drivers/net/nfp/flower/nfp_flower_cmsg.h b/drivers/net/nfp/flower/nfp_flower_cmsg.h (rejected hunks)
@@ -329,6 +329,11 @@ struct nfp_flower_tun_ipv4 {
rte_be32_t dst;
};
+struct nfp_flower_tun_ipv6 {
+ uint8_t ipv6_src[16];
+ uint8_t ipv6_dst[16];
+};
+
struct nfp_flower_tun_ip_ext {
uint8_t tos;
uint8_t ttl;
@@ -359,6 +364,43 @@ struct nfp_flower_ipv4_udp_tun {
rte_be32_t tun_id;
};
+/*
+ * Flow Frame IPv6 UDP TUNNEL --> Tunnel details (11W/44B)
+ * -----------------------------------------------------------------
+ * 3 2 1
+ * 1 0 9 8 7 6 5 4 3 2 1 0 9 8 7 6 5 4 3 2 1 0 9 8 7 6 5 4 3 2 1 0
+ * +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
+ * | ipv6_addr_src, 31 - 0 |
+ * +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
+ * | ipv6_addr_src, 63 - 32 |
+ * +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
+ * | ipv6_addr_src, 95 - 64 |
+ * +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
+ * | ipv6_addr_src, 127 - 96 |
+ * +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
+ * | ipv6_addr_dst, 31 - 0 |
+ * +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
+ * | ipv6_addr_dst, 63 - 32 |
+ * +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
+ * | ipv6_addr_dst, 95 - 64 |
+ * +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
+ * | ipv6_addr_dst, 127 - 96 |
+ * +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
+ * | Reserved | tos | ttl |
+ * +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
+ * | Reserved |
+ * +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
+ * | VNI | Reserved |
+ * +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
+ */
+struct nfp_flower_ipv6_udp_tun {
+ struct nfp_flower_tun_ipv6 ipv6;
+ rte_be16_t reserved1;
+ struct nfp_flower_tun_ip_ext ip_ext;
+ rte_be32_t reserved2;
+ rte_be32_t tun_id;
+};
+
struct nfp_fl_act_head {
uint8_t jump_id;
uint8_t len_lw;
Checking patch drivers/net/nfp/flower/nfp_flower_cmsg.c...
Hunk #1 succeeded at 177 (offset -69 lines).
Checking patch drivers/net/nfp/flower/nfp_flower_cmsg.h...
error: while searching for:
rte_be16_t mtu;
};
/*
* NFP_FLOWER_CMSG_TYPE_FLOW_STATS
* Bit 3 3 2 2 2 2 2 2 2 2 2 2 1 1 1 1 1 1 1 1 1 1 0 0 0 0 0 0 0 0 0 0
error: patch failed: drivers/net/nfp/flower/nfp_flower_cmsg.h:129
error: while searching for:
rte_be16_t dst_port;
};
int nfp_flower_cmsg_mac_repr(struct nfp_app_fw_flower *app_fw_flower);
int nfp_flower_cmsg_repr_reify(struct nfp_app_fw_flower *app_fw_flower,
struct nfp_flower_representor *repr);
error: patch failed: drivers/net/nfp/flower/nfp_flower_cmsg.h:574
error: while searching for:
struct rte_flow *flow);
int nfp_flower_cmsg_flow_add(struct nfp_app_fw_flower *app_fw_flower,
struct rte_flow *flow);
#endif /* _NFP_CMSG_H_ */
error: patch failed: drivers/net/nfp/flower/nfp_flower_cmsg.h:583
Checking patch drivers/net/nfp/nfp_flow.c...
error: drivers/net/nfp/nfp_flow.c: does not exist in index
Checking patch drivers/net/nfp/nfp_flow.h...
error: drivers/net/nfp/nfp_flow.h: does not exist in index
Applied patch drivers/net/nfp/flower/nfp_flower_cmsg.c cleanly.
Applying patch drivers/net/nfp/flower/nfp_flower_cmsg.h with 3 rejects...
Rejected hunk #1.
Rejected hunk #2.
Rejected hunk #3.
diff a/drivers/net/nfp/flower/nfp_flower_cmsg.h b/drivers/net/nfp/flower/nfp_flower_cmsg.h (rejected hunks)
@@ -129,6 +129,36 @@ struct nfp_flower_cmsg_port_mod {
rte_be16_t mtu;
};
+struct nfp_flower_tun_neigh {
+ uint8_t dst_mac[RTE_ETHER_ADDR_LEN];
+ uint8_t src_mac[RTE_ETHER_ADDR_LEN];
+ rte_be32_t port_id;
+};
+
+/*
+ * NFP_FLOWER_CMSG_TYPE_TUN_NEIGH_V4
+ * Bit 3 3 2 2 2 2 2 2 2 2 2 2 1 1 1 1 1 1 1 1 1 1 0 0 0 0 0 0 0 0 0 0
+ * -----\ 1 0 9 8 7 6 5 4 3 2 1 0 9 8 7 6 5 4 3 2 1 0 9 8 7 6 5 4 3 2 1 0
+ * +---------------------------------------------------------------+
+ * 0 | DST_IPV4 |
+ * +---------------------------------------------------------------+
+ * 1 | SRC_IPV4 |
+ * +---------------------------------------------------------------+
+ * 2 | DST_MAC_B5_B4_B3_B2 |
+ * +-------------------------------+-------------------------------+
+ * 3 | DST_MAC_B1_B0 | SRC_MAC_B5_B4 |
+ * +-------------------------------+-------------------------------+
+ * 4 | SRC_MAC_B3_B2_B1_B0 |
+ * +---------------------------------------------------------------+
+ * 5 | Egress Port (NFP internal) |
+ * +---------------------------------------------------------------+
+ */
+struct nfp_flower_cmsg_tun_neigh_v4 {
+ rte_be32_t dst_ipv4;
+ rte_be32_t src_ipv4;
+ struct nfp_flower_tun_neigh common;
+};
+
/*
* NFP_FLOWER_CMSG_TYPE_FLOW_STATS
* Bit 3 3 2 2 2 2 2 2 2 2 2 2 1 1 1 1 1 1 1 1 1 1 0 0 0 0 0 0 0 0 0 0
@@ -574,6 +604,67 @@ struct nfp_fl_act_set_tport {
rte_be16_t dst_port;
};
+/*
+ * Pre-tunnel
+ * 3 2 1
+ * 1 0 9 8 7 6 5 4 3 2 1 0 9 8 7 6 5 4 3 2 1 0 9 8 7 6 5 4 3 2 1 0
+ * +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
+ * | - | opcode | |jump_id| - |M| - |V|
+ * +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
+ * | ipv6_daddr_127_96 / ipv4_daddr |
+ * +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
+ * | ipv6_daddr_95_64 |
+ * +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
+ * | ipv6_daddr_63_32 |
+ * +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
+ * | ipv6_daddr_31_0 |
+ * +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
+ */
+struct nfp_fl_act_pre_tun {
+ struct nfp_fl_act_head head;
+ rte_be16_t flags;
+ union {
+ rte_be32_t ipv4_dst;
+ uint8_t ipv6_dst[16];
+ };
+};
+
+/*
+ * Set tunnel
+ * 3 2 1
+ * 1 0 9 8 7 6 5 4 3 2 1 0 9 8 7 6 5 4 3 2 1 0 9 8 7 6 5 4 3 2 1 0
+ * +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
+ * | res | opcode | res | len_lw| reserved |
+ * +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
+ * | tun_id0 |
+ * +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
+ * | tun_id1 |
+ * +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
+ * | reserved | type |r| idx |
+ * +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
+ * | ipv4_flags | ttl | tos |
+ * +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
+ * | reserved_cvs1 |
+ * +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
+ * | reserved_cvs2 | reserved_cvs3 |
+ * | var_flags | var_np |
+ * +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
+ */
+struct nfp_fl_act_set_tun {
+ struct nfp_fl_act_head head;
+ rte_be16_t reserved;
+ rte_be64_t tun_id;
+ rte_be32_t tun_type_index;
+ rte_be16_t tun_flags;
+ uint8_t ttl;
+ uint8_t tos;
+ rte_be16_t outer_vlan_tpid;
+ rte_be16_t outer_vlan_tci;
+ uint8_t tun_len; /* Only valid for NFP_FL_TUNNEL_GENEVE */
+ uint8_t reserved2;
+ rte_be16_t tun_proto; /* Only valid for NFP_FL_TUNNEL_GENEVE */
+} __rte_packed;
+
int nfp_flower_cmsg_mac_repr(struct nfp_app_fw_flower *app_fw_flower);
int nfp_flower_cmsg_repr_reify(struct nfp_app_fw_flower *app_fw_flower,
struct nfp_flower_representor *repr);
@@ -583,5 +674,7 @@ int nfp_flower_cmsg_flow_delete(struct nfp_app_fw_flower *app_fw_flower,
struct rte_flow *flow);
int nfp_flower_cmsg_flow_add(struct nfp_app_fw_flower *app_fw_flower,
struct rte_flow *flow);
+int nfp_flower_cmsg_tun_neigh_v4_rule(struct nfp_app_fw_flower *app_fw_flower,
+ struct nfp_flower_cmsg_tun_neigh_v4 *payload);
#endif /* _NFP_CMSG_H_ */
Checking patch drivers/net/nfp/flower/nfp_flower_cmsg.c...
error: drivers/net/nfp/flower/nfp_flower_cmsg.c: does not match index
Checking patch drivers/net/nfp/flower/nfp_flower_cmsg.h...
error: while searching for:
};
/*
* NFP_FLOWER_CMSG_TYPE_FLOW_STATS
* Bit 3 3 2 2 2 2 2 2 2 2 2 2 1 1 1 1 1 1 1 1 1 1 0 0 0 0 0 0 0 0 0 0
* -----\ 1 0 9 8 7 6 5 4 3 2 1 0 9 8 7 6 5 4 3 2 1 0 9 8 7 6 5 4 3 2 1 0
error: patch failed: drivers/net/nfp/flower/nfp_flower_cmsg.h:160
error: while searching for:
};
};
/*
* Set tunnel
* 3 2 1
error: patch failed: drivers/net/nfp/flower/nfp_flower_cmsg.h:629
error: while searching for:
struct rte_flow *flow);
int nfp_flower_cmsg_tun_neigh_v4_rule(struct nfp_app_fw_flower *app_fw_flower,
struct nfp_flower_cmsg_tun_neigh_v4 *payload);
#endif /* _NFP_CMSG_H_ */
error: patch failed: drivers/net/nfp/flower/nfp_flower_cmsg.h:676
Checking patch drivers/net/nfp/nfp_flow.c...
error: drivers/net/nfp/nfp_flow.c: does not exist in index
Applying patch drivers/net/nfp/flower/nfp_flower_cmsg.h with 3 rejects...
Rejected hunk #1.
Rejected hunk #2.
Rejected hunk #3.
diff a/drivers/net/nfp/flower/nfp_flower_cmsg.h b/drivers/net/nfp/flower/nfp_flower_cmsg.h (rejected hunks)
@@ -160,6 +160,42 @@ struct nfp_flower_cmsg_tun_neigh_v4 {
};
/*
+ * NFP_FLOWER_CMSG_TYPE_TUN_NEIGH_V6
+ * Bit 3 3 2 2 2 2 2 2 2 2 2 2 1 1 1 1 1 1 1 1 1 1 0 0 0 0 0 0 0 0 0 0
+ * -----\ 1 0 9 8 7 6 5 4 3 2 1 0 9 8 7 6 5 4 3 2 1 0 9 8 7 6 5 4 3 2 1 0
+ * +---------------------------------------------------------------+
+ * 0 | DST_IPV6 [0] |
+ * +---------------------------------------------------------------+
+ * 1 | DST_IPV6 [1] |
+ * +---------------------------------------------------------------+
+ * 2 | DST_IPV6 [2] |
+ * +---------------------------------------------------------------+
+ * 3 | DST_IPV6 [3] |
+ * +---------------------------------------------------------------+
+ * 4 | SRC_IPV6 [0] |
+ * +---------------------------------------------------------------+
+ * 5 | SRC_IPV6 [1] |
+ * +---------------------------------------------------------------+
+ * 6 | SRC_IPV6 [2] |
+ * +---------------------------------------------------------------+
+ * 7 | SRC_IPV6 [3] |
+ * +---------------------------------------------------------------+
+ * 8 | DST_MAC_B5_B4_B3_B2 |
+ * +-------------------------------+-------------------------------+
+ * 9 | DST_MAC_B1_B0 | SRC_MAC_B5_B4 |
+ * +-------------------------------+-------------------------------+
+ * 10 | SRC_MAC_B3_B2_B1_B0 |
+ * +---------------+---------------+---------------+---------------+
+ * 11 | Egress Port (NFP internal) |
+ * +---------------------------------------------------------------+
+ */
+struct nfp_flower_cmsg_tun_neigh_v6 {
+ uint8_t dst_ipv6[16];
+ uint8_t src_ipv6[16];
+ struct nfp_flower_tun_neigh common;
+};
+
+/*
* NFP_FLOWER_CMSG_TYPE_FLOW_STATS
* Bit 3 3 2 2 2 2 2 2 2 2 2 2 1 1 1 1 1 1 1 1 1 1 0 0 0 0 0 0 0 0 0 0
* -----\ 1 0 9 8 7 6 5 4 3 2 1 0 9 8 7 6 5 4 3 2 1 0 9 8 7 6 5 4 3 2 1 0
@@ -629,6 +665,8 @@ struct nfp_fl_act_pre_tun {
};
};
+#define NFP_FL_PRE_TUN_IPV6 (1 << 0)
+
/*
* Set tunnel
* 3 2 1
@@ -676,5 +714,7 @@ int nfp_flower_cmsg_flow_add(struct nfp_app_fw_flower *app_fw_flower,
struct rte_flow *flow);
int nfp_flower_cmsg_tun_neigh_v4_rule(struct nfp_app_fw_flower *app_fw_flower,
struct nfp_flower_cmsg_tun_neigh_v4 *payload);
+int nfp_flower_cmsg_tun_neigh_v6_rule(struct nfp_app_fw_flower *app_fw_flower,
+ struct nfp_flower_cmsg_tun_neigh_v6 *payload);
#endif /* _NFP_CMSG_H_ */
Checking patch doc/guides/nics/features/nfp.ini...
error: while searching for:
set_tp_dst = Y
set_tp_src = Y
set_ttl = Y
error: patch failed: doc/guides/nics/features/nfp.ini:56
Checking patch drivers/net/nfp/nfp_flow.c...
error: drivers/net/nfp/nfp_flow.c: does not exist in index
Applying patch doc/guides/nics/features/nfp.ini with 1 reject...
Rejected hunk #1.
diff a/doc/guides/nics/features/nfp.ini b/doc/guides/nics/features/nfp.ini (rejected hunks)
@@ -56,3 +56,4 @@ set_mac_src = Y
set_tp_dst = Y
set_tp_src = Y
set_ttl = Y
+vxlan_encap = Y
Checking patch drivers/net/nfp/nfp_flow.c...
error: drivers/net/nfp/nfp_flow.c: does not exist in index
Checking patch drivers/net/nfp/flower/nfp_flower_cmsg.c...
error: drivers/net/nfp/flower/nfp_flower_cmsg.c: does not match index
Checking patch drivers/net/nfp/flower/nfp_flower_cmsg.h...
error: while searching for:
struct nfp_flower_tun_neigh common;
};
/*
* NFP_FLOWER_CMSG_TYPE_FLOW_STATS
* Bit 3 3 2 2 2 2 2 2 2 2 2 2 1 1 1 1 1 1 1 1 1 1 0 0 0 0 0 0 0 0 0 0
error: patch failed: drivers/net/nfp/flower/nfp_flower_cmsg.h:195
error: while searching for:
struct nfp_flower_cmsg_tun_neigh_v4 *payload);
int nfp_flower_cmsg_tun_neigh_v6_rule(struct nfp_app_fw_flower *app_fw_flower,
struct nfp_flower_cmsg_tun_neigh_v6 *payload);
#endif /* _NFP_CMSG_H_ */
error: patch failed: drivers/net/nfp/flower/nfp_flower_cmsg.h:716
Checking patch drivers/net/nfp/nfp_flow.c...
error: drivers/net/nfp/nfp_flow.c: does not exist in index
Checking patch drivers/net/nfp/nfp_flow.h...
error: drivers/net/nfp/nfp_flow.h: does not exist in index
Applying patch drivers/net/nfp/flower/nfp_flower_cmsg.h with 2 rejects...
Rejected hunk #1.
Rejected hunk #2.
diff a/drivers/net/nfp/flower/nfp_flower_cmsg.h b/drivers/net/nfp/flower/nfp_flower_cmsg.h (rejected hunks)
@@ -195,6 +195,91 @@ struct nfp_flower_cmsg_tun_neigh_v6 {
struct nfp_flower_tun_neigh common;
};
+#define NFP_TUN_PRE_TUN_RULE_DEL (1 << 0)
+#define NFP_TUN_PRE_TUN_IDX_BIT (1 << 3)
+#define NFP_TUN_PRE_TUN_IPV6_BIT (1 << 7)
+
+/*
+ * NFP_FLOWER_CMSG_TYPE_PRE_TUN_RULE
+ * Bit 3 3 2 2 2 2 2 2 2 2 2 2 1 1 1 1 1 1 1 1 1 1 0 0 0 0 0 0 0 0 0 0
+ * -----\ 1 0 9 8 7 6 5 4 3 2 1 0 9 8 7 6 5 4 3 2 1 0 9 8 7 6 5 4 3 2 1 0
+ * +---------------------------------------------------------------+
+ * 0 | FLAGS |
+ * +---------------------------------------------------------------+
+ * 1 | MAC_IDX | VLAN_ID |
+ * +---------------------------------------------------------------+
+ * 2 | HOST_CTX |
+ * +---------------------------------------------------------------+
+ */
+struct nfp_flower_cmsg_pre_tun_rule {
+ rte_be32_t flags;
+ rte_be16_t port_idx;
+ rte_be16_t vlan_tci;
+ rte_be32_t host_ctx_id;
+};
+
+#define NFP_TUN_MAC_OFFLOAD_DEL_FLAG 0x2
+
+/*
+ * NFP_FLOWER_CMSG_TYPE_TUN_MAC
+ * Bit 3 3 2 2 2 2 2 2 2 2 2 2 1 1 1 1 1 1 1 1 1 1 0 0 0 0 0 0 0 0 0 0
+ * -----\ 1 0 9 8 7 6 5 4 3 2 1 0 9 8 7 6 5 4 3 2 1 0 9 8 7 6 5 4 3 2 1 0
+ * Word +-----------------------+---+-+-+---------------+---------------+
+ * 0 | spare |NBI|D|F| Amount of MAC’s in this msg |
+ * +---------------+-------+---+-+-+---------------+---------------+
+ * 1 | Index 0 | MAC[0] | MAC[1] |
+ * +---------------+---------------+---------------+---------------+
+ * 2 | MAC[2] | MAC[3] | MAC[4] | MAC[5] |
+ * +---------------+---------------+---------------+---------------+
+ * 3 | Index 1 | MAC[0] | MAC[1] |
+ * +---------------+---------------+---------------+---------------+
+ * 4 | MAC[2] | MAC[3] | MAC[4] | MAC[5] |
+ * +---------------+---------------+---------------+---------------+
+ * ...
+ * +---------------+---------------+---------------+---------------+
+ * 2N-1 | Index N | MAC[0] | MAC[1] |
+ * +---------------+---------------+---------------+---------------+
+ * 2N | MAC[2] | MAC[3] | MAC[4] | MAC[5] |
+ * +---------------+---------------+---------------+---------------+
+ *
+ * F: Flush bit. Set if entire table must be flushed. Rest of info in cmsg
+ * will be ignored. Not implemented.
+ * D: Delete bit. Set if entry must be deleted instead of added
+ * NBI: Network Block Interface. Set to 0
+ * The amount of MAC’s per control message is limited only by the packet
+ * buffer size. A 2048B buffer can fit 253 MAC address and a 10240B buffer
+ * 1277 MAC addresses.
+ */
+struct nfp_flower_cmsg_tun_mac {
+ rte_be16_t flags;
+ rte_be16_t count; /**< Should always be 1 */
+ rte_be16_t index;
+ struct rte_ether_addr addr;
+};
+
+#define NFP_FL_IPV4_ADDRS_MAX 32
+
+/*
+ * NFP_FLOWER_CMSG_TYPE_TUN_IPS
+ * Bit 3 3 2 2 2 2 2 2 2 2 2 2 1 1 1 1 1 1 1 1 1 1 0 0 0 0 0 0 0 0 0 0
+ * -----\ 1 0 9 8 7 6 5 4 3 2 1 0 9 8 7 6 5 4 3 2 1 0 9 8 7 6 5 4 3 2 1 0
+ * +---------------------------------------------------------------+
+ * 0 | Number of IP Addresses |
+ * +---------------------------------------------------------------+
+ * 1 | IP Address #1 |
+ * +---------------------------------------------------------------+
+ * 2 | IP Address #2 |
+ * +---------------------------------------------------------------+
+ * | ... |
+ * +---------------------------------------------------------------+
+ * 32 | IP Address #32 |
+ * +---------------------------------------------------------------+
+ */
+struct nfp_flower_cmsg_tun_ipv4_addr {
+ rte_be32_t count;
+ rte_be32_t ipv4_addr[NFP_FL_IPV4_ADDRS_MAX];
+};
+
/*
* NFP_FLOWER_CMSG_TYPE_FLOW_STATS
* Bit 3 3 2 2 2 2 2 2 2 2 2 2 1 1 1 1 1 1 1 1 1 1 0 0 0 0 0 0 0 0 0 0
@@ -716,5 +801,14 @@ int nfp_flower_cmsg_tun_neigh_v4_rule(struct nfp_app_fw_flower *app_fw_flower,
struct nfp_flower_cmsg_tun_neigh_v4 *payload);
int nfp_flower_cmsg_tun_neigh_v6_rule(struct nfp_app_fw_flower *app_fw_flower,
struct nfp_flower_cmsg_tun_neigh_v6 *payload);
+int nfp_flower_cmsg_tun_off_v4(struct nfp_app_fw_flower *app_fw_flower);
+int nfp_flower_cmsg_pre_tunnel_rule(struct nfp_app_fw_flower *app_fw_flower,
+ struct nfp_fl_rule_metadata *nfp_flow_meta,
+ uint16_t mac_idx,
+ bool is_del);
+int nfp_flower_cmsg_tun_mac_rule(struct nfp_app_fw_flower *app_fw_flower,
+ struct rte_ether_addr *mac,
+ uint16_t mac_idx,
+ bool is_del);
#endif /* _NFP_CMSG_H_ */
Checking patch drivers/net/nfp/flower/nfp_flower_cmsg.c...
error: drivers/net/nfp/flower/nfp_flower_cmsg.c: does not match index
Checking patch drivers/net/nfp/flower/nfp_flower_cmsg.h...
error: while searching for:
rte_be32_t ipv4_addr[NFP_FL_IPV4_ADDRS_MAX];
};
/*
* NFP_FLOWER_CMSG_TYPE_FLOW_STATS
* Bit 3 3 2 2 2 2 2 2 2 2 2 2 1 1 1 1 1 1 1 1 1 1 0 0 0 0 0 0 0 0 0 0
error: patch failed: drivers/net/nfp/flower/nfp_flower_cmsg.h:280
error: while searching for:
int nfp_flower_cmsg_tun_neigh_v6_rule(struct nfp_app_fw_flower *app_fw_flower,
struct nfp_flower_cmsg_tun_neigh_v6 *payload);
int nfp_flower_cmsg_tun_off_v4(struct nfp_app_fw_flower *app_fw_flower);
int nfp_flower_cmsg_pre_tunnel_rule(struct nfp_app_fw_flower *app_fw_flower,
struct nfp_fl_rule_metadata *nfp_flow_meta,
uint16_t mac_idx,
error: patch failed: drivers/net/nfp/flower/nfp_flower_cmsg.h:802
Checking patch drivers/net/nfp/nfp_flow.c...
error: drivers/net/nfp/nfp_flow.c: does not exist in index
Checking patch drivers/net/nfp/nfp_flow.h...
error: drivers/net/nfp/nfp_flow.h: does not exist in index
Applying patch drivers/net/nfp/flower/nfp_flower_cmsg.h with 2 rejects...
Rejected hunk #1.
Rejected hunk #2.
diff a/drivers/net/nfp/flower/nfp_flower_cmsg.h b/drivers/net/nfp/flower/nfp_flower_cmsg.h (rejected hunks)
@@ -280,6 +280,29 @@ struct nfp_flower_cmsg_tun_ipv4_addr {
rte_be32_t ipv4_addr[NFP_FL_IPV4_ADDRS_MAX];
};
+#define NFP_FL_IPV6_ADDRS_MAX 4
+
+/*
+ * NFP_FLOWER_CMSG_TYPE_TUN_IP_V6
+ * Bit 3 3 2 2 2 2 2 2 2 2 2 2 1 1 1 1 1 1 1 1 1 1 0 0 0 0 0 0 0 0 0 0
+ * -----\ 1 0 9 8 7 6 5 4 3 2 1 0 9 8 7 6 5 4 3 2 1 0 9 8 7 6 5 4 3 2 1 0
+ * +---------------------------------------------------------------+
+ * 0 | Number of IP Addresses |
+ * +---------------------------------------------------------------+
+ * 1 | IP Address1 #1 |
+ * +---------------------------------------------------------------+
+ * 2 | IP Address1 #2 |
+ * +---------------------------------------------------------------+
+ * | ... |
+ * +---------------------------------------------------------------+
+ * 16 | IP Address4 #4 |
+ * +---------------------------------------------------------------+
+ */
+struct nfp_flower_cmsg_tun_ipv6_addr {
+ rte_be32_t count;
+ uint8_t ipv6_addr[NFP_FL_IPV6_ADDRS_MAX * 16];
+};
+
/*
* NFP_FLOWER_CMSG_TYPE_FLOW_STATS
* Bit 3 3 2 2 2 2 2 2 2 2 2 2 1 1 1 1 1 1 1 1 1 1 0 0 0 0 0 0 0 0 0 0
@@ -802,6 +825,7 @@ int nfp_flower_cmsg_tun_neigh_v4_rule(struct nfp_app_fw_flower *app_fw_flower,
int nfp_flower_cmsg_tun_neigh_v6_rule(struct nfp_app_fw_flower *app_fw_flower,
struct nfp_flower_cmsg_tun_neigh_v6 *payload);
int nfp_flower_cmsg_tun_off_v4(struct nfp_app_fw_flower *app_fw_flower);
+int nfp_flower_cmsg_tun_off_v6(struct nfp_app_fw_flower *app_fw_flower);
int nfp_flower_cmsg_pre_tunnel_rule(struct nfp_app_fw_flower *app_fw_flower,
struct nfp_fl_rule_metadata *nfp_flow_meta,
uint16_t mac_idx,
Checking patch doc/guides/nics/features/nfp.ini...
error: while searching for:
set_tp_dst = Y
set_tp_src = Y
set_ttl = Y
vxlan_encap = Y
error: patch failed: doc/guides/nics/features/nfp.ini:56
Checking patch drivers/net/nfp/nfp_flow.c...
error: drivers/net/nfp/nfp_flow.c: does not exist in index
Applying patch doc/guides/nics/features/nfp.ini with 1 reject...
Rejected hunk #1.
diff a/doc/guides/nics/features/nfp.ini b/doc/guides/nics/features/nfp.ini (rejected hunks)
@@ -56,4 +56,5 @@ set_mac_src = Y
set_tp_dst = Y
set_tp_src = Y
set_ttl = Y
+vxlan_decap = Y
vxlan_encap = Y
Checking patch drivers/net/nfp/nfp_flow.c...
error: drivers/net/nfp/nfp_flow.c: does not exist in index
Checking patch doc/guides/nics/features/nfp.ini...
error: while searching for:
of_push_vlan = Y
of_set_vlan_pcp = Y
of_set_vlan_vid = Y
port_id = Y
set_ipv4_dscp = Y
set_ipv4_dst = Y
error: patch failed: doc/guides/nics/features/nfp.ini:44
Checking patch drivers/net/nfp/nfp_flow.c...
error: drivers/net/nfp/nfp_flow.c: does not exist in index
Applying patch doc/guides/nics/features/nfp.ini with 1 reject...
Rejected hunk #1.
diff a/doc/guides/nics/features/nfp.ini b/doc/guides/nics/features/nfp.ini (rejected hunks)
@@ -44,6 +44,7 @@ of_pop_vlan = Y
of_push_vlan = Y
of_set_vlan_pcp = Y
of_set_vlan_vid = Y
+raw_encap = Y
port_id = Y
set_ipv4_dscp = Y
set_ipv4_dst = Y
Checking patch drivers/net/nfp/nfp_flow.c...
error: drivers/net/nfp/nfp_flow.c: does not exist in index
Checking patch doc/guides/nics/features/nfp.ini...
error: while searching for:
[rte_flow items]
eth = Y
ipv4 = Y
ipv6 = Y
port_id = Y
error: patch failed: doc/guides/nics/features/nfp.ini:28
Checking patch drivers/net/nfp/nfp_flow.c...
error: drivers/net/nfp/nfp_flow.c: does not exist in index
Applying patch doc/guides/nics/features/nfp.ini with 1 reject...
Rejected hunk #1.
diff a/doc/guides/nics/features/nfp.ini b/doc/guides/nics/features/nfp.ini (rejected hunks)
@@ -28,6 +28,7 @@ Usage doc = Y
[rte_flow items]
eth = Y
+geneve = Y
ipv4 = Y
ipv6 = Y
port_id = Y
Checking patch drivers/net/nfp/nfp_flow.c...
error: drivers/net/nfp/nfp_flow.c: does not exist in index
Checking patch doc/guides/nics/features/nfp.ini...
error: while searching for:
of_push_vlan = Y
of_set_vlan_pcp = Y
of_set_vlan_vid = Y
raw_encap = Y
port_id = Y
set_ipv4_dscp = Y
error: patch failed: doc/guides/nics/features/nfp.ini:45
Checking patch drivers/net/nfp/nfp_flow.c...
error: drivers/net/nfp/nfp_flow.c: does not exist in index
Applying patch doc/guides/nics/features/nfp.ini with 1 reject...
Rejected hunk #1.
diff a/doc/guides/nics/features/nfp.ini b/doc/guides/nics/features/nfp.ini (rejected hunks)
@@ -45,6 +45,7 @@ of_pop_vlan = Y
of_push_vlan = Y
of_set_vlan_pcp = Y
of_set_vlan_vid = Y
+raw_decap = Y
raw_encap = Y
port_id = Y
set_ipv4_dscp = Y
Checking patch drivers/net/nfp/nfp_flow.c...
error: drivers/net/nfp/nfp_flow.c: does not exist in index
Checking patch doc/guides/nics/features/nfp.ini...
error: while searching for:
[rte_flow actions]
count = Y
drop = Y
of_pop_vlan = Y
of_push_vlan = Y
of_set_vlan_pcp = Y
error: patch failed: doc/guides/nics/features/nfp.ini:41
Checking patch drivers/net/nfp/nfp_flow.c...
error: drivers/net/nfp/nfp_flow.c: does not exist in index
Applying patch doc/guides/nics/features/nfp.ini with 1 reject...
Rejected hunk #1.
diff a/doc/guides/nics/features/nfp.ini b/doc/guides/nics/features/nfp.ini (rejected hunks)
@@ -41,6 +41,7 @@ vxlan = Y
[rte_flow actions]
count = Y
drop = Y
+nvgre_encap = Y
of_pop_vlan = Y
of_push_vlan = Y
of_set_vlan_pcp = Y
Checking patch drivers/net/nfp/nfp_flow.c...
error: drivers/net/nfp/nfp_flow.c: does not exist in index
Checking patch drivers/net/nfp/flower/nfp_flower_cmsg.h...
error: while searching for:
rte_be32_t tun_id;
};
struct nfp_fl_act_head {
uint8_t jump_id;
uint8_t len_lw;
error: patch failed: drivers/net/nfp/flower/nfp_flower_cmsg.h:575
Checking patch drivers/net/nfp/nfp_flow.c...
error: drivers/net/nfp/nfp_flow.c: does not exist in index
Checking patch drivers/net/nfp/nfp_flow.h...
error: drivers/net/nfp/nfp_flow.h: does not exist in index
Applying patch drivers/net/nfp/flower/nfp_flower_cmsg.h with 1 reject...
Rejected hunk #1.
diff a/drivers/net/nfp/flower/nfp_flower_cmsg.h b/drivers/net/nfp/flower/nfp_flower_cmsg.h (rejected hunks)
@@ -575,6 +575,35 @@ struct nfp_flower_ipv6_udp_tun {
rte_be32_t tun_id;
};
+/*
+ * Flow Frame GRE TUNNEL --> Tunnel details (6W/24B)
+ * -----------------------------------------------------------------
+ * 3 2 1
+ * 1 0 9 8 7 6 5 4 3 2 1 0 9 8 7 6 5 4 3 2 1 0 9 8 7 6 5 4 3 2 1 0
+ * +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
+ * | ipv4_addr_src |
+ * +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
+ * | ipv4_addr_dst |
+ * +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
+ * | tun_flags | tos | ttl |
+ * +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
+ * | Reserved | Ethertype |
+ * +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
+ * | Key |
+ * +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
+ * | Reserved |
+ * +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
+ */
+struct nfp_flower_ipv4_gre_tun {
+ struct nfp_flower_tun_ipv4 ipv4;
+ rte_be16_t tun_flags;
+ struct nfp_flower_tun_ip_ext ip_ext;
+ rte_be16_t reserved1;
+ rte_be16_t ethertype;
+ rte_be32_t tun_key;
+ rte_be32_t reserved2;
+};
+
struct nfp_fl_act_head {
uint8_t jump_id;
uint8_t len_lw;
Checking patch drivers/net/nfp/flower/nfp_flower_cmsg.h...
error: while searching for:
rte_be32_t reserved2;
};
struct nfp_fl_act_head {
uint8_t jump_id;
uint8_t len_lw;
error: patch failed: drivers/net/nfp/flower/nfp_flower_cmsg.h:604
Checking patch drivers/net/nfp/nfp_flow.c...
error: drivers/net/nfp/nfp_flow.c: does not exist in index
Applying patch drivers/net/nfp/flower/nfp_flower_cmsg.h with 1 reject...
Rejected hunk #1.
diff a/drivers/net/nfp/flower/nfp_flower_cmsg.h b/drivers/net/nfp/flower/nfp_flower_cmsg.h (rejected hunks)
@@ -604,6 +604,47 @@ struct nfp_flower_ipv4_gre_tun {
rte_be32_t reserved2;
};
+/*
+ * Flow Frame GRE TUNNEL V6 --> Tunnel details (12W/48B)
+ * -----------------------------------------------------------------
+ * 3 2 1
+ * 1 0 9 8 7 6 5 4 3 2 1 0 9 8 7 6 5 4 3 2 1 0 9 8 7 6 5 4 3 2 1 0
+ * +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
+ * | ipv6_addr_src, 31 - 0 |
+ * +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
+ * | ipv6_addr_src, 63 - 32 |
+ * +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
+ * | ipv6_addr_src, 95 - 64 |
+ * +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
+ * | ipv6_addr_src, 127 - 96 |
+ * +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
+ * | ipv6_addr_dst, 31 - 0 |
+ * +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
+ * | ipv6_addr_dst, 63 - 32 |
+ * +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
+ * | ipv6_addr_dst, 95 - 64 |
+ * +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
+ * | ipv6_addr_dst, 127 - 96 |
+ * +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
+ * | tun_flags | tos | ttl |
+ * +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
+ * | Reserved | Ethertype |
+ * +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
+ * | Key |
+ * +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
+ * | Reserved |
+ * +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
+ */
+struct nfp_flower_ipv6_gre_tun {
+ struct nfp_flower_tun_ipv6 ipv6;
+ rte_be16_t tun_flags;
+ struct nfp_flower_tun_ip_ext ip_ext;
+ rte_be16_t reserved1;
+ rte_be16_t ethertype;
+ rte_be32_t tun_key;
+ rte_be32_t reserved2;
+};
+
struct nfp_fl_act_head {
uint8_t jump_id;
uint8_t len_lw;
Checking patch doc/guides/nics/features/nfp.ini...
error: while searching for:
[rte_flow items]
eth = Y
geneve = Y
ipv4 = Y
ipv6 = Y
port_id = Y
error: patch failed: doc/guides/nics/features/nfp.ini:29
Checking patch drivers/net/nfp/nfp_flow.c...
error: drivers/net/nfp/nfp_flow.c: does not exist in index
Applying patch doc/guides/nics/features/nfp.ini with 1 reject...
Rejected hunk #1.
diff a/doc/guides/nics/features/nfp.ini b/doc/guides/nics/features/nfp.ini (rejected hunks)
@@ -29,6 +29,8 @@ Usage doc = Y
[rte_flow items]
eth = Y
geneve = Y
+gre = Y
+gre_key = Y
ipv4 = Y
ipv6 = Y
port_id = Y
Checking patch drivers/net/nfp/nfp_flow.c...
error: drivers/net/nfp/nfp_flow.c: does not exist in index
Checking patch doc/guides/nics/features/nfp.ini...
error: while searching for:
[rte_flow actions]
count = Y
drop = Y
nvgre_encap = Y
of_pop_vlan = Y
of_push_vlan = Y
error: patch failed: doc/guides/nics/features/nfp.ini:43
Checking patch drivers/net/nfp/nfp_flow.c...
error: drivers/net/nfp/nfp_flow.c: does not exist in index
Applying patch doc/guides/nics/features/nfp.ini with 1 reject...
Rejected hunk #1.
diff a/doc/guides/nics/features/nfp.ini b/doc/guides/nics/features/nfp.ini (rejected hunks)
@@ -43,6 +43,7 @@ vxlan = Y
[rte_flow actions]
count = Y
drop = Y
+nvgre_decap = Y
nvgre_encap = Y
of_pop_vlan = Y
of_push_vlan = Y
Checking patch drivers/net/nfp/nfp_flow.c...
error: drivers/net/nfp/nfp_flow.c: does not exist in index
Checking patch drivers/net/nfp/flower/nfp_flower.c...
Hunk #1 succeeded at 1072 (offset -2 lines).
Hunk #2 succeeded at 1109 (offset -8 lines).
Checking patch drivers/net/nfp/flower/nfp_flower.h...
error: while searching for:
/* service id of ctrl vnic service */
uint32_t ctrl_vnic_id;
struct nfp_flow_priv *flow_priv;
};
int nfp_init_app_fw_flower(struct nfp_pf_dev *pf_dev);
int nfp_secondary_init_app_fw_flower(struct nfp_cpp *cpp);
uint16_t nfp_flower_pf_recv_pkts(void *rx_queue, struct rte_mbuf **rx_pkts,
error: patch failed: drivers/net/nfp/flower/nfp_flower.h:55
Checking patch drivers/net/nfp/flower/nfp_flower_cmsg.c...
error: drivers/net/nfp/flower/nfp_flower_cmsg.c: does not match index
Checking patch drivers/net/nfp/flower/nfp_flower_cmsg.h...
error: while searching for:
};
/*
* NFP_FLOWER_CMSG_TYPE_TUN_NEIGH_V4
* Bit 3 3 2 2 2 2 2 2 2 2 2 2 1 1 1 1 1 1 1 1 1 1 0 0 0 0 0 0 0 0 0 0
* -----\ 1 0 9 8 7 6 5 4 3 2 1 0 9 8 7 6 5 4 3 2 1 0 9 8 7 6 5 4 3 2 1 0
error: patch failed: drivers/net/nfp/flower/nfp_flower_cmsg.h:136
error: while searching for:
rte_be32_t dst_ipv4;
rte_be32_t src_ipv4;
struct nfp_flower_tun_neigh common;
};
/*
error: patch failed: drivers/net/nfp/flower/nfp_flower_cmsg.h:157
error: while searching for:
uint8_t dst_ipv6[16];
uint8_t src_ipv6[16];
struct nfp_flower_tun_neigh common;
};
#define NFP_TUN_PRE_TUN_RULE_DEL (1 << 0)
error: patch failed: drivers/net/nfp/flower/nfp_flower_cmsg.h:193
Checking patch drivers/net/nfp/nfp_flow.c...
error: drivers/net/nfp/nfp_flow.c: does not exist in index
Applied patch drivers/net/nfp/flower/nfp_flower.c cleanly.
Applying patch drivers/net/nfp/flower/nfp_flower.h with 1 reject...
Hunk #1 applied cleanly.
Rejected hunk #2.
Applying patch drivers/net/nfp/flower/nfp_flower_cmsg.h with 3 rejects...
Rejected hunk #1.
Rejected hunk #2.
Rejected hunk #3.
diff a/drivers/net/nfp/flower/nfp_flower.h b/drivers/net/nfp/flower/nfp_flower.h (rejected hunks)
@@ -55,9 +70,18 @@ struct nfp_app_fw_flower {
/* service id of ctrl vnic service */
uint32_t ctrl_vnic_id;
+ /* Flower extra features */
+ uint64_t ext_features;
+
struct nfp_flow_priv *flow_priv;
};
+static inline bool
+nfp_flower_support_decap_v2(const struct nfp_app_fw_flower *app_fw_flower)
+{
+ return app_fw_flower->ext_features & NFP_FL_FEATS_DECAP_V2;
+}
+
int nfp_init_app_fw_flower(struct nfp_pf_dev *pf_dev);
int nfp_secondary_init_app_fw_flower(struct nfp_cpp *cpp);
uint16_t nfp_flower_pf_recv_pkts(void *rx_queue, struct rte_mbuf **rx_pkts,
diff a/drivers/net/nfp/flower/nfp_flower_cmsg.h b/drivers/net/nfp/flower/nfp_flower_cmsg.h (rejected hunks)
@@ -136,6 +136,21 @@ struct nfp_flower_tun_neigh {
};
/*
+ * Bit 3 3 2 2 2 2 2 2 2 2 2 2 1 1 1 1 1 1 1 1 1 1 0 0 0 0 0 0 0 0 0 0
+ * -----\ 1 0 9 8 7 6 5 4 3 2 1 0 9 8 7 6 5 4 3 2 1 0 9 8 7 6 5 4 3 2 1 0
+ * +---------------------------------------------------------------+
+ * 0 | VLAN_TPID | VLAN_ID |
+ * +---------------------------------------------------------------+
+ * 1 | HOST_CTX |
+ * +---------------------------------------------------------------+
+ */
+struct nfp_flower_tun_neigh_ext {
+ rte_be16_t vlan_tpid;
+ rte_be16_t vlan_tci;
+ rte_be32_t host_ctx;
+};
+
+/*
* NFP_FLOWER_CMSG_TYPE_TUN_NEIGH_V4
* Bit 3 3 2 2 2 2 2 2 2 2 2 2 1 1 1 1 1 1 1 1 1 1 0 0 0 0 0 0 0 0 0 0
* -----\ 1 0 9 8 7 6 5 4 3 2 1 0 9 8 7 6 5 4 3 2 1 0 9 8 7 6 5 4 3 2 1 0
@@ -157,6 +172,7 @@ struct nfp_flower_cmsg_tun_neigh_v4 {
rte_be32_t dst_ipv4;
rte_be32_t src_ipv4;
struct nfp_flower_tun_neigh common;
+ struct nfp_flower_tun_neigh_ext ext;
};
/*
@@ -193,6 +209,7 @@ struct nfp_flower_cmsg_tun_neigh_v6 {
uint8_t dst_ipv6[16];
uint8_t src_ipv6[16];
struct nfp_flower_tun_neigh common;
+ struct nfp_flower_tun_neigh_ext ext;
};
#define NFP_TUN_PRE_TUN_RULE_DEL (1 << 0)
https://lab.dpdk.org/results/dashboard/patchsets/24136/
UNH-IOL DPDK Community Lab
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2022-10-22 8:59 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-10-22 8:59 |WARNING| pw118950-118972 [PATCH] [v2, 25/25] net/nfp: support new tunnel solution dpdklab
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).