Skip to contentSkip to conversation

sfc: do not try to call tc functions when CONFIG_SFC_SRIOV=n

PATCH Applied [email protected] 3 participants 3 messages Jun 15, 2023 – Jun 16, 2023

Subsystems (3)
lore
Share & tools
lore
#0 lore raw

PATCH v2 1/1 sfc: do not try to call tc functions when CONFIG_SFC_SRIOV=n

From: Edward Cree <[email protected]>

Functions efx_tc_netdev_event and efx_tc_netevent_event do not exist
in that case as object files tc_bindings.o and tc_encap_actions.o are not built, so the calls to them from ef100_netdev_event and ef100_netevent_event cause link errors.
Wrap the corresponding header files (tc_bindings.h, tc_encap_actions.h)
with #if IS_ENABLED(CONFIG_SFC_SRIOV), and add an #else with static inline stubs for these two functions.

Fixes 7e5e7d800011 ("sfc: neighbour lookup for TC encap action offload")
---
 drivers/net/ethernet/sfc/tc_bindings.h      | 12 ++++++++++++
 drivers/net/ethernet/sfc/tc_encap_actions.h | 11 +++++++++++
 2 files changed, 23 insertions(+)
drivers/net/ethernet/sfc/tc_bindings.h +12 -0
index 095ddeb59eb3..a326d23d322b 100644
@@ -12,6 +12,7 @@
 #define EFX_TC_BINDINGS_H
 #include "net_driver.h"
 
+#if IS_ENABLED(CONFIG_SFC_SRIOV)
 #include <net/sch_generic.h>
 
 struct efx_rep;
@@ -28,4 +29,15 @@ int efx_tc_indr_setup_cb(struct net_device *net_dev, struct Qdisc *sch,
 			 void (*cleanup)(struct flow_block_cb *block_cb));
 int efx_tc_netdev_event(struct efx_nic *efx, unsigned long event,
 			struct net_device *net_dev);
+
+#else /* CONFIG_SFC_SRIOV */
+
+static inline int efx_tc_netdev_event(struct efx_nic *efx, unsigned long event,
+				      struct net_device *net_dev)
+{
+	return NOTIFY_DONE;
+}
+
+#endif /* CONFIG_SFC_SRIOV */
+
 #endif /* EFX_TC_BINDINGS_H */
drivers/net/ethernet/sfc/tc_encap_actions.h +11 -0
index 4d755fb92daf..c3c7904ad7ff 100644
@@ -12,6 +12,7 @@
 #define EFX_TC_ENCAP_ACTIONS_H
 #include "net_driver.h"
 
+#if IS_ENABLED(CONFIG_SFC_SRIOV)
 #include <linux/refcount.h>
 #include <net/tc_act/tc_tunnel_key.h>
 
@@ -100,4 +101,14 @@ void efx_tc_unregister_egdev(struct efx_nic *efx, struct net_device *net_dev);
 int efx_tc_netevent_event(struct efx_nic *efx, unsigned long event,
 			  void *ptr);
 
+#else /* CONFIG_SFC_SRIOV */
+
+static inline int efx_tc_netevent_event(struct efx_nic *efx,
+					unsigned long event, void *ptr)
+{
+	return NOTIFY_DONE;
+}
+
+#endif /* CONFIG_SFC_SRIOV */
+
 #endif /* EFX_TC_ENCAP_ACTIONS_H */
Reviewed-by on v2 1/1
#1 lore raw
Quoted 10 lines · On Thu, Jun 15, 2023 at 10:52:43PM +0100, [email protected] wrote:

From: Edward Cree <[email protected]>

Functions efx_tc_netdev_event and efx_tc_netevent_event do not exist
in that case as object files tc_bindings.o and tc_encap_actions.o are not built, so the calls to them from ef100_netdev_event and ef100_netevent_event cause link errors.
Wrap the corresponding header files (tc_bindings.h, tc_encap_actions.h)
with #if IS_ENABLED(CONFIG_SFC_SRIOV), and add an #else with static inline stubs for these two functions.

