[net-next,05/18] tls: Refactor tls_offload variable names

Message ID	1530711161-14578-6-git-send-email-borisp@mellanox.com
State	Changes Requested, archived
Delegated to:	David Miller
Headers	show Return-Path: <netdev-owner@vger.kernel.org> From: Boris Pismenny <borisp@mellanox.com> To: davem@davemloft.net Cc: netdev@vger.kernel.org, davejwatson@fb.com, aviadye@mellanox.com, borisp@mellanox.com, saeedm@mellanox.com Subject: [PATCH net-next 05/18] tls: Refactor tls_offload variable names Date: Wed, 4 Jul 2018 16:32:28 +0300 Message-Id: <1530711161-14578-6-git-send-email-borisp@mellanox.com> In-Reply-To: <1530711161-14578-1-git-send-email-borisp@mellanox.com> References: <1530711161-14578-1-git-send-email-borisp@mellanox.com> Sender: netdev-owner@vger.kernel.org Precedence: bulk
Series	TLS offload rx, netdev & mlx5 \| expand [net-next,00/18] TLS offload rx, netdev & mlx5 [net-next,01/18] net: Add decrypted field to skb [net-next,02/18] net: Add TLS RX offload feature [net-next,03/18] net: Add TLS rx resync NDO [net-next,04/18] tcp: Don't coalesce decrypted and encrypted SKBs [net-next,05/18] tls: Refactor tls_offload variable names [net-next,06/18] tls: Split decrypt_skb to two functions [net-next,07/18] tls: Split tls_sw_release_resources_rx [net-next,08/18] tls: Fill software context without allocation [net-next,09/18] tls: Add rx inline crypto offload [net-next,10/18] net/mlx5e: TLS, refactor variable names [net-next,11/18] net/mlx5: Accel, add TLS rx offload routines [net-next,12/18] net/mlx5e: TLS, add innova rx support [net-next,13/18] net/mlx5e: TLS, add Innova TLS rx data path [net-next,14/18] net/mlx5e: TLS, add software statistics [net-next,15/18] net/mlx5e: TLS, build TLS netdev from capabilities [net-next,16/18] net/mlx5: Accel, add common metadata functions [net-next,17/18] net/mlx5e: IPsec, fix byte count in CQE [net-next,18/18] net/mlx5e: Kconfig, mutually exclude compilation of TLS and IPsec accel

