Skip to contentSkip to conversation

net/ixgbe: fix qos sched sample app performance drop

PATCH Superseded Shougang Wang 2 participants 6 messages Nov 20, 2019 – Nov 21, 2019 Network drivers

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 net/ixgbe: fix qos sched sample app performance drop

Currently MACsec register is set without any conditions when start port. It should be set only when user needs. To avoid wild value, I add init function. This patch fixes the issue.

Fixes 50556c88104c ("net/ixgbe: fix MACsec setting")
---
 drivers/net/ixgbe/ixgbe_ethdev.c | 31 ++++++++++++++++++++++++++-----
 1 file changed, 26 insertions(+), 5 deletions(-)
drivers/net/ixgbe/ixgbe_ethdev.c +26 -5
index 8c1caac18..d54eec1c6 100644
@@ -379,6 +379,8 @@ static int ixgbe_dev_udp_tunnel_port_del(struct rte_eth_dev *dev,
 static int ixgbe_filter_restore(struct rte_eth_dev *dev);
 static void ixgbe_l2_tunnel_conf(struct rte_eth_dev *dev);
 
+static void ixgbe_dev_macsec_init(struct rte_eth_dev *dev);
+
 /*
  * Define VF Stats MACRO for Non "cleared on read" register
  */
@@ -1095,6 +1097,8 @@ eth_ixgbe_dev_init(struct rte_eth_dev *eth_dev, void *init_params __rte_unused)
 
 	PMD_INIT_FUNC_TRACE();
 
+	ixgbe_dev_macsec_init(eth_dev);
+
 	eth_dev->dev_ops = &ixgbe_eth_dev_ops;
 	eth_dev->rx_pkt_burst = &ixgbe_recv_pkts;
 	eth_dev->tx_pkt_burst = &ixgbe_xmit_pkts;
@@ -2545,7 +2549,7 @@ ixgbe_dev_start(struct rte_eth_dev *dev)
 	uint32_t *link_speeds;
 	struct ixgbe_tm_conf *tm_conf =
 		IXGBE_DEV_PRIVATE_TO_TM_CONF(dev->data->dev_private);
-	struct ixgbe_macsec_setting *macsec_ctrl =
+	struct ixgbe_macsec_setting *macsec_setting =
 		IXGBE_DEV_PRIVATE_TO_MACSEC_SETTING(dev->data->dev_private);
 
 	PMD_INIT_FUNC_TRACE();
@@ -2799,9 +2803,11 @@ ixgbe_dev_start(struct rte_eth_dev *dev)
 	 */
 	ixgbe_dev_link_update(dev, 0);
 
-	/* setup the macsec ctrl register */
-	ixgbe_dev_macsec_register_enable(dev, macsec_ctrl);
-
+	/* setup the macsec setting register */
+	if (macsec_setting->encrypt_en != 0 ||
+	    macsec_setting->replayprotect_en != 0) {
+		ixgbe_dev_macsec_register_enable(dev, macsec_setting);
+	}
 	return 0;
 
 error:
@@ -2827,6 +2833,8 @@ ixgbe_dev_stop(struct rte_eth_dev *dev)
 	int vf;
 	struct ixgbe_tm_conf *tm_conf =
 		IXGBE_DEV_PRIVATE_TO_TM_CONF(dev->data->dev_private);
+	struct ixgbe_macsec_setting *macsec_setting =
+		IXGBE_DEV_PRIVATE_TO_MACSEC_SETTING(dev->data->dev_private);
 
 	if (hw->adapter_stopped)
 		return;
@@ -2834,7 +2842,10 @@ ixgbe_dev_stop(struct rte_eth_dev *dev)
 	PMD_INIT_FUNC_TRACE();
 
 	/* disable mecsec register */
-	ixgbe_dev_macsec_register_disable(dev);
+	if (macsec_setting->encrypt_en != 0 ||
+	    macsec_setting->replayprotect_en != 0) {
+		ixgbe_dev_macsec_register_disable(dev);
+	}
 
 	rte_eal_alarm_cancel(ixgbe_dev_setup_link_alarm_handler, dev);
 
@@ -8977,6 +8988,16 @@ ixgbe_dev_macsec_register_disable(struct rte_eth_dev *dev)
 	ixgbe_enable_sec_tx_path_generic(hw);
 }
 