Quoted 4 lines
Fixes 7e5e7d800011 ("sfc: neighbour lookup for TC encap action offload")
Quoted 60 lines
---
 drivers/net/ethernet/sfc/tc_bindings.h      | 12 ++++++++++++
 drivers/net/ethernet/sfc/tc_encap_actions.h | 11 +++++++++++
 2 files changed, 23 insertions(+)
drivers/net/ethernet/sfc/tc_bindings.h +12 -0
index 095ddeb59eb3..a326d23d322b 100644
@@ -12,6 +12,7 @@
 #define EFX_TC_BINDINGS_H
 #include "net_driver.h"
 
+#if IS_ENABLED(CONFIG_SFC_SRIOV)
 #include <net/sch_generic.h>
 
 struct efx_rep;
@@ -28,4 +29,15 @@ int efx_tc_indr_setup_cb(struct net_device *net_dev, struct Qdisc *sch,
 			 void (*cleanup)(struct flow_block_cb *block_cb));
 int efx_tc_netdev_event(struct efx_nic *efx, unsigned long event,
 			struct net_device *net_dev);
+
+#else /* CONFIG_SFC_SRIOV */
+
+static inline int efx_tc_netdev_event(struct efx_nic *efx, unsigned long event,
+				      struct net_device *net_dev)
+{
+	return NOTIFY_DONE;
+}
+
+#endif /* CONFIG_SFC_SRIOV */
+
 #endif /* EFX_TC_BINDINGS_H */
drivers/net/ethernet/sfc/tc_encap_actions.h +11 -0
index 4d755fb92daf..c3c7904ad7ff 100644
@@ -12,6 +12,7 @@
 #define EFX_TC_ENCAP_ACTIONS_H
 #include "net_driver.h"
 
+#if IS_ENABLED(CONFIG_SFC_SRIOV)
 #include <linux/refcount.h>
 #include <net/tc_act/tc_tunnel_key.h>
 
@@ -100,4 +101,14 @@ void efx_tc_unregister_egdev(struct efx_nic *efx, struct net_device *net_dev);
 int efx_tc_netevent_event(struct efx_nic *efx, unsigned long event,
 			  void *ptr);
 
+#else /* CONFIG_SFC_SRIOV */
+
+static inline int efx_tc_netevent_event(struct efx_nic *efx,
+					unsigned long event, void *ptr)
+{
+	return NOTIFY_DONE;
+}
+
+#endif /* CONFIG_SFC_SRIOV */
+
 #endif /* EFX_TC_ENCAP_ACTIONS_H */
#2 lore raw
In reply to [email protected]
This patch was applied to netdev/net-next.git (main) by David S. Miller <[email protected]>:

Hello:

This patch was applied to netdev/net-next.git (main) by David S. Miller <[email protected]>:

Quoted 11 lines · On Thu, 15 Jun 2023 22:52:43 +0100 you wrote:

From: Edward Cree <[email protected]>

Functions efx_tc_netdev_event and efx_tc_netevent_event do not exist
in that case as object files tc_bindings.o and tc_encap_actions.o are not built, so the calls to them from ef100_netdev_event and ef100_netevent_event cause link errors.
Wrap the corresponding header files (tc_bindings.h, tc_encap_actions.h)
with #if IS_ENABLED(CONFIG_SFC_SRIOV), and add an #else with static inline stubs for these two functions.

[...]

Here is the summary with links:
- [v2,net-next] sfc: do not try to call tc functions when CONFIG_SFC_SRIOV=n

    https://git.kernel.org/netdev/net-next/c/c08afcdcf952

You are awesome, thank you!

Signature · 2 lines
Deet-doot-dot, I am a bot.
https://korg.docs.kernel.org/patchwork/pwbot.html