Commit 8545b75b authored by David S. Miller's avatar David S. Miller
Browse files

Merge branch 'octeontx2-rvu-rep' 

Geetha sowjanya says:

====================
Introduce RVU representors

This series adds representor support for each rvu devices.
When switchdev mode is enabled, representor netdev is registered
for each rvu device. In implementation of representor model,
one NIX HW LF with multiple SQ and RQ is reserved, where each
RQ and SQ of the LF are mapped to a representor. A loopback channel
is reserved to support packet path between representors and VFs.
CN10K silicon supports 2 types of MACs, RPM and SDP. This
patch set adds representor support for both RPM and SDP MAC
interfaces.

- Patch 1: Implements basic representor driver.
- Patch 2: Add devlink support to create representor netdevs that
  can be used to manage VFs.
- Patch 3: Implements basec netdev_ndo_ops.
- Patch 4: Installs tcam rules to route packets between representor and
	   VFs.
- Patch 5: Enables fetching VF stats via representor interface
- Patch 6: Adds support to sync link state between representors and VFs .
- Patch 7: Enables configuring VF MTU via representor netdevs.
- Patch 8: Adds representors for sdp MAC.
- Patch 9: Adds devlink port support.
- Patch 10: Implements offload stats.
- Patch 11: Implements tc offload support.
- patch 12: Adds documentation for rvu port representor.

pci/0002:1c:00.0

Command to create PF/VF representor

	Rpf1vf0: <BROADCAST,MULTICAST,UP,LOWER_UP> mtu 1500 qdisc pfifo_fast state DOWN mode DEFAULT group default qlen 1000 link/ether f6:43:83:ee:26:21 brd ff:ff:ff:ff:ff:ff
	Rpf1vf1: <BROADCAST,MULTICAST,UP,LOWER_UP> mtu 1500 qdisc pfifo_fast state DOWN mode DEFAULT group default qlen 1000 link/ether 12:b2:54:0e:24:54 brd ff:ff:ff:ff:ff:ff
	Rpf1vf2: <BROADCAST,MULTICAST,UP,LOWER_UP> mtu 1500 qdisc pfifo_fast state DOWN mode DEFAULT group default qlen 1000 link/ether 4a:12:c4:4c:32:62 brd ff:ff:ff:ff:ff:ff
	Rpf1vf3: <BROADCAST,MULTICAST,UP,LOWER_UP> mtu 1500 qdisc pfifo_fast state DOWN mode DEFAULT group default qlen 1000 link/ether ca:cb:68:0e:e2:6e brd ff:ff:ff:ff:ff:ff
	Rpf2vf0: <BROADCAST,MULTICAST,UP,LOWER_UP> mtu 1500 qdisc pfifo_fast state DOWN mode DEFAULT group default qlen 1000 link/ether 06:cc:ad:b4:f0:93 brd ff:ff:ff:ff:ff:ff

~# devlink port
	pci/0002:1c:00.0/0: type eth netdev Rpf1vf0 flavour physical port 0 splittable false
	pci/0002:1c:00.0/1: type eth netdev Rpf1vf1 flavour pcivf controller 0 pfnum 1 vfnum 1 external false splittable false
	pci/0002:1c:00.0/2: type eth netdev Rpf1vf2 flavour pcivf controller 0 pfnum 1 vfnum 2 external false splittable false
	pci/0002:1c:00.0/3: type eth netdev Rpf1vf3 flavour pcivf controller 0 pfnum 1 vfnum 3 external false splittable false

-----------
v11:v1:
  - Submitted refactoring changes as a separate patch set.
	https://lore.kernel.org/netdev/20241023161843.15543-1-gakula@marvell.com/T/


  - Moved documentation to a separate patch.
  - patch 9: Added code changes to forward updated mac address to VF.
  - Implemented TC offload support.

v10-v11:
  - As suggested by "Jiri Pirko" adjusted the documentation.
  - Added more commit description to patch1.

v9-v10:
  - Fixed build warning w.r.t documentation.

v8-v9:
   - Updated the documentation.

v7-v8:
   - Implemented offload stats ndo.
   - Added documentation.

v6-v7:
  - Rebased on top net-next branch.

v5-v6:
  - Addressed review comments provided by "Simon Horman".
  - Added review tag.

v4-v5:
  - Patch 3: Removed devm_* usage in rvu_rep_create()
  - Patch 3: Fixed build warnings.