Hi Boris, I love your patch! Yet something to improve: [auto build test ERROR on net-next/master] url: https://github.com/0day-ci/linux/commits/Boris-Pismenny/TLS-offload-rx-netdev-mlx5/20180705-064704 config: ia64-allmodconfig (attached as .config) compiler: ia64-linux-gcc (GCC) 8.1.0 reproduce: wget https://raw.githubusercontent.com/intel/lkp-tests/master/sbin/make.cross -O ~/bin/make.cross chmod +x ~/bin/make.cross # save the attached .config to linux build tree GCC_VERSION=8.1.0 make.cross ARCH=ia64 Note: the linux-review/Boris-Pismenny/TLS-offload-rx-netdev-mlx5/20180705-064704 HEAD fbaef8a3b3a3283de49a7171144b7471e5c780d9 builds fine. It only hurts bisectibility. All error/warnings (new ones prefixed by >>): net/tls/tls_device.c: In function 'tls_device_free_ctx': >> net/tls/tls_device.c:55:22: error: 'TLS_HW' undeclared (first use in this function); did you mean 'TLS_TX'? if (ctx->tx_conf == TLS_HW) ^~~~~~ TLS_TX net/tls/tls_device.c:55:22: note: each undeclared identifier is reported only once for each function it appears in -- In file included from drivers/net/ethernet//mellanox/mlx5/core/en_main.c:45: >> drivers/net/ethernet//mellanox/mlx5/core/en_accel/tls.h:53:29: error: field 'base' has incomplete type struct tls_offload_context base; ^~~~ In file included from include/linux/kernel.h:10, from include/linux/list.h:9, from include/linux/timer.h:5, from include/linux/netdevice.h:28, from include/net/sch_generic.h:5, from include/net/act_api.h:9, from include/net/tc_act/tc_gact.h:5, from drivers/net/ethernet//mellanox/mlx5/core/en_main.c:33: drivers/net/ethernet//mellanox/mlx5/core/en_accel/tls.h: In function 'mlx5e_get_tls_tx_context': >> drivers/net/ethernet//mellanox/mlx5/core/en_accel/tls.h:62:8: error: 'TLS_OFFLOAD_CONTEXT_SIZE' undeclared (first use in this function); did you mean 'TLS_OFFLOAD_CONTEXT_SIZE_TX'? TLS_OFFLOAD_CONTEXT_SIZE); ^~~~~~~~~~~~~~~~~~~~~~~~ include/linux/compiler.h:316:19: note: in definition of macro '__compiletime_assert' bool __cond = !(condition); \ ^~~~~~~~~ include/linux/compiler.h:339:2: note: in expansion of macro '_compiletime_assert' _compiletime_assert(condition, msg, __compiletime_assert_, __LINE__) ^~~~~~~~~~~~~~~~~~~ include/linux/build_bug.h:45:37: note: in expansion of macro 'compiletime_assert' #define BUILD_BUG_ON_MSG(cond, msg) compiletime_assert(!(cond), msg) ^~~~~~~~~~~~~~~~~~ include/linux/build_bug.h:69:2: note: in expansion of macro 'BUILD_BUG_ON_MSG' BUILD_BUG_ON_MSG(condition, "BUILD_BUG_ON failed: " #condition) ^~~~~~~~~~~~~~~~ drivers/net/ethernet//mellanox/mlx5/core/en_accel/tls.h:61:2: note: in expansion of macro 'BUILD_BUG_ON' BUILD_BUG_ON(sizeof(struct mlx5e_tls_offload_context) > ^~~~~~~~~~~~ drivers/net/ethernet//mellanox/mlx5/core/en_accel/tls.h:62:8: note: each undeclared identifier is reported only once for each function it appears in TLS_OFFLOAD_CONTEXT_SIZE); ^~~~~~~~~~~~~~~~~~~~~~~~ include/linux/compiler.h:316:19: note: in definition of macro '__compiletime_assert' bool __cond = !(condition); \ ^~~~~~~~~ include/linux/compiler.h:339:2: note: in expansion of macro '_compiletime_assert' _compiletime_assert(condition, msg, __compiletime_assert_, __LINE__) ^~~~~~~~~~~~~~~~~~~ include/linux/build_bug.h:45:37: note: in expansion of macro 'compiletime_assert' #define BUILD_BUG_ON_MSG(cond, msg) compiletime_assert(!(cond), msg) ^~~~~~~~~~~~~~~~~~ include/linux/build_bug.h:69:2: note: in expansion of macro 'BUILD_BUG_ON_MSG' BUILD_BUG_ON_MSG(condition, "BUILD_BUG_ON failed: " #condition) ^~~~~~~~~~~~~~~~ drivers/net/ethernet//mellanox/mlx5/core/en_accel/tls.h:61:2: note: in expansion of macro 'BUILD_BUG_ON' BUILD_BUG_ON(sizeof(struct mlx5e_tls_offload_context) > ^~~~~~~~~~~~ In file included from include/linux/list.h:9, from include/linux/timer.h:5, from include/linux/netdevice.h:28, from include/net/sch_generic.h:5, from include/net/act_api.h:9, from include/net/tc_act/tc_gact.h:5, from drivers/net/ethernet//mellanox/mlx5/core/en_main.c:33: >> drivers/net/ethernet//mellanox/mlx5/core/en_accel/tls.h:63:22: error: implicit declaration of function 'tls_offload_ctx'; did you mean 'tls_offload_ctx_tx'? [-Werror=implicit-function-declaration] return container_of(tls_offload_ctx(tls_ctx), ^~~~~~~~~~~~~~~ include/linux/kernel.h:963:26: note: in definition of macro 'container_of' void *__mptr = (void *)(ptr); \ ^~~ >> include/linux/kernel.h:963:17: warning: cast to pointer from integer of different size [-Wint-to-pointer-cast] void *__mptr = (void *)(ptr); \ ^ drivers/net/ethernet//mellanox/mlx5/core/en_accel/tls.h:63:9: note: in expansion of macro 'container_of' return container_of(tls_offload_ctx(tls_ctx), ^~~~~~~~~~~~ In file included from include/linux/kernel.h:10, from include/linux/list.h:9, from include/linux/timer.h:5, from include/linux/netdevice.h:28, from include/net/sch_generic.h:5, from include/net/act_api.h:9, from include/net/tc_act/tc_gact.h:5, from drivers/net/ethernet//mellanox/mlx5/core/en_main.c:33: >> include/linux/kernel.h:964:32: error: invalid type argument of unary '*' (have 'int') BUILD_BUG_ON_MSG(!__same_type(*(ptr), ((type *)0)->member) && \ ^~~~~~ include/linux/compiler.h:316:19: note: in definition of macro '__compiletime_assert' bool __cond = !(condition); \ ^~~~~~~~~ include/linux/compiler.h:339:2: note: in expansion of macro '_compiletime_assert' _compiletime_assert(condition, msg, __compiletime_assert_, __LINE__) ^~~~~~~~~~~~~~~~~~~ include/linux/build_bug.h:45:37: note: in expansion of macro 'compiletime_assert' #define BUILD_BUG_ON_MSG(cond, msg) compiletime_assert(!(cond), msg) ^~~~~~~~~~~~~~~~~~ include/linux/kernel.h:964:2: note: in expansion of macro 'BUILD_BUG_ON_MSG' BUILD_BUG_ON_MSG(!__same_type(*(ptr), ((type *)0)->member) && \ ^~~~~~~~~~~~~~~~ include/linux/kernel.h:964:20: note: in expansion of macro '__same_type' BUILD_BUG_ON_MSG(!__same_type(*(ptr), ((type *)0)->member) && \ ^~~~~~~~~~~ drivers/net/ethernet//mellanox/mlx5/core/en_accel/tls.h:63:9: note: in expansion of macro 'container_of' return container_of(tls_offload_ctx(tls_ctx), ^~~~~~~~~~~~ include/linux/kernel.h:965:18: error: invalid type argument of unary '*' (have 'int') !__same_type(*(ptr), void), \ ^~~~~~ include/linux/compiler.h:316:19: note: in definition of macro '__compiletime_assert' bool __cond = !(condition); \ ^~~~~~~~~ include/linux/compiler.h:339:2: note: in expansion of macro '_compiletime_assert' _compiletime_assert(condition, msg, __compiletime_assert_, __LINE__) ^~~~~~~~~~~~~~~~~~~ include/linux/build_bug.h:45:37: note: in expansion of macro 'compiletime_assert' #define BUILD_BUG_ON_MSG(cond, msg) compiletime_assert(!(cond), msg) ^~~~~~~~~~~~~~~~~~ include/linux/kernel.h:964:2: note: in expansion of macro 'BUILD_BUG_ON_MSG' BUILD_BUG_ON_MSG(!__same_type(*(ptr), ((type *)0)->member) && \ ^~~~~~~~~~~~~~~~ include/linux/kernel.h:965:6: note: in expansion of macro '__same_type' !__same_type(*(ptr), void), \ ^~~~~~~~~~~ drivers/net/ethernet//mellanox/mlx5/core/en_accel/tls.h:63:9: note: in expansion of macro 'container_of' return container_of(tls_offload_ctx(tls_ctx), ^~~~~~~~~~~~ cc1: some warnings being treated as errors -- In file included from drivers/net/ethernet//mellanox/mlx5/core/en_accel/tls.c:36: >> drivers/net/ethernet//mellanox/mlx5/core/en_accel/tls.h:53:29: error: field 'base' has incomplete type struct tls_offload_context base; ^~~~ In file included from include/linux/kernel.h:10, from include/linux/list.h:9, from include/linux/timer.h:5, from include/linux/netdevice.h:28, from drivers/net/ethernet//mellanox/mlx5/core/en_accel/tls.c:34: drivers/net/ethernet//mellanox/mlx5/core/en_accel/tls.h: In function 'mlx5e_get_tls_tx_context': >> drivers/net/ethernet//mellanox/mlx5/core/en_accel/tls.h:62:8: error: 'TLS_OFFLOAD_CONTEXT_SIZE' undeclared (first use in this function); did you mean 'TLS_OFFLOAD_CONTEXT_SIZE_TX'? TLS_OFFLOAD_CONTEXT_SIZE); ^~~~~~~~~~~~~~~~~~~~~~~~ include/linux/compiler.h:316:19: note: in definition of macro '__compiletime_assert' bool __cond = !(condition); \ ^~~~~~~~~ include/linux/compiler.h:339:2: note: in expansion of macro '_compiletime_assert' _compiletime_assert(condition, msg, __compiletime_assert_, __LINE__) ^~~~~~~~~~~~~~~~~~~ include/linux/build_bug.h:45:37: note: in expansion of macro 'compiletime_assert' #define BUILD_BUG_ON_MSG(cond, msg) compiletime_assert(!(cond), msg) ^~~~~~~~~~~~~~~~~~ include/linux/build_bug.h:69:2: note: in expansion of macro 'BUILD_BUG_ON_MSG' BUILD_BUG_ON_MSG(condition, "BUILD_BUG_ON failed: " #condition) ^~~~~~~~~~~~~~~~ drivers/net/ethernet//mellanox/mlx5/core/en_accel/tls.h:61:2: note: in expansion of macro 'BUILD_BUG_ON' BUILD_BUG_ON(sizeof(struct mlx5e_tls_offload_context) > ^~~~~~~~~~~~ drivers/net/ethernet//mellanox/mlx5/core/en_accel/tls.h:62:8: note: each undeclared identifier is reported only once for each function it appears in TLS_OFFLOAD_CONTEXT_SIZE); ^~~~~~~~~~~~~~~~~~~~~~~~ include/linux/compiler.h:316:19: note: in definition of macro '__compiletime_assert' bool __cond = !(condition); \ ^~~~~~~~~ include/linux/compiler.h:339:2: note: in expansion of macro '_compiletime_assert' _compiletime_assert(condition, msg, __compiletime_assert_, __LINE__) ^~~~~~~~~~~~~~~~~~~ include/linux/build_bug.h:45:37: note: in expansion of macro 'compiletime_assert' #define BUILD_BUG_ON_MSG(cond, msg) compiletime_assert(!(cond), msg) ^~~~~~~~~~~~~~~~~~ include/linux/build_bug.h:69:2: note: in expansion of macro 'BUILD_BUG_ON_MSG' BUILD_BUG_ON_MSG(condition, "BUILD_BUG_ON failed: " #condition) ^~~~~~~~~~~~~~~~ drivers/net/ethernet//mellanox/mlx5/core/en_accel/tls.h:61:2: note: in expansion of macro 'BUILD_BUG_ON' BUILD_BUG_ON(sizeof(struct mlx5e_tls_offload_context) > ^~~~~~~~~~~~ In file included from include/linux/list.h:9, from include/linux/timer.h:5, from include/linux/netdevice.h:28, from drivers/net/ethernet//mellanox/mlx5/core/en_accel/tls.c:34: >> drivers/net/ethernet//mellanox/mlx5/core/en_accel/tls.h:63:22: error: implicit declaration of function 'tls_offload_ctx'; did you mean 'tls_offload_ctx_tx'? [-Werror=implicit-function-declaration] return container_of(tls_offload_ctx(tls_ctx), ^~~~~~~~~~~~~~~ include/linux/kernel.h:963:26: note: in definition of macro 'container_of' void *__mptr = (void *)(ptr); \ ^~~ >> include/linux/kernel.h:963:17: warning: cast to pointer from integer of different size [-Wint-to-pointer-cast] void *__mptr = (void *)(ptr); \ ^ drivers/net/ethernet//mellanox/mlx5/core/en_accel/tls.h:63:9: note: in expansion of macro 'container_of' return container_of(tls_offload_ctx(tls_ctx), ^~~~~~~~~~~~ In file included from include/linux/kernel.h:10, from include/linux/list.h:9, from include/linux/timer.h:5, from include/linux/netdevice.h:28, from drivers/net/ethernet//mellanox/mlx5/core/en_accel/tls.c:34: >> include/linux/kernel.h:964:32: error: invalid type argument of unary '*' (have 'int') BUILD_BUG_ON_MSG(!__same_type(*(ptr), ((type *)0)->member) && \ ^~~~~~ include/linux/compiler.h:316:19: note: in definition of macro '__compiletime_assert' bool __cond = !(condition); \ ^~~~~~~~~ include/linux/compiler.h:339:2: note: in expansion of macro '_compiletime_assert' _compiletime_assert(condition, msg, __compiletime_assert_, __LINE__) ^~~~~~~~~~~~~~~~~~~ include/linux/build_bug.h:45:37: note: in expansion of macro 'compiletime_assert' #define BUILD_BUG_ON_MSG(cond, msg) compiletime_assert(!(cond), msg) ^~~~~~~~~~~~~~~~~~ include/linux/kernel.h:964:2: note: in expansion of macro 'BUILD_BUG_ON_MSG' BUILD_BUG_ON_MSG(!__same_type(*(ptr), ((type *)0)->member) && \ ^~~~~~~~~~~~~~~~ include/linux/kernel.h:964:20: note: in expansion of macro '__same_type' BUILD_BUG_ON_MSG(!__same_type(*(ptr), ((type *)0)->member) && \ ^~~~~~~~~~~ drivers/net/ethernet//mellanox/mlx5/core/en_accel/tls.h:63:9: note: in expansion of macro 'container_of' return container_of(tls_offload_ctx(tls_ctx), ^~~~~~~~~~~~ include/linux/kernel.h:965:18: error: invalid type argument of unary '*' (have 'int') !__same_type(*(ptr), void), \ ^~~~~~ include/linux/compiler.h:316:19: note: in definition of macro '__compiletime_assert' bool __cond = !(condition); \ ^~~~~~~~~ include/linux/compiler.h:339:2: note: in expansion of macro '_compiletime_assert' _compiletime_assert(condition, msg, __compiletime_assert_, __LINE__) ^~~~~~~~~~~~~~~~~~~ include/linux/build_bug.h:45:37: note: in expansion of macro 'compiletime_assert' #define BUILD_BUG_ON_MSG(cond, msg) compiletime_assert(!(cond), msg) ^~~~~~~~~~~~~~~~~~ include/linux/kernel.h:964:2: note: in expansion of macro 'BUILD_BUG_ON_MSG' BUILD_BUG_ON_MSG(!__same_type(*(ptr), ((type *)0)->member) && \ ^~~~~~~~~~~~~~~~ include/linux/kernel.h:965:6: note: in expansion of macro '__same_type' !__same_type(*(ptr), void), \ ^~~~~~~~~~~ drivers/net/ethernet//mellanox/mlx5/core/en_accel/tls.h:63:9: note: in expansion of macro 'container_of' return container_of(tls_offload_ctx(tls_ctx), ^~~~~~~~~~~~ In file included from drivers/net/ethernet//mellanox/mlx5/core/en_accel/tls.c:36: >> drivers/net/ethernet//mellanox/mlx5/core/en_accel/tls.h:66:1: warning: control reaches end of non-void function [-Wreturn-type] } ^ cc1: some warnings being treated as errors -- In file included from drivers/net/ethernet/mellanox/mlx5/core/en_accel/tls.c:36: drivers/net/ethernet/mellanox/mlx5/core/en_accel/tls.h:53:29: error: field 'base' has incomplete type struct tls_offload_context base; ^~~~ In file included from include/linux/kernel.h:10, from include/linux/list.h:9, from include/linux/timer.h:5, from include/linux/netdevice.h:28, from drivers/net/ethernet/mellanox/mlx5/core/en_accel/tls.c:34: drivers/net/ethernet/mellanox/mlx5/core/en_accel/tls.h: In function 'mlx5e_get_tls_tx_context': drivers/net/ethernet/mellanox/mlx5/core/en_accel/tls.h:62:8: error: 'TLS_OFFLOAD_CONTEXT_SIZE' undeclared (first use in this function); did you mean 'TLS_OFFLOAD_CONTEXT_SIZE_TX'? TLS_OFFLOAD_CONTEXT_SIZE); ^~~~~~~~~~~~~~~~~~~~~~~~ include/linux/compiler.h:316:19: note: in definition of macro '__compiletime_assert' bool __cond = !(condition); \ ^~~~~~~~~ include/linux/compiler.h:339:2: note: in expansion of macro '_compiletime_assert' _compiletime_assert(condition, msg, __compiletime_assert_, __LINE__) ^~~~~~~~~~~~~~~~~~~ include/linux/build_bug.h:45:37: note: in expansion of macro 'compiletime_assert' #define BUILD_BUG_ON_MSG(cond, msg) compiletime_assert(!(cond), msg) ^~~~~~~~~~~~~~~~~~ include/linux/build_bug.h:69:2: note: in expansion of macro 'BUILD_BUG_ON_MSG' BUILD_BUG_ON_MSG(condition, "BUILD_BUG_ON failed: " #condition) ^~~~~~~~~~~~~~~~ drivers/net/ethernet/mellanox/mlx5/core/en_accel/tls.h:61:2: note: in expansion of macro 'BUILD_BUG_ON' BUILD_BUG_ON(sizeof(struct mlx5e_tls_offload_context) > ^~~~~~~~~~~~ drivers/net/ethernet/mellanox/mlx5/core/en_accel/tls.h:62:8: note: each undeclared identifier is reported only once for each function it appears in TLS_OFFLOAD_CONTEXT_SIZE); ^~~~~~~~~~~~~~~~~~~~~~~~ include/linux/compiler.h:316:19: note: in definition of macro '__compiletime_assert' bool __cond = !(condition); \ ^~~~~~~~~ include/linux/compiler.h:339:2: note: in expansion of macro '_compiletime_assert' _compiletime_assert(condition, msg, __compiletime_assert_, __LINE__) ^~~~~~~~~~~~~~~~~~~ include/linux/build_bug.h:45:37: note: in expansion of macro 'compiletime_assert' #define BUILD_BUG_ON_MSG(cond, msg) compiletime_assert(!(cond), msg) ^~~~~~~~~~~~~~~~~~ include/linux/build_bug.h:69:2: note: in expansion of macro 'BUILD_BUG_ON_MSG' BUILD_BUG_ON_MSG(condition, "BUILD_BUG_ON failed: " #condition) ^~~~~~~~~~~~~~~~ drivers/net/ethernet/mellanox/mlx5/core/en_accel/tls.h:61:2: note: in expansion of macro 'BUILD_BUG_ON' BUILD_BUG_ON(sizeof(struct mlx5e_tls_offload_context) > ^~~~~~~~~~~~ In file included from include/linux/list.h:9, from include/linux/timer.h:5, from include/linux/netdevice.h:28, from drivers/net/ethernet/mellanox/mlx5/core/en_accel/tls.c:34: drivers/net/ethernet/mellanox/mlx5/core/en_accel/tls.h:63:22: error: implicit declaration of function 'tls_offload_ctx'; did you mean 'tls_offload_ctx_tx'? [-Werror=implicit-function-declaration] return container_of(tls_offload_ctx(tls_ctx), ^~~~~~~~~~~~~~~ include/linux/kernel.h:963:26: note: in definition of macro 'container_of' void *__mptr = (void *)(ptr); \ ^~~ >> include/linux/kernel.h:963:17: warning: cast to pointer from integer of different size [-Wint-to-pointer-cast] void *__mptr = (void *)(ptr); \ ^ drivers/net/ethernet/mellanox/mlx5/core/en_accel/tls.h:63:9: note: in expansion of macro 'container_of' return container_of(tls_offload_ctx(tls_ctx), ^~~~~~~~~~~~ In file included from include/linux/kernel.h:10, from include/linux/list.h:9, from include/linux/timer.h:5, from include/linux/netdevice.h:28, from drivers/net/ethernet/mellanox/mlx5/core/en_accel/tls.c:34: >> include/linux/kernel.h:964:32: error: invalid type argument of unary '*' (have 'int') BUILD_BUG_ON_MSG(!__same_type(*(ptr), ((type *)0)->member) && \ ^~~~~~ include/linux/compiler.h:316:19: note: in definition of macro '__compiletime_assert' bool __cond = !(condition); \ ^~~~~~~~~ include/linux/compiler.h:339:2: note: in expansion of macro '_compiletime_assert' _compiletime_assert(condition, msg, __compiletime_assert_, __LINE__) ^~~~~~~~~~~~~~~~~~~ include/linux/build_bug.h:45:37: note: in expansion of macro 'compiletime_assert' #define BUILD_BUG_ON_MSG(cond, msg) compiletime_assert(!(cond), msg) ^~~~~~~~~~~~~~~~~~ include/linux/kernel.h:964:2: note: in expansion of macro 'BUILD_BUG_ON_MSG' BUILD_BUG_ON_MSG(!__same_type(*(ptr), ((type *)0)->member) && \ ^~~~~~~~~~~~~~~~ include/linux/kernel.h:964:20: note: in expansion of macro '__same_type' BUILD_BUG_ON_MSG(!__same_type(*(ptr), ((type *)0)->member) && \ ^~~~~~~~~~~ drivers/net/ethernet/mellanox/mlx5/core/en_accel/tls.h:63:9: note: in expansion of macro 'container_of' return container_of(tls_offload_ctx(tls_ctx), ^~~~~~~~~~~~ include/linux/kernel.h:965:18: error: invalid type argument of unary '*' (have 'int') !__same_type(*(ptr), void), \ ^~~~~~ include/linux/compiler.h:316:19: note: in definition of macro '__compiletime_assert' bool __cond = !(condition); \ ^~~~~~~~~ include/linux/compiler.h:339:2: note: in expansion of macro '_compiletime_assert' _compiletime_assert(condition, msg, __compiletime_assert_, __LINE__) ^~~~~~~~~~~~~~~~~~~ include/linux/build_bug.h:45:37: note: in expansion of macro 'compiletime_assert' #define BUILD_BUG_ON_MSG(cond, msg) compiletime_assert(!(cond), msg) ^~~~~~~~~~~~~~~~~~ include/linux/kernel.h:964:2: note: in expansion of macro 'BUILD_BUG_ON_MSG' BUILD_BUG_ON_MSG(!__same_type(*(ptr), ((type *)0)->member) && \ ^~~~~~~~~~~~~~~~ include/linux/kernel.h:965:6: note: in expansion of macro '__same_type' !__same_type(*(ptr), void), \ ^~~~~~~~~~~ drivers/net/ethernet/mellanox/mlx5/core/en_accel/tls.h:63:9: note: in expansion of macro 'container_of' return container_of(tls_offload_ctx(tls_ctx), ^~~~~~~~~~~~ In file included from drivers/net/ethernet/mellanox/mlx5/core/en_accel/tls.c:36: drivers/net/ethernet/mellanox/mlx5/core/en_accel/tls.h:66:1: warning: control reaches end of non-void function [-Wreturn-type] } ^ cc1: some warnings being treated as errors .. vim +55 net/tls/tls_device.c 52 53 static void tls_device_free_ctx(struct tls_context *ctx) 54 { > 55 if (ctx->tx_conf == TLS_HW) 56 kfree(tls_offload_ctx_tx(ctx)); 57 58 kfree(ctx); 59 } 60 --- 0-DAY kernel test infrastructure Open Source Technology Center https://lists.01.org/pipermail/kbuild-all Intel Corporation