+static void
+ixgbe_dev_macsec_init(struct rte_eth_dev *dev)
+{
+	struct ixgbe_macsec_setting *macsec =
+		IXGBE_DEV_PRIVATE_TO_MACSEC_SETTING(dev->data->dev_private);
+
+	macsec->encrypt_en = 0;
+	macsec->replayprotect_en = 0;
+}
+
 RTE_PMD_REGISTER_PCI(net_ixgbe, rte_ixgbe_pmd);
 RTE_PMD_REGISTER_PCI_TABLE(net_ixgbe, pci_id_ixgbe_map);
 RTE_PMD_REGISTER_KMOD_DEP(net_ixgbe, "* igb_uio | uio_pci_generic | vfio-pci");
Signature · 1 line
2.17.1
#1 lore raw

Hi,

Guinan, could you take a look at this patch as well.

Quoted 25 lines · Shougang Wang

Currently MACsec register is set without any conditions when start port. It should be set only when user needs. To avoid wild value, I add init function. This patch fixes the issue.

Fixes 50556c88104c ("net/ixgbe: fix MACsec setting")

---
drivers/net/ixgbe/ixgbe_ethdev.c | 31 ++++++++++++++++++++++++++-----

1 file changed, 26 insertions(+), 5 deletions(-)
drivers/net/ixgbe/ixgbe_ethdev.c +2 -0
index 8c1caac18..d54eec1c6 100644
@@ -379,6 +379,8 @@ static int ixgbe_dev_udp_tunnel_port_del(struct rte_eth_dev *dev,
 static int ixgbe_filter_restore(struct rte_eth_dev *dev);
 static void ixgbe_l2_tunnel_conf(struct rte_eth_dev *dev);
 
+static void ixgbe_dev_macsec_init(struct rte_eth_dev *dev);
+
 /*
 * Define VF Stats MACRO for Non "cleared on read" register
 */

drivers/net/ixgbe/ixgbe_ethdev.c eth_ixgbe_dev_init(struct rte_eth_dev *eth_dev, void *init_params __rte_unused) · line 1100

Quoted 4 lines
drivers/net/ixgbe/ixgbe_ethdev.c +1 -0
@@ -1095,6 +1097,8 @@ eth_ixgbe_dev_init(struct rte_eth_dev *eth_dev, void *init_params __rte_unused)
 
 	PMD_INIT_FUNC_TRACE();
 
+	ixgbe_dev_macsec_init(eth_dev);

This is not needed as dev_private is allocated by rte_zmalloc_socket.

Quoted 15 lines
drivers/net/ixgbe/ixgbe_ethdev.c +2 -1
+
 	eth_dev->dev_ops = &ixgbe_eth_dev_ops;
 	eth_dev->rx_pkt_burst = &ixgbe_recv_pkts;
 	eth_dev->tx_pkt_burst = &ixgbe_xmit_pkts;
@@ -2545,7 +2549,7 @@ ixgbe_dev_start(struct rte_eth_dev *dev)
 	uint32_t *link_speeds;
 	struct ixgbe_tm_conf *tm_conf =
 		IXGBE_DEV_PRIVATE_TO_TM_CONF(dev->data->dev_private);
-	struct ixgbe_macsec_setting *macsec_ctrl =
+	struct ixgbe_macsec_setting *macsec_setting =
 		IXGBE_DEV_PRIVATE_TO_MACSEC_SETTING(dev->data->dev_private);
 
 	PMD_INIT_FUNC_TRACE();
@@ -2799,9 +2803,11 @@ ixgbe_dev_start(struct rte_eth_dev *dev)
 	 */

drivers/net/ixgbe/ixgbe_ethdev.c ixgbe_dev_start(struct rte_eth_dev *dev) · line 2810

Quoted 10 lines
drivers/net/ixgbe/ixgbe_ethdev.c +5 -3
 	ixgbe_dev_link_update(dev, 0);
 
-	/* setup the macsec ctrl register */
-	ixgbe_dev_macsec_register_enable(dev, macsec_ctrl);
-
+	/* setup the macsec setting register */
+	if (macsec_setting->encrypt_en != 0 ||
+	    macsec_setting->replayprotect_en != 0) {
+		ixgbe_dev_macsec_register_enable(dev, macsec_setting);
+	}

Can we safely assume that if encrypt_en and replayprotect_en equals zero, then we don't need to call ixgbe_dev_macsec_register_enable at all? Since this enable routine is more about just encrypt_en/replayprotect_en, is that any usercase when user set macsec offload with both encrypt_en and replayprotect_en are 0?

Thanks,
Xiaolong

Quoted 44 lines
drivers/net/ixgbe/ixgbe_ethdev.c +0 -0
 	return 0;
 

error:

drivers/net/ixgbe/ixgbe_ethdev.c +16 -1
@@ -2827,6 +2833,8 @@ ixgbe_dev_stop(struct rte_eth_dev *dev)
 	int vf;
 	struct ixgbe_tm_conf *tm_conf =
 		IXGBE_DEV_PRIVATE_TO_TM_CONF(dev->data->dev_private);
+	struct ixgbe_macsec_setting *macsec_setting =
+		IXGBE_DEV_PRIVATE_TO_MACSEC_SETTING(dev->data->dev_private);
 
 	if (hw->adapter_stopped)
 		return;
@@ -2834,7 +2842,10 @@ ixgbe_dev_stop(struct rte_eth_dev *dev)
 	PMD_INIT_FUNC_TRACE();
 
 	/* disable mecsec register */
-	ixgbe_dev_macsec_register_disable(dev);
+	if (macsec_setting->encrypt_en != 0 ||
+	    macsec_setting->replayprotect_en != 0) {
+		ixgbe_dev_macsec_register_disable(dev);
+	}
 
 	rte_eal_alarm_cancel(ixgbe_dev_setup_link_alarm_handler, dev);
 
@@ -8977,6 +8988,16 @@ ixgbe_dev_macsec_register_disable(struct rte_eth_dev *dev)
 	ixgbe_enable_sec_tx_path_generic(hw);
 }
 
