Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20;
Date:   Thu, 1 Jun 2023 17:55:21 +0200
From:   Simon Horman <simon.horman@corigine.com>
To:     Justin Chen <justin.chen@broadcom.com>
Cc:     netdev@vger.kernel.org, linux-kernel@vger.kernel.org,
        davem@davemloft.net, edumazet@google.com, kuba@kernel.org,
        pabeni@redhat.com, bcm-kernel-feedback-list@broadcom.com,
        florian.fainelli@broadcom.com,
        Daniil Tatianin <d-tatianin@yandex-team.ru>,
        Andrew Lunn <andrew@lunn.ch>
Subject: Re: [PATCH net-next] ethtool: ioctl: improve error checking for
 set_wol
Message-ID: <ZHi/aT6vxpdOryD8@corigine.com>
References: <1685566429-2869-1-git-send-email-justin.chen@broadcom.com>
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
In-Reply-To: <1685566429-2869-1-git-send-email-justin.chen@broadcom.com>
MIME-Version: 1.0
X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?YbhbfJijaH0f8ZFxHUYVxr6dUB4/Fg4rIYFho81AFMbIrcRT2ROvv9Wen3LD?=
 =?us-ascii?Q?gnm/FqhAHRvU/NHU8NELf5aAz1DNSkG5jt6dwS4RzeEhuOPInOln/wG0LWy0?=
 =?us-ascii?Q?CL9BHEpD+tjg5k2euFbmaJFkSBjSW2tpolSKuoLSu9C24PJtrnmGEXxjnC89?=
 =?us-ascii?Q?Qi3R7uxD4Xxj4wvQRC5PhZuuQKsY1kbfuUkm6mrX297KWf0OyWzxhZwzD5WK?=
 =?us-ascii?Q?PJvpmI9gyH9CIxSaBTSlS+qRHMx929EPpAqYaanuNYcr0BvHPMtTyCYUOkQg?=
 =?us-ascii?Q?wwzBkbpaq8E29B3H+LLTubPhWgSJO8M7FNZyuA23TpgmycZHWqDbieUj7dpf?=
 =?us-ascii?Q?idnF1j0hkzEHj0sxIw60G9lHPpC98P5MtZ5xlfGqTdsHXgdYJ9xPAvxIf69v?=
 =?us-ascii?Q?d2bM0E4kKdgweWPoRQGiH5pSlvdq5eTj0PEa9D1HN26aSfshVNWKUp30z0ft?=
 =?us-ascii?Q?tpof/4CvMGqbmXtEQwv3i/dFQgGqyI342y4ZXCz2Qs6smHFc0eEQ9ox+y2ul?=
 =?us-ascii?Q?4L+9Yrggr/KpHUH6oqfaSUKfRIjdJnKv4pbPEFiSg6qQ6CgYVnmC4X+h0SF4?=
 =?us-ascii?Q?1DvkuziMrSCc8L7uPzl5lWnR+28xLFgbhNAIDQn5JKr5dRpsWW+emb2h0ex+?=
 =?us-ascii?Q?wetoMPrIvH2y4i+HzDrELitMgSSY3HbaUPT6l19cEYwyCEhD1djgEi8N6aPq?=
 =?us-ascii?Q?A/9mILqZzWo8kFFkDg51zGxHTPHv0xXutUe1t5S5QQtcZqhviJra2YB5svxZ?=
 =?us-ascii?Q?IgnMvHL9tSbzB3P3y0ilKqbYp8D8rSE/rWICRHqnpDieyEBGUB1d8Pt76aBb?=
 =?us-ascii?Q?P5+jkL+pBObqR8pv2e0gSJHmI+V/5l/oRQNMbWx61oHCtvWyOApy6kIk7FBw?=
 =?us-ascii?Q?CKB4ASPTuOkcbKooKPvNLx9KC86wcuvD7dK2TSyt7Xk3JcMCO8ulD1y95pjJ?=
 =?us-ascii?Q?WhKD481Rc6bJ62PUpSH+h+dEvLqpafc9P7bAEAnw4vQAecmv1MlHskNiwBig?=
 =?us-ascii?Q?rcJHeETYXfh4CPDSsNI8PU6kEBF8kxGO1HQ4AS9imKKvSPxFlNXCMLNbuCtE?=
 =?us-ascii?Q?r7V55IiKGHzepVg51udJbY+J5pzfg8/edJS6uL4sz4xyB95zl34blAxsmZHB?=
 =?us-ascii?Q?QkknfP+32yR/RMrU+ZsGqTqx4ScOe6upcI9/UPllup+hHZ9G6kXAlSOG5f4V?=
 =?us-ascii?Q?0veE/JM2nsCPy03YaOxRCU2ZaWxTg4IF1uRlkLvgKUtaudYXuSwm2ScSGaaN?=
 =?us-ascii?Q?/oLbGhFGDsya1eU/0G60ZhwMjC6fs+WJoeMghNLtSr5QakJhYk7D83vDGanl?=
 =?us-ascii?Q?yoKFDKkKIik4DE0VCgw13lLpSlMsbvP0TczbIcrw41rLVPYggu6dlNI+5K3t?=
 =?us-ascii?Q?gakuddQy+a0QkdJAdW5eilBdrS0GjEL/SdxYYDPN58s4QXZ96q/BkWZEqlSo?=
 =?us-ascii?Q?oPih7vCtzp/xO/HVjB5cymQX6hyLDX+1JlC5UJceHOBYzWqJU6Eh2OkerLEH?=
 =?us-ascii?Q?nwGxFGCcintyYZtCp+3rlMLVx+6gvc8Za9BRV5bK5FwJlqswRZihwRfzp17x?=
 =?us-ascii?Q?+WD1+I5QaVICPxrx6RMvsX+uF4+K8BZsju0+FTkkA0hHKxwVMz+N8XaQU/gi?=
 =?us-ascii?Q?wQ=3D=3D?=
