On Tue, Jan 25, 2022 at 3:09 PM <psathe...@marvell.com> wrote:
>
> From: Satheesh Paul <psathe...@marvell.com>
>
> When Rx/Tx functions are updated such as in an rte flow
> rule creation with VLAN stripping or marking action,
> update the fastpath ops table as well.
>
> Fixes: b951c2efcb1 ("net/cnxk: add Rx burst for CN9K")
> Fixes: f742a9a6681 ("net/cnxk: add Rx burst for CN10K")
>
> Signed-off-by: Satheesh Paul <psathe...@marvell.com>
> Reviewed-by: Jerin Jacob Kollanukkaran <jer...@marvell.com>
Updated the commit as follows and applied to
dpdk-next-net-mrvl/for-next-net. Thanks
net/cnxk: fix Rx/Tx function update
When Rx/Tx functions are updated such as in a rte flow
rule creation with VLAN stripping or marking action,
update the fastpath ops table as well.
Fixes: b951c2efcb1 ("net/cnxk: add Rx burst for CN9K")
Fixes: f742a9a6681 ("net/cnxk: add Rx burst for CN10K")
Cc: sta...@dpdk.org
Signed-off-by: Satheesh Paul <psathe...@marvell.com>
Reviewed-by: Jerin Jacob <jer...@marvell.com>
> ---
> drivers/net/cnxk/cn10k_rx.c | 4 ++++
> drivers/net/cnxk/cn10k_rx_select.c | 4 ++++
> drivers/net/cnxk/cn10k_tx_select.c | 4 ++++
> drivers/net/cnxk/cn9k_rx.c | 4 ++++
> drivers/net/cnxk/cn9k_rx_select.c | 4 ++++
> drivers/net/cnxk/cn9k_tx.c | 4 ++++
> drivers/net/cnxk/cn9k_tx_select.c | 4 ++++
> 7 files changed, 28 insertions(+)
>
> diff --git a/drivers/net/cnxk/cn10k_rx.c b/drivers/net/cnxk/cn10k_rx.c
> index 5d603514c0..15f71b14bd 100644
> --- a/drivers/net/cnxk/cn10k_rx.c
> +++ b/drivers/net/cnxk/cn10k_rx.c
> @@ -31,6 +31,10 @@ pick_rx_func(struct rte_eth_dev *eth_dev,
> [!!(dev->rx_offload_flags & NIX_RX_OFFLOAD_PTYPE_F)]
> [!!(dev->rx_offload_flags & NIX_RX_OFFLOAD_RSS_F)];
>
> + if (eth_dev->data->dev_started)
> + rte_eth_fp_ops[eth_dev->data->port_id].rx_pkt_burst =
> + eth_dev->rx_pkt_burst;
> +
> rte_atomic_thread_fence(__ATOMIC_RELEASE);
> }
>
> diff --git a/drivers/net/cnxk/cn10k_rx_select.c
> b/drivers/net/cnxk/cn10k_rx_select.c
> index 5ca18feb1e..60a3688114 100644
> --- a/drivers/net/cnxk/cn10k_rx_select.c
> +++ b/drivers/net/cnxk/cn10k_rx_select.c
> @@ -15,6 +15,10 @@ pick_rx_func(struct rte_eth_dev *eth_dev,
> eth_dev->rx_pkt_burst =
> rx_burst[dev->rx_offload_flags & (NIX_RX_OFFLOAD_MAX - 1)];
>
> + if (eth_dev->data->dev_started)
> + rte_eth_fp_ops[eth_dev->data->port_id].rx_pkt_burst =
> + eth_dev->rx_pkt_burst;
> +
> rte_atomic_thread_fence(__ATOMIC_RELEASE);
> }
>
> diff --git a/drivers/net/cnxk/cn10k_tx_select.c
> b/drivers/net/cnxk/cn10k_tx_select.c
> index 0b8e3f35b9..037ab6f447 100644
> --- a/drivers/net/cnxk/cn10k_tx_select.c
> +++ b/drivers/net/cnxk/cn10k_tx_select.c
> @@ -14,6 +14,10 @@ pick_tx_func(struct rte_eth_dev *eth_dev,
> /* [SEC] [TSP] [TSO] [NOFF] [VLAN] [OL3_OL4_CSUM] [IL3_IL4_CSUM] */
> eth_dev->tx_pkt_burst =
> tx_burst[dev->tx_offload_flags & (NIX_TX_OFFLOAD_MAX - 1)];
> +
> + if (eth_dev->data->dev_started)
> + rte_eth_fp_ops[eth_dev->data->port_id].tx_pkt_burst =
> + eth_dev->tx_pkt_burst;
> }
>
> void
> diff --git a/drivers/net/cnxk/cn9k_rx.c b/drivers/net/cnxk/cn9k_rx.c
> index 8d504c4a6d..185b643692 100644
> --- a/drivers/net/cnxk/cn9k_rx.c
> +++ b/drivers/net/cnxk/cn9k_rx.c
> @@ -31,6 +31,10 @@ pick_rx_func(struct rte_eth_dev *eth_dev,
> [!!(dev->rx_offload_flags & NIX_RX_OFFLOAD_PTYPE_F)]
> [!!(dev->rx_offload_flags & NIX_RX_OFFLOAD_RSS_F)];
>
> + if (eth_dev->data->dev_started)
> + rte_eth_fp_ops[eth_dev->data->port_id].rx_pkt_burst =
> + eth_dev->rx_pkt_burst;
> +
> rte_atomic_thread_fence(__ATOMIC_RELEASE);
> }
>
> diff --git a/drivers/net/cnxk/cn9k_rx_select.c
> b/drivers/net/cnxk/cn9k_rx_select.c
> index d07a5e890c..fb66d9df7c 100644
> --- a/drivers/net/cnxk/cn9k_rx_select.c
> +++ b/drivers/net/cnxk/cn9k_rx_select.c
> @@ -15,6 +15,10 @@ pick_rx_func(struct rte_eth_dev *eth_dev,
> eth_dev->rx_pkt_burst =
> rx_burst[dev->rx_offload_flags & (NIX_RX_OFFLOAD_MAX - 1)];
>
> + if (eth_dev->data->dev_started)
> + rte_eth_fp_ops[eth_dev->data->port_id].rx_pkt_burst =
> + eth_dev->rx_pkt_burst;
> +
> rte_atomic_thread_fence(__ATOMIC_RELEASE);
> }
>
> diff --git a/drivers/net/cnxk/cn9k_tx.c b/drivers/net/cnxk/cn9k_tx.c
> index f3f19fed97..f99e5d3e23 100644
> --- a/drivers/net/cnxk/cn9k_tx.c
> +++ b/drivers/net/cnxk/cn9k_tx.c
> @@ -36,6 +36,10 @@ pick_tx_func(struct rte_eth_dev *eth_dev,
> [!!(dev->tx_offload_flags & NIX_TX_OFFLOAD_VLAN_QINQ_F)]
> [!!(dev->tx_offload_flags & NIX_TX_OFFLOAD_OL3_OL4_CSUM_F)]
> [!!(dev->tx_offload_flags & NIX_TX_OFFLOAD_L3_L4_CSUM_F)];
> +
> + if (eth_dev->data->dev_started)
> + rte_eth_fp_ops[eth_dev->data->port_id].tx_pkt_burst =
> + eth_dev->tx_pkt_burst;
> }
>
> void
> diff --git a/drivers/net/cnxk/cn9k_tx_select.c
> b/drivers/net/cnxk/cn9k_tx_select.c
> index c1fb2f41d5..a84f74a918 100644
> --- a/drivers/net/cnxk/cn9k_tx_select.c
> +++ b/drivers/net/cnxk/cn9k_tx_select.c
> @@ -14,6 +14,10 @@ pick_tx_func(struct rte_eth_dev *eth_dev,
> /* [TS] [TSO] [NOFF] [VLAN] [OL3_OL4_CSUM] [IL3_IL4_CSUM] */
> eth_dev->tx_pkt_burst =
> tx_burst[dev->tx_offload_flags & (NIX_TX_OFFLOAD_MAX - 1)];
> +
> + if (eth_dev->data->dev_started)
> + rte_eth_fp_ops[eth_dev->data->port_id].tx_pkt_burst =
> + eth_dev->tx_pkt_burst;
> }
>
> void
> --
> 2.25.4
>