+static void
+ixgbe_dev_macsec_init(struct rte_eth_dev *dev)
+{
+	struct ixgbe_macsec_setting *macsec =
+		IXGBE_DEV_PRIVATE_TO_MACSEC_SETTING(dev->data->dev_private);
+
+	macsec->encrypt_en = 0;
+	macsec->replayprotect_en = 0;
+}
+
 RTE_PMD_REGISTER_PCI(net_ixgbe, rte_ixgbe_pmd);
 RTE_PMD_REGISTER_PCI_TABLE(net_ixgbe, pci_id_ixgbe_map);
 RTE_PMD_REGISTER_KMOD_DEP(net_ixgbe, "* igb_uio | uio_pci_generic | vfio-pci");
Signature · 1 line
2.17.1
#2 lore raw

Hi, Xiaolong

Quoted 1 line

-----Original Message-----

[snip]

Quoted 8 lines
Quoted 8 lines
drivers/net/ixgbe/ixgbe_ethdev.c +2 -0
+static void ixgbe_dev_macsec_init(struct rte_eth_dev *dev);
+

/*
* Define VF Stats MACRO for Non "cleared on read" register */

(quoted diff) +0 -0
@@ -1095,6 +1097,8 @@ eth_ixgbe_dev_init(struct rte_eth_dev *eth_dev,
 void *init_params __rte_unused)
 
Quoted 6 lines

drivers/net/ixgbe/ixgbe_ethdev.c eth_ixgbe_dev_init(struct rte_eth_dev *eth_dev, void *init_params __rte_unused) · line 1100

Quoted 3 lines
drivers/net/ixgbe/ixgbe_ethdev.c +1 -0
 	PMD_INIT_FUNC_TRACE();
 
+	ixgbe_dev_macsec_init(eth_dev);

This is not needed as dev_private is allocated by rte_zmalloc_socket.

OK, I will remove it.

