From: Chaoyong He <chaoyong.he@corigine.com>
To: dev@dpdk.org
Cc: oss-drivers@corigine.com, niklas.soderlund@corigine.com,
Chaoyong He <chaoyong.he@corigine.com>
Subject: [PATCH 12/24] net/nfp: add the offload support of set SRC MAC action
Date: Fri, 7 Oct 2022 10:18:34 +0800 [thread overview]
Message-ID: <1665109126-16201-13-git-send-email-chaoyong.he@corigine.com> (raw)
In-Reply-To: <1665109126-16201-1-git-send-email-chaoyong.he@corigine.com>
Add the corresponding data structure and logics, to support
the offload of set source MAC action.
Signed-off-by: Chaoyong He <chaoyong.he@corigine.com>
Reviewed-by: Niklas Söderlund <niklas.soderlund@corigine.com>
---
doc/guides/nics/features/nfp.ini | 1 +
drivers/net/nfp/flower/nfp_flower_cmsg.h | 27 ++++++++++++++++++
drivers/net/nfp/nfp_flow.c | 47 ++++++++++++++++++++++++++++++++
3 files changed, 75 insertions(+)
diff --git a/doc/guides/nics/features/nfp.ini b/doc/guides/nics/features/nfp.ini
index f8f2577..ab6ddab 100644
--- a/doc/guides/nics/features/nfp.ini
+++ b/doc/guides/nics/features/nfp.ini
@@ -42,3 +42,4 @@ count = Y
dec_ttl = Y
drop = Y
port_id = Y
+set_mac_src = Y
diff --git a/drivers/net/nfp/flower/nfp_flower_cmsg.h b/drivers/net/nfp/flower/nfp_flower_cmsg.h
index 36d406f..b61342e 100644
--- a/drivers/net/nfp/flower/nfp_flower_cmsg.h
+++ b/drivers/net/nfp/flower/nfp_flower_cmsg.h
@@ -335,6 +335,33 @@ struct nfp_fl_act_output {
rte_be32_t port;
};
+/*
+ * ETH
+ * 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| - |
+ * +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
+ * | eth_dst_47_16_mask |
+ * +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
+ * | eth_dst_15_0_mask | eth_src_47_32_mask |
+ * +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
+ * | eth_src_31_0_mask |
+ * +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
+ * | eth_dst_47_16 |
+ * +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
+ * | eth_dst_15_0 | eth_src_47_32 |
+ * +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
+ * | eth_src_31_0 |
+ * +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
+ */
+struct nfp_fl_act_set_eth {
+ struct nfp_fl_act_head head;
+ rte_be16_t reserved;
+ uint8_t eth_addr_mask[RTE_ETHER_ADDR_LEN * 2];
+ uint8_t eth_addr[RTE_ETHER_ADDR_LEN * 2];
+};
+
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);
diff --git a/drivers/net/nfp/nfp_flow.c b/drivers/net/nfp/nfp_flow.c
index bb445ef..431c212 100644
--- a/drivers/net/nfp/nfp_flow.c
+++ b/drivers/net/nfp/nfp_flow.c
@@ -573,6 +573,7 @@ struct nfp_mask_id_entry {
struct nfp_fl_key_ls *key_ls)
{
int ret = 0;
+ bool mac_set_flag = false;
const struct rte_flow_action *action;
for (action = actions; action->type != RTE_FLOW_ACTION_TYPE_END; ++action) {
@@ -603,6 +604,13 @@ struct nfp_mask_id_entry {
PMD_DRV_LOG(DEBUG, "RTE_FLOW_ACTION_TYPE_PORT_ID detected");
key_ls->act_size += sizeof(struct nfp_fl_act_output);
break;
+ case RTE_FLOW_ACTION_TYPE_SET_MAC_SRC:
+ PMD_DRV_LOG(DEBUG, "RTE_FLOW_ACTION_TYPE_SET_MAC_SRC detected");
+ if (!mac_set_flag) {
+ key_ls->act_size += sizeof(struct nfp_fl_act_set_eth);
+ mac_set_flag = true;
+ }
+ break;
default:
PMD_DRV_LOG(ERR, "Action type %d not supported.", action->type);
return -ENOTSUP;
@@ -1221,6 +1229,36 @@ struct nfp_mask_id_entry {
return 0;
}
+static void
+nfp_flow_action_set_mac(char *act_data,
+ const struct rte_flow_action *action,
+ bool mac_src_flag,
+ bool mac_set_flag)
+{
+ size_t act_size;
+ struct nfp_fl_act_set_eth *set_eth;
+ const struct rte_flow_action_set_mac *set_mac;
+
+ if (mac_set_flag)
+ set_eth = (struct nfp_fl_act_set_eth *)act_data - 1;
+ else
+ set_eth = (struct nfp_fl_act_set_eth *)act_data;
+
+ act_size = sizeof(struct nfp_fl_act_set_eth);
+ set_eth->head.jump_id = NFP_FL_ACTION_OPCODE_SET_ETHERNET;
+ set_eth->head.len_lw = act_size >> NFP_FL_LW_SIZ;
+ set_eth->reserved = 0;
+
+ set_mac = (const struct rte_flow_action_set_mac *)action->conf;
+ if (mac_src_flag) {
+ rte_memcpy(&set_eth->eth_addr[RTE_ETHER_ADDR_LEN],
+ set_mac->mac_addr, RTE_ETHER_ADDR_LEN);
+ } else {
+ rte_memcpy(&set_eth->eth_addr[0],
+ set_mac->mac_addr, RTE_ETHER_ADDR_LEN);
+ }
+}
+
static int
nfp_flow_compile_action(__rte_unused struct nfp_flower_representor *representor,
const struct rte_flow_action actions[],
@@ -1230,6 +1268,7 @@ struct nfp_mask_id_entry {
char *position;
char *action_data;
bool drop_flag = false;
+ bool mac_set_flag = false;
uint32_t total_actions = 0;
const struct rte_flow_action *action;
struct nfp_fl_rule_metadata *nfp_flow_meta;
@@ -1266,6 +1305,14 @@ struct nfp_mask_id_entry {
position += sizeof(struct nfp_fl_act_output);
break;
+ case RTE_FLOW_ACTION_TYPE_SET_MAC_SRC:
+ PMD_DRV_LOG(DEBUG, "Process RTE_FLOW_ACTION_TYPE_SET_MAC_SRC");
+ nfp_flow_action_set_mac(position, action, true, mac_set_flag);
+ if (!mac_set_flag) {
+ position += sizeof(struct nfp_fl_act_set_eth);
+ mac_set_flag = true;
+ }
+ break;
default:
PMD_DRV_LOG(ERR, "Unsupported action type: %d", action->type);
return -ENOTSUP;
--
1.8.3.1
next prev parent reply other threads:[~2022-10-07 2:20 UTC|newest]
Thread overview: 25+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-10-07 2:18 [PATCH 00/24] add the basic rte_flow offload support of nfp PMD Chaoyong He
2022-10-07 2:18 ` [PATCH 01/24] net/nfp: add the stats process logic in ctrl VNIC service Chaoyong He
2022-10-07 2:18 ` [PATCH 02/24] net/nfp: add the structures and functions for flow offload Chaoyong He
2022-10-07 2:18 ` [PATCH 03/24] net/nfp: add the flow APIs of nfp PMD Chaoyong He
2022-10-07 2:18 ` [PATCH 04/24] net/nfp: add the offload support of basic items Chaoyong He
2022-10-07 2:18 ` [PATCH 05/24] net/nfp: add the offload support of basic actions Chaoyong He
2022-10-07 2:18 ` [PATCH 06/24] net/nfp: add the offload support of VLAN item Chaoyong He
2022-10-07 2:18 ` [PATCH 07/24] net/nfp: add the offload support of IPv4 item Chaoyong He
2022-10-07 2:18 ` [PATCH 08/24] net/nfp: add the offload support of IPv6 item Chaoyong He
2022-10-07 2:18 ` [PATCH 09/24] net/nfp: add the offload support of TCP item Chaoyong He
2022-10-07 2:18 ` [PATCH 10/24] net/nfp: add the offload support of UDP item Chaoyong He
2022-10-07 2:18 ` [PATCH 11/24] net/nfp: add the offload support of SCTP item Chaoyong He
2022-10-07 2:18 ` Chaoyong He [this message]
2022-10-07 2:18 ` [PATCH 13/24] net/nfp: add the offload support of set DST MAC action Chaoyong He
2022-10-07 2:18 ` [PATCH 14/24] net/nfp: add the offload support of pop VLAN action Chaoyong He
2022-10-07 2:18 ` [PATCH 15/24] net/nfp: add the offload support of push " Chaoyong He
2022-10-07 2:18 ` [PATCH 16/24] net/nfp: add the offload support of set SRC IPv4 action Chaoyong He
2022-10-07 2:18 ` [PATCH 17/24] net/nfp: add the offload support of set DST " Chaoyong He
2022-10-07 2:18 ` [PATCH 18/24] net/nfp: add the offload support of set SRC IPv6 action Chaoyong He
2022-10-07 2:18 ` [PATCH 19/24] net/nfp: add the offload support of set DST " Chaoyong He
2022-10-07 2:18 ` [PATCH 20/24] net/nfp: add the offload support of set TP SRC port action Chaoyong He
2022-10-07 2:18 ` [PATCH 21/24] net/nfp: add the offload support of set TP DST " Chaoyong He
2022-10-07 2:18 ` [PATCH 22/24] net/nfp: add the offload support of set TTL action Chaoyong He
2022-10-07 2:18 ` [PATCH 23/24] net/nfp: add the offload support of set IPv4 DSCP action Chaoyong He
2022-10-07 2:18 ` [PATCH 24/24] net/nfp: add the offload support of set IPv6 " Chaoyong He
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1665109126-16201-13-git-send-email-chaoyong.he@corigine.com \
--to=chaoyong.he@corigine.com \
--cc=dev@dpdk.org \
--cc=niklas.soderlund@corigine.com \
--cc=oss-drivers@corigine.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
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).