netdev - Re: [PATCH net v2] r8169: skip DASH fw status checks when DASH is disabled

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] [thread-next>] [day] [month] [year] [list]

Message-ID: <1c02e074-5511-4c4b-b9f3-b280d3d75a93@gmail.com>
Date: Thu, 28 Mar 2024 07:49:46 +0100
From: Heiner Kallweit <hkallweit1@...il.com>
To: Atlas Yu <atlas.yu@...onical.com>, nic_swsd@...ltek.com,
 davem@...emloft.net, edumazet@...gle.com, kuba@...nel.org, pabeni@...hat.com
Cc: netdev@...r.kernel.org
Subject: Re: [PATCH net v2] r8169: skip DASH fw status checks when DASH is
 disabled

On 28.03.2024 06:51, Atlas Yu wrote:
> On devices that support DASH, the current code in the "rtl_loop_wait" function
> raises false alarms when DASH is disabled. This occurs because the function
> attempts to wait for the DASH firmware to be ready, even though it's not
> relevant in this case.
> 
> r8169 0000:0c:00.0 eth0: RTL8168ep/8111ep, 38:7c:76:49:08:d9, XID 502, IRQ 86
> r8169 0000:0c:00.0 eth0: jumbo features [frames: 9194 bytes, tx checksumming: ko]
> r8169 0000:0c:00.0 eth0: DASH disabled
> ...
> r8169 0000:0c:00.0 eth0: rtl_ep_ocp_read_cond == 0 (loop: 30, delay: 10000).
> 
> This patch modifies the driver start/stop functions to skip checking the DASH
> firmware status when DASH is explicitly disabled. This prevents unnecessary
> delays and false alarms.
> 
> The patch has been tested on several ThinkStation P8/PX workstations.
> 
> Fixes: 0ab0c45d8aae ("r8169: add handling DASH when DASH is disabled")
> Signed-off-by: Atlas Yu <atlas.yu@...onical.com>

You sent a v2 already, so I think this is v3. And the change log is missing.
But as the change is more or less trivial, no need to resubmit IMO.

> ---
>  drivers/net/ethernet/realtek/r8169_main.c | 31 ++++++++++++++++++++---
>  1 file changed, 27 insertions(+), 4 deletions(-)
> 
> diff --git a/drivers/net/ethernet/realtek/r8169_main.c b/drivers/net/ethernet/realtek/r8169_main.c
> index 5c879a5c86d7..4ac444eb269f 100644
> --- a/drivers/net/ethernet/realtek/r8169_main.c
> +++ b/drivers/net/ethernet/realtek/r8169_main.c
> @@ -1314,17 +1314,40 @@ static void rtl8168ep_stop_cmac(struct rtl8169_private *tp)
>  	RTL_W8(tp, IBCR0, RTL_R8(tp, IBCR0) & ~0x01);
>  }
>  
> +static void rtl_dash_loop_wait(struct rtl8169_private *tp,
> +			       const struct rtl_cond *c,
> +			       unsigned long usecs, int n, bool high)
> +{
> +	if (!tp->dash_enabled)
> +		return;
> +	rtl_loop_wait(tp, c, usecs, n, high);
> +}
> +
> +static void rtl_dash_loop_wait_high(struct rtl8169_private *tp,
> +				    const struct rtl_cond *c,
> +				    unsigned long d, int n)
> +{
> +	rtl_dash_loop_wait(tp, c, d, n, true);
> +}
> +
> +static void rtl_dash_loop_wait_low(struct rtl8169_private *tp,
> +				   const struct rtl_cond *c,
> +				   unsigned long d, int n)
> +{
> +	rtl_dash_loop_wait(tp, c, d, n, false);
> +}
> +
>  static void rtl8168dp_driver_start(struct rtl8169_private *tp)
>  {
>  	r8168dp_oob_notify(tp, OOB_CMD_DRIVER_START);
> -	rtl_loop_wait_high(tp, &rtl_dp_ocp_read_cond, 10000, 10);
> +	rtl_dash_loop_wait_high(tp, &rtl_dp_ocp_read_cond, 10000, 10);
>  }
>  
>  static void rtl8168ep_driver_start(struct rtl8169_private *tp)
>  {
>  	r8168ep_ocp_write(tp, 0x01, 0x180, OOB_CMD_DRIVER_START);
>  	r8168ep_ocp_write(tp, 0x01, 0x30, r8168ep_ocp_read(tp, 0x30) | 0x01);
> -	rtl_loop_wait_high(tp, &rtl_ep_ocp_read_cond, 10000, 30);
> +	rtl_dash_loop_wait_high(tp, &rtl_ep_ocp_read_cond, 10000, 30);
>  }
>  
>  static void rtl8168_driver_start(struct rtl8169_private *tp)
> @@ -1338,7 +1361,7 @@ static void rtl8168_driver_start(struct rtl8169_private *tp)
>  static void rtl8168dp_driver_stop(struct rtl8169_private *tp)
>  {
>  	r8168dp_oob_notify(tp, OOB_CMD_DRIVER_STOP);
> -	rtl_loop_wait_low(tp, &rtl_dp_ocp_read_cond, 10000, 10);
> +	rtl_dash_loop_wait_low(tp, &rtl_dp_ocp_read_cond, 10000, 10);
>  }
>  
>  static void rtl8168ep_driver_stop(struct rtl8169_private *tp)
> @@ -1346,7 +1369,7 @@ static void rtl8168ep_driver_stop(struct rtl8169_private *tp)
>  	rtl8168ep_stop_cmac(tp);
>  	r8168ep_ocp_write(tp, 0x01, 0x180, OOB_CMD_DRIVER_STOP);
>  	r8168ep_ocp_write(tp, 0x01, 0x30, r8168ep_ocp_read(tp, 0x30) | 0x01);
> -	rtl_loop_wait_low(tp, &rtl_ep_ocp_read_cond, 10000, 10);
> +	rtl_dash_loop_wait_low(tp, &rtl_ep_ocp_read_cond, 10000, 10);
>  }
>  
>  static void rtl8168_driver_stop(struct rtl8169_private *tp)

Reviewed-by: Heiner Kallweit <hkallweit1@...il.com>