eth: bnxt: fix a couple of W=1 C=1 warnings
Jakub Kicinski
maintainercover eth: bnxt: fix a couple of W=1 C=1 warnings
Fix a couple of build warnings.
Jakub Kicinski (2):
eth: bnxt: fix one of the W=1 warnings about fortified memcpy()
eth: bnxt: fix warning for define in struct_group
drivers/net/ethernet/broadcom/bnxt/bnxt_dcb.c | 2 +- drivers/net/ethernet/broadcom/bnxt/bnxt_dcb.h | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-)
Signature · 1 line
2.41.0
Jakub Kicinski
maintainerPATCH 1/2 eth: bnxt: fix one of the W=1 warnings about fortified memcpy()
Fix a W=1 warning with gcc 13.1:
In function ‘fortify_memcpy_chk’,
inlined from ‘bnxt_hwrm_queue_cos2bw_cfg’ at drivers/net/ethernet/broadcom/bnxt/bnxt_dcb.c:133:3:include/linux/fortify-string.h:592:25: warning: call to ‘__read_overflow2_field’ declared with attribute warning: detected read beyond size of field (2nd parameter); maybe use struct_group()? [-Wattribute-warning]
592 | __read_overflow2_field(q_size_field, size);
| ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~The field group is already defined and starts at queue_id:
struct bnxt_cos2bw_cfg {
u8 pad[3];
struct_group_attr(cfg, __packed,
u8 queue_id;
__le32 min_bw;---
CC: [email protected]
Michael, the other warning looks more.. interesting. The code does:
data = &resp->queue_id0 + offsetof(struct bnxt_cos2bw_cfg, queue_id);
which translates to: data = &resp->queue_id0 + 3, but the HWRM struct says:
struct hwrm_queue_cos2bw_qcfg_output {
__le16 error_code;
__le16 req_type;
__le16 seq_id;
__le16 resp_len;
u8 queue_id0;
u8 unused_0;
__le16 unused_1;
__le32 queue_id0_min_bw;So queue_id0 is in the wrong place?
Why not just move it in the spec?
Simplest fix for the warning would be to assign the 6 fields by value. But to get the value of queue_id we'd need to read unused_1 AFACT? :o Could you please fix this somehow? Doing W=1 builds on bnxt is painful.
--- drivers/net/ethernet/broadcom/bnxt/bnxt_dcb.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/net/ethernet/broadcom/bnxt/bnxt_dcb.c +1 -1
@@ -130,7 +130,7 @@ static int bnxt_hwrm_queue_cos2bw_cfg(struct bnxt *bp, struct ieee_ets *ets, BW_VALUE_UNIT_PERCENT1_100); } data = &req->unused_0 + qidx * (sizeof (cos2bw) -4 ); -memcpy (data, &cos2bw.queue_id,sizeof (cos2bw) -4 ); +memcpy (data, &cos2bw.cfg,sizeof (cos2bw) -4 );if (qidx ==0 ) { req->queue_id0 = cos2bw.queue_id; req->unused_0 =0 ;
Signature · 1 line
2.41.0
Re: [PATCH net-next 1/2] eth: bnxt: fix one of the W=1 warnings about fortified memcpy()
Quoted 38 lines · Jakub Kicinski
Fix a W=1 warning with gcc 13.1:
In function ‘fortify_memcpy_chk’,
inlined from ‘bnxt_hwrm_queue_cos2bw_cfg’ atdrivers/net/ethernet/broadcom/bnxt/bnxt_dcb.c:133:3:include/linux/fortify-string.h:592:25: warning: call to ‘__read_overflow2_field’ declared with attribute warning: detected read beyond size of field (2nd parameter); maybe usestruct_group()? [-Wattribute-warning]592 | __read_overflow2_field(q_size_field, size); | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~The field group is already defined and starts at
queue_id:struct bnxt_cos2bw_cfg { u8 pad[3]; struct_group_attr(cfg, __packed, u8 queue_id; __le32 min_bw;Signed-off-by Jakub Kicinski <[email protected]>---
CC: [email protected]Michael, the other warning looks more.. interesting. The code does:
data = &resp->queue_id0 + offsetof(struct bnxt_cos2bw_cfg, queue_id);which translates to: data =
&resp->queue_id0+ 3, but the HWRM struct says:struct hwrm_queue_cos2bw_qcfg_output { __le16 error_code; __le16 req_type; __le16 seq_id; __le16 resp_len; u8 queue_id0; u8 unused_0; __le16 unused_1; __le32 queue_id0_min_bw;
Quoted 5 lines
So
queue_id0is in the wrong place?
Why not just move it in the spec?
Simplest fix for the warning would be to assign the 6 fields by value. But to get the value ofqueue_idwe'd need to readunused_1AFACT? :o Could you please fix this somehow? Doing W=1 builds on bnxt is painful.
It seems I just ran into the same issue you're talking about here. See:
In function 'fortify_memcpy_chk',
inlined from 'bnxt_hwrm_queue_cos2bw_qcfg' at drivers/net/ethernet/broadcom/bnxt/bnxt_dcb.c:165:3:include/linux/fortify-string.h:592:25: warning: call to '__read_overflow2_field' declared with attribute warning: detected read beyond size of field (2nd parameter); maybe use struct_group()? [-Wattribute-warning]
592 | __read_overflow2_field(q_size_field, size);
| ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~Here is a potential fix for that:
drivers/net/ethernet/broadcom/bnxt/bnxt_dcb.c +3 -3
@@ -144,7 +144,7 @@ static int bnxt_hwrm_queue_cos2bw_qcfg(struct bnxt *bp, struct ieee_ets *ets)struct hwrm_queue_cos2bw_qcfg_output *resp;struct hwrm_queue_cos2bw_qcfg_input *req;struct bnxt_cos2bw_cfg cos2bw; -void *data; +struct bnxt_cos2bw_cfg *data;int rc, i; rc =hwrm_req_init (bp, req,HWRM_QUEUE_COS2BW_QCFG );
@@ -158,11 +158,11 @@ static int bnxt_hwrm_queue_cos2bw_qcfg(struct bnxt *bp, struct ieee_ets *ets)return rc; } - data = &resp->queue_id0 + offsetof(struct bnxt_cos2bw_cfg , queue_id); + data = (struct bnxt_cos2bw_cfg *)&resp->queue_id0;for (i =0 ; i < bp->max_tc; i++, data +=sizeof (cos2bw.cfg)) {int tc; -memcpy (&cos2bw.cfg, data,sizeof (cos2bw.cfg)); +memcpy (&cos2bw.cfg, &data->cfg,sizeof (cos2bw.cfg));if (i ==0 ) cos2bw.queue_id = resp->queue_id0;
Also, 0-day guys just reported[1] to me a -Wstringop-overflow in a similar piece of code in the same file. See:
drivers/net/ethernet/broadcom/bnxt/bnxt_dcb.c:133:17: warning: writing 12 bytes into a region of size 1 [-Wstringop-overflow=]
And I think this is a potential solution for that:
drivers/net/ethernet/broadcom/bnxt/bnxt_dcb.c +5 -3
@@ -98,7 +98,7 @@ static int bnxt_hwrm_queue_cos2bw_cfg(struct bnxt *bp, struct ieee_ets *ets, {struct hwrm_queue_cos2bw_cfg_input *req;struct bnxt_cos2bw_cfg cos2bw; -void *data; +struct bnxt_cos2bw_cfg *data;int rc, i; rc =hwrm_req_init (bp, req,HWRM_QUEUE_COS2BW_CFG );
@@ -129,8 +129,10 @@ static int bnxt_hwrm_queue_cos2bw_cfg(struct bnxt *bp, struct ieee_ets *ets,cpu_to_le32 ((ets->tc_tx_bw[i] *100 ) |BW_VALUE_UNIT_PERCENT1_100 ); } - data = &req->unused_0 + qidx * (sizeof (cos2bw) -4 ); -memcpy (data, &cos2bw.cfg,sizeof (cos2bw) -4 ); + data = (struct bnxt_cos2bw_cfg *)(&req->unused_0 + qidx * +sizeof (cos2bw.cfg) - + offsetof(struct bnxt_cos2bw_cfg , cfg)); +memcpy (&data->cfg, &cos2bw.cfg,sizeof (cos2bw.cfg));if (qidx ==0 ) { req->queue_id0 = cos2bw.queue_id; req->unused_0 =0 ;
If you agree with these changes I can send them as proper patches.
Thanks
--
Gustavo
[1] https://lore.kernel.org/lkml/[email protected]/
Quoted 17 lines
--- drivers/net/ethernet/broadcom/bnxt/bnxt_dcb.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)drivers/net/ethernet/broadcom/bnxt/bnxt_dcb.c +1
-1@@ -130,7 +130,7 @@ static int bnxt_hwrm_queue_cos2bw_cfg(struct bnxt *bp, struct ieee_ets *ets, BW_VALUE_UNIT_PERCENT1_100); } data = &req->unused_0 + qidx * (sizeof (cos2bw) -4 ); -memcpy (data, &cos2bw.queue_id,sizeof (cos2bw) -4 ); +memcpy (data, &cos2bw.cfg,sizeof (cos2bw) -4 );if (qidx ==0 ) { req->queue_id0 = cos2bw.queue_id; req->unused_0 =0 ;
Jakub Kicinski
maintainerRe: [PATCH net-next 1/2] eth: bnxt: fix one of the W=1 warnings about fortified memcpy()
Quoted 25 lines · On Thu, 3 Aug 2023 07:08:13 -0600 Gustavo A. R. Silva wrote:
In function '
fortify_memcpy_chk',
inlined from 'bnxt_hwrm_queue_cos2bw_qcfg' atdrivers/net/ethernet/broadcom/bnxt/bnxt_dcb.c:165:3:include/linux/fortify-string.h:592:25: warning: call to '__read_overflow2_field' declared with attribute warning: detected read beyond size of field (2nd parameter); maybe usestruct_group()? [-Wattribute-warning]592 | __read_overflow2_field(q_size_field, size); | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~Here is a potential fix for that:
drivers/net/ethernet/broadcom/bnxt/bnxt_dcb.c +1
-1@@ -144,7 +144,7 @@ static int bnxt_hwrm_queue_cos2bw_qcfg(struct bnxt *bp, struct ieee_ets *ets)struct hwrm_queue_cos2bw_qcfg_output *resp;struct hwrm_queue_cos2bw_qcfg_input *req;struct bnxt_cos2bw_cfg cos2bw; -void *data; +struct bnxt_cos2bw_cfg *data;int rc, i; rc =hwrm_req_init (bp, req,HWRM_QUEUE_COS2BW_QCFG );@@ -158,11 +158,11 @@ static int bnxt_hwrm_queue_cos2bw_qcfg(struct bnxt *bp, struct ieee_ets *ets)return rc; }
drivers/net/ethernet/broadcom/bnxt/bnxt_dcb.c static int bnxt_hwrm_queue_cos2bw_qcfg(struct bnxt *bp, struct ieee_ets *ets) · line 167
Quoted 10 lines
drivers/net/ethernet/broadcom/bnxt/bnxt_dcb.c +2
-2- data = &resp->queue_id0 + offsetof(struct bnxt_cos2bw_cfg , queue_id); + data = (struct bnxt_cos2bw_cfg *)&resp->queue_id0;for (i =0 ; i < bp->max_tc; i++, data +=sizeof (cos2bw.cfg)) {int tc; -memcpy (&cos2bw.cfg, data,sizeof (cos2bw.cfg)); +memcpy (&cos2bw.cfg, &data->cfg,sizeof (cos2bw.cfg));if (i ==0 ) cos2bw.queue_id = resp->queue_id0;
Neat trick, but seems like casting to the destination type should really be the last resort. There's only a handful of members in this struct, IMHO assigning member by member is cleaner.
But I'll defer to Michael.
Michael Chan
maintainerRe: [PATCH net-next 1/2] eth: bnxt: fix one of the W=1 warnings about fortified memcpy()
Quoted 33 lines · Jakub Kicinski
Quoted 31 lines · On Thu, 3 Aug 2023 07:08:13 -0600 Gustavo A. R. Silva wrote:
In function '
fortify_memcpy_chk',
inlined from 'bnxt_hwrm_queue_cos2bw_qcfg' atdrivers/net/ethernet/broadcom/bnxt/bnxt_dcb.c:165:3:include/linux/fortify-string.h:592:25: warning: call to '__read_overflow2_field' declared with attribute warning: detected read beyond size of field (2nd parameter); maybe usestruct_group()? [-Wattribute-warning]592 | __read_overflow2_field(q_size_field, size); | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~Here is a potential fix for that:
drivers/net/ethernet/broadcom/bnxt/bnxt_dcb.c +2
-2@@ -144,7 +144,7 @@ static int bnxt_hwrm_queue_cos2bw_qcfg(struct bnxt *bp, struct ieee_ets *ets)struct hwrm_queue_cos2bw_qcfg_output *resp;struct hwrm_queue_cos2bw_qcfg_input *req;struct bnxt_cos2bw_cfg cos2bw; -void *data; +struct bnxt_cos2bw_cfg *data;int rc, i; rc =hwrm_req_init (bp, req,HWRM_QUEUE_COS2BW_QCFG );@@ -158,11 +158,11 @@ static int bnxt_hwrm_queue_cos2bw_qcfg(struct bnxt *bp, struct ieee_ets *ets)return rc; } - data = &resp->queue_id0 + offsetof(struct bnxt_cos2bw_cfg , queue_id); + data = (struct bnxt_cos2bw_cfg *)&resp->queue_id0;for (i =0 ; i < bp->max_tc; i++, data +=sizeof (cos2bw.cfg)) {int tc;
Quoted 9 lines
drivers/net/ethernet/broadcom/bnxt/bnxt_dcb.c static int bnxt_hwrm_queue_cos2bw_qcfg(struct bnxt *bp, struct ieee_ets *ets) · line 167
Quoted 4 lines
drivers/net/ethernet/broadcom/bnxt/bnxt_dcb.c +1
-1-memcpy (&cos2bw.cfg, data,sizeof (cos2bw.cfg)); +memcpy (&cos2bw.cfg, &data->cfg,sizeof (cos2bw.cfg));if (i ==0 ) cos2bw.queue_id = resp->queue_id0;Neat trick, but seems like casting to the destination type should really be the last resort. There's only a handful of members in this struct, IMHO assigning member by member is cleaner.
But I'll defer to Michael.
The way I plan to fix this is to change the auto-generated struct hwrm_queue_cos2bw_qcfg_output to have an array of substruct. I think that will look the cleanest. I'll post it later today or tomorrow.
Re: [PATCH net-next 1/2] eth: bnxt: fix one of the W=1 warnings about fortified memcpy()
Quoted 4 lines · Michael Chan
The way I plan to fix this is to change the auto-generated struct
hwrm_queue_cos2bw_qcfg_outputto have an array of substruct. I think that will look the cleanest. I'll post it later today or tomorrow.
Will that also fix the -Wstringop-overflow warning I mentioned in my previous reply?
drivers/net/ethernet/broadcom/bnxt/bnxt_dcb.c:133:17: warning: writing 12 bytes into a region of size 1 [-Wstringop-overflow=]
--
Gustavo
Michael Chan
maintainerRe: [PATCH net-next 1/2] eth: bnxt: fix one of the W=1 warnings about fortified memcpy()
Quoted 5 lines · Gustavo A. R. Silva
Quoted 1 line · Michael Chan
Quoted 9 lines
Quoted 3 lines
The way I plan to fix this is to change the auto-generated struct
hwrm_queue_cos2bw_qcfg_outputto have an array of substruct. I think that will look the cleanest. I'll post it later today or tomorrow.Will that also fix the -Wstringop-overflow warning I mentioned in my previous reply?
drivers/net/ethernet/broadcom/bnxt/bnxt_dcb.c:133:17: warning: writing 12 bytes into a region of size 1 [-Wstringop-overflow=]
Yes, I will fix the other similar struct hwrm_queue_cos2bw_cfg_input in a similar way with an array of substruct. Thanks.
Re: [PATCH net-next 1/2] eth: bnxt: fix one of the W=1 warnings about fortified memcpy()
Quoted 11 lines · Michael Chan
Quoted 9 lines · Gustavo A. R. Silva
Quoted 4 lines · Michael Chan
The way I plan to fix this is to change the auto-generated struct
hwrm_queue_cos2bw_qcfg_outputto have an array of substruct. I think that will look the cleanest. I'll post it later today or tomorrow.
Quoted 8 lines
Quoted 5 lines
Will that also fix the -Wstringop-overflow warning I mentioned in my previous reply?
drivers/net/ethernet/broadcom/bnxt/bnxt_dcb.c:133:17: warning: writing 12 bytes into a region of size 1 [-Wstringop-overflow=]Yes, I will fix the other similar struct
hwrm_queue_cos2bw_cfg_inputin a similar way with an array of substruct. Thanks.
Awesome! :)
Thank you
--
Gustavo
Jakub Kicinski
maintainerPATCH 2/2 eth: bnxt: fix warning for define in struct_group
In reply to Jakub KicinskiFix C=1 warning with sparse 0.6.4:
drivers/net/ethernet/broadcom/bnxt/bnxt.c: note: in included file:drivers/net/ethernet/broadcom/bnxt/bnxt_dcb.h:30:1: warning: directive in macro's argument list
Don't put defines in a struct_group().
---
CC: [email protected]
--- drivers/net/ethernet/broadcom/bnxt/bnxt_dcb.h | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
drivers/net/ethernet/broadcom/bnxt/bnxt_dcb.h +2 -1
@@ -27,11 +27,12 @@ struct bnxt_cos2bw_cfg {u8 queue_id;__le32 min_bw;__le32 max_bw; -#define BW_VALUE_UNIT_PERCENT1_100 (0x1UL << 29)u8 tsa;u8 pri_lvl;u8 bw_weight; ); +/* for min_bw / max_bw */ +#define BW_VALUE_UNIT_PERCENT1_100 (0x1UL << 29)u8 unused; };
Signature · 1 line
2.41.0
Quoted 11 lines · Jakub Kicinski
Fix a couple of build warnings.
Jakub Kicinski (2):
eth: bnxt: fix one of the W=1 warnings about fortifiedmemcpy()
eth: bnxt: fix warning for define instruct_groupdrivers/net/ethernet/broadcom/bnxt/bnxt_dcb.c | 2 +- drivers/net/ethernet/broadcom/bnxt/bnxt_dcb.h | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-)
For the series,
I will look into the other issue that you mentioned. Thanks.
This series was applied to netdev/net-next.git (main) by Jakub Kicinski <[email protected]>:
Hello:
This series was applied to netdev/net-next.git (main) by Jakub Kicinski <[email protected]>:
Quoted 9 lines · On Thu, 27 Jul 2023 12:07:24 -0700 you wrote:
Fix a couple of build warnings.
Jakub Kicinski (2):
eth: bnxt: fix one of the W=1 warnings about fortifiedmemcpy()
eth: bnxt: fix warning for define instruct_groupdrivers/net/ethernet/broadcom/bnxt/bnxt_dcb.c | 2 +- drivers/net/ethernet/broadcom/bnxt/bnxt_dcb.h | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-)
Here is the summary with links:
- [net-next,1/2] eth: bnxt: fix one of the W=1 warnings about fortified memcpy()
https://git.kernel.org/netdev/net-next/c/833c4a8105ac - [net-next,2/2] eth: bnxt: fix warning for define in struct_group https://git.kernel.org/netdev/net-next/c/9f49db62f58e
You are awesome, thank you!
Signature · 2 lines
Deet-doot-dot, I am a bot. https://korg.docs.kernel.org/patchwork/pwbot.html