History

octeontx2-af: Block VFs from clobbering special CGX PKIND state

PF and VF NIX LFs that share a CGX LMAC reuse the same hardware PKIND programming. When HiGig2 or EDSA parsing is enabled, a VF NIX LF alloc must not reset the LMAC RX PKIND or default TX parse config over the PF setup. Add cgx_get_pkind() and rvu_cgx_is_pkind_config_permitted() so VFs skip cgx_set_pkind(), rvu_npc_set_pkind(), and NIX_AF_LFX_TX_PARSE_CFG updates when the LMAC is using NPC_RX_HIGIG_PKIND or NPC_RX_EDSA_PKIND.

Hariprasad Kelam committed 3 months ago

Commit 3bd438a1 parent 0fe1e3e6 files · +131 −14Browse files

Unified · Split

6 files
  1. drivers/net/ethernet/marvell/octeontx2/af/cgx.c +12 −0
  2. drivers/net/ethernet/marvell/octeontx2/af/cgx.h +1 −0
  3. drivers/net/ethernet/marvell/octeontx2/af/rvu.h +2 −0
  4. drivers/net/ethernet/marvell/octeontx2/af/rvu_cgx.c +79 −0
  5. drivers/net/ethernet/marvell/octeontx2/af/rvu_nix.c +18 −4
  6. drivers/net/ethernet/marvell/octeontx2/af/rvu_npc.c +19 −10
