drm/amd/pm: Avoid multiple -Wflex-array-member-not-at-end warnings
Subsystems (3)
PATCH 1/1 drm/amd/pm: Avoid multiple -Wflex-array-member-not-at-end warnings
-Wflex-array-member-not-at-end was introduced in GCC-14, and we are getting ready to enable it, globally.
So, in order to avoid ending up with a flexible-array member in the middle of other structs, we use the struct_group_tagged() helper to create a new tagged struct NISLANDS_SMC_SWSTATE_HDR (and struct SISLANDS_SMC_SWSTATE_HDR). This structures group together all the members of the flexible struct NISLANDS_SMC_SWSTATE (and struct SISLANDS_SMC_SWSTATE) except the flexible array.
As a result, the array is effectively separated from the rest of the members without modifying the memory layout of the flexible structure. We then change the type of the middle struct members currently causing trouble from struct NISLANDS_SMC_SWSTATE to struct NISLANDS_SMC_SWSTATE_HDR (and from struct SISLANDS_SMC_SWSTATE to struct SISLANDS_SMC_SWSTATE_HDR).
We also want to ensure that when new members need to be added to the flexible structure, they are always included within the newly created tagged struct. For this, we use static_assert(). This ensures that the memory layout for both the flexible structure and the new tagged struct is the same after any changes.
This approach avoids having to implement struct NISLANDS_SMC_SWSTATE_HDR (and struct SISLANDS_SMC_SWSTATE_HDR) as a completely separate structure, thus preventing having to maintain two independent but basically identical structures, closing the door to potential bugs in the future.
We also use container_of() whenever we need to retrieve a pointer to the flexible structure, through which we can access the flexible-array member, if necessary.
So, with this changes, fix the following warnings:
drivers/gpu/drm/amd/amdgpu/../pm/legacy-dpm/sislands_smc.h:218:49: warning: structure containing a flexible array member is not at the end of another structure [-Wflex-array-member-not-at-end] drivers/gpu/drm/amd/amdgpu/../pm/legacy-dpm/si_dpm.h:819:41: warning: structure containing a flexible array member is not at the end of another structure [-Wflex-array-member-not-at-end] drivers/gpu/drm/amd/amdgpu/../pm/legacy-dpm/si_dpm.h:818:41: warning: structure containing a flexible array member is not at the end of another structure [-Wflex-array-member-not-at-end] drivers/gpu/drm/amd/amdgpu/../pm/legacy-dpm/si_dpm.h:817:41: warning: structure containing a flexible array member is not at the end of another structure [-Wflex-array-member-not-at-end] drivers/gpu/drm/amd/amdgpu/../pm/legacy-dpm/si_dpm.h:816:41: warning: structure containing a flexible array member is not at the end of another structure [-Wflex-array-member-not-at-end]
--- drivers/gpu/drm/amd/pm/legacy-dpm/si_dpm.c | 7 ++++-- drivers/gpu/drm/amd/pm/legacy-dpm/si_dpm.h | 23 +++++++++++-------- .../gpu/drm/amd/pm/legacy-dpm/sislands_smc.h | 15 ++++++++---- 3 files changed, 29 insertions(+), 16 deletions(-)
drivers/gpu/drm/amd/pm/legacy-dpm/si_dpm.c +5 -2
@@ -5234,7 +5234,8 @@ static int si_init_smc_table(struct amdgpu_device *adev) table->driverState.flags = table->initialState.flags; table->driverState.levelCount = table->initialState.levelCount; - table->driverState.levels[0 ] = table->initialState.level; +container_of (&table->driverState,SISLANDS_SMC_SWSTATE , __hdr)->levels[0 ] = + table->initialState.level; ret =si_do_program_memory_timing_parameters (adev, amdgpu_boot_state,SISLANDS_INITIAL_STATE_ARB_INDEX );
@@ -5755,7 +5756,9 @@ static int si_upload_sw_state(struct amdgpu_device *adev,int ret;u32 address = si_pi->state_table_start + offsetof(SISLANDS_SMC_STATETABLE , driverState); -SISLANDS_SMC_SWSTATE *smc_state = &si_pi->smc_statetable.driverState; +SISLANDS_SMC_SWSTATE *smc_state = +container_of (&si_pi->smc_statetable.driverState, +SISLANDS_SMC_SWSTATE , __hdr);size_t state_size =struct_size (smc_state, levels, new_state->performance_level_count);memset (smc_state,0 , state_size);
drivers/gpu/drm/amd/pm/legacy-dpm/si_dpm.h +14 -9
@@ -784,12 +784,17 @@ typedef struct NISLANDS_SMC_HW_PERFORMANCE_LEVEL NISLANDS_SMC_HW_PERFORMANCE_LEVstruct NISLANDS_SMC_SWSTATE { -uint8_t flags; -uint8_t levelCount; -uint8_t padding2; -uint8_t padding3; -NISLANDS_SMC_HW_PERFORMANCE_LEVEL levels[]; +/* New members MUST be added within the struct_group() macro below. */ + struct_group_tagged(NISLANDS_SMC_SWSTATE_HDR, __hdr, + uint8_t flags; +uint8_t levelCount; +uint8_t padding2; +uint8_t padding3; + ); +NISLANDS_SMC_HW_PERFORMANCE_LEVEL levels[]; }; +static_assert (offsetof(struct NISLANDS_SMC_SWSTATE , levels) ==sizeof (struct NISLANDS_SMC_SWSTATE_HDR ), +"struct member likely outside of struct_group_tagged()" );typedef struct NISLANDS_SMC_SWSTATE NISLANDS_SMC_SWSTATE ;
@@ -813,10 +818,10 @@ struct NISLANDS_SMC_STATETABLEuint32_t lowSMIO[NISLANDS_MAX_NO_VREG_STEPS ];NISLANDS_SMC_VOLTAGEMASKTABLE voltageMaskTable;PP_NIslands_DPM2Parameters dpm2Params; -NISLANDS_SMC_SWSTATE initialState; -NISLANDS_SMC_SWSTATE ACPIState; -NISLANDS_SMC_SWSTATE ULVState; -NISLANDS_SMC_SWSTATE driverState; +struct NISLANDS_SMC_SWSTATE_HDR initialState; +struct NISLANDS_SMC_SWSTATE_HDR ACPIState; +struct NISLANDS_SMC_SWSTATE_HDR ULVState; +struct NISLANDS_SMC_SWSTATE_HDR driverState;NISLANDS_SMC_HW_PERFORMANCE_LEVEL dpmLevels[NISLANDS_MAX_SMC_PERFORMANCE_LEVELS_PER_SWSTATE -1 ]; };
drivers/gpu/drm/amd/pm/legacy-dpm/sislands_smc.h +10 -5
@@ -172,12 +172,17 @@ struct SISLANDS_SMC_HW_PERFORMANCE_LEVEL {typedef struct SISLANDS_SMC_HW_PERFORMANCE_LEVEL SISLANDS_SMC_HW_PERFORMANCE_LEVEL ;struct SISLANDS_SMC_SWSTATE { -uint8_t flags; -uint8_t levelCount; -uint8_t padding2; -uint8_t padding3; +/* New members MUST be added within the struct_group() macro below. */ + struct_group_tagged(SISLANDS_SMC_SWSTATE_HDR, __hdr, + uint8_t flags; +uint8_t levelCount; +uint8_t padding2; +uint8_t padding3; + );SISLANDS_SMC_HW_PERFORMANCE_LEVEL levels[]; }; +static_assert (offsetof(struct SISLANDS_SMC_SWSTATE , levels) ==sizeof (struct SISLANDS_SMC_SWSTATE_HDR ), +"struct member likely outside of struct_group_tagged()" );typedef struct SISLANDS_SMC_SWSTATE SISLANDS_SMC_SWSTATE ;
@@ -215,7 +220,7 @@ struct SISLANDS_SMC_STATETABLE {struct SISLANDS_SMC_SWSTATE_SINGLE initialState;struct SISLANDS_SMC_SWSTATE_SINGLE ACPIState;struct SISLANDS_SMC_SWSTATE_SINGLE ULVState; -SISLANDS_SMC_SWSTATE driverState; +struct SISLANDS_SMC_SWSTATE_HDR driverState;SISLANDS_SMC_HW_PERFORMANCE_LEVEL dpmLevels[SISLANDS_MAX_SMC_PERFORMANCE_LEVELS_PER_SWSTATE ]; };
Signature · 1 line
2.43.0
Hi all,
Friendly ping: who can take this, please? :)
Thanks!
--
Gustavo
Quoted 149 lines · Gustavo A. R. Silva
-Wflex-array-member-not-at-end was introduced in GCC-14, and we are getting ready to enable it, globally.
So, in order to avoid ending up with a flexible-array member in the middle of other structs, we use the
struct_group_tagged()helper to create a new taggedstruct NISLANDS_SMC_SWSTATE_HDR(andstruct SISLANDS_SMC_SWSTATE_HDR). This structures group together all the members of the flexiblestruct NISLANDS_SMC_SWSTATE(andstruct SISLANDS_SMC_SWSTATE) except the flexible array.As a result, the array is effectively separated from the rest of the members without modifying the memory layout of the flexible structure. We then change the type of the middle struct members currently causing trouble from
struct NISLANDS_SMC_SWSTATEtostruct NISLANDS_SMC_SWSTATE_HDR(and fromstruct SISLANDS_SMC_SWSTATEtostruct SISLANDS_SMC_SWSTATE_HDR).We also want to ensure that when new members need to be added to the flexible structure, they are always included within the newly created tagged struct. For this, we use
static_assert(). This ensures that the memory layout for both the flexible structure and the new tagged struct is the same after any changes.This approach avoids having to implement
struct NISLANDS_SMC_SWSTATE_HDR(andstruct SISLANDS_SMC_SWSTATE_HDR) as a completely separate structure, thus preventing having to maintain two independent but basically identical structures, closing the door to potential bugs in the future.We also use
container_of()whenever we need to retrieve a pointer to the flexible structure, through which we can access the flexible-array member, if necessary.So, with this changes, fix the following warnings:
drivers/gpu/drm/amd/amdgpu/../pm/legacy-dpm/sislands_smc.h:218:49: warning: structure containing a flexible array member is not at the end of another structure [-Wflex-array-member-not-at-end]drivers/gpu/drm/amd/amdgpu/../pm/legacy-dpm/si_dpm.h:819:41: warning: structure containing a flexible array member is not at the end of another structure [-Wflex-array-member-not-at-end]drivers/gpu/drm/amd/amdgpu/../pm/legacy-dpm/si_dpm.h:818:41: warning: structure containing a flexible array member is not at the end of another structure [-Wflex-array-member-not-at-end]drivers/gpu/drm/amd/amdgpu/../pm/legacy-dpm/si_dpm.h:817:41: warning: structure containing a flexible array member is not at the end of another structure [-Wflex-array-member-not-at-end]drivers/gpu/drm/amd/amdgpu/../pm/legacy-dpm/si_dpm.h:816:41: warning: structure containing a flexible array member is not at the end of another structure [-Wflex-array-member-not-at-end]Signed-off-by Gustavo A. R. Silva <[email protected]>--- drivers/gpu/drm/amd/pm/legacy-dpm/si_dpm.c | 7 ++++-- drivers/gpu/drm/amd/pm/legacy-dpm/si_dpm.h | 23 +++++++++++-------- .../gpu/drm/amd/pm/legacy-dpm/sislands_smc.h | 15 ++++++++---- 3 files changed, 29 insertions(+), 16 deletions(-)drivers/gpu/drm/amd/pm/legacy-dpm/si_dpm.c +5
-2@@ -5234,7 +5234,8 @@ static int si_init_smc_table(struct amdgpu_device *adev) table->driverState.flags = table->initialState.flags; table->driverState.levelCount = table->initialState.levelCount; - table->driverState.levels[0 ] = table->initialState.level; +container_of (&table->driverState,SISLANDS_SMC_SWSTATE , __hdr)->levels[0 ] = + table->initialState.level; ret =si_do_program_memory_timing_parameters (adev, amdgpu_boot_state,SISLANDS_INITIAL_STATE_ARB_INDEX );@@ -5755,7 +5756,9 @@ static int si_upload_sw_state(struct amdgpu_device *adev,int ret;u32 address = si_pi->state_table_start + offsetof(SISLANDS_SMC_STATETABLE , driverState); -SISLANDS_SMC_SWSTATE *smc_state = &si_pi->smc_statetable.driverState; +SISLANDS_SMC_SWSTATE *smc_state = +container_of (&si_pi->smc_statetable.driverState, +SISLANDS_SMC_SWSTATE , __hdr);size_t state_size =struct_size (smc_state, levels, new_state->performance_level_count);memset (smc_state,0 , state_size);drivers/gpu/drm/amd/pm/legacy-dpm/si_dpm.h +14
-9@@ -784,12 +784,17 @@ typedef struct NISLANDS_SMC_HW_PERFORMANCE_LEVEL NISLANDS_SMC_HW_PERFORMANCE_LEVstruct NISLANDS_SMC_SWSTATE { -uint8_t flags; -uint8_t levelCount; -uint8_t padding2; -uint8_t padding3; -NISLANDS_SMC_HW_PERFORMANCE_LEVEL levels[]; +/* New members MUST be added within the struct_group() macro below. */ + struct_group_tagged(NISLANDS_SMC_SWSTATE_HDR, __hdr, + uint8_t flags; +uint8_t levelCount; +uint8_t padding2; +uint8_t padding3; + ); +NISLANDS_SMC_HW_PERFORMANCE_LEVEL levels[]; }; +static_assert (offsetof(struct NISLANDS_SMC_SWSTATE , levels) ==sizeof (struct NISLANDS_SMC_SWSTATE_HDR ), +"struct member likely outside of struct_group_tagged()" );typedef struct NISLANDS_SMC_SWSTATE NISLANDS_SMC_SWSTATE ;@@ -813,10 +818,10 @@ struct NISLANDS_SMC_STATETABLEuint32_t lowSMIO[NISLANDS_MAX_NO_VREG_STEPS ];NISLANDS_SMC_VOLTAGEMASKTABLE voltageMaskTable;PP_NIslands_DPM2Parameters dpm2Params; -NISLANDS_SMC_SWSTATE initialState; -NISLANDS_SMC_SWSTATE ACPIState; -NISLANDS_SMC_SWSTATE ULVState; -NISLANDS_SMC_SWSTATE driverState; +struct NISLANDS_SMC_SWSTATE_HDR initialState; +struct NISLANDS_SMC_SWSTATE_HDR ACPIState; +struct NISLANDS_SMC_SWSTATE_HDR ULVState; +struct NISLANDS_SMC_SWSTATE_HDR driverState;NISLANDS_SMC_HW_PERFORMANCE_LEVEL dpmLevels[NISLANDS_MAX_SMC_PERFORMANCE_LEVELS_PER_SWSTATE -1 ]; };drivers/gpu/drm/amd/pm/legacy-dpm/sislands_smc.h +10
-5@@ -172,12 +172,17 @@ struct SISLANDS_SMC_HW_PERFORMANCE_LEVEL {typedef struct SISLANDS_SMC_HW_PERFORMANCE_LEVEL SISLANDS_SMC_HW_PERFORMANCE_LEVEL ;struct SISLANDS_SMC_SWSTATE { -uint8_t flags; -uint8_t levelCount; -uint8_t padding2; -uint8_t padding3; +/* New members MUST be added within the struct_group() macro below. */ + struct_group_tagged(SISLANDS_SMC_SWSTATE_HDR, __hdr, + uint8_t flags; +uint8_t levelCount; +uint8_t padding2; +uint8_t padding3; + );SISLANDS_SMC_HW_PERFORMANCE_LEVEL levels[]; }; +static_assert (offsetof(struct SISLANDS_SMC_SWSTATE , levels) ==sizeof (struct SISLANDS_SMC_SWSTATE_HDR ), +"struct member likely outside of struct_group_tagged()" );typedef struct SISLANDS_SMC_SWSTATE SISLANDS_SMC_SWSTATE ;@@ -215,7 +220,7 @@ struct SISLANDS_SMC_STATETABLE {struct SISLANDS_SMC_SWSTATE_SINGLE initialState;struct SISLANDS_SMC_SWSTATE_SINGLE ACPIState;struct SISLANDS_SMC_SWSTATE_SINGLE ULVState; -SISLANDS_SMC_SWSTATE driverState; +struct SISLANDS_SMC_SWSTATE_HDR driverState;SISLANDS_SMC_HW_PERFORMANCE_LEVEL dpmLevels[SISLANDS_MAX_SMC_PERFORMANCE_LEVELS_PER_SWSTATE ]; };
Hi all,
Friendly ping (second one): who can take this patch, please? 🙂
Thanks!
-Gustavo
Quoted 149 lines · Gustavo A. R. Silva
Hi all,
Friendly ping: who can take this, please? :)
Thanks!
Signature · 1 line
GustavoQuoted 139 lines · Gustavo A. R. Silva
-Wflex-array-member-not-at-end was introduced in GCC-14, and we are getting ready to enable it, globally.
So, in order to avoid ending up with a flexible-array member in the middle of other structs, we use the
struct_group_tagged()helper to create a new taggedstruct NISLANDS_SMC_SWSTATE_HDR(andstruct SISLANDS_SMC_SWSTATE_HDR). This structures group together all the members of the flexiblestruct NISLANDS_SMC_SWSTATE(andstruct SISLANDS_SMC_SWSTATE) except the flexible array.As a result, the array is effectively separated from the rest of the members without modifying the memory layout of the flexible structure. We then change the type of the middle struct members currently causing trouble from
struct NISLANDS_SMC_SWSTATEtostruct NISLANDS_SMC_SWSTATE_HDR(and fromstruct SISLANDS_SMC_SWSTATEtostruct SISLANDS_SMC_SWSTATE_HDR).We also want to ensure that when new members need to be added to the flexible structure, they are always included within the newly created tagged struct. For this, we use
static_assert(). This ensures that the memory layout for both the flexible structure and the new tagged struct is the same after any changes.This approach avoids having to implement
struct NISLANDS_SMC_SWSTATE_HDR(andstruct SISLANDS_SMC_SWSTATE_HDR) as a completely separate structure, thus preventing having to maintain two independent but basically identical structures, closing the door to potential bugs in the future.We also use
container_of()whenever we need to retrieve a pointer to the flexible structure, through which we can access the flexible-array member, if necessary.So, with this changes, fix the following warnings:
drivers/gpu/drm/amd/amdgpu/../pm/legacy-dpm/sislands_smc.h:218:49: warning: structure containing a flexible array member is not at the end of another structure [-Wflex-array-member-not-at-end]drivers/gpu/drm/amd/amdgpu/../pm/legacy-dpm/si_dpm.h:819:41: warning: structure containing a flexible array member is not at the end of another structure [- Wflex-array-member-not-at-end]drivers/gpu/drm/amd/amdgpu/../pm/legacy-dpm/si_dpm.h:818:41: warning: structure containing a flexible array member is not at the end of another structure [- Wflex-array-member-not-at-end]drivers/gpu/drm/amd/amdgpu/../pm/legacy-dpm/si_dpm.h:817:41: warning: structure containing a flexible array member is not at the end of another structure [- Wflex-array-member-not-at-end]drivers/gpu/drm/amd/amdgpu/../pm/legacy-dpm/si_dpm.h:816:41: warning: structure containing a flexible array member is not at the end of another structure [- Wflex-array-member-not-at-end]Signed-off-by Gustavo A. R. Silva <[email protected]>---
drivers/gpu/drm/amd/pm/legacy-dpm/si_dpm.c | 7 ++++-- drivers/gpu/drm/amd/pm/legacy-dpm/si_dpm.h | 23 +++++++++++-------- .../gpu/drm/amd/pm/legacy-dpm/sislands_smc.h | 15 ++++++++----3 files changed, 29 insertions(+), 16 deletions(-)drivers/gpu/drm/amd/pm/legacy-dpm/si_dpm.c +2
-1@@ -5234,7 +5234,8 @@ static int si_init_smc_table(struct amdgpu_device *adev) table->driverState.flags = table->initialState.flags; table->driverState.levelCount = table->initialState.levelCount; - table->driverState.levels[0] = table->initialState.level; + container_of(&table->driverState, SISLANDS_SMC_SWSTATE, __hdr)->levels[0] = + table->initialState.level; ret = si_do_program_memory_timing_parameters(adev, amdgpu_boot_state, SISLANDS_INITIAL_STATE_ARB_INDEX);@@ -5755,7 +5756,9 @@ static int si_upload_sw_state(struct amdgpu_device *adev, int ret;u32 address =
si_pi->state_table_start+offsetof(SISLANDS_SMC_STATETABLE, driverState);
-SISLANDS_SMC_SWSTATE*smc_state=&si_pi->smc_statetable.driverState; +SISLANDS_SMC_SWSTATE*smc_state=
+ container_of(&si_pi->smc_statetable.driverState,
+SISLANDS_SMC_SWSTATE,__hdr);
size_tstate_size=struct_size(smc_state, levels, new_state->performance_level_count);memset(smc_state, 0, state_size);drivers/gpu/drm/amd/pm/legacy-dpm/si_dpm.h +0
-0@@ -784,12 +784,17 @@ typedef struct NISLANDS_SMC_HW_PERFORMANCE_LEVEL NISLANDS_SMC_HW_PERFORMANCE_LEVstruct
NISLANDS_SMC_SWSTATE
{
- uint8_t flags;
- uint8_t levelCount;
- uint8_t padding2;
- uint8_t padding3;
- NISLANDS_SMC_HW_PERFORMANCE_LEVEL levels[];
+ /* New members MUST be added within thestruct_group()macro below. */
+ struct_group_tagged(NISLANDS_SMC_SWSTATE_HDR,__hdr,
+ uint8_t flags;
+ uint8_t levelCount;
+ uint8_t padding2;
+ uint8_t padding3;
+ );
+ NISLANDS_SMC_HW_PERFORMANCE_LEVEL levels[];
};
+static_assert(offsetof(structNISLANDS_SMC_SWSTATE, levels) ==sizeof(struct NISLANDS_SMC_SWSTATE_HDR), + "struct member likely outside ofstruct_group_tagged()");
typedef structNISLANDS_SMC_SWSTATENISLANDS_SMC_SWSTATE;drivers/gpu/drm/amd/pm/legacy-dpm/si_dpm.h +4
-4@@ -813,10 +818,10 @@ struct NISLANDS_SMC_STATETABLE uint32_t lowSMIO[NISLANDS_MAX_NO_VREG_STEPS]; NISLANDS_SMC_VOLTAGEMASKTABLE voltageMaskTable; PP_NIslands_DPM2Parameters dpm2Params; - NISLANDS_SMC_SWSTATE initialState; - NISLANDS_SMC_SWSTATE ACPIState; - NISLANDS_SMC_SWSTATE ULVState; - NISLANDS_SMC_SWSTATE driverState; + struct NISLANDS_SMC_SWSTATE_HDR initialState; + struct NISLANDS_SMC_SWSTATE_HDR ACPIState; + struct NISLANDS_SMC_SWSTATE_HDR ULVState; + struct NISLANDS_SMC_SWSTATE_HDR driverState; NISLANDS_SMC_HW_PERFORMANCE_LEVEL dpmLevels[NISLANDS_MAX_SMC_PERFORMANCE_LEVELS_PER_SWSTATE - 1]; };drivers/gpu/drm/amd/pm/legacy-dpm/sislands_smc.h +10
-5@@ -172,12 +172,17 @@ struct SISLANDS_SMC_HW_PERFORMANCE_LEVEL { typedef struct SISLANDS_SMC_HW_PERFORMANCE_LEVEL SISLANDS_SMC_HW_PERFORMANCE_LEVEL; struct SISLANDS_SMC_SWSTATE { - uint8_t flags; - uint8_t levelCount; - uint8_t padding2; - uint8_t padding3; + /* New members MUST be added within the struct_group() macro below. */ + struct_group_tagged(SISLANDS_SMC_SWSTATE_HDR, __hdr, + uint8_t flags; + uint8_t levelCount; + uint8_t padding2; + uint8_t padding3; + ); SISLANDS_SMC_HW_PERFORMANCE_LEVEL levels[]; }; +static_assert (offsetof(struct SISLANDS_SMC_SWSTATE , levels) ==sizeof (struct SISLANDS_SMC_SWSTATE_HDR ), + "struct member likely outside of struct_group_tagged()"); typedef struct SISLANDS_SMC_SWSTATE SISLANDS_SMC_SWSTATE;@@ -215,7 +220,7 @@ struct SISLANDS_SMC_STATETABLE { struct SISLANDS_SMC_SWSTATE_SINGLE initialState; struct SISLANDS_SMC_SWSTATE_SINGLE ACPIState; struct SISLANDS_SMC_SWSTATE_SINGLE ULVState; - SISLANDS_SMC_SWSTATE driverState; + struct SISLANDS_SMC_SWSTATE_HDR driverState; SISLANDS_SMC_HW_PERFORMANCE_LEVEL dpmLevels[SISLANDS_MAX_SMC_PERFORMANCE_LEVELS_PER_SWSTATE]; };
Can you resend, I can't seem to find the original emails. Additionally, all of the NISLANDS structures are unused in amdgpu, so those could be removed.
Alex
Quoted 164 lines · Gustavo A. R. Silva
Hi all,
Friendly ping (second one): who can take this patch, please? 🙂
Thanks!
-GustavoQuoted 154 lines · Gustavo A. R. Silva
Hi all,
Friendly ping: who can take this, please? :)
Thanks!
--
GustavoQuoted 144 lines · Gustavo A. R. Silva
-Wflex-array-member-not-at-end was introduced in GCC-14, and we are getting ready to enable it, globally.
So, in order to avoid ending up with a flexible-array member in the middle of other structs, we use the
struct_group_tagged()helper to create a new taggedstruct NISLANDS_SMC_SWSTATE_HDR(andstruct SISLANDS_SMC_SWSTATE_HDR). This structures group together all the members of the flexiblestruct NISLANDS_SMC_SWSTATE(andstruct SISLANDS_SMC_SWSTATE) except the flexible array.As a result, the array is effectively separated from the rest of the members without modifying the memory layout of the flexible structure. We then change the type of the middle struct members currently causing trouble from
struct NISLANDS_SMC_SWSTATEtostruct NISLANDS_SMC_SWSTATE_HDR(and fromstruct SISLANDS_SMC_SWSTATEtostruct SISLANDS_SMC_SWSTATE_HDR).We also want to ensure that when new members need to be added to the flexible structure, they are always included within the newly created tagged struct. For this, we use
static_assert(). This ensures that the memory layout for both the flexible structure and the new tagged struct is the same after any changes.This approach avoids having to implement
struct NISLANDS_SMC_SWSTATE_HDR(andstruct SISLANDS_SMC_SWSTATE_HDR) as a completely separate structure, thus preventing having to maintain two independent but basically identical structures, closing the door to potential bugs in the future.We also use
container_of()whenever we need to retrieve a pointer to the flexible structure, through which we can access the flexible-array member, if necessary.So, with this changes, fix the following warnings:
drivers/gpu/drm/amd/amdgpu/../pm/legacy-dpm/sislands_smc.h:218:49: warning: structure containing a flexible array member is not at the end of another structure [-Wflex-array-member-not-at-end]drivers/gpu/drm/amd/amdgpu/../pm/legacy-dpm/si_dpm.h:819:41: warning: structure containing a flexible array member is not at the end of another structure [- Wflex-array-member-not-at-end]drivers/gpu/drm/amd/amdgpu/../pm/legacy-dpm/si_dpm.h:818:41: warning: structure containing a flexible array member is not at the end of another structure [- Wflex-array-member-not-at-end]drivers/gpu/drm/amd/amdgpu/../pm/legacy-dpm/si_dpm.h:817:41: warning: structure containing a flexible array member is not at the end of another structure [- Wflex-array-member-not-at-end]drivers/gpu/drm/amd/amdgpu/../pm/legacy-dpm/si_dpm.h:816:41: warning: structure containing a flexible array member is not at the end of another structure [- Wflex-array-member-not-at-end]Signed-off-by Gustavo A. R. Silva <[email protected]>--- drivers/gpu/drm/amd/pm/legacy-dpm/si_dpm.c | 7 ++++-- drivers/gpu/drm/amd/pm/legacy-dpm/si_dpm.h | 23 +++++++++++-------- .../gpu/drm/amd/pm/legacy-dpm/sislands_smc.h | 15 ++++++++---- 3 files changed, 29 insertions(+), 16 deletions(-)drivers/gpu/drm/amd/pm/legacy-dpm/si_dpm.c +5
-2@@ -5234,7 +5234,8 @@ static int si_init_smc_table(struct amdgpu_device *adev) table->driverState.flags = table->initialState.flags; table->driverState.levelCount = table->initialState.levelCount; - table->driverState.levels[0 ] = table->initialState.level; +container_of (&table->driverState,SISLANDS_SMC_SWSTATE , __hdr)->levels[0 ] = + table->initialState.level; ret =si_do_program_memory_timing_parameters (adev, amdgpu_boot_state,SISLANDS_INITIAL_STATE_ARB_INDEX );@@ -5755,7 +5756,9 @@ static int si_upload_sw_state(struct amdgpu_device *adev,int ret;u32 address = si_pi->state_table_start + offsetof(SISLANDS_SMC_STATETABLE , driverState); -SISLANDS_SMC_SWSTATE *smc_state = &si_pi->smc_statetable.driverState; +SISLANDS_SMC_SWSTATE *smc_state = +container_of (&si_pi->smc_statetable.driverState, +SISLANDS_SMC_SWSTATE , __hdr);size_t state_size =struct_size (smc_state, levels, new_state->performance_level_count);memset (smc_state,0 , state_size);drivers/gpu/drm/amd/pm/legacy-dpm/si_dpm.h +14
-9@@ -784,12 +784,17 @@ typedef struct NISLANDS_SMC_HW_PERFORMANCE_LEVEL NISLANDS_SMC_HW_PERFORMANCE_LEVstruct NISLANDS_SMC_SWSTATE { -uint8_t flags; -uint8_t levelCount; -uint8_t padding2; -uint8_t padding3; -NISLANDS_SMC_HW_PERFORMANCE_LEVEL levels[]; +/* New members MUST be added within the struct_group() macro below. */ + struct_group_tagged(NISLANDS_SMC_SWSTATE_HDR, __hdr, + uint8_t flags; +uint8_t levelCount; +uint8_t padding2; +uint8_t padding3; + ); +NISLANDS_SMC_HW_PERFORMANCE_LEVEL levels[]; }; +static_assert (offsetof(struct NISLANDS_SMC_SWSTATE , levels) ==sizeof (struct NISLANDS_SMC_SWSTATE_HDR ), +"struct member likely outside of struct_group_tagged()" );typedef struct NISLANDS_SMC_SWSTATE NISLANDS_SMC_SWSTATE ;@@ -813,10 +818,10 @@ struct NISLANDS_SMC_STATETABLEuint32_t lowSMIO[NISLANDS_MAX_NO_VREG_STEPS ];NISLANDS_SMC_VOLTAGEMASKTABLE voltageMaskTable;PP_NIslands_DPM2Parameters dpm2Params; -NISLANDS_SMC_SWSTATE initialState; -NISLANDS_SMC_SWSTATE ACPIState; -NISLANDS_SMC_SWSTATE ULVState; -NISLANDS_SMC_SWSTATE driverState; +struct NISLANDS_SMC_SWSTATE_HDR initialState; +struct NISLANDS_SMC_SWSTATE_HDR ACPIState; +struct NISLANDS_SMC_SWSTATE_HDR ULVState; +struct NISLANDS_SMC_SWSTATE_HDR driverState;NISLANDS_SMC_HW_PERFORMANCE_LEVEL dpmLevels[NISLANDS_MAX_SMC_PERFORMANCE_LEVELS_PER_SWSTATE -1 ]; };drivers/gpu/drm/amd/pm/legacy-dpm/sislands_smc.h +10
-5@@ -172,12 +172,17 @@ struct SISLANDS_SMC_HW_PERFORMANCE_LEVEL {typedef struct SISLANDS_SMC_HW_PERFORMANCE_LEVEL SISLANDS_SMC_HW_PERFORMANCE_LEVEL ;struct SISLANDS_SMC_SWSTATE { -uint8_t flags; -uint8_t levelCount; -uint8_t padding2; -uint8_t padding3; +/* New members MUST be added within the struct_group() macro below. */ + struct_group_tagged(SISLANDS_SMC_SWSTATE_HDR, __hdr, + uint8_t flags; +uint8_t levelCount; +uint8_t padding2; +uint8_t padding3; + );SISLANDS_SMC_HW_PERFORMANCE_LEVEL levels[]; }; +static_assert (offsetof(struct SISLANDS_SMC_SWSTATE , levels) ==sizeof (struct SISLANDS_SMC_SWSTATE_HDR ), +"struct member likely outside of struct_group_tagged()" );typedef struct SISLANDS_SMC_SWSTATE SISLANDS_SMC_SWSTATE ;@@ -215,7 +220,7 @@ struct SISLANDS_SMC_STATETABLE {struct SISLANDS_SMC_SWSTATE_SINGLE initialState;struct SISLANDS_SMC_SWSTATE_SINGLE ACPIState;struct SISLANDS_SMC_SWSTATE_SINGLE ULVState; -SISLANDS_SMC_SWSTATE driverState; +struct SISLANDS_SMC_SWSTATE_HDR driverState;SISLANDS_SMC_HW_PERFORMANCE_LEVEL dpmLevels[SISLANDS_MAX_SMC_PERFORMANCE_LEVELS_PER_SWSTATE ]; };
Quoted 3 lines · Alex Deucher
Can you resend, I can't seem to find the original emails. Additionally, all of the NISLANDS structures are unused in amdgpu, so those could be removed.
Okay, I'll take a look.
Thanks
-Gustavo
Hi!
Quoted 6 lines · Gustavo A. R. Silva
Quoted 3 lines · Alex Deucher
Can you resend, I can't seem to find the original emails. Additionally, all of the NISLANDS structures are unused in amdgpu, so those could be removed.
I'm taking a look at this, and it seems that those NISLANDS structs are actually needed in amdgpu code. For instance, struct si_power_info contains a member of the type of struct ni_power_info, and this latter struct contains a member of the type of NISLANDS_SMC_STATETABLE, thus NISLANDS_SMC_SWSTATE and NISLANDS_SMC_HW_PERFORMANCE_LEVEL are needed, and so on.
So, it seems that all those structs should stay. What do you think?
Thanks!
-Gustavo
Quoted 11 lines · Gustavo A. R. Silva
Hi!
Quoted 6 lines · Gustavo A. R. Silva
Quoted 3 lines · Alex Deucher
Can you resend, I can't seem to find the original emails. Additionally, all of the NISLANDS structures are unused in amdgpu, so those could be removed.
Quoted 7 lines
I'm taking a look at this, and it seems that those NISLANDS structs are actually needed in amdgpu code. For instance,
struct si_power_infocontains a member of the type ofstruct ni_power_info, and this latter struct contains a member of the type ofNISLANDS_SMC_STATETABLE, thusNISLANDS_SMC_SWSTATEandNISLANDS_SMC_HW_PERFORMANCE_LEVELare needed, and so on.So, it seems that all those structs should stay. What do you think?
They are not used for programming the hardware. They were just inherited from radeon. All of the NI SMC stuff can be dropped.
Alex
Quoted 3 lines
Thanks!
-Gustavo
Quoted 19 lines · Alex Deucher
Quoted 17 lines · Gustavo A. R. Silva
Hi!
Quoted 6 lines · Gustavo A. R. Silva
Quoted 3 lines · Alex Deucher
Can you resend, I can't seem to find the original emails. Additionally, all of the NISLANDS structures are unused in amdgpu, so those could be removed.
I'm taking a look at this, and it seems that those NISLANDS structs are actually needed in amdgpu code. For instance,
struct si_power_infocontains a member of the type ofstruct ni_power_info, and this latter struct contains a member of the type ofNISLANDS_SMC_STATETABLE, thusNISLANDS_SMC_SWSTATEandNISLANDS_SMC_HW_PERFORMANCE_LEVELare needed, and so on.
Quoted 4 lines
Quoted 1 line
So, it seems that all those structs should stay. What do you think?
They are not used for programming the hardware. They were just inherited from radeon. All of the NI SMC stuff can be dropped.
(Looking through patchwork...)
It's not obvious for me how to drop that stuff. It seems pretty integral? What's wanted here?
Signature · 1 line
Kees Cook
Quoted 23 lines · Kees Cook
Quoted 21 lines · Alex Deucher
Quoted 18 lines · Gustavo A. R. Silva
Hi!
Quoted 6 lines · Gustavo A. R. Silva
Quoted 3 lines · Alex Deucher
Can you resend, I can't seem to find the original emails. Additionally, all of the NISLANDS structures are unused in amdgpu, so those could be removed.
I'm taking a look at this, and it seems that those NISLANDS structs are actually needed in amdgpu code. For instance,
struct si_power_infocontains a member of the type ofstruct ni_power_info, and this latter struct contains a member of the type ofNISLANDS_SMC_STATETABLE, thusNISLANDS_SMC_SWSTATEandNISLANDS_SMC_HW_PERFORMANCE_LEVELare needed, and so on.So, it seems that all those structs should stay. What do you think?
Quoted 7 lines
Quoted 2 lines
They are not used for programming the hardware. They were just inherited from radeon. All of the NI SMC stuff can be dropped.
(Looking through patchwork...)
It's not obvious for me how to drop that stuff. It seems pretty integral? What's wanted here?
All of the NI stuff has been removed. You can rebase your patch.
Alex