From: Ke Zhang <ke1x.zhang@intel.com>
To: dev@dpdk.org, mb@smartsharesystems.com, thomas@monjalon.net,
ferruh.yigit@amd.com, olivier.matz@6wind.com,
Yuying.Zhang@intel.com, beilei.xing@intel.com
Cc: Ke Zhang <ke1x.zhang@intel.com>
Subject: [PATCH v2] net/i40e: support enabling/disabling source pruning
Date: Mon, 30 Jan 2023 16:09:16 +0800 [thread overview]
Message-ID: <20230130080916.77274-1-ke1x.zhang@intel.com> (raw)
In-Reply-To: <20230109022027.190627-1-ke1x.zhang@intel.com>
VRRP advertisement packets are dropped on i40e PF devices because
when a MAC address is added to a device, packets originating from
that MAC address are dropped.
This patch adds a PMD specific API to enable/disable source
pruning to fix above issue.
Bugzilla ID: 648
Signed-off-by: Ke Zhang <ke1x.zhang@intel.com>
---
app/test-pmd/cmdline.c | 84 +++++++++++++++++++++++++++++++++
drivers/net/i40e/i40e_ethdev.c | 43 +++++++++++++++++
drivers/net/i40e/i40e_ethdev.h | 1 +
drivers/net/i40e/rte_pmd_i40e.c | 20 ++++++++
drivers/net/i40e/rte_pmd_i40e.h | 16 +++++++
5 files changed, 164 insertions(+)
diff --git a/app/test-pmd/cmdline.c b/app/test-pmd/cmdline.c
index cb8c174020..76a574affd 100644
--- a/app/test-pmd/cmdline.c
+++ b/app/test-pmd/cmdline.c
@@ -776,6 +776,9 @@ static void cmd_help_long_parsed(void *parsed_result,
"port cleanup (port_id) txq (queue_id) (free_cnt)\n"
" Cleanup txq mbufs for a specific Tx queue\n\n"
+
+ "port config (port_id|all) src_prune (on|off)\n"
+ " Set source prune on port_id, or all.\n\n"
);
}
@@ -1619,6 +1622,84 @@ static cmdline_parse_inst_t cmd_config_loopback_specific = {
},
};
+/* *** configure source prune for port *** */
+struct cmd_config_src_prune_result {
+ cmdline_fixed_string_t port;
+ cmdline_fixed_string_t keyword;
+ cmdline_fixed_string_t port_all; /* valid if "allports" argument == 1 */
+ uint16_t port_num; /* valid if "allports" argument == 0 */
+ cmdline_fixed_string_t item;
+ cmdline_fixed_string_t enable;
+};
+
+static void cmd_config_src_prune_parsed(void *parsed_result,
+ __rte_unused struct cmdline *cl,
+ void *allports)
+{
+ struct cmd_config_src_prune_result *res = parsed_result;
+ int enable;
+ portid_t i;
+
+ if (!strcmp(res->enable, "on"))
+ enable = 1;
+ else
+ enable = 0;
+
+ /* all ports */
+ if (allports) {
+ RTE_ETH_FOREACH_DEV(i)
+ rte_pmd_i40e_set_src_prune(i, enable);
+ } else {
+ rte_pmd_i40e_set_src_prune(res->port_num, enable);
+ }
+}
+
+static cmdline_parse_token_string_t cmd_config_src_prune_port =
+ TOKEN_STRING_INITIALIZER(struct cmd_config_src_prune_result, port, "port");
+static cmdline_parse_token_string_t cmd_config_src_prune_keyword =
+ TOKEN_STRING_INITIALIZER(struct cmd_config_src_prune_result, keyword,
+ "config");
+static cmdline_parse_token_string_t cmd_config_src_prune_portall =
+ TOKEN_STRING_INITIALIZER(struct cmd_config_src_prune_result, port_all,
+ "all");
+static cmdline_parse_token_num_t cmd_config_src_prune_portnum =
+ TOKEN_NUM_INITIALIZER(struct cmd_config_src_prune_result, port_num,
+ RTE_UINT16);
+static cmdline_parse_token_string_t cmd_config_src_prune_item =
+ TOKEN_STRING_INITIALIZER(struct cmd_config_src_prune_result,
+ item, "src_prune");
+static cmdline_parse_token_string_t cmd_config_src_prune_enable =
+ TOKEN_STRING_INITIALIZER(struct cmd_config_src_prune_result, enable,
+ "on#off");
+
+static cmdline_parse_inst_t cmd_config_src_prune_all = {
+ .f = cmd_config_src_prune_parsed,
+ .data = (void *)1,
+ .help_str = "port config all src_prune (on|off): Set source prune on all ports.",
+ .tokens = {
+ (void *)&cmd_config_src_prune_port,
+ (void *)&cmd_config_src_prune_keyword,
+ (void *)&cmd_config_src_prune_portall,
+ (void *)&cmd_config_src_prune_item,
+ (void *)&cmd_config_src_prune_enable,
+ NULL,
+ },
+};
+
+static cmdline_parse_inst_t cmd_config_src_prune_specific = {
+ .f = cmd_config_src_prune_parsed,
+ .data = (void *)0,
+ .help_str = "port config all src_prune (on|off): Set source prune on specific port.",
+ .tokens = {
+ (void *)&cmd_config_src_prune_port,
+ (void *)&cmd_config_src_prune_keyword,
+ (void *)&cmd_config_src_prune_portnum,
+ (void *)&cmd_config_src_prune_item,
+ (void *)&cmd_config_src_prune_enable,
+ NULL,
+ },
+};
+
/* *** configure txq/rxq, txd/rxd *** */
struct cmd_config_rx_tx {
cmdline_fixed_string_t port;
@@ -12731,6 +12812,8 @@ static cmdline_parse_ctx_t builtin_ctx[] = {
(cmdline_parse_inst_t *)&cmd_config_speed_specific,
(cmdline_parse_inst_t *)&cmd_config_loopback_all,
(cmdline_parse_inst_t *)&cmd_config_loopback_specific,
+ (cmdline_parse_inst_t *)&cmd_config_src_prune_all,
+ (cmdline_parse_inst_t *)&cmd_config_src_prune_specific,
(cmdline_parse_inst_t *)&cmd_config_rx_tx,
(cmdline_parse_inst_t *)&cmd_config_mtu,
(cmdline_parse_inst_t *)&cmd_config_max_pkt_len,
@@ -12850,6 +12933,7 @@ static cmdline_parse_ctx_t builtin_ctx[] = {
(cmdline_parse_inst_t *)&cmd_operate_bpf_unld_parse,
#endif
(cmdline_parse_inst_t *)&cmd_config_tx_metadata_specific,
+
(cmdline_parse_inst_t *)&cmd_show_tx_metadata,
(cmdline_parse_inst_t *)&cmd_show_rx_tx_desc_status,
(cmdline_parse_inst_t *)&cmd_show_rx_queue_desc_used_count,
diff --git a/drivers/net/i40e/i40e_ethdev.c b/drivers/net/i40e/i40e_ethdev.c
index 7726a89d99..0f993b958e 100644
--- a/drivers/net/i40e/i40e_ethdev.c
+++ b/drivers/net/i40e/i40e_ethdev.c
@@ -5634,6 +5634,46 @@ i40e_enable_pf_lb(struct i40e_pf *pf)
hw->aq.asq_last_status);
}
+/* i40e_set_pf_source_prune
+ * @pf: pointer to the pf structure
+ * @on: Enable/disable source prune
+ *
+ * set source prune on pf
+ */
+int
+i40e_set_pf_source_prune(struct i40e_pf *pf, int on)
+{
+ struct i40e_hw *hw = I40E_PF_TO_HW(pf);
+ struct i40e_vsi_context ctxt;
+ int ret;
+
+ memset(&ctxt, 0, sizeof(ctxt));
+ ctxt.seid = pf->main_vsi_seid;
+ ctxt.pf_num = hw->pf_id;
+ ret = i40e_aq_get_vsi_params(hw, &ctxt, NULL);
+ if (ret) {
+ PMD_DRV_LOG(ERR, "cannot get pf vsi config, err %d, aq_err %d",
+ ret, hw->aq.asq_last_status);
+ return ret;
+ }
+ ctxt.flags = I40E_AQ_VSI_TYPE_PF;
+ ctxt.info.valid_sections =
+ rte_cpu_to_le_16(I40E_AQ_VSI_PROP_SWITCH_VALID);
+ if (on)
+ ctxt.info.switch_id &=
+ ~rte_cpu_to_le_16(I40E_AQ_VSI_SW_ID_FLAG_LOCAL_LB);
+ else
+ ctxt.info.switch_id |=
+ rte_cpu_to_le_16(I40E_AQ_VSI_SW_ID_FLAG_LOCAL_LB);
+
+ ret = i40e_aq_update_vsi_params(hw, &ctxt, NULL);
+ if (ret)
+ PMD_DRV_LOG(ERR, "update vsi switch failed, aq_err=%d",
+ hw->aq.asq_last_status);
+
+ return ret;
+}
+
/* Setup a VSI */
struct i40e_vsi *
i40e_vsi_setup(struct i40e_pf *pf,
@@ -5691,6 +5731,9 @@ i40e_vsi_setup(struct i40e_pf *pf,
}
}
+ /* source prune is disabled to support VRRP in default*/
+ i40e_set_pf_source_prune(pf, 0);
+
vsi = rte_zmalloc("i40e_vsi", sizeof(struct i40e_vsi), 0);
if (!vsi) {
PMD_DRV_LOG(ERR, "Failed to allocate memory for vsi");
diff --git a/drivers/net/i40e/i40e_ethdev.h b/drivers/net/i40e/i40e_ethdev.h
index 7c4cc44a27..df1591584b 100644
--- a/drivers/net/i40e/i40e_ethdev.h
+++ b/drivers/net/i40e/i40e_ethdev.h
@@ -1427,6 +1427,7 @@ int i40e_pf_calc_configured_queues_num(struct i40e_pf *pf);
int i40e_pf_reset_rss_reta(struct i40e_pf *pf);
int i40e_pf_reset_rss_key(struct i40e_pf *pf);
int i40e_pf_config_rss(struct i40e_pf *pf);
+int i40e_set_pf_source_prune(struct i40e_pf *pf, int on);
int i40e_set_rss_key(struct i40e_vsi *vsi, uint8_t *key, uint8_t key_len);
int i40e_set_rss_lut(struct i40e_vsi *vsi, uint8_t *lut, uint16_t lut_size);
int i40e_vf_representor_init(struct rte_eth_dev *ethdev, void *init_params);
diff --git a/drivers/net/i40e/rte_pmd_i40e.c b/drivers/net/i40e/rte_pmd_i40e.c
index 35829a1eea..b9fc3c24a1 100644
--- a/drivers/net/i40e/rte_pmd_i40e.c
+++ b/drivers/net/i40e/rte_pmd_i40e.c
@@ -445,6 +445,26 @@ rte_pmd_i40e_set_tx_loopback(uint16_t port, uint8_t on)
return ret;
}
+int
+rte_pmd_i40e_set_src_prune(uint16_t port, uint8_t on)
+{
+ struct rte_eth_dev *dev;
+ struct i40e_pf *pf;
+ int ret;
+
+ RTE_ETH_VALID_PORTID_OR_ERR_RET(port, -ENODEV);
+
+ dev = &rte_eth_devices[port];
+
+ if (!is_i40e_supported(dev))
+ return -ENOTSUP;
+
+ pf = I40E_DEV_PRIVATE_TO_PF(dev->data->dev_private);
+
+ ret = i40e_set_pf_source_prune(pf, on);
+ return ret;
+}
+
int
rte_pmd_i40e_set_vf_unicast_promisc(uint16_t port, uint16_t vf_id, uint8_t on)
{
diff --git a/drivers/net/i40e/rte_pmd_i40e.h b/drivers/net/i40e/rte_pmd_i40e.h
index 4cb21c3713..76c9296413 100644
--- a/drivers/net/i40e/rte_pmd_i40e.h
+++ b/drivers/net/i40e/rte_pmd_i40e.h
@@ -400,6 +400,22 @@ int rte_pmd_i40e_set_vf_vlan_anti_spoof(uint16_t port,
int rte_pmd_i40e_set_tx_loopback(uint16_t port,
uint8_t on);
+/**
+ * Enable/Disable source prune on all the PF.
+ *
+ * @param port
+ * The port identifier of the Ethernet device.
+ * @param on
+ * 1 - Enable source prune.
+ * 0 - Disable source prune.
+ * @return
+ * - (0) if successful.
+ * - (-ENODEV) if *port* invalid.
+ * - (-EINVAL) if bad parameter.
+ */
+int rte_pmd_i40e_set_src_prune(uint16_t port,
+ uint8_t on);
+
/**
* Enable/Disable VF unicast promiscuous mode.
*
--
2.25.1
next prev parent reply other threads:[~2023-01-30 8:22 UTC|newest]
Thread overview: 18+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-10-19 9:04 [dpdk-dev] [PATCH] net/i40e: disable " Alvin Zhang
2021-10-19 9:38 ` [dpdk-dev] [PATCH v2] " Alvin Zhang
2021-10-20 1:28 ` [dpdk-dev] [PATCH v3] " Alvin Zhang
2022-02-21 8:30 ` Jiang, YuX
2022-02-21 9:35 ` Morten Brørup
2022-12-26 9:03 ` Zhang, Ke1X
2022-12-26 10:26 ` Morten Brørup
2022-12-26 10:27 ` Morten Brørup
2023-01-09 2:20 ` [PATCH] " Ke Zhang
2023-01-09 7:40 ` Morten Brørup
2023-01-13 12:50 ` Ferruh Yigit
2023-01-30 8:09 ` Ke Zhang [this message]
2023-01-30 8:41 ` [PATCH v2] net/i40e: support enabling/disabling " Morten Brørup
2023-01-30 8:58 ` David Marchand
2023-01-31 3:28 ` Zhang, Ke1X
2023-02-01 11:11 ` Thomas Monjalon
2023-02-07 1:40 ` Zhang, Ke1X
2023-02-07 8:35 ` Thomas Monjalon
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=20230130080916.77274-1-ke1x.zhang@intel.com \
--to=ke1x.zhang@intel.com \
--cc=Yuying.Zhang@intel.com \
--cc=beilei.xing@intel.com \
--cc=dev@dpdk.org \
--cc=ferruh.yigit@amd.com \
--cc=mb@smartsharesystems.com \
--cc=olivier.matz@6wind.com \
--cc=thomas@monjalon.net \
/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).