octeontx2-pf: Check for DMAC extraction before setting VF DMAC
Subbaraya Sundeep
maintainerPATCH 1/1 octeontx2-pf: Check for DMAC extraction before setting VF DMAC
From: Suman Ghosh <[email protected]>
Currently while setting a MAC address of a PF's VF (e.g. ip link set <pf-netdev> vf 0 mac <mac-address>), it simply tries to install a DMAC based hardware filter. But it is possible that the loaded hardware parser profile does not support DMAC extraction. Hence check for DMAC extraction before installing the filter.
--- .../net/ethernet/marvell/octeontx2/nic/otx2_pf.c | 31 ++++++++++++++++++++++ 1 file changed, 31 insertions(+)
drivers/net/ethernet/marvell/octeontx2/nic/otx2_pf.c +31 -0
@@ -2559,6 +2559,8 @@ static int otx2_do_set_vf_mac(struct otx2_nic *pf, int vf, const u8 *mac)static int otx2_set_vf_mac (struct net_device *netdev,int vf,u8 *mac) {struct otx2_nic *pf =netdev_priv (netdev); +struct npc_get_field_status_req *req; +struct npc_get_field_status_rsp *rsp;struct pci_dev *pdev = pf->pdev;struct otx2_vf_config *config;int ret;
@@ -2572,6 +2574,35 @@ static int otx2_set_vf_mac(struct net_device *netdev, int vf, u8 *mac)if (!is_valid_ether_addr (mac))return -EINVAL ; +/* Check if NPC_DMAC feature is set in NPC. If not set then +* return from the function. +*/ +mutex_lock (&pf->mbox.lock); + req =otx2_mbox_alloc_msg_npc_get_field_status (&pf->mbox); +if (!req) { +mutex_unlock (&pf->mbox.lock); +return -ENOMEM ; + } + + req->field =NPC_DMAC ; + ret =otx2_sync_mbox_msg (&pf->mbox); +if (ret) { +mutex_unlock (&pf->mbox.lock); +return ret; + } + + rsp = (struct npc_get_field_status_rsp *)otx2_mbox_get_rsp + (&pf->mbox.mbox,0 , &req->hdr); +if (IS_ERR (rsp)) { +mutex_unlock (&pf->mbox.lock); +return PTR_ERR (rsp); + } + +mutex_unlock (&pf->mbox.lock); + +if (!rsp->enable) +return 0 ; + config = &pf->vf_configs[vf];ether_addr_copy (config->mac, mac);
Signature · 1 line
2.7.4
Simon Horman
reviewerQuoted 7 lines · Subbaraya Sundeep
From: Suman Ghosh <[email protected]>
Currently while setting a MAC address of a PF's VF (e.g. ip link set <pf-netdev> vf 0 mac <mac-address>), it simply tries to install a DMAC based hardware filter. But it is possible that the loaded hardware parser profile does not support DMAC extraction. Hence check for DMAC extraction before installing the filter.
Makes sense to me, but should this be treated as a bug fix?
Quoted 3 lines
Signed-off-by Suman Ghosh <[email protected]>Signed-off-by Subbaraya Sundeep <[email protected]>
...
Subbaraya Sundeep
maintainerQuoted 11 lines · Simon Horman
Quoted 7 lines · Subbaraya Sundeep
From: Suman Ghosh <[email protected]>
Currently while setting a MAC address of a PF's VF (e.g. ip link set <pf-netdev> vf 0 mac <mac-address>), it simply tries to install a DMAC based hardware filter. But it is possible that the loaded hardware parser profile does not support DMAC extraction. Hence check for DMAC extraction before installing the filter.
Makes sense to me, but should this be treated as a bug fix?
No strong opinion on whether this is a bug fix or not. We assumed DMAC is required always until on of our customers came up with profile with no DMAC extraction so that they can use the additional MCAM space created for other packet fields. I will send as bug fix if you insist.
Thanks,
Sundeep
Quoted 5 lines
Quoted 3 lines
Signed-off-by Suman Ghosh <[email protected]>Signed-off-by Subbaraya Sundeep <[email protected]>...
Quoted 10 lines · Subbaraya Sundeep
Quoted 9 lines · Simon Horman
Quoted 7 lines · Subbaraya Sundeep
From: Suman Ghosh <[email protected]>
Currently while setting a MAC address of a PF's VF (e.g. ip link set <pf-netdev> vf 0 mac <mac-address>), it simply tries to install a DMAC based hardware filter. But it is possible that the loaded hardware parser profile does not support DMAC extraction. Hence check for DMAC extraction before installing the filter.
Quoted 7 lines
Quoted 2 lines
Makes sense to me, but should this be treated as a bug fix?
No strong opinion on whether this is a bug fix or not. We assumed DMAC is required always until on of our customers came up with profile with no DMAC extraction so that they can use the additional MCAM space created for other packet fields. I will send as bug fix if you insist.
No strong feeling on my side either.
Let's leave it for net-next unless someone else thinks otherwise.
Jakub Kicinski
maintainerQuoted 9 lines · On Wed, 25 Jun 2025 17:00:02 +0530 Subbaraya Sundeep wrote:
drivers/net/ethernet/marvell/octeontx2/nic/otx2_pf.c +9
-0+/* Check if NPC_DMAC feature is set in NPC. If not set then +* return from the function. +*/ +mutex_lock (&pf->mbox.lock); + req =otx2_mbox_alloc_msg_npc_get_field_status (&pf->mbox); +if (!req) { +mutex_unlock (&pf->mbox.lock); +return -ENOMEM ; + }
drivers/net/ethernet/marvell/octeontx2/nic/otx2_pf.c static int otx2_set_vf_mac(struct net_device *netdev, int vf, u8 *mac) · line 2595
Quoted 10 lines
drivers/net/ethernet/marvell/octeontx2/nic/otx2_pf.c +10
-0+ + req->field =NPC_DMAC ; + ret =otx2_sync_mbox_msg (&pf->mbox); +if (ret) { +mutex_unlock (&pf->mbox.lock); +return ret; + } + + rsp = (struct npc_get_field_status_rsp *)otx2_mbox_get_rsp + (&pf->mbox.mbox,0 , &req->hdr);
This is too ugly. Cast it to a void pointer to avoid the super long line.
drivers/net/ethernet/marvell/octeontx2/nic/otx2_pf.c static int otx2_set_vf_mac(struct net_device *netdev, int vf, u8 *mac) · line 2604
Quoted 9 lines
drivers/net/ethernet/marvell/octeontx2/nic/otx2_pf.c +9
-0+if (IS_ERR (rsp)) { +mutex_unlock (&pf->mbox.lock); +return PTR_ERR (rsp); + } + +mutex_unlock (&pf->mbox.lock); + +if (!rsp->enable) +return 0 ;
Please send as a fix, and factor this out to a helper.
Signature · 1 line
pw-bot: cr