From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtpout-03.galae.net (smtpout-03.galae.net [185.246.85.4]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id B82E454706D for ; Tue, 6 Oct 2026 07:50:49 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=185.246.85.4 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1791273053; cv=none; b=FWyMZIBeXMhMyO8SHVzi/eMDSrob0PHKc1kJaCHlwZxOat9/nc0UZhZuYMxqzFxDgzbeaXiczx1DUEzrYUXzDnteMCaRgXLEOuUXb8ymTwEHiiRbLr29g2zCYwp9shcTXYSvVt+NlpN0JXQwbXpo+hSzUIha0WycnRMvYQeFw+4= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1791273053; c=relaxed/simple; bh=Keln+N68J8XZDbe+kzt1qXG/rgmmDyHZEtTL8njsg5o=; h=Message-ID:Date:MIME-Version:Subject:To:Cc:References:From: In-Reply-To:Content-Type; b=m/gi/I4IdTf3sPvpFQusrCMIYykE7ShPW41nWM/lBcC+LeJuFcBSuHYJDsE2Pq1Hoc8VXB+bnm8WxIz4+RZd+C+gksed69rImn7rRfu2VibSUSIYu0PT9xpoEaGa/4A6LNy//DbFb/FkI8amiv/U/zvuF5gZWI0H1zX8qGfJxcI= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=bootlin.com; spf=pass smtp.mailfrom=bootlin.com; dkim=pass (2048-bit key) header.d=bootlin.com header.i=@bootlin.com header.b=h71LLACy; arc=none smtp.client-ip=185.246.85.4 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=bootlin.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=bootlin.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=bootlin.com header.i=@bootlin.com header.b="h71LLACy" Received: from smtpout-01.galae.net (smtpout-01.galae.net [212.83.139.233]) by smtpout-03.galae.net (Postfix) with ESMTPS id AE8654E411A1; Tue, 6 Oct 2026 07:50:41 +0000 (UTC) Received: from mail.galae.net (mail.galae.net [212.83.136.155]) by smtpout-01.galae.net (Postfix) with ESMTPS id 80B4960553; Tue, 6 Oct 2026 07:50:41 +0000 (UTC) Received: from [127.0.0.1] (localhost [127.0.0.1]) by localhost (Mailerdaemon) with ESMTPSA id 205751033069A; Tue, 6 Oct 2026 09:50:34 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bootlin.com; s=dkim; t=1791273040; h=from:subject:date:message-id:to:cc:mime-version:content-type: content-transfer-encoding:content-language:in-reply-to:references; bh=Y687D0b0XnsGS0sPqnJmnJK0mFwzbLcgaZ8E4hwXOuY=; b=h71LLACy3ly81f+yP0sA5gGlPiCBQERPnJDVMokgcAb93p+b9EO5xXEdmclFfV0U6Md1el jWjZpD+A8b0T32+Pbgm1kDLNW06sJ+TbWD6L1a2fJvWRVD4gfcKWDFek2uBBx9azHk0oFG OfE7pK6l/J40SOqBQodwpvZL7bhCbXwTVO7LjbJzULy0guEOTGTWG99HQJ8W+ipxpRkExv WbFya2BD16PAqkfJqCVdqOp/bbMuAjWxIGjvHz1uH9hO8T6ssuQPDs8fKgKemHbF4fYXQx eS653ptxuAIE6w/Y9j3ntM6wUkZo+PS9KQRay+ztt0McNJreGxxdiupfySZRUw== Message-ID: <97bc7b37-0c21-4182-9d1d-075287cd0fde@bootlin.com> Date: Tue, 6 Oct 2026 09:50:32 +0200 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 v2] net: stmmac: unwind the WoL IRQ after a safety IRQ request failure To: James Hilliard , netdev@vger.kernel.org, Paolo Abeni , Jakub Kicinski , Andrew Lunn , Eric Dumazet , Maxime Coquelin , Alexandre Torgue , Serge Semin Cc: "David S. Miller" , Nicolai Buchwitz , linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org References: <20261006-stmmac-irq-unwind-v2-1-194591c87460@gmail.com> Content-Language: en-US From: Maxime Chevallier In-Reply-To: <20261006-stmmac-irq-unwind-v2-1-194591c87460@gmail.com> Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 7bit X-Last-TLS-Session-Version: TLSv1.3 Hi, On 10/6/26 09:06, James Hilliard wrote: > The safety IRQ is requested after the MAC and optional WoL IRQs. If its > request fails, stmmac_free_irq() frees the unregistered safety IRQ and > leaks the WoL handler. This can warn about an already-free IRQ and make > the next open fail. > > Move the safety and WoL cleanup labels into reverse acquisition order. > > Fixes: 5c2215167d12 ("net: stmmac: Add driver support for common safety IRQ") > Signed-off-by: James Hilliard > Reviewed-by: Nicolai Buchwitz Reviewed-by: Maxime Chevallier Maxime > --- > Changes in v2: > - Drop the claim that later per-queue IRQ failures also had broken > cleanup; those paths already released both IRQs. > - Add Nicolai Buchwitz's Reviewed-by. > - Link to v1: https://patch.msgid.link/20260930-stmmac-irq-unwind-v1-1-0c8a053761c7@gmail.com > --- > drivers/net/ethernet/stmicro/stmmac/stmmac_main.c | 8 ++++---- > 1 file changed, 4 insertions(+), 4 deletions(-) > > diff --git a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c > index b837e8e27a35..0403d434c9b9 100644 > --- a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c > +++ b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c > @@ -3799,13 +3799,13 @@ static void stmmac_free_irq(struct net_device *dev, > free_irq(msi->sfty_ce_irq, dev); > fallthrough; > case REQ_IRQ_ERR_SFTY_CE: > - if (priv->wol_irq > 0 && priv->wol_irq != dev->irq) > - free_irq(priv->wol_irq, dev); > - fallthrough; > - case REQ_IRQ_ERR_SFTY: > if (priv->sfty_irq > 0 && priv->sfty_irq != dev->irq) > free_irq(priv->sfty_irq, dev); > fallthrough; > + case REQ_IRQ_ERR_SFTY: > + if (priv->wol_irq > 0 && priv->wol_irq != dev->irq) > + free_irq(priv->wol_irq, dev); > + fallthrough; > case REQ_IRQ_ERR_WOL: > free_irq(dev->irq, dev); > fallthrough; > > --- > base-commit: d5a007b9b457c915ab1a53227e8939e4018aa97a > change-id: 20260930-stmmac-irq-unwind-0be86901638d > > Best regards, > -- > James Hilliard