| Message ID | 21258fe55f608ccf1ee2783a5a4534220af28903.1734354812.git.petrm@nvidia.com (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | 1ba06ca96ca255c079ce5ea6a75cc0bfd5e97921 |
| Delegated to: | Netdev Maintainers |
| Headers | show |
| Series | [net-next] mlxsw: Switch to napi_gro_receive() | expand |
From: Petr Machata <petrm@nvidia.com> Date: Mon, 16 Dec 2024 14:18:44 +0100 > From: Ido Schimmel <idosch@nvidia.com> > > Benefit from the recent conversion of the driver to NAPI and enable GRO > support through the use of napi_gro_receive(). Pass the NAPI pointer > from the bus driver (mlxsw_pci) to the switch driver (mlxsw_spectrum) > through the skb control block where various packet metadata is already > encoded. > > The main motivation is to improve forwarding performance through the use > of GRO fraglist [1]. In my testing, when the forwarding data path is > simple (routing between two ports) there is not much difference in > forwarding performance between GRO disabled and GRO enabled with > fraglist. > > The improvement becomes more noticeable as the data path becomes more > complex since it is traversed less times with GRO enabled. For example, > with 10 ingress and 10 egress flower filters with different priorities > on the two ports between which routing is performed, there is an > improvement of about 140% in forwarded bandwidth. > > [1] https://lore.kernel.org/netdev/20200125102645.4782-1-steffen.klassert@secunet.com/ > > Signed-off-by: Ido Schimmel <idosch@nvidia.com> > Reviewed-by: Petr Machata <petrm@nvidia.com> > Reviewed-by: Amit Cohen <amcohen@nvidia.com> > Signed-off-by: Petr Machata <petrm@nvidia.com> Reviewed-by: Alexander Lobakin <aleksander.lobakin@intel.com> Thanks, Olek
Hello: This patch was applied to netdev/net-next.git (main) by Jakub Kicinski <kuba@kernel.org>: On Mon, 16 Dec 2024 14:18:44 +0100 you wrote: > From: Ido Schimmel <idosch@nvidia.com> > > Benefit from the recent conversion of the driver to NAPI and enable GRO > support through the use of napi_gro_receive(). Pass the NAPI pointer > from the bus driver (mlxsw_pci) to the switch driver (mlxsw_spectrum) > through the skb control block where various packet metadata is already > encoded. > > [...] Here is the summary with links: - [net-next] mlxsw: Switch to napi_gro_receive() https://git.kernel.org/netdev/net-next/c/1ba06ca96ca2 You are awesome, thank you!
diff --git a/drivers/net/ethernet/mellanox/mlxsw/core.h b/drivers/net/ethernet/mellanox/mlxsw/core.h index 8150d20cc5dc..59b4d26b4931 100644 --- a/drivers/net/ethernet/mellanox/mlxsw/core.h +++ b/drivers/net/ethernet/mellanox/mlxsw/core.h @@ -84,6 +84,7 @@ struct mlxsw_txhdr_info { }; struct mlxsw_rx_md_info { + struct napi_struct *napi; u32 cookie_index; u32 latency; u32 tx_congestion; diff --git a/drivers/net/ethernet/mellanox/mlxsw/pci.c b/drivers/net/ethernet/mellanox/mlxsw/pci.c index 0e4711804198..38e7bd3d365b 100644 --- a/drivers/net/ethernet/mellanox/mlxsw/pci.c +++ b/drivers/net/ethernet/mellanox/mlxsw/pci.c @@ -945,6 +945,7 @@ mlxsw_pci_xdp_handle(struct mlxsw_pci *mlxsw_pci, struct mlxsw_pci_queue *q, } static void mlxsw_pci_cqe_rdq_handle(struct mlxsw_pci *mlxsw_pci, + struct napi_struct *napi, struct mlxsw_pci_queue *q, u16 consumer_counter_limit, enum mlxsw_pci_cqe_v cqe_v, char *cqe) @@ -1032,6 +1033,7 @@ static void mlxsw_pci_cqe_rdq_handle(struct mlxsw_pci *mlxsw_pci, } mlxsw_pci_skb_cb_ts_set(mlxsw_pci, skb, cqe_v, cqe); + mlxsw_skb_cb(skb)->rx_md_info.napi = napi; mlxsw_core_skb_receive(mlxsw_pci->core, skb, &rx_info); @@ -1120,7 +1122,7 @@ static int mlxsw_pci_napi_poll_cq_rx(struct napi_struct *napi, int budget) continue; } - mlxsw_pci_cqe_rdq_handle(mlxsw_pci, rdq, + mlxsw_pci_cqe_rdq_handle(mlxsw_pci, napi, rdq, wqe_counter, q->u.cq.v, cqe); if (++work_done == budget) diff --git a/drivers/net/ethernet/mellanox/mlxsw/spectrum.c b/drivers/net/ethernet/mellanox/mlxsw/spectrum.c index 146acb5f0092..78a519149fa4 100644 --- a/drivers/net/ethernet/mellanox/mlxsw/spectrum.c +++ b/drivers/net/ethernet/mellanox/mlxsw/spectrum.c @@ -2412,7 +2412,7 @@ void mlxsw_sp_rx_listener_no_mark_func(struct sk_buff *skb, u64_stats_update_end(&pcpu_stats->syncp); skb->protocol = eth_type_trans(skb, skb->dev); - netif_receive_skb(skb); + napi_gro_receive(mlxsw_skb_cb(skb)->rx_md_info.napi, skb); } static void mlxsw_sp_rx_listener_mark_func(struct sk_buff *skb, u16 local_port, diff --git a/drivers/net/ethernet/mellanox/mlxsw/spectrum_trap.c b/drivers/net/ethernet/mellanox/mlxsw/spectrum_trap.c index 899c954e0e5f..1f9c1c86839f 100644 --- a/drivers/net/ethernet/mellanox/mlxsw/spectrum_trap.c +++ b/drivers/net/ethernet/mellanox/mlxsw/spectrum_trap.c @@ -173,7 +173,7 @@ static void mlxsw_sp_rx_no_mark_listener(struct sk_buff *skb, u16 local_port, if (err) return; - netif_receive_skb(skb); + napi_gro_receive(mlxsw_skb_cb(skb)->rx_md_info.napi, skb); } static void mlxsw_sp_rx_mark_listener(struct sk_buff *skb, u16 local_port,