idpf: avoid compiler padding in virtchnl2_ptype struct
Subsystems (3)
PATCH v4 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. Also align the structure by using "__aligned(2)" for better code optimization. While at it, swap the static_assert conditional statement variables.
---
v4:
- swap the static_assert conditional statement variables
v3:
- add "__aligned(2)" structure attribute for better code optimization
v2:
- add the kconfig option causing the compile failure to the commit message
--- drivers/net/ethernet/intel/idpf/virtchnl2.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/net/ethernet/intel/idpf/virtchnl2.h +2 -2
@@ -23,7 +23,7 @@* is not exactly the correct length. */ #define VIRTCHNL2_CHECK_STRUCT_LEN (n,X ) \ - static_assert((n) == sizeof(struct X)) + static_assert(sizeof(struct X) == (n))/* New major set of opcodes introduced and so leaving room for * old misc opcodes to be added in future. Also these opcodes may only
@@ -978,7 +978,7 @@ struct virtchnl2_ptype {u8 proto_id_count;__le16 pad;__le16 proto_id[]; -}; +} __packed__aligned(2) ;VIRTCHNL2_CHECK_STRUCT_LEN (6 , virtchnl2_ptype);/**
Signature · 1 line
2.43.0