Commit 6f91d7ab authored by David S. Miller's avatar David S. Miller
Browse files

Merge branch 'octeon-DMAC' 



Subbaraya Sundeep says:

====================
octeontx2-af: Introduce DMAC based switching

With this patch set packets can be switched between
all CGX mapped PFs and VFs in the system based on
the DMAC addresses. To implement this:
AF allocates high priority rules from top entry(0) in MCAM.
Rules are allocated for all the CGX mapped PFs and VFs though
they are not active and with no NIXLFs attached.
Rules for a PF/VF will be enabled only after they are brought up.
Two rules one for TX and one for RX are allocated for each PF/VF.

A packet sent from a PF/VF with a destination mac of another
PF/VF will be hit by TX rule and sent to LBK channel 63. The
same returned packet will be hit by RX rule whose action is
to forward packet to PF/VF with that destination mac.

Implementation of this for 98xx is tricky since there are
two NIX blocks and till now a PF/VF can install rule for
an NIX0/1 interface only if it is mapped to corresponding NIX0/1 block.
Hence Tx rules are modified such that TX interface in MCAM
entry can be either NIX0-TX or NIX1-TX.

Testing:

1. Create two VFs over PF1(on NIX0) and assign two VFs to two VMs
2. Assign ip addresses to two VFs in VMs and PF2(on NIX1) in host.
3. Assign static arp entries in two VMs and PF2.
4. Ping between VMs and host PF2.
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 97d0931f 23109f8d

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

+1 −1
Original line number Diff line number Diff line
@@ -10,4 +10,4 @@ obj-$(CONFIG_OCTEONTX2_AF) += rvu_af.o 
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_cpt.o rvu_devlink.o rpm.o rvu_cn10k.o rvu_switch.o

drivers/net/ethernet/marvell/octeontx2/af/rvu.c

+9 −1
Original line number Diff line number Diff line
@@ -1314,7 +1314,7 @@ int rvu_mbox_handler_detach_resources(struct rvu *rvu, 
	return rvu_detach_rsrcs(rvu, detach, detach->hdr.pcifunc);

}



static int rvu_get_nix_blkaddr(struct rvu *rvu, u16 pcifunc)

int rvu_get_nix_blkaddr(struct rvu *rvu, u16 pcifunc)

