diff mbox series

[v2,net-next] sfc: do not try to call tc functions when CONFIG_SFC_SRIOV=n

Message ID 20230615215243.34942-1-edward.cree@amd.com (mailing list archive)
State Accepted
Commit c08afcdcf95288c627267bb20002e8baaf3394e1
Delegated to: Netdev Maintainers
Headers show
Series [v2,net-next] sfc: do not try to call tc functions when CONFIG_SFC_SRIOV=n | expand

Checks

Context Check Description
netdev/series_format success Single patches do not need cover letters
netdev/tree_selection success Clearly marked for net-next
netdev/fixes_present success Fixes tag not required for -next series
netdev/header_inline success No static functions without inline keyword in header files
netdev/build_32bit success Errors and warnings before: 8 this patch: 8
netdev/cc_maintainers success CCed 10 of 10 maintainers
netdev/build_clang success Errors and warnings before: 8 this patch: 8
netdev/verify_signedoff success Signed-off-by tag matches author and committer
netdev/deprecated_api success None detected
netdev/check_selftest success No net selftest shell script
netdev/verify_fixes success Fixes tag looks correct
netdev/build_allmodconfig_warn success Errors and warnings before: 8 this patch: 8
netdev/checkpatch success total: 0 errors, 0 warnings, 0 checks, 43 lines checked
netdev/kdoc success Errors and warnings before: 0 this patch: 0
netdev/source_inline success Was 0 now: 0

Commit Message

edward.cree@amd.com June 15, 2023, 9:52 p.m. UTC 
From: Edward Cree <ecree.xilinx@gmail.com>

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.

Reported-by: kernel test robot <lkp@intel.com>
Closes: https://lore.kernel.org/oe-kbuild-all/202306102026.ISK5JfUQ-lkp@intel.com/
Fixes: 7e5e7d800011 ("sfc: neighbour lookup for TC encap action offload")
Signed-off-by: Edward Cree <ecree.xilinx@gmail.com>
---
 drivers/net/ethernet/sfc/tc_bindings.h      | 12 ++++++++++++
 drivers/net/ethernet/sfc/tc_encap_actions.h | 11 +++++++++++
 2 files changed, 23 insertions(+)

Comments

Martin Habets June 16, 2023, 7:44 a.m. UTC | #1 
On Thu, Jun 15, 2023 at 10:52:43PM +0100, edward.cree@amd.com wrote:
> From: Edward Cree <ecree.xilinx@gmail.com>
> 
> 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.
> 
> Reported-by: kernel test robot <lkp@intel.com>
> Closes: https://lore.kernel.org/oe-kbuild-all/202306102026.ISK5JfUQ-lkp@intel.com/
> Fixes: 7e5e7d800011 ("sfc: neighbour lookup for TC encap action offload")
> Signed-off-by: Edward Cree <ecree.xilinx@gmail.com>

Reviewed-by: Martin Habets <habetsm.xilinx@gmail.com>

> ---
>  drivers/net/ethernet/sfc/tc_bindings.h      | 12 ++++++++++++
>  drivers/net/ethernet/sfc/tc_encap_actions.h | 11 +++++++++++
>  2 files changed, 23 insertions(+)
> 
> diff --git a/drivers/net/ethernet/sfc/tc_bindings.h b/drivers/net/ethernet/sfc/tc_bindings.h
> index 095ddeb59eb3..a326d23d322b 100644
> --- a/drivers/net/ethernet/sfc/tc_bindings.h
> +++ b/drivers/net/ethernet/sfc/tc_bindings.h
> @@ -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 */
> diff --git a/drivers/net/ethernet/sfc/tc_encap_actions.h b/drivers/net/ethernet/sfc/tc_encap_actions.h
> index 4d755fb92daf..c3c7904ad7ff 100644
> --- a/drivers/net/ethernet/sfc/tc_encap_actions.h
> +++ b/drivers/net/ethernet/sfc/tc_encap_actions.h
> @@ -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 */
patchwork-bot+netdevbpf@kernel.org June 16, 2023, 8:20 a.m. UTC | #2 
Hello:

This patch was applied to netdev/net-next.git (main)
by David S. Miller <davem@davemloft.net>:

On Thu, 15 Jun 2023 22:52:43 +0100 you wrote:
> From: Edward Cree <ecree.xilinx@gmail.com>
> 
> 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!
diff mbox series

Patch

diff --git a/drivers/net/ethernet/sfc/tc_bindings.h b/drivers/net/ethernet/sfc/tc_bindings.h
index 095ddeb59eb3..a326d23d322b 100644
--- a/drivers/net/ethernet/sfc/tc_bindings.h
+++ b/drivers/net/ethernet/sfc/tc_bindings.h
@@ -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 */
diff --git a/drivers/net/ethernet/sfc/tc_encap_actions.h b/drivers/net/ethernet/sfc/tc_encap_actions.h
index 4d755fb92daf..c3c7904ad7ff 100644
--- a/drivers/net/ethernet/sfc/tc_encap_actions.h
+++ b/drivers/net/ethernet/sfc/tc_encap_actions.h
@@ -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 */