| Message ID | 20180525213630.2119214-1-arnd@arndb.de |
|---|---|
| State | Accepted |
| Commit | c3cd281e2bc8da18f225f1191e9751d771411933 |
| Headers | show |
| Series | [net-next] net/mlx5e: fix TLS dependency | expand |
On Fri, 2018-05-25 at 23:36 +0200, Arnd Bergmann wrote: > With CONFIG_TLS=m and MLX5_CORE_EN=y, we get a link failure: > > drivers/net/ethernet/mellanox/mlx5/core/en_accel/tls_rxtx.o: In > function `mlx5e_tls_handle_ooo': > tls_rxtx.c:(.text+0x24c): undefined reference to `tls_get_record' > drivers/net/ethernet/mellanox/mlx5/core/en_accel/tls_rxtx.o: In > function `mlx5e_tls_handle_tx_skb': > tls_rxtx.c:(.text+0x9a8): undefined reference to > `tls_device_sk_destruct' > > This narrows down the dependency to only allow the configurations > that will actually work. The existing dependency on TLS_DEVICE is > not sufficient here since MLX5_EN_TLS is a 'bool' symbol. > > Fixes: c83294b9efa5 ("net/mlx5e: TLS, Add Innova TLS TX support") > Signed-off-by: Arnd Bergmann <arnd@arndb.de> > --- LGTM Acked-by: Saeed Mahameed <saeedm@mellanox.com> Thank you Arnd! > drivers/net/ethernet/mellanox/mlx5/core/Kconfig | 1 + > 1 file changed, 1 insertion(+) > > diff --git a/drivers/net/ethernet/mellanox/mlx5/core/Kconfig > b/drivers/net/ethernet/mellanox/mlx5/core/Kconfig > index ee6684779d11..2545296a0c08 100644 > --- a/drivers/net/ethernet/mellanox/mlx5/core/Kconfig > +++ b/drivers/net/ethernet/mellanox/mlx5/core/Kconfig > @@ -91,6 +91,7 @@ config MLX5_EN_TLS > bool "TLS cryptography-offload accelaration" > depends on MLX5_CORE_EN > depends on TLS_DEVICE > + depends on TLS=y || MLX5_CORE=m > depends on MLX5_ACCEL > default n > ---help---
Acked-by: Boris Pismenny <borisp@mellanox.com> Thank you. > -----Original Message----- > From: Saeed Mahameed > Sent: Saturday, May 26, 2018 2:19 AM > To: davem@davemloft.net; arnd@arndb.de; leon@kernel.org > Cc: linux-kernel@vger.kernel.org; linux-rdma@vger.kernel.org; Boris > Pismenny <borisp@mellanox.com>; Or Gerlitz <ogerlitz@mellanox.com>; > Feras Daoud <ferasda@mellanox.com>; Ilan Tayari <ilant@mellanox.com>; > netdev@vger.kernel.org; Ilya Lesokhin <ilyal@mellanox.com> > Subject: Re: [PATCH, net-next] net/mlx5e: fix TLS dependency > > On Fri, 2018-05-25 at 23:36 +0200, Arnd Bergmann wrote: > > With CONFIG_TLS=m and MLX5_CORE_EN=y, we get a link failure: > > > > drivers/net/ethernet/mellanox/mlx5/core/en_accel/tls_rxtx.o: In > > function `mlx5e_tls_handle_ooo': > > tls_rxtx.c:(.text+0x24c): undefined reference to `tls_get_record' > > drivers/net/ethernet/mellanox/mlx5/core/en_accel/tls_rxtx.o: In > > function `mlx5e_tls_handle_tx_skb': > > tls_rxtx.c:(.text+0x9a8): undefined reference to > > `tls_device_sk_destruct' > > > > This narrows down the dependency to only allow the configurations that > > will actually work. The existing dependency on TLS_DEVICE is not > > sufficient here since MLX5_EN_TLS is a 'bool' symbol. > > > > Fixes: c83294b9efa5 ("net/mlx5e: TLS, Add Innova TLS TX support") > > Signed-off-by: Arnd Bergmann <arnd@arndb.de> > > --- > > LGTM > > Acked-by: Saeed Mahameed <saeedm@mellanox.com> > > Thank you Arnd! > > > > drivers/net/ethernet/mellanox/mlx5/core/Kconfig | 1 + > > 1 file changed, 1 insertion(+) > > > > diff --git a/drivers/net/ethernet/mellanox/mlx5/core/Kconfig > > b/drivers/net/ethernet/mellanox/mlx5/core/Kconfig > > index ee6684779d11..2545296a0c08 100644 > > --- a/drivers/net/ethernet/mellanox/mlx5/core/Kconfig > > +++ b/drivers/net/ethernet/mellanox/mlx5/core/Kconfig > > @@ -91,6 +91,7 @@ config MLX5_EN_TLS > > bool "TLS cryptography-offload accelaration" > > depends on MLX5_CORE_EN > > depends on TLS_DEVICE > > + depends on TLS=y || MLX5_CORE=m > > depends on MLX5_ACCEL > > default n > > ---help---
From: Arnd Bergmann <arnd@arndb.de> Date: Fri, 25 May 2018 23:36:06 +0200 > With CONFIG_TLS=m and MLX5_CORE_EN=y, we get a link failure: > > drivers/net/ethernet/mellanox/mlx5/core/en_accel/tls_rxtx.o: In function `mlx5e_tls_handle_ooo': > tls_rxtx.c:(.text+0x24c): undefined reference to `tls_get_record' > drivers/net/ethernet/mellanox/mlx5/core/en_accel/tls_rxtx.o: In function `mlx5e_tls_handle_tx_skb': > tls_rxtx.c:(.text+0x9a8): undefined reference to `tls_device_sk_destruct' > > This narrows down the dependency to only allow the configurations > that will actually work. The existing dependency on TLS_DEVICE is > not sufficient here since MLX5_EN_TLS is a 'bool' symbol. > > Fixes: c83294b9efa5 ("net/mlx5e: TLS, Add Innova TLS TX support") > Signed-off-by: Arnd Bergmann <arnd@arndb.de> Applied, thank you.
diff --git a/drivers/net/ethernet/mellanox/mlx5/core/Kconfig b/drivers/net/ethernet/mellanox/mlx5/core/Kconfig index ee6684779d11..2545296a0c08 100644 --- a/drivers/net/ethernet/mellanox/mlx5/core/Kconfig +++ b/drivers/net/ethernet/mellanox/mlx5/core/Kconfig @@ -91,6 +91,7 @@ config MLX5_EN_TLS bool "TLS cryptography-offload accelaration" depends on MLX5_CORE_EN depends on TLS_DEVICE + depends on TLS=y || MLX5_CORE=m depends on MLX5_ACCEL default n ---help---
With CONFIG_TLS=m and MLX5_CORE_EN=y, we get a link failure: drivers/net/ethernet/mellanox/mlx5/core/en_accel/tls_rxtx.o: In function `mlx5e_tls_handle_ooo': tls_rxtx.c:(.text+0x24c): undefined reference to `tls_get_record' drivers/net/ethernet/mellanox/mlx5/core/en_accel/tls_rxtx.o: In function `mlx5e_tls_handle_tx_skb': tls_rxtx.c:(.text+0x9a8): undefined reference to `tls_device_sk_destruct' This narrows down the dependency to only allow the configurations that will actually work. The existing dependency on TLS_DEVICE is not sufficient here since MLX5_EN_TLS is a 'bool' symbol. Fixes: c83294b9efa5 ("net/mlx5e: TLS, Add Innova TLS TX support") Signed-off-by: Arnd Bergmann <arnd@arndb.de> --- drivers/net/ethernet/mellanox/mlx5/core/Kconfig | 1 + 1 file changed, 1 insertion(+) -- 2.9.0