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 B9D3E33F8DC for ; Mon, 20 Apr 2026 14:58:37 +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=1776697117; cv=none; b=aImV3MUpXE2QKocqzbRRj9JJrhnexCNP75CIwAmnALqPH9qO3qONZI56pIWvo58Ro7n7lCvexy3Ys3ZsLWac39tbTEA1gJUWVwbYQ4jzmMXWeMqWKQNmoyWifaCaCPEV2H1GzHUNec809KHB5RHqvYO0gxAI7OiJ1EtLHXCjD6w= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1776697117; c=relaxed/simple; bh=TF00Ki4pjC1hpSea63OMylrQd8e4xUrgsrwfsossx2g=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=B/BVV8ala728+TWIC/qY3n/wvrh59JCc5YUAxUUTiocYPbM//NBLG1C8pSwxYqVXSYxDs3wNoWvLqY1MYpXd47HgA/MCuSRPqwL1XcY+xvDtFxs5y6VCEsLbzUoejV6+rudEQYj5HzIY8GuibQhYXfTbpDoswX5NpjMcYlBLhjo= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=sMaSGwo3; 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="sMaSGwo3" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 1B889C19425; Mon, 20 Apr 2026 14:58:37 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1776697117; bh=TF00Ki4pjC1hpSea63OMylrQd8e4xUrgsrwfsossx2g=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=sMaSGwo3bHTOoDO9LbGAW71S1GRXryEJWv8u4zUPYEjNbYC8p6hz5eup+rJPBz1+t oa045kG+0EmIIAFEUhNeuzn8eA/tX7YXs6yepYpIu2Z/5uIK0+orh5JbXGkfqBT9lc mWptQTroIx0uR9kh2/hbOO83zzY/dvdWDZ1Hbn1+Fc4vuPcbmkiTMDWdUgyUJfd91j RfA8PCSyEWigp5uw+VhwmbRQ9LlMtPPQKATTZnBaaVZyrsd8jvk8jb0HbF0421fpvE wTMkbLTYsaPfgTLwfV2fm2qPM4w1APMLUxpaYm/p0ehZTqOXsM5Eu9ppmgNJ/hSVJk xarxrhFznNpKw== From: Sasha Levin To: stable@vger.kernel.org Cc: Koichiro Den , Manivannan Sadhasivam , Frank Li , Sasha Levin Subject: [PATCH 6.1.y] PCI: endpoint: pci-epf-vntb: Remove duplicate resource teardown Date: Mon, 20 Apr 2026 10:58:35 -0400 Message-ID: <20260420145835.1151312-1-sashal@kernel.org> X-Mailer: git-send-email 2.53.0 In-Reply-To: <2026042023-humiliate-slightly-3d92@gregkh> References: <2026042023-humiliate-slightly-3d92@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 d057537781f60..eee49a3eec04c 100644 --- a/drivers/pci/endpoint/functions/pci-epf-vntb.c +++ b/drivers/pci/endpoint/functions/pci-epf-vntb.c @@ -676,18 +676,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) @@ -1331,7 +1319,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); @@ -1371,9 +1359,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; } @@ -1389,7 +1374,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