v3-v4:
 - Patch 2 & 3: Fixed coccinelle reported warnings.
 - Patch 10: Added devlink port support.

v2-v3:
 - Used extack for error messages.
 - As suggested reworked commit messages.
 - Fixed sparse warning.

v1-v2:
 -Fixed build warnings.
 -Address review comments provided by "Kalesh Anakkur Purayil".
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents ef04d290 6050b04d

Documentation/networking/device_drivers/ethernet/marvell/octeontx2.rst

+91 −0
Original line number Diff line number Diff line
@@ -14,6 +14,7 @@ Contents 
- `Basic packet flow`_

- `Devlink health reporters`_

- `Quality of service`_

- `RVU representors`_



Overview

========
@@ -340,3 +341,93 @@ Setup HTB offload 
        # tc class add dev <interface> parent 1: classid 1:2 htb rate 10Gbit prio 2 quantum 188416



        # tc class add dev <interface> parent 1: classid 1:3 htb rate 10Gbit prio 2 quantum 32768





RVU Representors

================



RVU representor driver adds support for creation of representor devices for

RVU PFs' VFs in the system. Representor devices are created when user enables

the switchdev mode.

Switchdev mode can be enabled either before or after setting up SRIOV numVFs.

All representor devices share a single NIXLF but each has a dedicated Rx/Tx

queues. RVU PF representor driver registers a separate netdev for each

Rx/Tx queue pair.



Current HW does not support built-in switch which can do L2 learning and

forwarding packets between representee and representor. Hence, packet path

between representee and it's representor is achieved by setting up appropriate

NPC MCAM filters.

Transmit packets matching these filters will be loopbacked through hardware

loopback channel/interface (i.e, instead of sending them out of MAC interface).

Which will again match the installed filters and will be forwarded.

This way representee => representor and representor => representee packet

path is achieved. These rules get installed when representors are created

and gets active/deactivate based on the representor/representee interface state.



Usage example:



 - Change device to switchdev mode::



	# devlink dev eswitch set pci/0002:1c:00.0 mode switchdev



 - List of representor devices on the system::



	# ip link show

	Rpf1vf0: <BROADCAST,MULTICAST,UP,LOWER_UP> mtu 1500 qdisc pfifo_fast state DOWN mode DEFAULT group default qlen 1000 link/ether f6:43:83:ee:26:21 brd ff:ff:ff:ff:ff:ff

	Rpf1vf1: <BROADCAST,MULTICAST,UP,LOWER_UP> mtu 1500 qdisc pfifo_fast state DOWN mode DEFAULT group default qlen 1000 link/ether 12:b2:54:0e:24:54 brd ff:ff:ff:ff:ff:ff

	Rpf1vf2: <BROADCAST,MULTICAST,UP,LOWER_UP> mtu 1500 qdisc pfifo_fast state DOWN mode DEFAULT group default qlen 1000 link/ether 4a:12:c4:4c:32:62 brd ff:ff:ff:ff:ff:ff

	Rpf1vf3: <BROADCAST,MULTICAST,UP,LOWER_UP> mtu 1500 qdisc pfifo_fast state DOWN mode DEFAULT group default qlen 1000 link/ether ca:cb:68:0e:e2:6e brd ff:ff:ff:ff:ff:ff

	Rpf2vf0: <BROADCAST,MULTICAST,UP,LOWER_UP> mtu 1500 qdisc pfifo_fast state DOWN mode DEFAULT group default qlen 1000 link/ether 06:cc:ad:b4:f0:93 brd ff:ff:ff:ff:ff:ff





To delete the representors devices from the system. Change the device to legacy mode.



 - Change device to legacy mode::



	# devlink dev eswitch set pci/0002:1c:00.0 mode legacy



RVU representors can be managed using devlink ports

(see :ref:`Documentation/networking/devlink/devlink-port.rst <devlink_port>`) interface.



 - Show devlink ports of representors::



	# devlink port

	pci/0002:1c:00.0/0: type eth netdev Rpf1vf0 flavour physical port 0 splittable false

	pci/0002:1c:00.0/1: type eth netdev Rpf1vf1 flavour pcivf controller 0 pfnum 1 vfnum 1 external false splittable false

	pci/0002:1c:00.0/2: type eth netdev Rpf1vf2 flavour pcivf controller 0 pfnum 1 vfnum 2 external false splittable false

	pci/0002:1c:00.0/3: type eth netdev Rpf1vf3 flavour pcivf controller 0 pfnum 1 vfnum 3 external false splittable false