X-OriginatorOrg: corigine.com
X-MS-Exchange-CrossTenant-Network-Message-Id: 153d3ecb-3d36-4cd9-7199-08db62b89ea8
X-MS-Exchange-CrossTenant-AuthSource: PH0PR13MB4842.namprd13.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 01 Jun 2023 15:55:27.9602
 (UTC)
X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted
X-MS-Exchange-CrossTenant-Id: fe128f2c-073b-4c20-818e-7246a585940c
X-MS-Exchange-CrossTenant-MailboxType: HOSTED
X-MS-Exchange-CrossTenant-UserPrincipalName: w0Fy7jOkKrcZRx3InXO+YqGk0Py/czLrLNki27DCPd49Z06MU27TxkoRMZaOzD4KEZMtgvdO5ltmcneLsxUzvaqJZ76xZX7xxyhrX6j0tgI=
X-MS-Exchange-Transport-CrossTenantHeadersStamped: PH0PR13MB5764
X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,DKIM_SIGNED,
        DKIM_VALID,RCVD_IN_DNSWL_NONE,RCVD_IN_MSPIKE_H2,SPF_HELO_PASS,SPF_PASS,
        T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6
X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on
        lindbergh.monkeyblade.net
Precedence: bulk
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

+ Daniil Tatianin <d-tatianin@yandex-team.ru>, Andrew Lunn <andrew@lunn.ch>
  as per ./scripts/get_maintainer.pl --git-min-percent 25 net/ethtool/ioctl.c

On Wed, May 31, 2023 at 01:53:49PM -0700, Justin Chen wrote:
> The netlink version of set_wol checks for not supported wolopts and avoids
> setting wol when the correct wolopt is already set. If we do the same with
> the ioctl version then we can remove these checks from the driver layer.

Hi Justin,

Are you planning follow-up patches for the driver layer?

> Signed-off-by: Justin Chen <justin.chen@broadcom.com>
> ---
>  net/ethtool/ioctl.c | 14 ++++++++++++--
>  1 file changed, 12 insertions(+), 2 deletions(-)
> 
> diff --git a/net/ethtool/ioctl.c b/net/ethtool/ioctl.c
> index 6bb778e10461..80f456f83db0 100644
> --- a/net/ethtool/ioctl.c
> +++ b/net/ethtool/ioctl.c
> @@ -1436,15 +1436,25 @@ static int ethtool_get_wol(struct net_device *dev, char __user *useraddr)
>  
>  static int ethtool_set_wol(struct net_device *dev, char __user *useraddr)
>  {
> -	struct ethtool_wolinfo wol;
> +	struct ethtool_wolinfo wol, cur_wol;
>  	int ret;
>  
> -	if (!dev->ethtool_ops->set_wol)
> +	if (!dev->ethtool_ops->get_wol || !dev->ethtool_ops->set_wol)
>  		return -EOPNOTSUPP;

Are there cases where (in-tree) drivers provide set_wol byt not get_wol?
If so, does this break their set_wol support?

>  
> +	memset(&cur_wol, 0, sizeof(struct ethtool_wolinfo));
> +	cur_wol.cmd = ETHTOOL_GWOL;
> +	dev->ethtool_ops->get_wol(dev, &cur_wol);
> +
>  	if (copy_from_user(&wol, useraddr, sizeof(wol)))
>  		return -EFAULT;
>  
> +	if (wol.wolopts & ~cur_wol.supported)
> +		return -EOPNOTSUPP;
> +
> +	if (wol.wolopts == cur_wol.wolopts)
> +		return 0;
> +
>  	ret = dev->ethtool_ops->set_wol(dev, &wol);
>  	if (ret)
>  		return ret;