diff --git a/include/net/tls.h b/include/net/tls.h index 70c2737..5dcd808 100644 --- a/include/net/tls.h +++ b/include/net/tls.h @@ -128,7 +128,7 @@ struct tls_record_info { skb_frag_t frags[MAX_SKB_FRAGS]; }; -struct tls_offload_context { +struct tls_offload_context_tx { struct crypto_aead *aead_send; spinlock_t lock; /* protects records list */ struct list_head records_list; @@ -147,8 +147,8 @@ struct tls_offload_context { #define TLS_DRIVER_STATE_SIZE (max_t(size_t, 8, sizeof(void *))) }; -#define TLS_OFFLOAD_CONTEXT_SIZE \ - (ALIGN(sizeof(struct tls_offload_context), sizeof(void *)) + \ +#define TLS_OFFLOAD_CONTEXT_SIZE_TX \ + (ALIGN(sizeof(struct tls_offload_context_tx), sizeof(void *)) + \ TLS_DRIVER_STATE_SIZE) enum { @@ -239,7 +239,7 @@ int tls_device_sendpage(struct sock *sk, struct page *page, void tls_device_init(void); void tls_device_cleanup(void); -struct tls_record_info *tls_get_record(struct tls_offload_context *context, +struct tls_record_info *tls_get_record(struct tls_offload_context_tx *context, u32 seq, u64 *p_record_sn); static inline bool tls_record_is_start_marker(struct tls_record_info *rec) @@ -380,10 +380,10 @@ static inline struct tls_sw_context_tx *tls_sw_ctx_tx( return (struct tls_sw_context_tx *)tls_ctx->priv_ctx_tx; } -static inline struct tls_offload_context *tls_offload_ctx( - const struct tls_context *tls_ctx) +static inline struct tls_offload_context_tx * +tls_offload_ctx_tx(const struct tls_context *tls_ctx) { - return (struct tls_offload_context *)tls_ctx->priv_ctx_tx; + return (struct tls_offload_context_tx *)tls_ctx->priv_ctx_tx; } int tls_proccess_cmsg(struct sock *sk, struct msghdr *msg, @@ -396,7 +396,7 @@ struct sk_buff *tls_validate_xmit_skb(struct sock *sk, struct sk_buff *skb); int tls_sw_fallback_init(struct sock *sk, - struct tls_offload_context *offload_ctx, + struct tls_offload_context_tx *offload_ctx, struct tls_crypto_info *crypto_info); #endif /* _TLS_OFFLOAD_H */ diff --git a/net/tls/tls_device.c b/net/tls/tls_device.c index a7a8f8e..c01de7d 100644 --- a/net/tls/tls_device.c +++ b/net/tls/tls_device.c @@ -52,9 +52,9 @@ static void tls_device_free_ctx(struct tls_context *ctx) { - struct tls_offload_context *offload_ctx = tls_offload_ctx(ctx); + if (ctx->tx_conf == TLS_HW) + kfree(tls_offload_ctx_tx(ctx)); - kfree(offload_ctx); kfree(ctx); } @@ -125,7 +125,7 @@ static void destroy_record(struct tls_record_info *record) kfree(record); } -static void delete_all_records(struct tls_offload_context *offload_ctx) +static void delete_all_records(struct tls_offload_context_tx *offload_ctx) { struct tls_record_info *info, *temp; @@ -141,14 +141,14 @@ static void tls_icsk_clean_acked(struct sock *sk, u32 acked_seq) { struct tls_context *tls_ctx = tls_get_ctx(sk); struct tls_record_info *info, *temp; - struct tls_offload_context *ctx; + struct tls_offload_context_tx *ctx; u64 deleted_records = 0; unsigned long flags; if (!tls_ctx) return; - ctx = tls_offload_ctx(tls_ctx); + ctx = tls_offload_ctx_tx(tls_ctx); spin_lock_irqsave(&ctx->lock, flags); info = ctx->retransmit_hint; @@ -179,7 +179,7 @@ static void tls_icsk_clean_acked(struct sock *sk, u32 acked_seq) void tls_device_sk_destruct(struct sock *sk) { struct tls_context *tls_ctx = tls_get_ctx(sk); - struct tls_offload_context *ctx = tls_offload_ctx(tls_ctx); + struct tls_offload_context_tx *ctx = tls_offload_ctx_tx(tls_ctx); if (ctx->open_record) destroy_record(ctx->open_record); @@ -219,7 +219,7 @@ static void tls_append_frag(struct tls_record_info *record, static int tls_push_record(struct sock *sk, struct tls_context *ctx, - struct tls_offload_context *offload_ctx, + struct tls_offload_context_tx *offload_ctx, struct tls_record_info *record, struct page_frag *pfrag, int flags, @@ -264,7 +264,7 @@ static int tls_push_record(struct sock *sk, return tls_push_sg(sk, ctx, offload_ctx->sg_tx_data, 0, flags); } -static int tls_create_new_record(struct tls_offload_context *offload_ctx, +static int tls_create_new_record(struct tls_offload_context_tx *offload_ctx, struct page_frag *pfrag, size_t prepend_size) { @@ -290,7 +290,7 @@ static int tls_create_new_record(struct tls_offload_context *offload_ctx, } static int tls_do_allocation(struct sock *sk, - struct tls_offload_context *offload_ctx, + struct tls_offload_context_tx *offload_ctx, struct page_frag *pfrag, size_t prepend_size) { @@ -324,7 +324,7 @@ static int tls_push_data(struct sock *sk, unsigned char record_type) { struct tls_context *tls_ctx = tls_get_ctx(sk); - struct tls_offload_context *ctx = tls_offload_ctx(tls_ctx); + struct tls_offload_context_tx *ctx = tls_offload_ctx_tx(tls_ctx); int tls_push_record_flags = flags | MSG_SENDPAGE_NOTLAST; int more = flags & (MSG_SENDPAGE_NOTLAST | MSG_MORE); struct tls_record_info *record = ctx->open_record; @@ -477,7 +477,7 @@ int tls_device_sendpage(struct sock *sk, struct page *page, return rc; } -struct tls_record_info *tls_get_record(struct tls_offload_context *context, +struct tls_record_info *tls_get_record(struct tls_offload_context_tx *context, u32 seq, u64 *p_record_sn) { u64 record_sn = context->hint_record_sn; @@ -524,7 +524,7 @@ int tls_set_device_offload(struct sock *sk, struct tls_context *ctx) { u16 nonce_size, tag_size, iv_size, rec_seq_size; struct tls_record_info *start_marker_record; - struct tls_offload_context *offload_ctx; + struct tls_offload_context_tx *offload_ctx; struct tls_crypto_info *crypto_info; struct net_device *netdev; char *iv, *rec_seq; @@ -546,7 +546,7 @@ int tls_set_device_offload(struct sock *sk, struct tls_context *ctx) goto out; } - offload_ctx = kzalloc(TLS_OFFLOAD_CONTEXT_SIZE, GFP_KERNEL); + offload_ctx = kzalloc(TLS_OFFLOAD_CONTEXT_SIZE_TX, GFP_KERNEL); if (!offload_ctx) { rc = -ENOMEM; goto free_marker_record; diff --git a/net/tls/tls_device_fallback.c b/net/tls/tls_device_fallback.c index 748914a..d1d7dce 100644 --- a/net/tls/tls_device_fallback.c +++ b/net/tls/tls_device_fallback.c @@ -214,7 +214,7 @@ static void complete_skb(struct sk_buff *nskb, struct sk_buff *skb, int headln) static int fill_sg_in(struct scatterlist *sg_in, struct sk_buff *skb, - struct tls_offload_context *ctx, + struct tls_offload_context_tx *ctx, u64 *rcd_sn, s32 *sync_size, int *resync_sgs) @@ -299,7 +299,7 @@ static struct sk_buff *tls_enc_skb(struct tls_context *tls_ctx, s32 sync_size, u64 rcd_sn) { int tcp_payload_offset = skb_transport_offset(skb) + tcp_hdrlen(skb); - struct tls_offload_context *ctx = tls_offload_ctx(tls_ctx); + struct tls_offload_context_tx *ctx = tls_offload_ctx_tx(tls_ctx); int payload_len = skb->len - tcp_payload_offset; void *buf, *iv, *aad, *dummy_buf; struct aead_request *aead_req; @@ -361,7 +361,7 @@ static struct sk_buff *tls_sw_fallback(struct sock *sk, struct sk_buff *skb) { int tcp_payload_offset = skb_transport_offset(skb) + tcp_hdrlen(skb); struct tls_context *tls_ctx = tls_get_ctx(sk); - struct tls_offload_context *ctx = tls_offload_ctx(tls_ctx); + struct tls_offload_context_tx *ctx = tls_offload_ctx_tx(tls_ctx); int payload_len = skb->len - tcp_payload_offset; struct scatterlist *sg_in, sg_out[3]; struct sk_buff *nskb = NULL; @@ -415,7 +415,7 @@ struct sk_buff *tls_validate_xmit_skb(struct sock *sk, } int tls_sw_fallback_init(struct sock *sk, - struct tls_offload_context *offload_ctx, + struct tls_offload_context_tx *offload_ctx, struct tls_crypto_info *crypto_info) { const u8 *key;

[net-next,05/18] tls: Refactor tls_offload variable names

Commit Message

Comments

Patch