Quoted 18 lines
Quoted 18 lines
drivers/net/ixgbe/ixgbe_ethdev.c +1 -0
+
 	eth_dev->dev_ops = &ixgbe_eth_dev_ops;
 	eth_dev->rx_pkt_burst = &ixgbe_recv_pkts;
	eth_dev->tx_pkt_burst = &ixgbe_xmit_pkts; @@ -2545,7 +2549,7 @@
ixgbe_dev_start(struct rte_eth_dev *dev)
	uint32_t *link_speeds;
	struct ixgbe_tm_conf *tm_conf =
		IXGBE_DEV_PRIVATE_TO_TM_CONF(dev->data->dev_private);
drivers/net/ixgbe/ixgbe_ethdev.c +1 -1
-	struct ixgbe_macsec_setting *macsec_ctrl =
+	struct ixgbe_macsec_setting *macsec_setting =
		IXGBE_DEV_PRIVATE_TO_MACSEC_SETTING(dev->data-

dev_private);

	PMD_INIT_FUNC_TRACE();
drivers/net/ixgbe/ixgbe_ethdev.c +0 -0
@@ -2799,9 +2803,11 @@ ixgbe_dev_start(struct rte_eth_dev *dev)
 	 */
 	ixgbe_dev_link_update(dev, 0);
 
Quoted 15 lines

drivers/net/ixgbe/ixgbe_ethdev.c ixgbe_dev_start(struct rte_eth_dev *dev) · line 2810

Quoted 8 lines
drivers/net/ixgbe/ixgbe_ethdev.c +5 -3
-	/* setup the macsec ctrl register */
-	ixgbe_dev_macsec_register_enable(dev, macsec_ctrl);
-
+	/* setup the macsec setting register */
+	if (macsec_setting->encrypt_en != 0 ||
+	    macsec_setting->replayprotect_en != 0) {
+		ixgbe_dev_macsec_register_enable(dev, macsec_setting);
+	}

Can we safely assume that if encrypt_en and replayprotect_en equals zero, then we don't need to call ixgbe_dev_macsec_register_enable at all? Since this enable routine is more about just encrypt_en/replayprotect_en, is that any usercase when user set macsec offload with both encrypt_en and replayprotect_en are 0?

As you said, this is a problem. I will fix it. Thanks a lot.

Thanks.
Shougang

#3 lore raw

PATCH v2 1/1 net/ixgbe: fix QoS performance drop issue

In reply to Shougang Wang

Currently macsec offload will be enabled all the time when device start. It will cause QoS sample application performance drop issue. This patch add check before this feature enabled.

Fixes 50556c88104c ("net/ixgbe: fix MACsec setting")
---
 drivers/net/ixgbe/ixgbe_ethdev.c  | 14 ++++++++------
 drivers/net/ixgbe/ixgbe_ethdev.h  |  1 +
 drivers/net/ixgbe/rte_pmd_ixgbe.c |  1 +
 3 files changed, 10 insertions(+), 6 deletions(-)
drivers/net/ixgbe/ixgbe_ethdev.c +8 -6
index 8c1caac18..aeb82d1c8 100644
@@ -1095,6 +1095,8 @@ eth_ixgbe_dev_init(struct rte_eth_dev *eth_dev, void *init_params __rte_unused)
 
 	PMD_INIT_FUNC_TRACE();
 
+	ixgbe_dev_macsec_setting_reset(eth_dev);
+
 	eth_dev->dev_ops = &ixgbe_eth_dev_ops;
 	eth_dev->rx_pkt_burst = &ixgbe_recv_pkts;
 	eth_dev->tx_pkt_burst = &ixgbe_xmit_pkts;
@@ -2545,7 +2547,7 @@ ixgbe_dev_start(struct rte_eth_dev *dev)
 	uint32_t *link_speeds;
 	struct ixgbe_tm_conf *tm_conf =
 		IXGBE_DEV_PRIVATE_TO_TM_CONF(dev->data->dev_private);
-	struct ixgbe_macsec_setting *macsec_ctrl =
+	struct ixgbe_macsec_setting *macsec_setting =
 		IXGBE_DEV_PRIVATE_TO_MACSEC_SETTING(dev->data->dev_private);
 
 	PMD_INIT_FUNC_TRACE();
