[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-ID: <f6c90a57-0cd6-4e26-9250-8a63d043e252@embeddedor.com>
Date: Tue, 29 Oct 2024 10:55:14 -0600
From: "Gustavo A. R. Silva" <gustavo@...eddedor.com>
To: Jakub Kicinski <kuba@...nel.org>,
"Gustavo A. R. Silva" <gustavoars@...nel.org>
Cc: Michael Chan <michael.chan@...adcom.com>,
Andrew Lunn <andrew+netdev@...n.ch>, "David S. Miller"
<davem@...emloft.net>, Eric Dumazet <edumazet@...gle.com>,
Paolo Abeni <pabeni@...hat.com>, Potnuri Bharat Teja <bharat@...lsio.com>,
Christian Benvenuti <benve@...co.com>, Satish Kharat <satishkh@...co.com>,
Manish Chopra <manishc@...vell.com>, netdev@...r.kernel.org,
linux-kernel@...r.kernel.org, linux-hardening@...r.kernel.org
Subject: Re: [PATCH 2/2][next] net: ethtool: Avoid thousands of
-Wflex-array-member-not-at-end warnings
On 29/10/24 07:58, Jakub Kicinski wrote:
> On Mon, 21 Oct 2024 13:02:27 -0600 Gustavo A. R. Silva wrote:
>> @@ -3025,7 +3025,7 @@ static int bnxt_set_link_ksettings(struct net_device *dev,
>> {
>> struct bnxt *bp = netdev_priv(dev);
>> struct bnxt_link_info *link_info = &bp->link_info;
>> - const struct ethtool_link_settings *base = &lk_ksettings->base;
>> + const struct ethtool_link_settings_hdr *base = &lk_ksettings->base;
>
> Please improve the variable ordering while at it. Longest list first,
> so move the @base definition first.
OK. This would end up looking like:
const struct ethtool_link_settings_hdr *base = &lk_ksettings->base;
struct bnxt *bp = netdev_priv(dev);
struct bnxt_link_info *link_info = &bp->link_info;
>
>> bool set_pause = false;
>> u32 speed, lanes = 0;
>> int rc = 0;
>> diff --git a/drivers/net/ethernet/chelsio/cxgb4/cxgb4_ethtool.c b/drivers/net/ethernet/chelsio/cxgb4/cxgb4_ethtool.c
>> index 7f3f5afa864f..cc43294bdc96 100644
>> --- a/drivers/net/ethernet/chelsio/cxgb4/cxgb4_ethtool.c
>> +++ b/drivers/net/ethernet/chelsio/cxgb4/cxgb4_ethtool.c
>> @@ -663,7 +663,7 @@ static int get_link_ksettings(struct net_device *dev,
>> struct ethtool_link_ksettings *link_ksettings)
>> {
>> struct port_info *pi = netdev_priv(dev);
>> - struct ethtool_link_settings *base = &link_ksettings->base;
>> + struct ethtool_link_settings_hdr *base = &link_ksettings->base;
>
> ditto
>
>> /* For the nonce, the Firmware doesn't send up Port State changes
>> * when the Virtual Interface attached to the Port is down. So
>> @@ -719,7 +719,7 @@ static int set_link_ksettings(struct net_device *dev,
>> {
>> struct port_info *pi = netdev_priv(dev);
>> struct link_config *lc = &pi->link_cfg;
>> - const struct ethtool_link_settings *base = &link_ksettings->base;
>> + const struct ethtool_link_settings_hdr *base = &link_ksettings->base;
>
> and here
>
>> struct link_config old_lc;
>> unsigned int fw_caps;
>> int ret = 0;
>> diff --git a/drivers/net/ethernet/chelsio/cxgb4vf/cxgb4vf_main.c b/drivers/net/ethernet/chelsio/cxgb4vf/cxgb4vf_main.c
>> index 2fbe0f059a0b..0d85ac342ac7 100644
>> --- a/drivers/net/ethernet/chelsio/cxgb4vf/cxgb4vf_main.c
>> +++ b/drivers/net/ethernet/chelsio/cxgb4vf/cxgb4vf_main.c
>> @@ -1437,7 +1437,7 @@ static int cxgb4vf_get_link_ksettings(struct net_device *dev,
>> struct ethtool_link_ksettings *link_ksettings)
>> {
>> struct port_info *pi = netdev_priv(dev);
>> - struct ethtool_link_settings *base = &link_ksettings->base;
>> + struct ethtool_link_settings_hdr *base = &link_ksettings->base;
>
> and here
>
>> /* For the nonce, the Firmware doesn't send up Port State changes
>> * when the Virtual Interface attached to the Port is down. So
>> diff --git a/drivers/net/ethernet/cisco/enic/enic_ethtool.c b/drivers/net/ethernet/cisco/enic/enic_ethtool.c
>> index f7986f2b6a17..8670eb394fad 100644
>> --- a/drivers/net/ethernet/cisco/enic/enic_ethtool.c
>> +++ b/drivers/net/ethernet/cisco/enic/enic_ethtool.c
>> @@ -130,7 +130,7 @@ static int enic_get_ksettings(struct net_device *netdev,
>> struct ethtool_link_ksettings *ecmd)
>> {
>> struct enic *enic = netdev_priv(netdev);
>> - struct ethtool_link_settings *base = &ecmd->base;
>> + struct ethtool_link_settings_hdr *base = &ecmd->base;
>
> and here
>
>> ethtool_link_ksettings_add_link_mode(ecmd, supported,
>> 10000baseT_Full);
>
>> @@ -62,7 +62,7 @@ static int linkmodes_reply_size(const struct ethnl_req_info *req_base,
>> {
>> const struct linkmodes_reply_data *data = LINKMODES_REPDATA(reply_base);
>> const struct ethtool_link_ksettings *ksettings = &data->ksettings;
>> - const struct ethtool_link_settings *lsettings = &ksettings->base;
>> + const struct ethtool_link_settings_hdr *lsettings = &ksettings->base;
>
> here it was correct and now its not
I don't think you want to change this. `lsettings` is based on `ksettings`. So,
`ksettings` should go first. The same scenario for the one below.
>
>> bool compact = req_base->flags & ETHTOOL_FLAG_COMPACT_BITSETS;
>> int len, ret;
>>
>> @@ -103,7 +103,7 @@ static int linkmodes_fill_reply(struct sk_buff *skb,
>> {
>> const struct linkmodes_reply_data *data = LINKMODES_REPDATA(reply_base);
>> const struct ethtool_link_ksettings *ksettings = &data->ksettings;
>> - const struct ethtool_link_settings *lsettings = &ksettings->base;
>> + const struct ethtool_link_settings_hdr *lsettings = &ksettings->base;
>
> same
>
>> bool compact = req_base->flags & ETHTOOL_FLAG_COMPACT_BITSETS;
>> int ret;
>
Powered by blists - more mailing lists