idpf: avoid compiler padding in virtchnl2_ptype struct
Subsystems (3)
PATCH v2 1/1 idpf: avoid compiler padding in virtchnl2_ptype struct
In the arm random config file, kconfig option 'CONFIG_AEABI' is disabled which results in adding the compiler flag '-mabi=apcs-gnu'. This causes the compiler to add padding in virtchnl2_ptype structure to align it to 8 bytes, resulting in the following size check failure:
include/linux/build_bug.h:78:41: error: static assertion failed: "(6) == sizeof(struct virtchnl2_ptype)"
78 | #define __static_assert(expr, msg, ...) _Static_assert(expr, msg)
| ^~~~~~~~~~~~~~
include/linux/build_bug.h:77:34: note: in expansion of macro '__static_assert'
77 | #define static_assert(expr, ...) __static_assert(expr, ##__VA_ARGS__, #expr)
| ^~~~~~~~~~~~~~~
drivers/net/ethernet/intel/idpf/virtchnl2.h:26:9: note: in expansion of macro 'static_assert'
26 | static_assert((n) == sizeof(struct X))
| ^~~~~~~~~~~~~
drivers/net/ethernet/intel/idpf/virtchnl2.h:982:1: note: in expansion of macro 'VIRTCHNL2_CHECK_STRUCT_LEN'
982 | VIRTCHNL2_CHECK_STRUCT_LEN(6, virtchnl2_ptype);
| ^~~~~~~~~~~~~~~~~~~~~~~~~~Avoid the compiler padding by using "__packed" structure attribute for the virtchnl2_ptype struct.
---
v2:
- add the kconfig option causing the compile failure to the commit message
--- drivers/net/ethernet/intel/idpf/virtchnl2.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/net/ethernet/intel/idpf/virtchnl2.h +1 -1
@@ -978,7 +978,7 @@ struct virtchnl2_ptype {u8 proto_id_count;__le16 pad;__le16 proto_id[]; -}; +} __packed;VIRTCHNL2_CHECK_STRUCT_LEN (6 , virtchnl2_ptype);/**
Signature · 1 line
2.43.0
Quoted 22 lines · Pavan Kumar Linga
In the arm random config file, kconfig option '
CONFIG_AEABI' is disabled which results in adding the compiler flag '-mabi=apcs-gnu'. This causes the compiler to add padding invirtchnl2_ptypestructure to align it to 8 bytes, resulting in the following size check failure:
include/linux/build_bug.h:78:41: error: static assertion failed: "(6) ==sizeof(struct virtchnl2_ptype)"78 | #define __static_assert(expr, msg, ...) _Static_assert(expr, msg) | ^~~~~~~~~~~~~~ include/linux/build_bug.h:77:34: note: in expansion of macro '__static_assert' 77 | #define static_assert(expr, ...) __static_assert(expr, ##__VA_ARGS__, #expr) | ^~~~~~~~~~~~~~~ drivers/net/ethernet/intel/idpf/virtchnl2.h:26:9: note: in expansion of macro 'static_assert' 26 | static_assert((n) == sizeof(struct X)) | ^~~~~~~~~~~~~ drivers/net/ethernet/intel/idpf/virtchnl2.h:982:1: note: in expansion of macro 'VIRTCHNL2_CHECK_STRUCT_LEN' 982 | VIRTCHNL2_CHECK_STRUCT_LEN(6, virtchnl2_ptype); | ^~~~~~~~~~~~~~~~~~~~~~~~~~Avoid the compiler padding by using "
__packed" structure attribute for thevirtchnl2_ptypestruct.
Quoted 6 lines
Fixes 0d7502a9b4a7 ("virtchnl: add virtchnl version 2 ops")Reported-by kernel test robot <[email protected]>Reviewed-by Przemek Kitszel <[email protected]>Reviewed-by Paul Menzel <[email protected]>Signed-off-by Pavan Kumar Linga <[email protected]>
From: Pavan Kumar Linga <[email protected]>
Date: Thu, 4 Jan 2024 17:32:32 -0800
Quoted 5 lines
In the arm random config file, kconfig option '
CONFIG_AEABI' is disabled which results in adding the compiler flag '-mabi=apcs-gnu'. This causes the compiler to add padding invirtchnl2_ptypestructure to align it to 8 bytes, resulting in the following size check failure:
[...]
drivers/net/ethernet/intel/idpf/virtchnl2.h struct virtchnl2_ptype { · line 981
Quoted 10 lines
drivers/net/ethernet/intel/idpf/virtchnl2.h +1
-1@@ -978,7 +978,7 @@ struct virtchnl2_ptype {u8 proto_id_count;__le16 pad;__le16 proto_id[]; -}; +} __packed;
Try using __packed __aligned(sizeof(__le16))
(or just __packed __aligned(2)) here. It may generate more optimized code than just __packed, as the latter assumes the structure address in the memory can be 2n + 1, while it fact it's aligned to 2 bytes.
(another virtchnl2 design fail anyway :D)
drivers/net/ethernet/intel/idpf/virtchnl2.h struct virtchnl2_ptype { · line 984
Quoted 3 lines
drivers/net/ethernet/intel/idpf/virtchnl2.h +0
-0VIRTCHNL2_CHECK_STRUCT_LEN (6 , virtchnl2_ptype);/**
Thanks,
Olek