Function attributes

===================



The RVU representor support function attributes for representors.

Port function configuration of the representors are supported through devlink eswitch port.



MAC address setup

-----------------



RVU representor driver support devlink port function attr mechanism to setup MAC

address. (refer to Documentation/networking/devlink/devlink-port.rst)



 - To setup MAC address for port 2::



	# devlink port function set pci/0002:1c:00.0/2 hw_addr 5c:a1:1b:5e:43:11

	# devlink port show pci/0002:1c:00.0/2

	pci/0002:1c:00.0/2: type eth netdev Rpf1vf2 flavour pcivf controller 0 pfnum 1 vfnum 2 external false splittable false

	function:

		hw_addr 5c:a1:1b:5e:43:11





TC offload

==========



The rvu representor driver implements support for offloading tc rules using port representors.



 - Drop packets with vlan id 3::



	# tc filter add dev Rpf1vf0 protocol 802.1Q parent ffff: flower vlan_id 3 vlan_ethtype ipv4 skip_sw action drop



 - Redirect packets with vlan id 5 and IPv4 packets to eth1, after stripping vlan header.::



	# tc filter add dev Rpf1vf0 ingress protocol 802.1Q flower vlan_id 5 vlan_ethtype ipv4 skip_sw action vlan pop action mirred ingress redirect dev eth1

drivers/net/ethernet/marvell/octeontx2/Kconfig

+8 −0
Original line number Diff line number Diff line
@@ -46,3 +46,11 @@ config OCTEONTX2_VF 
	depends on OCTEONTX2_PF

	help

	  This driver supports Marvell's OcteonTX2 NIC virtual function.



config RVU_ESWITCH

	tristate "Marvell RVU E-Switch support"

	depends on OCTEONTX2_PF

	default m

	help

	  This driver supports Marvell's RVU E-Switch that

	  provides internal SRIOV packet steering and switching.

drivers/net/ethernet/marvell/octeontx2/af/Makefile

+2 −1
Original line number Diff line number Diff line
@@ -11,4 +11,5 @@ rvu_mbox-y := mbox.o rvu_trace.o 
rvu_af-y := cgx.o rvu.o rvu_cgx.o rvu_npa.o rvu_nix.o \

		  rvu_reg.o rvu_npc.o rvu_debugfs.o ptp.o rvu_npc_fs.o \

		  rvu_cpt.o rvu_devlink.o rpm.o rvu_cn10k.o rvu_switch.o \

		  rvu_sdp.o rvu_npc_hash.o mcs.o mcs_rvu_if.o mcs_cnf10kb.o
 
		  rvu_sdp.o rvu_npc_hash.o mcs.o mcs_rvu_if.o mcs_cnf10kb.o \

		  rvu_rep.o

drivers/net/ethernet/marvell/octeontx2/af/common.h

