From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (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 5875C3AB289 for ; Mon, 20 Apr 2026 14:31:08 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1776695468; cv=none; b=o2QiPjZV+f+0FbvubXq/+B6DAkUnj8zrWZIzJ0AixV8an2OiS2x4SxwTBu/8bYq9i2TvSKhleva7gIsiG7PW5AgLxR8XlP6zA1iu7k3SpyaNq3sKzQCojgm8D3pW/52xSjGzP4aJliTALvRgWzPPR1RZV4KxSe2wj99pWeHXhlU= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1776695468; c=relaxed/simple; bh=1RNMTRwKd23YM1F1fHSkfLNEjywfPC28BOGuWZZYEMI=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=dI9YfNsg/tW9XFZ3DJXyeZ/Ac36LlU0JshSHGc8x1gtJos75IJwLvBdLdc3aO9YoRa7eWn8mtQnNVHHXh9xNaqzkU1EnZ2jSZe42oVBBJ3DRc6AoVu3MTEh5sk/5n8XpHhRUzFprwmhQT7UZY4wYV88v5Wl3CSjumi+yjCpPsQ4= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=BUHgQclV; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="BUHgQclV" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 65F32C19425; Mon, 20 Apr 2026 14:31:07 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1776695468; bh=1RNMTRwKd23YM1F1fHSkfLNEjywfPC28BOGuWZZYEMI=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=BUHgQclVEe7xRgIuhZRRORpsY/UwKPwDwmmkY4vD+/qwkbTYRDle5eVQQIgb7KPyZ dOvfvhxv8uD53jtPJMY4B8PoWWZ7t9zGEsfKe2IHVKQmiWzeYc8CFgUrHkC58k9mm0 0TbA7xZ7UUwtnFEb+zRABo4BZLZGBJtFlMB7qIN73Wc6DAJZ3EJI/lK8JyFHTEZ+0p pNLmwJOCZyRLOw9TIe1PtOp7m2sJVAnmPPRBP4bBD3YpzMkcyTOp4B+30ls42emgvq 40Sc4lE+1D4wkdDvsNKvt+PAwdfK6AgSbi5S8k8wcHseSA/6nYV6gSGH0Je8QMVm1t GwNgFcIklyP6A== From: Sasha Levin To: stable@vger.kernel.org Cc: Koichiro Den , Manivannan Sadhasivam , Frank Li , Sasha Levin Subject: [PATCH 6.12.y] PCI: endpoint: pci-epf-vntb: Remove duplicate resource teardown Date: Mon, 20 Apr 2026 10:31:05 -0400 Message-ID: <20260420143105.1095263-1-sashal@kernel.org> X-Mailer: git-send-email 2.53.0 In-Reply-To: <2026042022-dormitory-uncrushed-c526@gregkh> References: <2026042022-dormitory-uncrushed-c526@gregkh> Precedence: bulk X-Mailing-List: stable@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit From: Koichiro Den [ Upstream commit 0da63230d3ec1ec5fcc443a2314233e95bfece54 ] epf_ntb_epc_destroy() duplicates the teardown that the caller is supposed to perform later. This leads to an oops when .allow_link fails or when .drop_link is performed. The following is an example oops of the former case: Unable to handle kernel paging request at virtual address dead000000000108 [...] [dead000000000108] address between user and kernel address ranges Internal error: Oops: 0000000096000044 [#1] SMP [...] Call trace: pci_epc_remove_epf+0x78/0xe0 (P) pci_primary_epc_epf_link+0x88/0xa8 configfs_symlink+0x1f4/0x5a0 vfs_symlink+0x134/0x1d8 do_symlinkat+0x88/0x138 __arm64_sys_symlinkat+0x74/0xe0 [...] Remove the helper, and drop pci_epc_put(). EPC device refcounting is tied to the configfs EPC group lifetime, and pci_epc_put() in the .drop_link path is sufficient. Fixes: e35f56bb0330 ("PCI: endpoint: Support NTB transfer between RC and EP") Signed-off-by: Koichiro Den Signed-off-by: Manivannan Sadhasivam Reviewed-by: Frank Li Cc: stable@vger.kernel.org Link: https://patch.msgid.link/20260226084142.2226875-2-den@valinux.co.jp [ adjusted context ] Signed-off-by: Sasha Levin --- drivers/pci/endpoint/functions/pci-epf-vntb.c | 18 +----------------- 1 file changed, 1 insertion(+), 17 deletions(-) diff --git a/drivers/pci/endpoint/functions/pci-epf-vntb.c b/drivers/pci/endpoint/functions/pci-epf-vntb.c index 62d09a528e688..a70c58cb611b7 100644 --- a/drivers/pci/endpoint/functions/pci-epf-vntb.c +++ b/drivers/pci/endpoint/functions/pci-epf-vntb.c @@ -662,18 +662,6 @@ static void epf_ntb_mw_bar_clear(struct epf_ntb *ntb, int num_mws) } } -/** - * epf_ntb_epc_destroy() - Cleanup NTB EPC interface - * @ntb: NTB device that facilitates communication between HOST and VHOST - * - * Wrapper for epf_ntb_epc_destroy_interface() to cleanup all the NTB interfaces - */ -static void epf_ntb_epc_destroy(struct epf_ntb *ntb) -{ - pci_epc_remove_epf(ntb->epf->epc, ntb->epf, 0); - pci_epc_put(ntb->epf->epc); -} - /** * epf_ntb_init_epc_bar() - Identify BARs to be used for each of the NTB * constructs (scratchpad region, doorbell, memorywindow) @@ -1314,7 +1302,7 @@ static int epf_ntb_bind(struct pci_epf *epf) ret = epf_ntb_init_epc_bar(ntb); if (ret) { dev_err(dev, "Failed to create NTB EPC\n"); - goto err_bar_init; + return ret; } ret = epf_ntb_config_spad_bar_alloc(ntb); @@ -1354,9 +1342,6 @@ static int epf_ntb_bind(struct pci_epf *epf) err_bar_alloc: epf_ntb_config_spad_bar_free(ntb); -err_bar_init: - epf_ntb_epc_destroy(ntb); - return ret; } @@ -1372,7 +1357,6 @@ static void epf_ntb_unbind(struct pci_epf *epf) epf_ntb_epc_cleanup(ntb); epf_ntb_config_spad_bar_free(ntb); - epf_ntb_epc_destroy(ntb); pci_unregister_driver(&vntb_pci_driver); } -- 2.53.0