@@ -2799,8 +2801,9 @@ ixgbe_dev_start(struct rte_eth_dev *dev)
 	 */
 	ixgbe_dev_link_update(dev, 0);
 
-	/* setup the macsec ctrl register */
-	ixgbe_dev_macsec_register_enable(dev, macsec_ctrl);
+	/* setup the macsec setting register */
+	if (macsec_setting->offload_en)
+		ixgbe_dev_macsec_register_enable(dev, macsec_setting);
 
 	return 0;
 
@@ -2833,9 +2836,6 @@ ixgbe_dev_stop(struct rte_eth_dev *dev)
 
 	PMD_INIT_FUNC_TRACE();
 
-	/* disable mecsec register */
-	ixgbe_dev_macsec_register_disable(dev);
-
 	rte_eal_alarm_cancel(ixgbe_dev_setup_link_alarm_handler, dev);
 
 	/* disable interrupts */
@@ -8843,6 +8843,7 @@ ixgbe_dev_macsec_setting_save(struct rte_eth_dev *dev,
 	struct ixgbe_macsec_setting *macsec =
 		IXGBE_DEV_PRIVATE_TO_MACSEC_SETTING(dev->data->dev_private);
 
+	macsec->offload_en = macsec_setting->offload_en;
 	macsec->encrypt_en = macsec_setting->encrypt_en;
 	macsec->replayprotect_en = macsec_setting->replayprotect_en;
 }
@@ -8853,6 +8854,7 @@ ixgbe_dev_macsec_setting_reset(struct rte_eth_dev *dev)
 	struct ixgbe_macsec_setting *macsec =
 		IXGBE_DEV_PRIVATE_TO_MACSEC_SETTING(dev->data->dev_private);
 
+	macsec->offload_en = 0;
 	macsec->encrypt_en = 0;
 	macsec->replayprotect_en = 0;
 }
drivers/net/ixgbe/ixgbe_ethdev.h +1 -0
index 5da6923a1..76a1b9d18 100644
@@ -366,6 +366,7 @@ struct rte_flow {
 };
 
 struct ixgbe_macsec_setting {
+	uint8_t offload_en;
 	uint8_t encrypt_en;
 	uint8_t replayprotect_en;
 };
drivers/net/ixgbe/rte_pmd_ixgbe.c +1 -0
index 073fe1e23..8bcaded6e 100644
@@ -522,6 +522,7 @@ rte_pmd_ixgbe_macsec_enable(uint16_t port, uint8_t en, uint8_t rp)
 
 	dev = &rte_eth_devices[port];
 
+	macsec_setting.offload_en = 1;
 	macsec_setting.encrypt_en = en;
 	macsec_setting.replayprotect_en = rp;
 
Signature · 1 line
2.17.1
Reviewed-by on v2 1/1
#4 lore raw

Re: [dpdk-dev] [PATCH v2] net/ixgbe: fix QoS performance drop issue

Quoted 101 lines · Shougang Wang

Currently macsec offload will be enabled all the time when device start. It will cause QoS sample application performance drop issue. This patch add check before this feature enabled.

Fixes 50556c88104c ("net/ixgbe: fix MACsec setting")

---

drivers/net/ixgbe/ixgbe_ethdev.c  | 14 ++++++++------
drivers/net/ixgbe/ixgbe_ethdev.h  |  1 +
drivers/net/ixgbe/rte_pmd_ixgbe.c |  1 +
3 files changed, 10 insertions(+), 6 deletions(-)
drivers/net/ixgbe/ixgbe_ethdev.c +8 -6
index 8c1caac18..aeb82d1c8 100644
@@ -1095,6 +1095,8 @@ eth_ixgbe_dev_init(struct rte_eth_dev *eth_dev, void *init_params __rte_unused)
 
 	PMD_INIT_FUNC_TRACE();
 
+	ixgbe_dev_macsec_setting_reset(eth_dev);
+
 	eth_dev->dev_ops = &ixgbe_eth_dev_ops;
 	eth_dev->rx_pkt_burst = &ixgbe_recv_pkts;
 	eth_dev->tx_pkt_burst = &ixgbe_xmit_pkts;
