59 lines
2.1 KiB
Diff
59 lines
2.1 KiB
Diff
|
From 2b3082c6ef3b0104d822f6f18d2afbe5fc9a5c2c Mon Sep 17 00:00:00 2001
|
||
|
|
From: Ratheesh Kannoth <rkannoth@marvell.com>
|
||
|
|
Date: Sat, 29 Jul 2023 04:52:15 +0530
|
||
|
|
Subject: [PATCH] net: flow_dissector: Use 64bits for used_keys
|
||
|
|
|
||
|
|
As 32bits of dissector->used_keys are exhausted,
|
||
|
|
increase the size to 64bits.
|
||
|
|
|
||
|
|
This is base change for ESP/AH flow dissector patch.
|
||
|
|
Please find patch and discussions at
|
||
|
|
https://lore.kernel.org/netdev/ZMDNjD46BvZ5zp5I@corigine.com/T/#t
|
||
|
|
|
||
|
|
Signed-off-by: Ratheesh Kannoth <rkannoth@marvell.com>
|
||
|
|
Reviewed-by: Petr Machata <petrm@nvidia.com> # for mlxsw
|
||
|
|
Tested-by: Petr Machata <petrm@nvidia.com>
|
||
|
|
Reviewed-by: Martin Habets <habetsm.xilinx@gmail.com>
|
||
|
|
Reviewed-by: Simon Horman <simon.horman@corigine.com>
|
||
|
|
Reviewed-by: Vladimir Oltean <vladimir.oltean@nxp.com>
|
||
|
|
Signed-off-by: David S. Miller <davem@davemloft.net>
|
||
|
|
|
||
|
|
---
|
||
|
|
src/iavf_main.c | 18 +++++++++---------
|
||
|
|
1 file changed, 9 insertions(+), 9 deletions(-)
|
||
|
|
|
||
|
|
diff --git a/src/iavf_main.c b/src/iavf_main.c
|
||
|
|
index e475564..9b70c2e 100644
|
||
|
|
--- a/src/iavf_main.c
|
||
|
|
+++ b/src/iavf_main.c
|
||
|
|
@@ -4073,17 +4073,17 @@ static int iavf_parse_cls_flower(struct iavf_adapter *adapter,
|
||
|
|
int i = 0;
|
||
|
|
|
||
|
|
if (dissector->used_keys &
|
||
|
|
- ~(BIT(FLOW_DISSECTOR_KEY_CONTROL) |
|
||
|
|
- BIT(FLOW_DISSECTOR_KEY_BASIC) |
|
||
|
|
- BIT(FLOW_DISSECTOR_KEY_ETH_ADDRS) |
|
||
|
|
- BIT(FLOW_DISSECTOR_KEY_VLAN) |
|
||
|
|
- BIT(FLOW_DISSECTOR_KEY_IPV4_ADDRS) |
|
||
|
|
- BIT(FLOW_DISSECTOR_KEY_IPV6_ADDRS) |
|
||
|
|
+ ~(BIT_ULL(FLOW_DISSECTOR_KEY_CONTROL) |
|
||
|
|
+ BIT_ULL(FLOW_DISSECTOR_KEY_BASIC) |
|
||
|
|
+ BIT_ULL(FLOW_DISSECTOR_KEY_ETH_ADDRS) |
|
||
|
|
+ BIT_ULL(FLOW_DISSECTOR_KEY_VLAN) |
|
||
|
|
+ BIT_ULL(FLOW_DISSECTOR_KEY_IPV4_ADDRS) |
|
||
|
|
+ BIT_ULL(FLOW_DISSECTOR_KEY_IPV6_ADDRS) |
|
||
|
|
#ifdef HAVE_TC_FLOWER_ENC
|
||
|
|
- BIT(FLOW_DISSECTOR_KEY_ENC_KEYID) |
|
||
|
|
+ BIT_ULL(FLOW_DISSECTOR_KEY_ENC_KEYID) |
|
||
|
|
#endif /* HAVE_TC_FLOWER_ENC */
|
||
|
|
- BIT(FLOW_DISSECTOR_KEY_PORTS))) {
|
||
|
|
- dev_err(&adapter->pdev->dev, "Unsupported key used: 0x%x\n",
|
||
|
|
+ BIT_ULL(FLOW_DISSECTOR_KEY_PORTS))) {
|
||
|
|
+ dev_err(&adapter->pdev->dev, "Unsupported key used: 0x%llx\n",
|
||
|
|
dissector->used_keys);
|
||
|
|
return -EOPNOTSUPP;
|
||
|
|
}
|
||
|
|
--
|
||
|
|
2.41.0
|
||
|
|
|