From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-alma10-1.taild15c8.ts.net [100.103.45.18]) (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 209AB4FD274; Thu, 17 Sep 2026 17:05:26 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=100.103.45.18 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1789664727; cv=none; b=Qrx7qwgQeuohVorNvU9rNbl3EurwwRWa1RGFL8Jqcz2DrZou9I6cXcLzuOJe0WLjuk/v9Ask4mh6HA7NtyFcibst2ig9Z9An2gd+d5pJO4t+ibqKEOJx+sVEuHG0z/PwZCXt4gvx8Y/34NRLRXFxoRkNuvZ9hSDO4i2tUnogLPs= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1789664727; c=relaxed/simple; bh=3WYvx8kHb0ckVnZaHtGNw7v/59fDuLqw0EPJs0ZxWnw=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=DeIgtPJYYsss5K0yb9dNWYbu1OiRVIp50VvY3I/KONP1kR9KVlG0hHmC5L4ktirzDjJLggzkgAIHKNuI/ce/UppyWHQkWnhcLyxFR1sarq3CA2HfNqLhVaZ5d5kZ9A/lZqiw4SJh+OsQQAac/0pJHXcw247zrnUgWSQkqSqBmHU= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=tq5tbUhs; arc=none smtp.client-ip=100.103.45.18 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="tq5tbUhs" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 701231F000FF; Thu, 17 Sep 2026 17:05:25 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linuxfoundation.org; s=korg; t=1789664726; bh=WGhZmV21x34xgmflydy4CVL08Nl/3erNepNA3SB6t4M=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=tq5tbUhsvc+sxSd6mnvnBe4VAdxLwaBzQEkhZlNsfEsznSqwIJ4p+EiXjRxKWDAEk W7QBXeLMOfyLmgQ1BAvghYdKUupTm+t7CrAlq5FzC9X+77jZq61aL7PPMiWzaSgsBY u62m8PqhjDt9IvsWpUCXHbDbXeBCAsm+eOZ+atvs= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Runyu Xiao , Simon Horman , Jakub Kicinski , Sasha Levin Subject: [PATCH 6.18 0467/1250] net: au1000: move free_irq out of the close-time spinlocked section Date: Thu, 17 Sep 2026 16:04:22 +0100 Message-ID: <20260917151604.635304033@linuxfoundation.org> X-Mailer: git-send-email 2.55.0 In-Reply-To: <20260917151551.901433442@linuxfoundation.org> References: <20260917151551.901433442@linuxfoundation.org> User-Agent: quilt/0.69 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: patches@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 6.18-stable review patch. If anyone has any objections, please let me know. ------------------ From: Runyu Xiao [ Upstream commit f48763beab4eea41fc480c9702ec6eebe8d75e4f ] au1000_close() calls free_irq() while aup->lock is still held with spin_lock_irqsave(). free_irq() can sleep because it takes the IRQ descriptor request mutex, so it does not belong inside the close-time spinlocked section. This was found by our static analysis tool and then confirmed by manual review of the in-tree au1000_close() .ndo_stop path. The reviewed path keeps aup->lock held across the MAC reset, queue stop and free_irq(dev->irq, dev). A directed runtime validation kept that ndo_stop carrier and the same free_irq(dev->irq, dev) operation under the driver lock. Lockdep reported "BUG: sleeping function called from invalid context" and "Invalid wait context" while free_irq() was taking desc->request_mutex, with au1000_close() and free_irq() on the stack. Drop aup->lock before freeing the IRQ. The protected close-time work still stops the device and queue before IRQ teardown, but the sleepable IRQ core path now runs outside the spinlocked section. Signed-off-by: Runyu Xiao Reviewed-by: Simon Horman Link: https://patch.msgid.link/20260619151816.1144289-1-runyu.xiao@seu.edu.cn Signed-off-by: Jakub Kicinski Signed-off-by: Sasha Levin --- drivers/net/ethernet/amd/au1000_eth.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/drivers/net/ethernet/amd/au1000_eth.c b/drivers/net/ethernet/amd/au1000_eth.c index 9d35ac348ebe3..5a04056e38fa3 100644 --- a/drivers/net/ethernet/amd/au1000_eth.c +++ b/drivers/net/ethernet/amd/au1000_eth.c @@ -943,9 +943,10 @@ static int au1000_close(struct net_device *dev) /* stop the device */ netif_stop_queue(dev); + spin_unlock_irqrestore(&aup->lock, flags); + /* disable the interrupt */ free_irq(dev->irq, dev); - spin_unlock_irqrestore(&aup->lock, flags); return 0; } -- 2.53.0