@@ -2545,7 +2547,7 @@ ixgbe_dev_start(struct rte_eth_dev *dev)
 	uint32_t *link_speeds;
 	struct ixgbe_tm_conf *tm_conf =
 		IXGBE_DEV_PRIVATE_TO_TM_CONF(dev->data->dev_private);
-	struct ixgbe_macsec_setting *macsec_ctrl =
+	struct ixgbe_macsec_setting *macsec_setting =
 		IXGBE_DEV_PRIVATE_TO_MACSEC_SETTING(dev->data->dev_private);
 
 	PMD_INIT_FUNC_TRACE();
@@ -2799,8 +2801,9 @@ ixgbe_dev_start(struct rte_eth_dev *dev)
 	 */
 	ixgbe_dev_link_update(dev, 0);
 
-	/* setup the macsec ctrl register */
-	ixgbe_dev_macsec_register_enable(dev, macsec_ctrl);
+	/* setup the macsec setting register */
+	if (macsec_setting->offload_en)
+		ixgbe_dev_macsec_register_enable(dev, macsec_setting);
 
 	return 0;
 
@@ -2833,9 +2836,6 @@ ixgbe_dev_stop(struct rte_eth_dev *dev)
 
 	PMD_INIT_FUNC_TRACE();
 
-	/* disable mecsec register */
-	ixgbe_dev_macsec_register_disable(dev);
-
 	rte_eal_alarm_cancel(ixgbe_dev_setup_link_alarm_handler, dev);
 
 	/* disable interrupts */
@@ -8843,6 +8843,7 @@ ixgbe_dev_macsec_setting_save(struct rte_eth_dev *dev,
 	struct ixgbe_macsec_setting *macsec =
 		IXGBE_DEV_PRIVATE_TO_MACSEC_SETTING(dev->data->dev_private);
 
+	macsec->offload_en = macsec_setting->offload_en;
 	macsec->encrypt_en = macsec_setting->encrypt_en;
 	macsec->replayprotect_en = macsec_setting->replayprotect_en;
 }
@@ -8853,6 +8854,7 @@ ixgbe_dev_macsec_setting_reset(struct rte_eth_dev *dev)
 	struct ixgbe_macsec_setting *macsec =
 		IXGBE_DEV_PRIVATE_TO_MACSEC_SETTING(dev->data->dev_private);
 
+	macsec->offload_en = 0;
 	macsec->encrypt_en = 0;
 	macsec->replayprotect_en = 0;
 }
drivers/net/ixgbe/ixgbe_ethdev.h +1 -0
index 5da6923a1..76a1b9d18 100644
@@ -366,6 +366,7 @@ struct rte_flow {
 };
 
 struct ixgbe_macsec_setting {
+	uint8_t offload_en;
 	uint8_t encrypt_en;
 	uint8_t replayprotect_en;
 };
drivers/net/ixgbe/rte_pmd_ixgbe.c +1 -0
index 073fe1e23..8bcaded6e 100644
@@ -522,6 +522,7 @@ rte_pmd_ixgbe_macsec_enable(uint16_t port, uint8_t en, uint8_t rp)
 
 	dev = &rte_eth_devices[port];
 
+	macsec_setting.offload_en = 1;
 	macsec_setting.encrypt_en = en;
 	macsec_setting.replayprotect_en = rp;
 
Signature · 1 line
2.17.1
Applied
#5 lore raw

Re: [dpdk-dev] [PATCH v2] net/ixgbe: fix QoS performance drop issue

In reply to Shougang Wang
Quoted 101 lines · Shougang Wang

Currently macsec offload will be enabled all the time when device start. It will cause QoS sample application performance drop issue. This patch add check before this feature enabled.

Fixes 50556c88104c ("net/ixgbe: fix MACsec setting")

---

