Message ID | 20230809064039.1167803-1-rkannoth@marvell.com (mailing list archive) |
---|---|
State | Accepted |
Commit | 12aa0a3b93f3adf61b6f7937c3aac8585ced3fca |
Delegated to: | Netdev Maintainers |
Headers | show |
Series | [net-next] octeontx2-af: Harden rule validation. | expand |
On Wed, Aug 09, 2023 at 12:10:39PM +0530, Ratheesh Kannoth wrote: > Accept TC offload classifier rule only if SPI field > can be extracted by HW. > > Signed-off-by: Ratheesh Kannoth <rkannoth@marvell.com> Reviewed-by: Simon Horman <horms@kernel.org>
Hello: This patch was applied to netdev/net-next.git (main) by David S. Miller <davem@davemloft.net>: On Wed, 9 Aug 2023 12:10:39 +0530 you wrote: > Accept TC offload classifier rule only if SPI field > can be extracted by HW. > > Signed-off-by: Ratheesh Kannoth <rkannoth@marvell.com> > --- > drivers/net/ethernet/marvell/octeontx2/af/rvu_npc_fs.c | 4 +++- > 1 file changed, 3 insertions(+), 1 deletion(-) Here is the summary with links: - [net-next] octeontx2-af: Harden rule validation. https://git.kernel.org/netdev/net-next/c/12aa0a3b93f3 You are awesome, thank you!
diff --git a/drivers/net/ethernet/marvell/octeontx2/af/rvu_npc_fs.c b/drivers/net/ethernet/marvell/octeontx2/af/rvu_npc_fs.c index 5c8f9fc15ff8..237f82082ebe 100644 --- a/drivers/net/ethernet/marvell/octeontx2/af/rvu_npc_fs.c +++ b/drivers/net/ethernet/marvell/octeontx2/af/rvu_npc_fs.c @@ -580,7 +580,9 @@ static void npc_set_features(struct rvu *rvu, int blkaddr, u8 intf) if (!npc_check_field(rvu, blkaddr, NPC_LB, intf)) *features &= ~BIT_ULL(NPC_OUTER_VID); - if (*features & (BIT_ULL(NPC_IPPROTO_AH) | BIT_ULL(NPC_IPPROTO_ESP))) + /* Set SPI flag only if AH/ESP and IPSEC_SPI are in the key */ + if (npc_check_field(rvu, blkaddr, NPC_IPSEC_SPI, intf) && + (*features & (BIT_ULL(NPC_IPPROTO_ESP) | BIT_ULL(NPC_IPPROTO_AH)))) *features |= BIT_ULL(NPC_IPSEC_SPI); /* for vlan ethertypes corresponding layer type should be in the key */
Accept TC offload classifier rule only if SPI field can be extracted by HW. Signed-off-by: Ratheesh Kannoth <rkannoth@marvell.com> --- drivers/net/ethernet/marvell/octeontx2/af/rvu_npc_fs.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)