From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mx01.omp.ru (mx01.omp.ru [90.154.21.10]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id CBBDD2B9A4; Wed, 22 Jan 2025 18:53:16 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=90.154.21.10 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1737572000; cv=none; b=JYdubgJrvrMKLUl//FqD0AnaCf0CO1+GneL2oUmnVdMLxAOM7x8fDpmUjuwXQb+VikDjG308u3DYKk+XR7ZmkAelIlAS/BT8BrzClsPYY8vscN7HZC4Ff4/b+d5mK7795fy6vxr5ZXOKi4vwPk/rgTMD5lvHBciR2vRPEZuYiH4= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1737572000; c=relaxed/simple; bh=jTgt7ZT16DFHxck9Z41Awr89XcMluiZq0812Zd1T5CQ=; h=Message-ID:Date:MIME-Version:Subject:From:To:CC:References: In-Reply-To:Content-Type; b=QSc8FcOngzZOG0joUbU+yxtoNat5ihpNbWiK1PsvISyUZTzjMDt7ojzzpmZR7eBdYZ/aS/0uGRm/JQZM9BoHHSCRkIa5HCClll30wLTKQ73zCosZ8hJyiZUu6HfZKlt3yHz5HLvBVI9G1O/SzMFEHQQZOEbQNFdauKYCq+XK6Cc= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=omp.ru; spf=pass smtp.mailfrom=omp.ru; arc=none smtp.client-ip=90.154.21.10 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=omp.ru Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=omp.ru Received: from [192.168.2.102] (213.87.159.248) by msexch01.omp.ru (10.188.4.12) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384) id 15.2.1258.12; Wed, 22 Jan 2025 21:53:05 +0300 Message-ID: Date: Wed, 22 Jan 2025 21:53:02 +0300 Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Subject: Re: [PATCH net 1/2] net: ravb: Fix missing rtnl lock in suspend path From: Sergey Shtylyov To: Kory Maincent , Paul Barker , =?UTF-8?Q?Niklas_S=C3=B6derlund?= , Andrew Lunn , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Mikhail Ulyanov CC: Thomas Petazzoni , =?UTF-8?Q?Niklas_S=C3=B6derlund?= , Claudiu Beznea , , , References: <20250122-fix_missing_rtnl_lock_phy_disconnect-v1-0-8cb9f6f88fd1@bootlin.com> <20250122-fix_missing_rtnl_lock_phy_disconnect-v1-1-8cb9f6f88fd1@bootlin.com> Content-Language: en-US Organization: Open Mobile Platform In-Reply-To: Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: 7bit X-ClientProxiedBy: msexch01.omp.ru (10.188.4.12) To msexch01.omp.ru (10.188.4.12) X-KSE-ServerInfo: msexch01.omp.ru, 9 X-KSE-AntiSpam-Interceptor-Info: scan successful X-KSE-AntiSpam-Version: 6.1.1, Database issued on: 01/22/2025 17:54:00 X-KSE-AntiSpam-Status: KAS_STATUS_NOT_DETECTED X-KSE-AntiSpam-Method: none X-KSE-AntiSpam-Rate: 19 X-KSE-AntiSpam-Info: Lua profiles 190517 [Jan 22 2025] X-KSE-AntiSpam-Info: Version: 6.1.1.7 X-KSE-AntiSpam-Info: Envelope from: s.shtylyov@omp.ru X-KSE-AntiSpam-Info: LuaCore: 50 0.3.50 df4aeb250ed63fd3baa80a493fa6caee5dd9e10f X-KSE-AntiSpam-Info: {rep_avail} X-KSE-AntiSpam-Info: {Tracking_uf_ne_domains} X-KSE-AntiSpam-Info: {Tracking_from_domain_doesnt_match_to} X-KSE-AntiSpam-Info: {SMTP from is not routable} X-KSE-AntiSpam-Info: {Found in DNSBL: 213.87.159.248 in (user) b.barracudacentral.org} X-KSE-AntiSpam-Info: lore.kernel.org:7.1.1;d41d8cd98f00b204e9800998ecf8427e.com:7.1.1;omp.ru:7.1.1;127.0.0.199:7.1.2 X-KSE-AntiSpam-Info: FromAlignment: s X-KSE-AntiSpam-Info: ApMailHostAddress: 213.87.159.248 X-KSE-AntiSpam-Info: {DNS response errors} X-KSE-AntiSpam-Info: Rate: 19 X-KSE-AntiSpam-Info: Status: not_detected X-KSE-AntiSpam-Info: Method: none X-KSE-AntiSpam-Info: Auth:dmarc=temperror header.from=omp.ru;spf=temperror smtp.mailfrom=omp.ru;dkim=none X-KSE-Antiphishing-Info: Clean X-KSE-Antiphishing-ScanningType: Heuristic X-KSE-Antiphishing-Method: None X-KSE-Antiphishing-Bases: 01/22/2025 18:07:00 X-KSE-Antivirus-Interceptor-Info: scan successful X-KSE-Antivirus-Info: Clean, bases: 1/22/2025 3:28:00 PM X-KSE-Attachment-Filter-Triggered-Rules: Clean X-KSE-Attachment-Filter-Triggered-Filters: Clean X-KSE-BulkMessagesFiltering-Scan-Result: InTheLimit On 1/22/25 9:33 PM, Sergey Shtylyov wrote: [...] >> Fix the suspend path by ensuring the rtnl lock is held where required. > > Maybe suspend/resume path (the same w/the subject)? > >> Calls to ravb_open, ravb_close and wol operations must be performed under >> the rtnl lock to prevent conflicts with ongoing ndo operations. > > [...] > >> Reported-by: Claudiu Beznea >> Closes: https://lore.kernel.org/netdev/4c6419d8-c06b-495c-b987-d66c2e1ff848@tuxon.dev/ >> Fixes: 0184165b2f42 ("ravb: add sleep PM suspend/resume support") >> Signed-off-by: Kory Maincent > > FWIW: > > Reviewed-by: Sergey Shtylyov > > [...] >> diff --git a/drivers/net/ethernet/renesas/ravb_main.c b/drivers/net/ethernet/renesas/ravb_main.c >> index bc395294a32d..2c6d8e4966c3 100644 >> --- a/drivers/net/ethernet/renesas/ravb_main.c >> +++ b/drivers/net/ethernet/renesas/ravb_main.c > [...] >> @@ -3245,19 +3250,25 @@ static int ravb_resume(struct device *dev) >> if (!netif_running(ndev)) >> return 0; >> >> + rtnl_lock(); >> /* If WoL is enabled restore the interface. */ >> if (priv->wol_enabled) { >> ret = ravb_wol_restore(ndev); >> - if (ret) >> + if (ret) { >> + rtnl_unlock(); >> return ret; >> + } >> } else { >> ret = pm_runtime_force_resume(dev); >> - if (ret) >> + if (ret) { >> + rtnl_unlock(); >> return ret; > > Hm, are you sure we need to have rtnl_lock around pm_runtime_force_resume() too? Anyway, the above *if* statements are needlessly duplicated, I think it's time that we do away with this! :-) [...] MBR, Sergey