drivers/net/ixgbe/ixgbe_ethdev.c  | 14 ++++++++------
drivers/net/ixgbe/ixgbe_ethdev.h  |  1 +
drivers/net/ixgbe/rte_pmd_ixgbe.c |  1 +
3 files changed, 10 insertions(+), 6 deletions(-)
drivers/net/ixgbe/ixgbe_ethdev.c +8 -6
index 8c1caac18..aeb82d1c8 100644
@@ -1095,6 +1095,8 @@ eth_ixgbe_dev_init(struct rte_eth_dev *eth_dev, void *init_params __rte_unused)
 
 	PMD_INIT_FUNC_TRACE();
 
+	ixgbe_dev_macsec_setting_reset(eth_dev);
+
 	eth_dev->dev_ops = &ixgbe_eth_dev_ops;
 	eth_dev->rx_pkt_burst = &ixgbe_recv_pkts;
 	eth_dev->tx_pkt_burst = &ixgbe_xmit_pkts;
@@ -2545,7 +2547,7 @@ ixgbe_dev_start(struct rte_eth_dev *dev)
 	uint32_t *link_speeds;
 	struct ixgbe_tm_conf *tm_conf =
 		IXGBE_DEV_PRIVATE_TO_TM_CONF(dev->data->dev_private);
-	struct ixgbe_macsec_setting *macsec_ctrl =
+	struct ixgbe_macsec_setting *macsec_setting =
 		IXGBE_DEV_PRIVATE_TO_MACSEC_SETTING(dev->data->dev_private);
 
 	PMD_INIT_FUNC_TRACE();
@@ -2799,8 +2801,9 @@ ixgbe_dev_start(struct rte_eth_dev *dev)
 	 */
 	ixgbe_dev_link_update(dev, 0);
 
-	/* setup the macsec ctrl register */
-	ixgbe_dev_macsec_register_enable(dev, macsec_ctrl);
+	/* setup the macsec setting register */
+	if (macsec_setting->offload_en)
+		ixgbe_dev_macsec_register_enable(dev, macsec_setting);
 
 	return 0;
 
@@ -2833,9 +2836,6 @@ ixgbe_dev_stop(struct rte_eth_dev *dev)
 
 	PMD_INIT_FUNC_TRACE();
 
-	/* disable mecsec register */
-	ixgbe_dev_macsec_register_disable(dev);
-
 	rte_eal_alarm_cancel(ixgbe_dev_setup_link_alarm_handler, dev);
 
 	/* disable interrupts */
@@ -8843,6 +8843,7 @@ ixgbe_dev_macsec_setting_save(struct rte_eth_dev *dev,
 	struct ixgbe_macsec_setting *macsec =
 		IXGBE_DEV_PRIVATE_TO_MACSEC_SETTING(dev->data->dev_private);
 
+	macsec->offload_en = macsec_setting->offload_en;
 	macsec->encrypt_en = macsec_setting->encrypt_en;
 	macsec->replayprotect_en = macsec_setting->replayprotect_en;
 }
@@ -8853,6 +8854,7 @@ ixgbe_dev_macsec_setting_reset(struct rte_eth_dev *dev)
 	struct ixgbe_macsec_setting *macsec =
 		IXGBE_DEV_PRIVATE_TO_MACSEC_SETTING(dev->data->dev_private);
 
+	macsec->offload_en = 0;
 	macsec->encrypt_en = 0;
 	macsec->replayprotect_en = 0;
 }
drivers/net/ixgbe/ixgbe_ethdev.h +1 -0
index 5da6923a1..76a1b9d18 100644
@@ -366,6 +366,7 @@ struct rte_flow {
 };
 
 struct ixgbe_macsec_setting {
+	uint8_t offload_en;
 	uint8_t encrypt_en;
 	uint8_t replayprotect_en;
 };
drivers/net/ixgbe/rte_pmd_ixgbe.c +1 -0
index 073fe1e23..8bcaded6e 100644
@@ -522,6 +522,7 @@ rte_pmd_ixgbe_macsec_enable(uint16_t port, uint8_t en, uint8_t rp)
 
 	dev = &rte_eth_devices[port];
 
+	macsec_setting.offload_en = 1;
 	macsec_setting.encrypt_en = en;
 	macsec_setting.replayprotect_en = rp;
 
Signature · 1 line
2.17.1

Applied to dpdk-next-net-intel, Thanks.