drivers/net/ethernet/marvell/octeontx2/af/cgx.c+12−0
@@ -518,6 +518,18 @@ int cgx_set_pkind(void *cgxd, u8 lmac_id, int pkind) · 517 unmodified lines
518518 return 0;
519519 }
520520
521+int cgx_get_pkind(void *cgxd, u8 lmac_id, int *pkind)
522+{
523+ struct cgx *cgx = cgxd;
524+
525+ if (!is_lmac_valid(cgx, lmac_id))
526+ return -ENODEV;
527+
528+ *pkind = cgx_read(cgx, lmac_id, cgx->mac_ops->rxid_map_offset);
529+ *pkind = *pkind & 0x3F;
530+ return 0;
531+}
532+
521533 static u8 cgx_get_lmac_type(void *cgxd, int lmac_id)
522534 {
523535 struct cgx *cgx = cgxd;
drivers/net/ethernet/marvell/octeontx2/af/cgx.h+1−0
@@ -141,6 +141,7 @@ int cgx_get_cgxid(void *cgxd); · 140 unmodified lines
141141 int cgx_get_lmac_cnt(void *cgxd);
142142 void *cgx_get_pdata(int cgx_id);
143143 int cgx_set_pkind(void *cgxd, u8 lmac_id, int pkind);
144+int cgx_get_pkind(void *cgxd, u8 lmac_id, int *pkind);
144145 int cgx_lmac_evh_register(struct cgx_event_cb *cb, void *cgxd, int lmac_id);
145146 int cgx_lmac_evh_unregister(void *cgxd, int lmac_id);
146147 int cgx_get_tx_stats(void *cgxd, int lmac_id, int idx, u64 *tx_stat);
drivers/net/ethernet/marvell/octeontx2/af/rvu.h+2−0
@@ -1115,6 +1115,8 @@ void npc_read_mcam_entry(struct rvu *rvu, struct npc_mcam *mcam, · 1114 unmodified lines
11151115 u8 *intf, u8 *ena);
11161116 int npc_config_cntr_default_entries(struct rvu *rvu, bool enable);
11171117 bool is_cgx_config_permitted(struct rvu *rvu, u16 pcifunc);
1118+bool rvu_cgx_check_permission_and_set_pkind(struct rvu *rvu, u16 pcifunc, int pkind);
1119+bool rvu_cgx_is_pkind_config_permitted(struct rvu *rvu, u16 pcifunc);
11181120 bool is_mac_feature_supported(struct rvu *rvu, int pf, int feature);
11191121 u32 rvu_cgx_get_fifolen(struct rvu *rvu);
11201122 void *rvu_first_cgx_pdata(struct rvu *rvu);
drivers/net/ethernet/marvell/octeontx2/af/rvu_cgx.c+79−0
@@ -1355,3 +1355,82 @@ void rvu_mac_reset(struct rvu *rvu, u16 pcifunc) · 1354 unmodified lines
13551355 if (mac_ops->mac_reset(cgxd, lmac, !is_vf(pcifunc)))
13561356 dev_err(rvu->dev, "Failed to reset MAC\n");
13571357 }
1358+
1359+/* Do not allow CGX-mapped VFs to overwrite PKIND when special parse kinds
1360+ * (HiGig, EDSA, etc.) are in use on the shared LMAC. VFs must not program
1361+ * NPC_TX_DEF_PKIND on NIX_AF_LFX_TX_PARSE_CFG in that case: the PF owns
1362+ * parse mode and no separate NPC_TX_HIGIG_PKIND is installed on the VF LF.
1363+ * TX-parse callers skip the write when denied; rvu_lf_reset() clears each LF
1364+ * before alloc so the next permitted owner programs NPC_TX_DEF_PKIND.
1365+ */
1366+bool rvu_cgx_is_pkind_config_permitted(struct rvu *rvu, u16 pcifunc)
1367+{
1368+ int pf, err, rxpkind;
1369+ u8 cgx_id, lmac_id;
1370+ void *cgxd;
1371+
1372+ pf = rvu_get_pf(rvu->pdev, pcifunc);
1373+
1374+ if (!(pcifunc & RVU_PFVF_FUNC_MASK))
1375+ return true;
1376+
1377+ if (!is_pf_cgxmapped(rvu, pf))
1378+ return true;
1379+
1380+ rvu_get_cgx_lmac_id(rvu->pf2cgxlmac_map[pf], &cgx_id, &lmac_id);
1381+ cgxd = rvu_cgx_pdata(cgx_id, rvu);
1382+ err = cgx_get_pkind(cgxd, lmac_id, &rxpkind);
1383+ if (err)
1384+ return false;
1385+
1386+ switch (rxpkind) {
1387+ case NPC_RX_HIGIG_PKIND:
1388+ case NPC_RX_EDSA_PKIND:
1389+ return false;
1390+ default:
1391+ return true;
1392+ }
1393+}
1394+
1395+/* Do not allow CGX-mapped VFs to overwrite PKIND when special parse kinds
1396+ * (HiGig, EDSA, etc.) are in use on the shared LMAC.
1397+ */
1398+bool rvu_cgx_check_permission_and_set_pkind(struct rvu *rvu, u16 pcifunc, int pkind)
1399+{
1400+ int pf, err, rxpkind;
1401+ u8 cgx_id, lmac_id;
1402+ struct cgx *cgxd;
1403+
1404+ pf = rvu_get_pf(rvu->pdev, pcifunc);
1405+
1406+ if (!is_pf_cgxmapped(rvu, pf))
1407+ return false;
1408+
1409+ rvu_get_cgx_lmac_id(rvu->pf2cgxlmac_map[pf], &cgx_id, &lmac_id);
1410+ cgxd = rvu_cgx_pdata(cgx_id, rvu);
1411+
1412+ mutex_lock(&cgxd->lock);
1413+ if (!is_vf(pcifunc))
1414+ goto set;
1415+
1416+ err = cgx_get_pkind(cgxd, lmac_id, &rxpkind);
1417+ if (err)
1418+ goto err;
1419+
1420+ switch (rxpkind) {
1421+ case NPC_RX_HIGIG_PKIND:
1422+ case NPC_RX_EDSA_PKIND:
1423+ goto err;
1424+ default:
1425+ break;
1426+ }
1427+
1428+set:
1429+ cgx_set_pkind(rvu_cgx_pdata(cgx_id, rvu), lmac_id, pkind);
1430+ mutex_unlock(&cgxd->lock);
1431+ return true;
1432+
1433+err:
1434+ mutex_unlock(&cgxd->lock);
1435+ return false;
1436+}
drivers/net/ethernet/marvell/octeontx2/af/rvu_nix.c+18−4
@@ -363,8 +363,8 @@ static int nix_interface_init(struct rvu *rvu, u16 pcifunc, int type, int nixlf, · 362 unmodified lines
363363 pfvf->tx_chan_cnt = 1;
364364 rsp->tx_link = cgx_id * hw->lmac_per_cgx + lmac_id;
365365
366− cgx_set_pkind(rvu_cgx_pdata(cgx_id, rvu), lmac_id, pkind);
367− rvu_npc_set_pkind(rvu, pkind, pfvf);
366+ if (rvu_cgx_check_permission_and_set_pkind(rvu, pcifunc, pkind))
367+ rvu_npc_set_pkind(rvu, pkind, pfvf);
368368 break;
369369 case NIX_INTF_TYPE_LBK:
370370 vf = (pcifunc & RVU_PFVF_FUNC_MASK) - 1;
@@ -1505,13 +1505,15 @@ int rvu_mbox_handler_nix_lf_alloc(struct rvu *rvu, · 1134 unmodified lines
15051505 struct nix_lf_alloc_req *req,
15061506 struct nix_lf_alloc_rsp *rsp)
15071507 {
1508− int nixlf, qints, hwctx_size, intf, rc = 0;
1508+ int nixlf, qints, hwctx_size, intf, rc = 0, pf;
15091509 u16 bcast, mcast, promisc, ucast;
15101510 struct rvu_hwinfo *hw = rvu->hw;
15111511 u16 pcifunc = req->hdr.pcifunc;
1512+ u8 cgx_id = 0, lmac_id = 0;
15121513 bool rules_created = false;
15131514 struct rvu_block *block;
15141515 struct rvu_pfvf *pfvf;
1516+ struct cgx *cgxd;
15151517 u64 cfg, ctx_cfg;
15161518 int blkaddr;
15171519
@@ -1685,8 +1687,20 @@ int rvu_mbox_handler_nix_lf_alloc(struct rvu *rvu, · 167 unmodified lines
16851687 rvu_write64(rvu, blkaddr, NIX_AF_LFX_RX_CFG(nixlf), req->rx_cfg);
16861688
16871689 /* Configure pkind for TX parse config */
1690+
1691+ pf = rvu_get_pf(rvu->pdev, pcifunc);
16881692 cfg = NPC_TX_DEF_PKIND;
1689− rvu_write64(rvu, blkaddr, NIX_AF_LFX_TX_PARSE_CFG(nixlf), cfg);
1693+
1694+ if (is_pf_cgxmapped(rvu, pf) && is_vf(pcifunc)) {
1695+ rvu_get_cgx_lmac_id(rvu->pf2cgxlmac_map[pf], &cgx_id, &lmac_id);
1696+ cgxd = rvu_cgx_pdata(cgx_id, rvu);
1697+ mutex_lock(&cgxd->lock);
1698+ if (rvu_cgx_is_pkind_config_permitted(rvu, pcifunc))
1699+ rvu_write64(rvu, blkaddr, NIX_AF_LFX_TX_PARSE_CFG(nixlf), cfg);
1700+ mutex_unlock(&cgxd->lock);
1701+ } else {
1702+ rvu_write64(rvu, blkaddr, NIX_AF_LFX_TX_PARSE_CFG(nixlf), cfg);
1703+ }
16901704
16911705 if (is_rep_dev(rvu, pcifunc)) {
16921706 pfvf->tx_chan_base = RVU_SWITCH_LBK_CHAN;
drivers/net/ethernet/marvell/octeontx2/af/rvu_npc.c+19−10
@@ -19,6 +19,7 @@ · 18 unmodified lines
1919 #include "cn20k/npc.h"
2020 #include "rvu_npc.h"
2121 #include "cn20k/reg.h"
22+#include "lmac_common.h"
2223
2324 #define RSVD_MCAM_ENTRIES_PER_PF 3 /* Broadcast, Promisc and AllMulticast */
2425 #define RSVD_MCAM_ENTRIES_PER_NIXLF 1 /* Ucast for LFs */
@@ -4200,10 +4201,11 @@ int rvu_npc_set_parse_mode(struct rvu *rvu, u16 pcifunc, u64 mode, u8 dir, · 4175 unmodified lines
42004201
42014202 {
42024203 struct rvu_pfvf *pfvf = rvu_get_pfvf(rvu, pcifunc);
4203− int blkaddr, nixlf, rc, intf_mode;
42044204 int pf = rvu_get_pf(rvu->pdev, pcifunc);
4205+ int blkaddr, nixlf, rc, intf_mode;
4206+ u8 cgx_id = 0, lmac_id = 0;
42054207 u64 rxpkind, txpkind;
4206− u8 cgx_id, lmac_id;
4208+ struct cgx *cgxd;
42074209
42084210 /* use default pkind to disable edsa/higig */
42094211 rxpkind = rvu_npc_get_pkind(rvu, pf);
@@ -4227,12 +4229,8 @@ int rvu_npc_set_parse_mode(struct rvu *rvu, u16 pcifunc, u64 mode, u8 dir, · 17 unmodified lines
42274229 /* rx pkind set req valid only for cgx mapped PFs */
42284230 if (!is_cgx_config_permitted(rvu, pcifunc))
42294231 return 0;
4230− rvu_get_cgx_lmac_id(rvu->pf2cgxlmac_map[pf], &cgx_id, &lmac_id);
4231−
4232− rc = cgx_set_pkind(rvu_cgx_pdata(cgx_id, rvu), lmac_id,
4233− rxpkind);
4234− if (rc)
4235− return rc;
4232+ if (!rvu_cgx_check_permission_and_set_pkind(rvu, pcifunc, rxpkind))
4233+ return -EINVAL;
42364234 }
42374235
42384236 if (dir & PKIND_TX) {
@@ -4241,8 +4239,19 @@ int rvu_npc_set_parse_mode(struct rvu *rvu, u16 pcifunc, u64 mode, u8 dir, · 2 unmodified lines
42414239 if (rc)
42424240 return rc;
42434241
4244− rvu_write64(rvu, blkaddr, NIX_AF_LFX_TX_PARSE_CFG(nixlf),
4245− txpkind);
4242+ if (is_pf_cgxmapped(rvu, pf) && is_vf(pcifunc)) {
4243+ rvu_get_cgx_lmac_id(rvu->pf2cgxlmac_map[pf], &cgx_id,
4244+ &lmac_id);
4245+ cgxd = rvu_cgx_pdata(cgx_id, rvu);
4246+ mutex_lock(&cgxd->lock);
4247+ if (rvu_cgx_is_pkind_config_permitted(rvu, pcifunc))
4248+ rvu_write64(rvu, blkaddr, NIX_AF_LFX_TX_PARSE_CFG(nixlf),
4249+ txpkind);
4250+ mutex_unlock(&cgxd->lock);
4251+ } else {
4252+ rvu_write64(rvu, blkaddr, NIX_AF_LFX_TX_PARSE_CFG(nixlf),
4253+ txpkind);
4254+ }
42464255 }
42474256
42484257 pfvf->intf_mode = intf_mode;

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t