Re: stable-rc: 6.1: mlx5: params.c:994:53: error: 'MLX5_IPSEC_CAP_CRYPTO' undeclared (first use in this function)

[Florian Fainelli <f.fainelli@gmail.com>]

On 1/29/2024 6:52 PM, Naresh Kamboju wrote:
> On Mon, 29 Jan 2024 at 21:58, Greg Kroah-Hartman
> <gregkh@linuxfoundation.org> wrote:
>>
>> On Mon, Jan 29, 2024 at 09:17:31PM +0530, Naresh Kamboju wrote:
>>> Following build errors noticed on stable-rc linux-6.1.y for arm64.
>>>
>>> arm64:
>>> --------
>>>    * build/gcc-13-lkftconfig
>>>    * build/gcc-13-lkftconfig-kunit
>>>    * build/clang-nightly-lkftconfig
>>>    * build/clang-17-lkftconfig-no-kselftest-frag
>>>    * build/gcc-13-lkftconfig-devicetree
>>>    * build/clang-lkftconfig
>>>    * build/gcc-13-lkftconfig-perf
>>>
>>> Reported-by: Linux Kernel Functional Testing <lkft@linaro.org>
>>>
>>> Build errors:
>>> ------
>>> drivers/net/ethernet/mellanox/mlx5/core/en/params.c: In function
>>> 'mlx5e_build_sq_param':
>>> drivers/net/ethernet/mellanox/mlx5/core/en/params.c:994:53: error:
>>> 'MLX5_IPSEC_CAP_CRYPTO' undeclared (first use in this function)
>>>    994 |                     (mlx5_ipsec_device_caps(mdev) &
>>> MLX5_IPSEC_CAP_CRYPTO);
>>>        |
>>> ^~~~~~~~~~~~~~~~~~~~~
>>>
>>> Suspecting commit:
>>>    net/mlx5e: Allow software parsing when IPsec crypto is enabled
>>>    [ Upstream commit 20f5468a7988dedd94a57ba8acd65ebda6a59723 ]
>>
>> Something looks very odd here, as the proper .h file is being included,
>> AND this isn't a build failure on x86, so why is this only arm64 having
>> problems?  What's causing this not to show up?
> 
> As per the Daniel report on stable-rc review on 6.1, these build failures also
> reported on System/390.

The build failure is legitimate here since 
drivers/net/ethernet/mellanox/mlx5/core/en_accel/ipsec.h guards all of 
the definitions and enumerations under a CONFIG_MLX5_EN_IPSEC which is 
not enabled in the build configuration that failed.

This is implicitly fixed upstream with 
8c582ddfbb473c1d799c40b5140aed81278e2837 ("net/mlx5e: Handle hardware 
IPsec limits events") which relocates the #ifdef CONFIG_MLX5_EN_IPSEC 
below and allows the MLX5_IPSEC_CAP_CRYPTO enum value, amongst others to 
be visible to code that is not guarded with CONFIG_MLX5_EN_IPSEC. This 
specific commit does not apply cleanly to the stable-6.1 branch, so 
maybe the best we can come up with is this targeted change that does the 
same thing against 6.1:

diff --git a/drivers/net/ethernet/mellanox/mlx5/core/en_accel/ipsec.h 
b/drivers/net/ethernet/mellanox/mlx5/core/en_accel/ipsec.h
index 16bcceec16c4..785f188148d8 100644
--- a/drivers/net/ethernet/mellanox/mlx5/core/en_accel/ipsec.h
+++ b/drivers/net/ethernet/mellanox/mlx5/core/en_accel/ipsec.h
@@ -34,7 +34,6 @@
  #ifndef __MLX5E_IPSEC_H__
  #define __MLX5E_IPSEC_H__

-#ifdef CONFIG_MLX5_EN_IPSEC

  #include <linux/mlx5/device.h>
  #include <net/xfrm.h>
@@ -146,6 +145,7 @@ struct mlx5e_ipsec_sa_entry {
         struct mlx5e_ipsec_modify_state_work modify_work;
  };

+#ifdef CONFIG_MLX5_EN_IPSEC
  int mlx5e_ipsec_init(struct mlx5e_priv *priv);
  void mlx5e_ipsec_cleanup(struct mlx5e_priv *priv);
  void mlx5e_ipsec_build_netdev(struct mlx5e_priv *priv);
-- 
Florian