| Message ID | 20230204135307.1036988-1-vladimir.oltean@nxp.com (mailing list archive) |
|---|---|
| Headers | show |
| Series | ENETC mqprio/taprio cleanup | expand |
Hello: This series was applied to netdev/net-next.git (master) by David S. Miller <davem@davemloft.net>: On Sat, 4 Feb 2023 15:52:54 +0200 you wrote: > v5->v6: > - patches 01/17 - 04/17 from previous patch set were merged separately > - small change to a comment in patch 05/13 > - bug fix to patch 07/13 where we introduced allow_overlapping_txqs but > we always set it to false, including for the txtime-assist mode that > it was intended for > - add am65_cpsw to the list of drivers with gate mask per TXQ (10/13) > v5 at: > https://patchwork.kernel.org/project/netdevbpf/cover/20230202003621.2679603-1-vladimir.oltean@nxp.com/ > > [...] Here is the summary with links: - [v6,net-next,01/13] net/sched: mqprio: refactor nlattr parsing to a separate function https://git.kernel.org/netdev/net-next/c/feb2cf3dcfb9 - [v6,net-next,02/13] net/sched: mqprio: refactor offloading and unoffloading to dedicated functions https://git.kernel.org/netdev/net-next/c/5cfb45e2fb71 - [v6,net-next,03/13] net/sched: move struct tc_mqprio_qopt_offload from pkt_cls.h to pkt_sched.h https://git.kernel.org/netdev/net-next/c/9adafe2b8546 - [v6,net-next,04/13] net/sched: mqprio: allow reverse TC:TXQ mappings https://git.kernel.org/netdev/net-next/c/d7045f520a74 - [v6,net-next,05/13] net/sched: mqprio: allow offloading drivers to request queue count validation https://git.kernel.org/netdev/net-next/c/19278d76915d - [v6,net-next,06/13] net/sched: mqprio: add extack messages for queue count validation https://git.kernel.org/netdev/net-next/c/d404959fa23a - [v6,net-next,07/13] net/sched: taprio: centralize mqprio qopt validation https://git.kernel.org/netdev/net-next/c/1dfe086dd7ef - [v6,net-next,08/13] net/sched: refactor mqprio qopt reconstruction to a library function https://git.kernel.org/netdev/net-next/c/9dd6ad674cc7 - [v6,net-next,09/13] net/sched: taprio: pass mqprio queue configuration to ndo_setup_tc() https://git.kernel.org/netdev/net-next/c/09c794c0a88d - [v6,net-next,10/13] net/sched: taprio: only pass gate mask per TXQ for igc, stmmac, tsnep, am65_cpsw https://git.kernel.org/netdev/net-next/c/522d15ea831f - [v6,net-next,11/13] net: enetc: request mqprio to validate the queue counts https://git.kernel.org/netdev/net-next/c/735ef62c2f2c - [v6,net-next,12/13] net: enetc: act upon the requested mqprio queue configuration https://git.kernel.org/netdev/net-next/c/1a353111b6d4 - [v6,net-next,13/13] net: enetc: act upon mqprio queue config in taprio offload https://git.kernel.org/netdev/net-next/c/06b1c9110ad1 You are awesome, thank you!
On 2/6/2023 2:10 AM, patchwork-bot+netdevbpf@kernel.org wrote: > Hello: > > This series was applied to netdev/net-next.git (master) > by David S. Miller <davem@davemloft.net>: > > On Sat, 4 Feb 2023 15:52:54 +0200 you wrote: >> v5->v6: >> - patches 01/17 - 04/17 from previous patch set were merged separately >> - small change to a comment in patch 05/13 >> - bug fix to patch 07/13 where we introduced allow_overlapping_txqs but >> we always set it to false, including for the txtime-assist mode that >> it was intended for >> - add am65_cpsw to the list of drivers with gate mask per TXQ (10/13) >> v5 at: >> https://patchwork.kernel.org/project/netdevbpf/cover/20230202003621.2679603-1-vladimir.oltean@nxp.com/ >> >> [...] A little late since it was already merged, but this version seems good to me! Thanks! -Jake > Here is the summary with links: > - [v6,net-next,01/13] net/sched: mqprio: refactor nlattr parsing to a separate function > https://git.kernel.org/netdev/net-next/c/feb2cf3dcfb9 > - [v6,net-next,02/13] net/sched: mqprio: refactor offloading and unoffloading to dedicated functions > https://git.kernel.org/netdev/net-next/c/5cfb45e2fb71 > - [v6,net-next,03/13] net/sched: move struct tc_mqprio_qopt_offload from pkt_cls.h to pkt_sched.h > https://git.kernel.org/netdev/net-next/c/9adafe2b8546 > - [v6,net-next,04/13] net/sched: mqprio: allow reverse TC:TXQ mappings > https://git.kernel.org/netdev/net-next/c/d7045f520a74 > - [v6,net-next,05/13] net/sched: mqprio: allow offloading drivers to request queue count validation > https://git.kernel.org/netdev/net-next/c/19278d76915d > - [v6,net-next,06/13] net/sched: mqprio: add extack messages for queue count validation > https://git.kernel.org/netdev/net-next/c/d404959fa23a > - [v6,net-next,07/13] net/sched: taprio: centralize mqprio qopt validation > https://git.kernel.org/netdev/net-next/c/1dfe086dd7ef > - [v6,net-next,08/13] net/sched: refactor mqprio qopt reconstruction to a library function > https://git.kernel.org/netdev/net-next/c/9dd6ad674cc7 > - [v6,net-next,09/13] net/sched: taprio: pass mqprio queue configuration to ndo_setup_tc() > https://git.kernel.org/netdev/net-next/c/09c794c0a88d > - [v6,net-next,10/13] net/sched: taprio: only pass gate mask per TXQ for igc, stmmac, tsnep, am65_cpsw > https://git.kernel.org/netdev/net-next/c/522d15ea831f > - [v6,net-next,11/13] net: enetc: request mqprio to validate the queue counts > https://git.kernel.org/netdev/net-next/c/735ef62c2f2c > - [v6,net-next,12/13] net: enetc: act upon the requested mqprio queue configuration > https://git.kernel.org/netdev/net-next/c/1a353111b6d4 > - [v6,net-next,13/13] net: enetc: act upon mqprio queue config in taprio offload > https://git.kernel.org/netdev/net-next/c/06b1c9110ad1 > > You are awesome, thank you!
On Mon, Feb 06, 2023 at 09:51:36AM -0800, Jacob Keller wrote: > On 2/6/2023 2:10 AM, patchwork-bot+netdevbpf@kernel.org wrote: > > Hello: > > > > This series was applied to netdev/net-next.git (master) > > by David S. Miller <davem@davemloft.net>: > > > > On Sat, 4 Feb 2023 15:52:54 +0200 you wrote: > >> v5->v6: > >> - patches 01/17 - 04/17 from previous patch set were merged separately > >> - small change to a comment in patch 05/13 > >> - bug fix to patch 07/13 where we introduced allow_overlapping_txqs but > >> we always set it to false, including for the txtime-assist mode that > >> it was intended for > >> - add am65_cpsw to the list of drivers with gate mask per TXQ (10/13) > >> v5 at: > >> https://patchwork.kernel.org/project/netdevbpf/cover/20230202003621.2679603-1-vladimir.oltean@nxp.com/ > >> > >> [...] > > > A little late since it was already merged, but this version seems good > to me! > > Thanks! Thanks. Don't worry, there's more coming :)
v5->v6: - patches 01/17 - 04/17 from previous patch set were merged separately - small change to a comment in patch 05/13 - bug fix to patch 07/13 where we introduced allow_overlapping_txqs but we always set it to false, including for the txtime-assist mode that it was intended for - add am65_cpsw to the list of drivers with gate mask per TXQ (10/13) v5 at: https://patchwork.kernel.org/project/netdevbpf/cover/20230202003621.2679603-1-vladimir.oltean@nxp.com/ v4->v5: - new patches: "[08/17] net/sched: mqprio: allow reverse TC:TXQ mappings" "[11/17] net/sched: taprio: centralize mqprio qopt validation" "[12/17] net/sched: refactor mqprio qopt reconstruction to a library function" - changed patches worth revisiting: "[09/17] net/sched: mqprio: allow offloading drivers to request queue count validation" v4 at: https://patchwork.kernel.org/project/netdevbpf/cover/20230130173145.475943-1-vladimir.oltean@nxp.com/ v3->v4: - adjusted patch 07/15 to not remove "#include <net/pkt_sched.h>" from ti cpsw https://patchwork.kernel.org/project/netdevbpf/cover/20230127001516.592984-1-vladimir.oltean@nxp.com/ v2->v3: - move min_num_stack_tx_queues definition so it doesn't conflict with the ethtool mm patches I haven't submitted yet for enetc (and also to make use of a 4 byte hole) - warn and mask off excess TCs in gate mask instead of failing - finally CC qdisc maintainers v2 at: https://patchwork.kernel.org/project/netdevbpf/patch/20230126125308.1199404-16-vladimir.oltean@nxp.com/ v1->v2: - patches 1->4 are new - update some header inclusions in drivers - fix typo (said "taprio" instead of "mqprio") - better enetc mqprio error handling - dynamically reconstruct mqprio configuration in taprio offload - also let stmmac and tsnep use per-TXQ gate_mask v1 (RFC) at: https://patchwork.kernel.org/project/netdevbpf/cover/20230120141537.1350744-1-vladimir.oltean@nxp.com/ The main goal of this patch set is to make taprio pass the mqprio queue configuration structure down to ndo_setup_tc() - patch 13/17. But mqprio itself is not in the best shape currently, so there are some consolidation patches on that as well. Next, there are some consolidation patches in the enetc driver's handling of TX queues and their traffic class assignment. Then, there is a consolidation between the TX queue configuration for mqprio and taprio. Finally, there is a change in the meaning of the gate_mask passed by taprio through ndo_setup_tc(). We introduce a capability through which drivers can request the gate mask to be per TXQ. The default is changed so that it is per TC. Cc: Igor Russkikh <irusskikh@marvell.com> Cc: Yisen Zhuang <yisen.zhuang@huawei.com> Cc: Salil Mehta <salil.mehta@huawei.com> Cc: Jesse Brandeburg <jesse.brandeburg@intel.com> Cc: Tony Nguyen <anthony.l.nguyen@intel.com> Cc: Thomas Petazzoni <thomas.petazzoni@bootlin.com> Cc: Saeed Mahameed <saeedm@nvidia.com> Cc: Leon Romanovsky <leon@kernel.org> Cc: Horatiu Vultur <horatiu.vultur@microchip.com> Cc: Lars Povlsen <lars.povlsen@microchip.com> Cc: Steen Hegelund <Steen.Hegelund@microchip.com> Cc: Daniel Machon <daniel.machon@microchip.com> Cc: UNGLinuxDriver@microchip.com Cc: Gerhard Engleder <gerhard@engleder-embedded.com> Cc: Siddharth Vadapalli <s-vadapalli@ti.com> Cc: Roger Quadros <rogerq@kernel.org> Vladimir Oltean (13): net/sched: mqprio: refactor nlattr parsing to a separate function net/sched: mqprio: refactor offloading and unoffloading to dedicated functions net/sched: move struct tc_mqprio_qopt_offload from pkt_cls.h to pkt_sched.h net/sched: mqprio: allow reverse TC:TXQ mappings net/sched: mqprio: allow offloading drivers to request queue count validation net/sched: mqprio: add extack messages for queue count validation net/sched: taprio: centralize mqprio qopt validation net/sched: refactor mqprio qopt reconstruction to a library function net/sched: taprio: pass mqprio queue configuration to ndo_setup_tc() net/sched: taprio: only pass gate mask per TXQ for igc, stmmac, tsnep, am65_cpsw net: enetc: request mqprio to validate the queue counts net: enetc: act upon the requested mqprio queue configuration net: enetc: act upon mqprio queue config in taprio offload .../net/ethernet/aquantia/atlantic/aq_main.c | 1 + .../ethernet/chelsio/cxgb4/cxgb4_tc_mqprio.h | 2 +- drivers/net/ethernet/engleder/tsnep_tc.c | 21 ++ drivers/net/ethernet/freescale/enetc/enetc.c | 106 ++++--- .../net/ethernet/freescale/enetc/enetc_qos.c | 27 +- drivers/net/ethernet/hisilicon/hns3/hnae3.h | 1 + .../net/ethernet/hisilicon/hns3/hns3_enet.c | 1 + drivers/net/ethernet/intel/i40e/i40e.h | 1 + drivers/net/ethernet/intel/iavf/iavf.h | 1 + drivers/net/ethernet/intel/ice/ice.h | 1 + drivers/net/ethernet/intel/igc/igc_main.c | 23 ++ drivers/net/ethernet/marvell/mvneta.c | 2 +- .../net/ethernet/mellanox/mlx5/core/en_main.c | 1 + .../ethernet/microchip/lan966x/lan966x_tc.c | 1 + .../net/ethernet/microchip/sparx5/sparx5_tc.c | 1 + drivers/net/ethernet/stmicro/stmmac/hwif.h | 5 + .../net/ethernet/stmicro/stmmac/stmmac_main.c | 2 + .../net/ethernet/stmicro/stmmac/stmmac_tc.c | 20 ++ drivers/net/ethernet/ti/am65-cpsw-qos.c | 22 ++ drivers/net/ethernet/ti/cpsw_priv.c | 1 + include/net/pkt_cls.h | 10 - include/net/pkt_sched.h | 16 + net/sched/Kconfig | 7 + net/sched/Makefile | 1 + net/sched/sch_mqprio.c | 291 +++++++++--------- net/sched/sch_mqprio_lib.c | 117 +++++++ net/sched/sch_mqprio_lib.h | 18 ++ net/sched/sch_taprio.c | 70 ++--- 28 files changed, 516 insertions(+), 254 deletions(-) create mode 100644 net/sched/sch_mqprio_lib.c create mode 100644 net/sched/sch_mqprio_lib.h