* [PATCH][next] scsi: hisi_sas: Avoid a couple -Wflex-array-member-not-at-end warnings
@ 2025-09-19 12:17 Gustavo A. R. Silva
2025-10-07 10:45 ` Gustavo A. R. Silva
0 siblings, 1 reply; 4+ messages in thread
From: Gustavo A. R. Silva @ 2025-09-19 12:17 UTC (permalink / raw)
To: Yihang Li, James E.J. Bottomley, Martin K. Petersen
Cc: linux-scsi, linux-kernel, Gustavo A. R. Silva, linux-hardening
-Wflex-array-member-not-at-end was introduced in GCC-14, and we are
getting ready to enable it, globally.
Move the conflicting declarations to the end of the corresponding
structures (and in a union). Notice that `struct ssp_command_iu`
is a flexible structure, this is a structure that contains a
flexible-array member.
With these changes fix the following warnings:
drivers/scsi/hisi_sas/hisi_sas.h:639:38: warning: structure containing a flexible array member is not at the end of another structure [-Wflex-array-member-not-at-end]
drivers/scsi/hisi_sas/hisi_sas.h:616:47: 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 <gustavoars@kernel.org>
---
drivers/scsi/hisi_sas/hisi_sas.h | 10 +++++++---
1 file changed, 7 insertions(+), 3 deletions(-)
diff --git a/drivers/scsi/hisi_sas/hisi_sas.h b/drivers/scsi/hisi_sas/hisi_sas.h
index 1323ed8aa717..55c638dd58b1 100644
--- a/drivers/scsi/hisi_sas/hisi_sas.h
+++ b/drivers/scsi/hisi_sas/hisi_sas.h
@@ -613,8 +613,8 @@ struct hisi_sas_command_table_ssp {
struct ssp_frame_hdr hdr;
union {
struct {
- struct ssp_command_iu task;
u32 prot[PROT_BUF_SIZE];
+ struct ssp_command_iu task;
};
struct ssp_tmf_iu ssp_task;
struct xfer_rdy_iu xfer_rdy;
@@ -636,13 +636,17 @@ struct hisi_sas_status_buffer {
struct hisi_sas_slot_buf_table {
struct hisi_sas_status_buffer status_buffer;
- union hisi_sas_command_table command_header;
struct hisi_sas_sge_page sge_page;
+
+ /* Must be last --ends in a flexible-array member. */
+ union hisi_sas_command_table command_header;
};
struct hisi_sas_slot_dif_buf_table {
- struct hisi_sas_slot_buf_table slot_buf;
struct hisi_sas_sge_dif_page sge_dif_page;
+
+ /* Must be last --ends in a flexible-array member. */
+ struct hisi_sas_slot_buf_table slot_buf;
};
extern struct scsi_transport_template *hisi_sas_stt;
--
2.43.0
^ permalink raw reply related [flat|nested] 4+ messages in thread* Re: [PATCH][next] scsi: hisi_sas: Avoid a couple -Wflex-array-member-not-at-end warnings
2025-09-19 12:17 [PATCH][next] scsi: hisi_sas: Avoid a couple -Wflex-array-member-not-at-end warnings Gustavo A. R. Silva
@ 2025-10-07 10:45 ` Gustavo A. R. Silva
2025-10-07 10:54 ` Gustavo A. R. Silva
0 siblings, 1 reply; 4+ messages in thread
From: Gustavo A. R. Silva @ 2025-10-07 10:45 UTC (permalink / raw)
To: Gustavo A. R. Silva, Yihang Li, James E.J. Bottomley,
Martin K. Petersen
Cc: linux-scsi, linux-kernel, linux-hardening
Hi all,
Friendly ping: who can take this, please?
Thanks!
-Gustavo
On 9/19/25 13:17, Gustavo A. R. Silva wrote:
> -Wflex-array-member-not-at-end was introduced in GCC-14, and we are
> getting ready to enable it, globally.
>
> Move the conflicting declarations to the end of the corresponding
> structures (and in a union). Notice that `struct ssp_command_iu`
> is a flexible structure, this is a structure that contains a
> flexible-array member.
>
> With these changes fix the following warnings:
>
> drivers/scsi/hisi_sas/hisi_sas.h:639:38: warning: structure containing a flexible array member is not at the end of another structure [-Wflex-array-member-not-at-end]
> drivers/scsi/hisi_sas/hisi_sas.h:616:47: 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 <gustavoars@kernel.org>
> ---
> drivers/scsi/hisi_sas/hisi_sas.h | 10 +++++++---
> 1 file changed, 7 insertions(+), 3 deletions(-)
>
> diff --git a/drivers/scsi/hisi_sas/hisi_sas.h b/drivers/scsi/hisi_sas/hisi_sas.h
> index 1323ed8aa717..55c638dd58b1 100644
> --- a/drivers/scsi/hisi_sas/hisi_sas.h
> +++ b/drivers/scsi/hisi_sas/hisi_sas.h
> @@ -613,8 +613,8 @@ struct hisi_sas_command_table_ssp {
> struct ssp_frame_hdr hdr;
> union {
> struct {
> - struct ssp_command_iu task;
> u32 prot[PROT_BUF_SIZE];
> + struct ssp_command_iu task;
> };
> struct ssp_tmf_iu ssp_task;
> struct xfer_rdy_iu xfer_rdy;
> @@ -636,13 +636,17 @@ struct hisi_sas_status_buffer {
>
> struct hisi_sas_slot_buf_table {
> struct hisi_sas_status_buffer status_buffer;
> - union hisi_sas_command_table command_header;
> struct hisi_sas_sge_page sge_page;
> +
> + /* Must be last --ends in a flexible-array member. */
> + union hisi_sas_command_table command_header;
> };
>
> struct hisi_sas_slot_dif_buf_table {
> - struct hisi_sas_slot_buf_table slot_buf;
> struct hisi_sas_sge_dif_page sge_dif_page;
> +
> + /* Must be last --ends in a flexible-array member. */
> + struct hisi_sas_slot_buf_table slot_buf;
> };
>
> extern struct scsi_transport_template *hisi_sas_stt;
^ permalink raw reply [flat|nested] 4+ messages in thread* Re: [PATCH][next] scsi: hisi_sas: Avoid a couple -Wflex-array-member-not-at-end warnings
2025-10-07 10:45 ` Gustavo A. R. Silva
@ 2025-10-07 10:54 ` Gustavo A. R. Silva
2025-10-14 22:19 ` Martin K. Petersen
0 siblings, 1 reply; 4+ messages in thread
From: Gustavo A. R. Silva @ 2025-10-07 10:54 UTC (permalink / raw)
To: Gustavo A. R. Silva, Yihang Li, James E.J. Bottomley,
Martin K. Petersen
Cc: linux-scsi, linux-kernel, linux-hardening
On 10/7/25 11:45, Gustavo A. R. Silva wrote:
> Hi all,
>
> Friendly ping: who can take this, please?
>
> Thanks!
> -Gustavo
>
> On 9/19/25 13:17, Gustavo A. R. Silva wrote:
>> -Wflex-array-member-not-at-end was introduced in GCC-14, and we are
>> getting ready to enable it, globally.
>>
>> Move the conflicting declarations to the end of the corresponding
>> structures (and in a union). Notice that `struct ssp_command_iu`
>> is a flexible structure, this is a structure that contains a
>> flexible-array member.
>>
>> With these changes fix the following warnings:
>>
>> drivers/scsi/hisi_sas/hisi_sas.h:639:38: warning: structure containing a flexible array member is not at the end of another structure [-Wflex-array-member-
>> not-at-end]
>> drivers/scsi/hisi_sas/hisi_sas.h:616:47: 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 <gustavoars@kernel.org>
>> ---
>> drivers/scsi/hisi_sas/hisi_sas.h | 10 +++++++---
>> 1 file changed, 7 insertions(+), 3 deletions(-)
>>
>> diff --git a/drivers/scsi/hisi_sas/hisi_sas.h b/drivers/scsi/hisi_sas/hisi_sas.h
>> index 1323ed8aa717..55c638dd58b1 100644
>> --- a/drivers/scsi/hisi_sas/hisi_sas.h
>> +++ b/drivers/scsi/hisi_sas/hisi_sas.h
>> @@ -613,8 +613,8 @@ struct hisi_sas_command_table_ssp {
>> struct ssp_frame_hdr hdr;
>> union {
>> struct {
>> - struct ssp_command_iu task;
>> u32 prot[PROT_BUF_SIZE];
>> + struct ssp_command_iu task;
>> };
Actually, I have a question here:
is u32 prot[PROT_BUF_SIZE]; intended to overlap flex array task.add_cdb[]
at some point?
if not, this change is just fine. Otherwise, I'd need to update this
patch to account for the overlap.
Could someone provide some feedback here? :)
Thanks!
-Gustavo
>> struct ssp_tmf_iu ssp_task;
>> struct xfer_rdy_iu xfer_rdy;
>> @@ -636,13 +636,17 @@ struct hisi_sas_status_buffer {
>> struct hisi_sas_slot_buf_table {
>> struct hisi_sas_status_buffer status_buffer;
>> - union hisi_sas_command_table command_header;
>> struct hisi_sas_sge_page sge_page;
>> +
>> + /* Must be last --ends in a flexible-array member. */
>> + union hisi_sas_command_table command_header;
>> };
>> struct hisi_sas_slot_dif_buf_table {
>> - struct hisi_sas_slot_buf_table slot_buf;
>> struct hisi_sas_sge_dif_page sge_dif_page;
>> +
>> + /* Must be last --ends in a flexible-array member. */
>> + struct hisi_sas_slot_buf_table slot_buf;
>> };
>> extern struct scsi_transport_template *hisi_sas_stt;
>
^ permalink raw reply [flat|nested] 4+ messages in thread* Re: [PATCH][next] scsi: hisi_sas: Avoid a couple -Wflex-array-member-not-at-end warnings
2025-10-07 10:54 ` Gustavo A. R. Silva
@ 2025-10-14 22:19 ` Martin K. Petersen
0 siblings, 0 replies; 4+ messages in thread
From: Martin K. Petersen @ 2025-10-14 22:19 UTC (permalink / raw)
To: Gustavo A. R. Silva
Cc: Gustavo A. R. Silva, Yihang Li, James E.J. Bottomley,
Martin K. Petersen, linux-scsi, linux-kernel, linux-hardening,
John Garry
Gustavo,
>>> struct {
>>> - struct ssp_command_iu task;
>>> u32 prot[PROT_BUF_SIZE];
>>> + struct ssp_command_iu task;
>>> };
>
> Actually, I have a question here:
>
> is u32 prot[PROT_BUF_SIZE]; intended to overlap flex array
> task.add_cdb[] at some point?
>
> if not, this change is just fine. Otherwise, I'd need to update this
> patch to account for the overlap.
I am not familiar with the hisi hardware interface so I don't know
whether the overlap is intentional.
--
Martin K. Petersen
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2025-10-14 22:19 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2025-09-19 12:17 [PATCH][next] scsi: hisi_sas: Avoid a couple -Wflex-array-member-not-at-end warnings Gustavo A. R. Silva
2025-10-07 10:45 ` Gustavo A. R. Silva
2025-10-07 10:54 ` Gustavo A. R. Silva
2025-10-14 22:19 ` Martin K. Petersen
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox