netdev - Re: [PATCH net-next v6 5/7] net: ethtool: Add new power limit get and set features

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [day] [month] [year] [list]

Message-ID: <20240709152041.7493ffc5@kmaincent-XPS-13-7390>
Date: Tue, 9 Jul 2024 15:20:41 +0200
From: Kory Maincent <kory.maincent@...tlin.com>
To: Jakub Kicinski <kuba@...nel.org>
Cc: "David S. Miller" <davem@...emloft.net>, Eric Dumazet
 <edumazet@...gle.com>, Paolo Abeni <pabeni@...hat.com>, Donald Hunter
 <donald.hunter@...il.com>, Oleksij Rempel <o.rempel@...gutronix.de>,
 Jonathan Corbet <corbet@....net>, Thomas Petazzoni
 <thomas.petazzoni@...tlin.com>, linux-kernel@...r.kernel.org,
 netdev@...r.kernel.org, Dent Project <dentproject@...uxfoundation.org>,
 kernel@...gutronix.de, linux-doc@...r.kernel.org
Subject: Re: [PATCH net-next v6 5/7] net: ethtool: Add new power limit get
 and set features

On Mon, 8 Jul 2024 11:33:00 -0700
Jakub Kicinski <kuba@...nel.org> wrote:

> On Mon, 8 Jul 2024 11:38:46 +0200 Kory Maincent wrote:
>  [...]  
>  [...]  
> 
> Don't worry I understand the code well enough to resolve any conflicts
> (famous last words?). And if we fix as part of ethnl_set_pse_validate()
> then there's no conflict, AFAICT.

As you can see in the patch I just sent
https://lore.kernel.org/netdev/20240709131201.166421-1-kory.maincent@bootlin.com/T/#u
the fix is not in set_pse_validate() therefore you will have a merge conflict.

You could do this to solve the merge conflict:
--- a/net/ethtool/pse-pd.c
+++ b/net/ethtool/pse-pd.c
@@ -256,6 +256,7 @@ static int
 ethnl_set_pse(struct ethnl_req_info *req_info, struct genl_info *info)
 {
        struct net_device *dev = req_info->dev;
+       struct pse_control_config config = {};
        struct nlattr **tb = info->attrs;
        struct phy_device *phydev;
        int ret = 0;
@@ -273,15 +274,13 @@ ethnl_set_pse(struct ethnl_req_info *req_info, struct genl_info *info)
        }

        /* These values are already validated by the ethnl_pse_set_policy */
+       if (tb[ETHTOOL_A_PODL_PSE_ADMIN_CONTROL])
+               config.podl_admin_control = nla_get_u32(tb[ETHTOOL_A_PODL_PSE_ADMIN_CONTROL]);
+       if (tb[ETHTOOL_A_C33_PSE_ADMIN_CONTROL])
+               config.c33_admin_control = nla_get_u32(tb[ETHTOOL_A_C33_PSE_ADMIN_CONTROL]);
+
        if (tb[ETHTOOL_A_PODL_PSE_ADMIN_CONTROL] ||
            tb[ETHTOOL_A_C33_PSE_ADMIN_CONTROL]) {
-               struct pse_control_config config = {};
-
-               if (pse_has_podl(phydev->psec))
-                       config.podl_admin_control = nla_get_u32(tb[ETHTOOL_A_PODL_PSE_ADMIN_CONTROL]);
-               if (pse_has_c33(phydev->psec))
-                       config.c33_admin_control = nla_get_u32(tb[ETHTOOL_A_C33_PSE_ADMIN_CONTROL]);
-
                ret = pse_ethtool_set_config(phydev->psec, info->extack,
                                             &config);
                if (ret)

Regards,
-- 
Köry Maincent, Bootlin
Embedded Linux and kernel engineering
https://bootlin.com