{

	struct rvu_pfvf *pfvf = rvu_get_pfvf(rvu, pcifunc);

	int blkaddr = BLKADDR_NIX0, vf;
@@ -2859,6 +2859,12 @@ static int rvu_enable_sriov(struct rvu *rvu) 
	if (!vfs)

		return 0;



	/* LBK channel number 63 is used for switching packets between

	 * CGX mapped VFs. Hence limit LBK pairs till 62 only.

	 */

	if (vfs > 62)

		vfs = 62;



	/* Save VFs number for reference in VF interrupts handlers.

	 * Since interrupts might start arriving during SRIOV enablement

	 * ordinary API cannot be used to get number of enabled VFs.
@@ -3001,6 +3007,8 @@ static int rvu_probe(struct pci_dev *pdev, const struct pci_device_id *id) 
	/* Initialize debugfs */

	rvu_dbg_init(rvu);



	mutex_init(&rvu->rswitch.switch_lock);



	return 0;

err_dl:

	rvu_unregister_dl(rvu);

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

+21 −0
Original line number Diff line number Diff line
@@ -415,6 +415,16 @@ struct npc_kpu_profile_adapter { 
	size_t				kpus;

};



#define RVU_SWITCH_LBK_CHAN	63



struct rvu_switch {

	struct mutex switch_lock; /* Serialize flow installation */

	u32 used_entries;

	u16 *entry2pcifunc;

	u16 mode;

	u16 start_entry;

};



struct rvu {

	void __iomem		*afreg_base;

	void __iomem		*pfreg_base;
@@ -445,6 +455,7 @@ struct rvu { 


	/* CGX */

#define PF_CGXMAP_BASE		1 /* PF 0 is reserved for RVU PF */

	u16			cgx_mapped_vfs; /* maximum CGX mapped VFs */

	u8			cgx_mapped_pfs;

	u8			cgx_cnt_max;	 /* CGX port count max */

	u8			*pf2cgxlmac_map; /* pf to cgx_lmac map */
@@ -477,6 +488,9 @@ struct rvu { 
	struct rvu_debugfs	rvu_dbg;

#endif

	struct rvu_devlink	*rvu_dl;



	/* RVU switch implementation over NPC with DMAC rules */

	struct rvu_switch	rswitch;

};



static inline void rvu_write64(struct rvu *rvu, u64 block, u64 offset, u64 val)
@@ -691,6 +705,7 @@ int nix_aq_context_read(struct rvu *rvu, struct nix_hw *nix_hw, 
			struct nix_cn10k_aq_enq_req *aq_req,

			struct nix_cn10k_aq_enq_rsp *aq_rsp,

			u16 pcifunc, u8 ctype, u32 qidx);

int rvu_get_nix_blkaddr(struct rvu *rvu, u16 pcifunc);



/* NPC APIs */

int rvu_npc_init(struct rvu *rvu);
@@ -768,4 +783,10 @@ void rvu_dbg_exit(struct rvu *rvu); 
static inline void rvu_dbg_init(struct rvu *rvu) {}

static inline void rvu_dbg_exit(struct rvu *rvu) {}

#endif



/* RVU Switch */

void rvu_switch_enable(struct rvu *rvu);

void rvu_switch_disable(struct rvu *rvu);

void rvu_switch_update_rules(struct rvu *rvu, u16 pcifunc);



#endif /* RVU_H */

drivers/net/ethernet/marvell/octeontx2/af/rvu_cgx.c

+3 −0
Original line number Diff line number Diff line
@@ -126,6 +126,7 @@ static int rvu_map_cgx_lmac_pf(struct rvu *rvu) 
	unsigned long lmac_bmap;

	int size, free_pkind;

	int cgx, lmac, iter;

	int numvfs, hwvfs;



	if (!cgx_cnt_max)

		return 0;
@@ -166,6 +167,8 @@ static int rvu_map_cgx_lmac_pf(struct rvu *rvu) 
			pkind->pfchan_map[free_pkind] = ((pf) & 0x3F) << 16;

			rvu_map_cgx_nix_block(rvu, pf, cgx, lmac);

			rvu->cgx_mapped_pfs++;

			rvu_get_pf_numvfs(rvu, pf, &numvfs, &hwvfs);

			rvu->cgx_mapped_vfs += numvfs;

			pf++;

		}

	}

drivers/net/ethernet/marvell/octeontx2/af/rvu_debugfs.c

+1 −4
Original line number Diff line number Diff line
@@ -2113,9 +2113,6 @@ static void rvu_print_npc_mcam_info(struct seq_file *s, 
	int entry_acnt, entry_ecnt;

	int cntr_acnt, cntr_ecnt;



	/* Skip PF0 */

	if (!pcifunc)

		return;

	rvu_npc_get_mcam_entry_alloc_info(rvu, pcifunc, blkaddr,

					  &entry_acnt, &entry_ecnt);

	rvu_npc_get_mcam_counter_alloc_info(rvu, pcifunc, blkaddr,
@@ -2298,7 +2295,7 @@ static void rvu_dbg_npc_mcam_show_flows(struct seq_file *s, 
static void rvu_dbg_npc_mcam_show_action(struct seq_file *s,

					 struct rvu_npc_mcam_rule *rule)

{

	if (rule->intf == NIX_INTF_TX) {

	if (is_npc_intf_tx(rule->intf)) {

		switch (rule->tx_action.op) {

		case NIX_TX_ACTIONOP_DROP:

			seq_puts(s, "\taction: Drop\n");