+1 −0
Original line number Diff line number Diff line
@@ -156,6 +156,7 @@ enum nix_scheduler { 
#define	NIC_HW_MIN_FRS			40

#define	NIC_HW_MAX_FRS			9212

#define	SDP_HW_MAX_FRS			65535

#define	SDP_HW_MIN_FRS			16

#define CN10K_LMAC_LINK_MAX_FRS		16380 /* 16k - FCS */

#define CN10K_LBK_LINK_MAX_FRS		65535 /* 64k */

drivers/net/ethernet/marvell/octeontx2/af/mbox.h

+75 −0
Original line number Diff line number Diff line
@@ -144,6 +144,9 @@ M(LMTST_TBL_SETUP, 0x00a, lmtst_tbl_setup, lmtst_tbl_setup_req, \ 
				msg_rsp)				\

M(SET_VF_PERM,		0x00b, set_vf_perm, set_vf_perm, msg_rsp)	\

M(PTP_GET_CAP,		0x00c, ptp_get_cap, msg_req, ptp_get_cap_rsp)	\

M(GET_REP_CNT,		0x00d, get_rep_cnt, msg_req, get_rep_cnt_rsp)	\

M(ESW_CFG,		0x00e, esw_cfg, esw_cfg_req, msg_rsp)	\

M(REP_EVENT_NOTIFY,     0x00f, rep_event_notify, rep_event, msg_rsp) \

/* CGX mbox IDs (range 0x200 - 0x3FF) */				\

M(CGX_START_RXTX,	0x200, cgx_start_rxtx, msg_req, msg_rsp)	\

M(CGX_STOP_RXTX,	0x201, cgx_stop_rxtx, msg_req, msg_rsp)		\
@@ -319,6 +322,7 @@ M(NIX_MCAST_GRP_DESTROY, 0x802c, nix_mcast_grp_destroy, nix_mcast_grp_destroy_re 
M(NIX_MCAST_GRP_UPDATE, 0x802d, nix_mcast_grp_update,				\

				nix_mcast_grp_update_req,			\

				nix_mcast_grp_update_rsp)			\

M(NIX_LF_STATS, 0x802e, nix_lf_stats, nix_stats_req, nix_stats_rsp)	\

/* MCS mbox IDs (range 0xA000 - 0xBFFF) */					\

M(MCS_ALLOC_RESOURCES,	0xa000, mcs_alloc_resources, mcs_alloc_rsrc_req,	\

				mcs_alloc_rsrc_rsp)				\
@@ -380,12 +384,16 @@ M(CPT_INST_LMTST, 0xD00, cpt_inst_lmtst, cpt_inst_lmtst_req, msg_rsp) 
#define MBOX_UP_MCS_MESSAGES						\

M(MCS_INTR_NOTIFY,	0xE00, mcs_intr_notify, mcs_intr_info, msg_rsp)



#define MBOX_UP_REP_MESSAGES						\

M(REP_EVENT_UP_NOTIFY,	0xEF0, rep_event_up_notify, rep_event, msg_rsp) \



enum {

#define M(_name, _id, _1, _2, _3) MBOX_MSG_ ## _name = _id,

MBOX_MESSAGES

MBOX_UP_CGX_MESSAGES

MBOX_UP_CPT_MESSAGES

MBOX_UP_MCS_MESSAGES

MBOX_UP_REP_MESSAGES

#undef M

};
@@ -1364,6 +1372,37 @@ struct nix_bandprof_get_hwinfo_rsp { 
	u32 policer_timeunit;

};



struct nix_stats_req {

	struct mbox_msghdr hdr;

	u8 reset;

	u16 pcifunc;

	u64 rsvd;

};



struct nix_stats_rsp {

	struct mbox_msghdr hdr;

	u16 pcifunc;

	struct {

		u64 octs;

		u64 ucast;

		u64 bcast;

		u64 mcast;

		u64 drop;

		u64 drop_octs;

		u64 drop_mcast;

		u64 drop_bcast;

		u64 err;

		u64 rsvd[5];

	} rx;

	struct {

		u64 ucast;

		u64 bcast;

		u64 mcast;

		u64 drop;

		u64 octs;

	} tx;

};



/* NPC mbox message structs */



#define NPC_MCAM_ENTRY_INVALID	0xFFFF
@@ -1525,6 +1564,41 @@ struct ptp_get_cap_rsp { 
	u64 cap;

};



struct get_rep_cnt_rsp {

	struct mbox_msghdr hdr;

	u16 rep_cnt;

	u16 rep_pf_map[64];

	u64 rsvd;

};



struct esw_cfg_req {

	struct mbox_msghdr hdr;

	u8 ena;

	u64 rsvd;

};



struct rep_evt_data {

	u8 port_state;

	u8 vf_state;

	u16 rx_mode;

	u16 rx_flags;

	u16 mtu;

	u8 mac[ETH_ALEN];

	u64 rsvd[5];

};



struct rep_event {

	struct mbox_msghdr hdr;

	u16 pcifunc;

#define RVU_EVENT_PORT_STATE		BIT_ULL(0)

#define RVU_EVENT_PFVF_STATE		BIT_ULL(1)

#define RVU_EVENT_MTU_CHANGE		BIT_ULL(2)

#define RVU_EVENT_RX_MODE_CHANGE	BIT_ULL(3)

#define RVU_EVENT_MAC_ADDR_CHANGE	BIT_ULL(4)

	u16 event;

	struct rep_evt_data evt_data;

};



struct flow_msg {

	unsigned char dmac[6];

	unsigned char smac[6];
@@ -1563,6 +1637,7 @@ struct flow_msg { 
	u8 icmp_type;

	u8 icmp_code;

	__be16 tcp_flags;

	u16 sq_id;

};



struct npc_install_flow_req {