From patchwork Thu Oct 10 07:58:48 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Jiqian Chen X-Patchwork-Id: 13829721 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id B2B26CF07BF for ; Thu, 10 Oct 2024 08:00:15 +0000 (UTC) Received: from list by lists.xenproject.org with outflank-mailman.815632.1229622 (Exim 4.92) (envelope-from ) id 1syo5Q-0000b6-2T; Thu, 10 Oct 2024 07:59:52 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 815632.1229622; Thu, 10 Oct 2024 07:59:52 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1syo5P-0000az-W3; Thu, 10 Oct 2024 07:59:51 +0000 Received: by outflank-mailman (input) for mailman id 815632; Thu, 10 Oct 2024 07:59:50 +0000 Received: from se1-gles-sth1-in.inumbo.com ([159.253.27.254] helo=se1-gles-sth1.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1syo5O-0000as-Ed for xen-devel@lists.xenproject.org; Thu, 10 Oct 2024 07:59:50 +0000 Received: from NAM12-BN8-obe.outbound.protection.outlook.com (mail-bn8nam12on20631.outbound.protection.outlook.com [2a01:111:f403:2418::631]) by se1-gles-sth1.inumbo.com (Halon) with ESMTPS id 9eb0d512-86dd-11ef-a0bd-8be0dac302b0; Thu, 10 Oct 2024 09:59:49 +0200 (CEST) Received: from CH2PR18CA0050.namprd18.prod.outlook.com (2603:10b6:610:55::30) by MW4PR12MB6998.namprd12.prod.outlook.com (2603:10b6:303:20a::22) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8048.16; Thu, 10 Oct 2024 07:59:43 +0000 Received: from CH1PEPF0000A349.namprd04.prod.outlook.com (2603:10b6:610:55:cafe::41) by CH2PR18CA0050.outlook.office365.com (2603:10b6:610:55::30) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8026.23 via Frontend Transport; Thu, 10 Oct 2024 07:59:43 +0000 Received: from SATLEXMB04.amd.com (165.204.84.17) by CH1PEPF0000A349.mail.protection.outlook.com (10.167.244.9) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.8048.13 via Frontend Transport; Thu, 10 Oct 2024 07:59:43 +0000 Received: from cjq-desktop.amd.com (10.180.168.240) by SATLEXMB04.amd.com (10.181.40.145) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2507.39; Thu, 10 Oct 2024 02:59:40 -0500 X-BeenThere: xen-devel@lists.xenproject.org List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xenproject.org Precedence: list Sender: "Xen-devel" X-Inumbo-ID: 9eb0d512-86dd-11ef-a0bd-8be0dac302b0 ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=X02xCPqO76J3dnJa00uPbt2H078yKMZ498JBIi7w21W0BGr506YHMfT2rEImp111fjjuUdfa6QOMmugCOwc62s0/i6Vf27uEqhSrOa3k7i6itJLPy7YVRrgrss8se1Raq6nFPO7+7uelrQs8mBMz1CU3HOx9wfJO3HxcQMjZCXG8hmjwoeEwXV1bhLH8rB7Mv6iltKOKGhr+KO9bDOPXP3e//yZIJX1aDMz6IDTlIIQA+QN5fbjkESRtaERy1LobffhzmlQ2xM5VeWyb00ky1CGl7B8MNjECFl80/kofkRK2OuuMPRdCkR30hDs0B0qJFqAodCbNMEAmjFnSO8u2jw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector10001; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=9gdCt5Jv6hMT61z14pdBUVE0kmhGMgvijH9MaPD7Tdk=; b=W668X+LXXORDxzzT7rDhcFJQfZ+1cKu5/p4oje9GmWoEoySuloLnVhtvB/jBz1pGd55/PrDap9gnA/2r0jIPtw8b4TBM/Jf2smlSNdDj5+sZg0HL71p+wZvrOt/yPrRy5Z+0c36gL2cgyM62Fgf5GnqcsiZ0DysmkzttlEQm+AxbW8wz2VyR9spqlo7GZElViI0EIE25VHNVVcgI5Th6r3+G2d1nuwAKwp6uop26bADcM70DMa0s4cA/jjEGTgB4ZO7pZTtoYVYbJDQ6f2x/LQKLFGRd8itI7R+Uc5mMLpwP4omUomQB2f7f69vnKn9rgveE8YPq0nmXHMmKIh3mfQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 165.204.84.17) smtp.rcpttodomain=suse.com smtp.mailfrom=amd.com; dmarc=pass (p=quarantine sp=quarantine pct=100) action=none header.from=amd.com; dkim=none (message not signed); arc=none (0) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=amd.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=9gdCt5Jv6hMT61z14pdBUVE0kmhGMgvijH9MaPD7Tdk=; b=Nnbu2QIlnxrjktxYX1KNn4JkyWBy+FtSzA0X+A7Iw4E11zoYTzCM9Kldlzx0iNI9qRVwR5d3iCkMjhgedlLzalo5HU4GA/TNFNDQBN++r/x3uOxNpixKNN1TpoDyULrJ2WFqwUsyYa0HvQGscKpvjg/Joq0DLujqr4c2cDS1/SI= X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 165.204.84.17) smtp.mailfrom=amd.com; dkim=none (message not signed) header.d=none;dmarc=pass action=none header.from=amd.com; Received-SPF: Pass (protection.outlook.com: domain of amd.com designates 165.204.84.17 as permitted sender) receiver=protection.outlook.com; client-ip=165.204.84.17; helo=SATLEXMB04.amd.com; pr=C From: Jiqian Chen To: Juergen Gross , Stefano Stabellini , Oleksandr Tyshchenko CC: , , =?utf-8?q?Marek_Marczykowski-G=C3=B3recki?= , Jiqian Chen Subject: [PATCH v2] xen: Remove dependency between pciback and privcmd Date: Thu, 10 Oct 2024 15:58:48 +0800 Message-ID: <20241010075848.1002891-1-Jiqian.Chen@amd.com> X-Mailer: git-send-email 2.34.1 MIME-Version: 1.0 X-Originating-IP: [10.180.168.240] X-ClientProxiedBy: SATLEXMB03.amd.com (10.181.40.144) To SATLEXMB04.amd.com (10.181.40.145) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: CH1PEPF0000A349:EE_|MW4PR12MB6998:EE_ X-MS-Office365-Filtering-Correlation-Id: d211a721-9c7e-464c-b061-08dce9018024 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|82310400026|376014|1800799024|36860700013; X-Microsoft-Antispam-Message-Info: =?utf-8?q?lzyw329Sj9kEXGKesMSNzm24C2hcOXZ?= =?utf-8?q?a2oNRnO9AQROlFxgi/MPbhLgz0QaBP7g8sdHS58L+9nUoUpjlcU0BOAFUwMzZ+3kp?= =?utf-8?q?kkonUPcOoo3l5k+LKT0mFkimBB4adnGE2kgEmA8fdjl9zERup0DD4REAvqLw1S15q?= =?utf-8?q?e3Ih5KLbO/40icQCcXJcTCR/RVjqpJBrtoUE69TdU7qjoyv61TgZeD7Mhz+MUo4/N?= =?utf-8?q?EF58+qklXhFmTNS/lhmWKpT76tK+/7wKKgdNTEbsTW/+KeThlVGtGVPamuDi/UmRE?= =?utf-8?q?DSh0D9Jw2UicvUo4PCMhqYH3XTU160VAPY2yoE/RfUwjuWDhq25biDcUPmOikFwrH?= =?utf-8?q?P6/OBzl0pDhZsYyfKUFktbXuAUnyv9W17cQ2oF/5V7sUe9oPbfdUkF6Mprajx3ZOC?= =?utf-8?q?GBmZjdOnCrVgnkYQavLZxg0cpsYNlPlqHOG0UUmF67XTGjv7kexlpjGT1+A/Y5biU?= =?utf-8?q?/uRirmYfVQGBZNnArpz8n/HiAbXZCAsjbeyoWtBu0LtS0dsVdtooi5NwTeZVcDTzK?= =?utf-8?q?4mM8fU7Y2VdSTAXgZZvjRUc+gY5WpB24VGhNeD1GSqFLsa2f6fT2gnmDgLjC70Lnb?= =?utf-8?q?oo3ZwcpjbIJOeRcrMjKEqvsPiuduz61gy+ML8erWOsr41uYI9TkxlC7HUCKVe7+Le?= =?utf-8?q?NKe1Ip/fALC3ERiQ+1YvRHqOGt5FwcTkp3CQjU/zlUiVNt5/luc7oSnY80R2Q4/dk?= =?utf-8?q?4WCy99FAVt8cDk3QckXGawxLZYaLYN+AHWSSLGdvJH4qpYiZ+fyZ8lcpkmO83xU/B?= =?utf-8?q?HnkRJ5EaOoZOSVbfVcPfkU/vAYNaIEfzB7VDHn4zpdmchuC+CThgiJ/U+YUf6ZBzB?= =?utf-8?q?Tix8dcEJWIyZuDIMQPVSfVPc+CC2Zz+jJWdG/H6Bl4axDtPVRS41ppUttMuaVgGmT?= =?utf-8?q?xkSvcqF+b9GdeE+mb75ZypTCGBuips4IazS7ewxdivRFeRKmTRBCxYpjnN6rsaqHn?= =?utf-8?q?nRrJrHBi/3RQ2hAtui9sYbGGnTjPc6KNiQNo4I5VWI0M6urqwIr1ttwujB6gwNbHr?= =?utf-8?q?t4gqWvLdUsUf59y8FOprPFdzgFsaLJYTaA2p9M5zPjzn+u46d+46/EoJmrGv46VCP?= =?utf-8?q?AgQ3+vUjO+27LK03O5ggZOSCXUYssoldUB6FFcASVhMM+8h7l3ACCKAQM9v2gLmxk?= =?utf-8?q?0LU3p5WHVGFyre/2AXlCmy3uSE3WZ3SQP7XND86dI91wRP/vQv/102gBE1WlgoDK3?= =?utf-8?q?eGAVwvOp2goY8+5cgLwRn3N1K69LopZewMTHgJwGC9IBHz4yzX//1A1n4GRG+L+7f?= =?utf-8?q?OQQzuz/MdEAURHR9D4lNqi9xalvBydQT3W8+mnAmN7s3+pFHUkGjaD+CutVsp/Vhb?= =?utf-8?q?cn519/9FjniD?= X-Forefront-Antispam-Report: CIP:165.204.84.17;CTRY:US;LANG:en;SCL:1;SRV:;IPV:CAL;SFV:NSPM;H:SATLEXMB04.amd.com;PTR:InfoDomainNonexistent;CAT:NONE;SFS:(13230040)(82310400026)(376014)(1800799024)(36860700013);DIR:OUT;SFP:1101; X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 10 Oct 2024 07:59:43.2801 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: d211a721-9c7e-464c-b061-08dce9018024 X-MS-Exchange-CrossTenant-Id: 3dd8961f-e488-4e60-8e11-a82d994e183d X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=3dd8961f-e488-4e60-8e11-a82d994e183d;Ip=[165.204.84.17];Helo=[SATLEXMB04.amd.com] X-MS-Exchange-CrossTenant-AuthSource: CH1PEPF0000A349.namprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: MW4PR12MB6998 Commit 2fae6bb7be32 ("xen/privcmd: Add new syscall to get gsi from dev") adds a weak reverse dependency to the config XEN_PRIVCMD definition, that dependency causes xen-privcmd can't be loaded on domU, because dependent xen-pciback is always not be loaded successfully on domU. To solve above problem, remove that dependency, and do not call pcistub_get_gsi_from_sbdf() directly, instead add a hook in drivers/xen/apci.c, xen-pciback register the real call function, then in privcmd_ioctl_pcidev_get_gsi call that hook. Fixes: 2fae6bb7be32 ("xen/privcmd: Add new syscall to get gsi from dev") Reported-by: Marek Marczykowski-Górecki Signed-off-by: Jiqian Chen --- v1->v2 changes: Added hook xen_acpi_get_gsi_from_sbdf. Changed pcistub_get_gsi_from_sbdf to static and pciback register it as the real hook function. --- drivers/xen/Kconfig | 1 - drivers/xen/acpi.c | 17 +++++++++++++++++ drivers/xen/privcmd.c | 6 ++---- drivers/xen/xen-pciback/pci_stub.c | 4 ++-- include/xen/acpi.h | 12 ++++-------- 5 files changed, 25 insertions(+), 15 deletions(-) diff --git a/drivers/xen/Kconfig b/drivers/xen/Kconfig index 72ddee4c1544..f7d6f47971fd 100644 --- a/drivers/xen/Kconfig +++ b/drivers/xen/Kconfig @@ -261,7 +261,6 @@ config XEN_SCSI_BACKEND config XEN_PRIVCMD tristate "Xen hypercall passthrough driver" depends on XEN - imply XEN_PCIDEV_BACKEND default m help The hypercall passthrough driver allows privileged user programs to diff --git a/drivers/xen/acpi.c b/drivers/xen/acpi.c index 9e2096524fbc..0bff2f3a87d2 100644 --- a/drivers/xen/acpi.c +++ b/drivers/xen/acpi.c @@ -125,3 +125,20 @@ int xen_acpi_get_gsi_info(struct pci_dev *dev, return 0; } EXPORT_SYMBOL_GPL(xen_acpi_get_gsi_info); + +get_gsi_from_sbdf_t get_gsi_from_sbdf = NULL; + +void xen_acpi_register_get_gsi_func(get_gsi_from_sbdf_t func) +{ + get_gsi_from_sbdf = func; +} +EXPORT_SYMBOL_GPL(xen_acpi_register_get_gsi_func); + +int xen_acpi_get_gsi_from_sbdf(u32 sbdf) +{ + if (get_gsi_from_sbdf) + return get_gsi_from_sbdf(sbdf); + + return -EINVAL; +} +EXPORT_SYMBOL_GPL(xen_acpi_get_gsi_from_sbdf); \ No newline at end of file diff --git a/drivers/xen/privcmd.c b/drivers/xen/privcmd.c index 3273cb8c2a66..4f75bc876454 100644 --- a/drivers/xen/privcmd.c +++ b/drivers/xen/privcmd.c @@ -850,15 +850,13 @@ static long privcmd_ioctl_mmap_resource(struct file *file, static long privcmd_ioctl_pcidev_get_gsi(struct file *file, void __user *udata) { #if defined(CONFIG_XEN_ACPI) - int rc = -EINVAL; + int rc; struct privcmd_pcidev_get_gsi kdata; if (copy_from_user(&kdata, udata, sizeof(kdata))) return -EFAULT; - if (IS_REACHABLE(CONFIG_XEN_PCIDEV_BACKEND)) - rc = pcistub_get_gsi_from_sbdf(kdata.sbdf); - + rc = xen_acpi_get_gsi_from_sbdf(kdata.sbdf); if (rc < 0) return rc; diff --git a/drivers/xen/xen-pciback/pci_stub.c b/drivers/xen/xen-pciback/pci_stub.c index 2f3da5ac62cd..900e6199eec7 100644 --- a/drivers/xen/xen-pciback/pci_stub.c +++ b/drivers/xen/xen-pciback/pci_stub.c @@ -227,7 +227,7 @@ static struct pci_dev *pcistub_device_get_pci_dev(struct xen_pcibk_device *pdev, } #ifdef CONFIG_XEN_ACPI -int pcistub_get_gsi_from_sbdf(unsigned int sbdf) +static int pcistub_get_gsi_from_sbdf(unsigned int sbdf) { struct pcistub_device *psdev; int domain = (sbdf >> 16) & 0xffff; @@ -242,7 +242,6 @@ int pcistub_get_gsi_from_sbdf(unsigned int sbdf) return psdev->gsi; } -EXPORT_SYMBOL_GPL(pcistub_get_gsi_from_sbdf); #endif struct pci_dev *pcistub_get_pci_dev_by_slot(struct xen_pcibk_device *pdev, @@ -484,6 +483,7 @@ static int pcistub_init_device(struct pcistub_device *psdev) if (err) goto config_release; psdev->gsi = gsi; + xen_acpi_register_get_gsi_func(pcistub_get_gsi_from_sbdf); } #endif diff --git a/include/xen/acpi.h b/include/xen/acpi.h index daa96a22d257..ef4f70e4a557 100644 --- a/include/xen/acpi.h +++ b/include/xen/acpi.h @@ -91,13 +91,9 @@ static inline int xen_acpi_get_gsi_info(struct pci_dev *dev, } #endif -#ifdef CONFIG_XEN_PCI_STUB -int pcistub_get_gsi_from_sbdf(unsigned int sbdf); -#else -static inline int pcistub_get_gsi_from_sbdf(unsigned int sbdf) -{ - return -1; -} -#endif +typedef int (*get_gsi_from_sbdf_t)(u32 sbdf); + +void xen_acpi_register_get_gsi_func(get_gsi_from_sbdf_t func); +int xen_acpi_get_gsi_from_sbdf(unsigned int sbdf); #endif /* _XEN_ACPI_H */