From: Cristobal Forno <cforno12@linux.vnet.ibm.com>
To: Michal Kubecek <mkubecek@suse.cz>, netdev@vger.kernel.org
Cc: Thomas Falcon <tlfalcon@linux.ibm.com>,
mst@redhat.com, jasowang@redhat.com, haiyangz@microsoft.com,
sthemmin@microsoft.com, sashal@kernel.org,
David Miller <davem@davemloft.net>,
Jakub Kicinski <jakub.kicinski@netronome.com>
Subject: Re: [PATCH, net-next, v3, 1/2] Three virtual devices (ibmveth, virtio_net, and netvsc) all have similar code to set/get link settings and validate ethtool command. To eliminate duplication of code, it is factored out into core/ethtool.c.
Date: Tue, 7 Jan 2020 11:40:22 -0600 [thread overview]
Message-ID: <27f4902c-d731-d215-14b9-d490cdd8b86d@linux.vnet.ibm.com> (raw)
In-Reply-To: <20191220070418.GE21614@unicorn.suse.cz>
Thanks for your suggestion Micheal and Thomas. This will be included in
the next version of the patch series.
-Cris Forno
On 20/12/2019 01:04, Michal Kubecek wrote:
> On Thu, Dec 19, 2019 at 07:26:14PM -0600, Thomas Falcon wrote:
>> On 12/19/19 4:36 PM, Michal Kubecek wrote:
>>> On Thu, Dec 19, 2019 at 01:40:56PM -0600, Cris Forno wrote:
> [...]
>>>> @@ -579,6 +579,32 @@ static int load_link_ksettings_from_user(struct ethtool_link_ksettings *to,
>>>> return 0;
>>>> }
>>>> +/* Check if the user is trying to change anything besides speed/duplex */
>>>> +static bool
>>>> +ethtool_virtdev_validate_cmd(const struct ethtool_link_ksettings *cmd)
>>>> +{
>>>> + struct ethtool_link_ksettings diff1 = *cmd;
>>>> + struct ethtool_link_ksettings diff2 = {};
>>>> +
>>>> + /* cmd is always set so we need to clear it, validate the port type
>>>> + * and also without autonegotiation we can ignore advertising
>>>> + */
>>>> + diff1.base.speed = 0;
>>>> + diff2.base.port = PORT_OTHER;
>>>> + ethtool_link_ksettings_zero_link_mode(&diff1, advertising);
>>>> + diff1.base.duplex = 0;
>>>> + diff1.base.cmd = 0;
>>>> + diff1.base.link_mode_masks_nwords = 0;
>>>> +
>>>> + return !memcmp(&diff1.base, &diff2.base, sizeof(diff1.base)) &&
>>>> + bitmap_empty(diff1.link_modes.supported,
>>>> + __ETHTOOL_LINK_MODE_MASK_NBITS) &&
>>>> + bitmap_empty(diff1.link_modes.advertising,
>>>> + __ETHTOOL_LINK_MODE_MASK_NBITS) &&
>>> Isn't this condition always true? You zeroed the advertising bitmap
>>> above. Could you just omit this part and clearing of advertising above?
>>>
>>>> + bitmap_empty(diff1.link_modes.lp_advertising,
>>>> + __ETHTOOL_LINK_MODE_MASK_NBITS);
>>>> +}
>>> Another idea: instead of zeroing parts of diff1, you could copy these
>>> members from *cmd to diff2 and compare cmd->base with diff2.base. You
>>> could then drop diff1. And you wouldn't even need whole struct
>>> ethtool_link_ksettings for diff2 as you only compare embedded struct
>>> ethtool_link_settings (and check two bitmaps in cmd->link_modes).
>> If I understand your suggestion correctly, then the validate function might
>> look something like this?
>>
>> /* Check if the user is trying to change anything besides speed/duplex */
>> static bool
>> ethtool_virtdev_validate_cmd(const struct ethtool_link_ksettings *cmd)
>> {
>> struct ethtool_link_settings base2 = {};
>>
>> base2.speed = cmd->base.speed;
>> base2.port = PORT_OTHER;
>> base2.duplex = cmd->base.duplex;
>> base2.cmd = cmd->base.cmd;
>> base2.link_mode_masks_nwords = cmd->base.link_mode_masks_nwords;
>>
>> return !memcmp(&base2, cmd->base, sizeof(base2)) &&
>> bitmap_empty(cmd->link_modes.supported,
>> __ETHTOOL_LINK_MODE_MASK_NBITS) &&
>> bitmap_empty(cmd->link_modes.lp_advertising,
>> __ETHTOOL_LINK_MODE_MASK_NBITS);
>> }
> Yes, that is what I wanted to suggest (the second argument of memcmp()
> should be "&cmd->base", I think).
>
> Michal
next prev parent reply other threads:[~2020-01-07 17:40 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-12-19 19:40 [PATCH, net-next, v3, 0/2] net/ethtool: Introduce link_ksettings API for virtual network devices Cris Forno
2019-12-19 19:40 ` [PATCH, net-next, v3, 1/2] Three virtual devices (ibmveth, virtio_net, and netvsc) all have similar code to set/get link settings and validate ethtool command. To eliminate duplication of code, it is factored out into core/ethtool.c Cris Forno
2019-12-19 22:36 ` Michal Kubecek
2019-12-20 1:26 ` Thomas Falcon
2019-12-20 7:04 ` Michal Kubecek
2020-01-07 17:40 ` Cristobal Forno [this message]
2019-12-19 19:40 ` [PATCH, net-next, v3, 2/2] With get/set link settings functions in core/ethtool.c, ibmveth, netvsc, and virtio now use the core's helper function Cris Forno
2019-12-19 21:11 ` [PATCH, net-next, v3, 0/2] net/ethtool: Introduce link_ksettings API for virtual network devices Stephen Hemminger
2019-12-19 22:16 ` David Miller
2019-12-20 3:29 ` Stephen Hemminger
2019-12-20 22:53 ` David Miller
2019-12-20 3:58 ` Stephen Hemminger
2019-12-20 22:30 ` Stephen Hemminger
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=27f4902c-d731-d215-14b9-d490cdd8b86d@linux.vnet.ibm.com \
--to=cforno12@linux.vnet.ibm.com \
--cc=davem@davemloft.net \
--cc=haiyangz@microsoft.com \
--cc=jakub.kicinski@netronome.com \
--cc=jasowang@redhat.com \
--cc=mkubecek@suse.cz \
--cc=mst@redhat.com \
--cc=netdev@vger.kernel.org \
--cc=sashal@kernel.org \
--cc=sthemmin@microsoft.com \
--cc=tlfalcon@linux.ibm.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).