From patchwork Tue Feb 4 13:54:04 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mykyta Poturai X-Patchwork-Id: 13959285 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 9D945C02196 for ; Tue, 4 Feb 2025 13:54:24 +0000 (UTC) Received: from list by lists.xenproject.org with outflank-mailman.881487.1291690 (Exim 4.92) (envelope-from ) id 1tfJNX-0000nM-86; Tue, 04 Feb 2025 13:54:15 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 881487.1291690; Tue, 04 Feb 2025 13:54:15 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1tfJNX-0000mx-4B; Tue, 04 Feb 2025 13:54:15 +0000 Received: by outflank-mailman (input) for mailman id 881487; Tue, 04 Feb 2025 13:54:14 +0000 Received: from se1-gles-flk1-in.inumbo.com ([94.247.172.50] helo=se1-gles-flk1.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1tfJNW-0007bp-03 for xen-devel@lists.xenproject.org; Tue, 04 Feb 2025 13:54:14 +0000 Received: from EUR03-DBA-obe.outbound.protection.outlook.com (mail-dbaeur03on20630.outbound.protection.outlook.com [2a01:111:f403:260d::630]) by se1-gles-flk1.inumbo.com (Halon) with ESMTPS id 838906b0-e2ff-11ef-99a4-01e77a169b0f; Tue, 04 Feb 2025 14:54:12 +0100 (CET) Received: from PAVPR03MB10102.eurprd03.prod.outlook.com (2603:10a6:102:30d::12) by AS8PR03MB10120.eurprd03.prod.outlook.com (2603:10a6:20b:57f::6) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8398.24; Tue, 4 Feb 2025 13:54:05 +0000 Received: from PAVPR03MB10102.eurprd03.prod.outlook.com ([fe80::35ac:8893:c31c:b971]) by PAVPR03MB10102.eurprd03.prod.outlook.com ([fe80::35ac:8893:c31c:b971%7]) with mapi id 15.20.8398.021; Tue, 4 Feb 2025 13:54:05 +0000 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: 838906b0-e2ff-11ef-99a4-01e77a169b0f ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=edjCSlaYKAEBRGPLr7MeZ3l+bPSDDTIp3ZSjBRhYcdk3YyZgaa14OkUk7a07OiGBd/DR4DbyzZZcMZkbJGpCtFK/vTB4AD93/Jz+1Z6Lfgwu+gTg6LU3qeRy55FKsu82uoa6pvKY5vjWlL7X/ZDBbHoefy9dBbWNO3a6wGcNm0Am6L1NTkW9wwnHOHk2m4Mb6olLR1yoDsvhcBmXKlC+WDadii1duSJgYBvKRQLYLcCLAeTWRbyIKOM1Uws1T7YWvXS6W2RU3eZ7tTUa6A1nNfEofnfMGHr+BJOT2oP0ptCBxTdVyIQw9cshl2jw/fI98gbf2HZc7flvNK9Bqs5oGQ== 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=M6yVN/7mR8MjfSPlwMkMwzKY7bVejLrXee73gB5MtkM=; b=y0Lom8FCzYW3DyRWZ9qYpKJyPBoLZ36XhzmkRi9n0+WxZxgkg2k2w74EVRRCgQgTh0orzXQIVqtGvccZkDBhKQn6xz8/O8m2u0Mp8w3upaBPWFOnZHK6L/3wuBbSJhas6JGqwY5gm0sE4WO0OWlH17AwgTyNBiGQyjA6Q+2eoXVgE7fKTRa3Jv25eyV0vWOl7+f/zli+XzlKg0y4K3OVOdOCUsmgFbR18Ku4TiEBo/YG2cUxOLs8lDurSj/OWJ0RMqgY4AW94l+/oDmuApA4Z1CJpsHdrAmVsbaHZyQkLtjcvWGwBx37AiDKigX4T5vXAEg9gx679BxfSviIZkoPLA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=epam.com; dmarc=pass action=none header.from=epam.com; dkim=pass header.d=epam.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=epam.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=M6yVN/7mR8MjfSPlwMkMwzKY7bVejLrXee73gB5MtkM=; b=d1wX+yHR/O62tKhCAAU2E5RvvZtnWwdPP8VzqVimqsi0o5ML6CuG/Vs7srKiloLDHpm2YD4xDZtc3psSbOKw/NmRoq83BK6OuTRmMDoArBsTAPu8B1bII6GfAFqysJ38DqsD1VWxoCWcIvPeKIYTAzCBgIHk15L6Wmd4yOSQsSImznRngNx1ZpGhWerSoowdepHN5JYrW4OsfZ553khmGU0YMO8LZCWduxWvSGYRarCE+KwCxm88XrIV9Hn00vq/xLn49dxrro2kPKNvSaxxrWJNIj1x265rXA40CD7hc8HzQlj0XnVAY3Kq20wSlntsJgloooz9oLn88uUmzC4P9A== From: Mykyta Poturai To: "xen-devel@lists.xenproject.org" CC: Stewart Hildebrand , Stefano Stabellini , Julien Grall , Bertrand Marquis , Michal Orzel , Volodymyr Babchuk , Andrew Cooper , Anthony PERARD , Jan Beulich , =?iso-8859-1?q?Roger_Pau_Monn=E9?= , Mykyta Poturai Subject: [PATCH v7 7/8] xen/arm: enable dom0 to use PCI devices with pci-passthrough=no Thread-Topic: [PATCH v7 7/8] xen/arm: enable dom0 to use PCI devices with pci-passthrough=no Thread-Index: AQHbdwxA2HXgA27x50qr88LJQwvJaw== Date: Tue, 4 Feb 2025 13:54:04 +0000 Message-ID: <7d9c8b93c01ee56cb8da6e959a020946efe65330.1738665272.git.mykyta_poturai@epam.com> References: In-Reply-To: Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: authentication-results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=epam.com; x-ms-publictraffictype: Email x-ms-traffictypediagnostic: PAVPR03MB10102:EE_|AS8PR03MB10120:EE_ x-ms-office365-filtering-correlation-id: a1ad0abb-2df3-4554-9942-08dd45236388 x-ld-processed: b41b72d0-4e9f-4c26-8a69-f949f367c91d,ExtAddr x-ms-exchange-senderadcheck: 1 x-ms-exchange-antispam-relay: 0 x-microsoft-antispam: BCL:0;ARA:13230040|1800799024|376014|7416014|366016|38070700018; x-microsoft-antispam-message-info: =?iso-8859-1?q?XTmnKrbxCTVLNXMGAYgm/gwIts?= =?iso-8859-1?q?0qBTd/NclKn5x2+enpSrzf+lYmhV+hlW+eWBloi1Sn+aJEmrOC2csajbcsRc?= =?iso-8859-1?q?VxTuWQa+nyG+gQ4TsL2mZ+Ctm0ad6y5ZHgHrO2HaV+t7cOGEgpeHnpbPAJpr?= =?iso-8859-1?q?XZpxHZLUt2UEzWcG6+wFuCJH4PD1xEuQaV8Tidv/2Yama3JLd9lv5w0b9Yuv?= =?iso-8859-1?q?90PUWPkUwhmqyxIP5ealFydCtz9MksuxSTm62YZYKjn5PV1XuevsE3QqE279?= =?iso-8859-1?q?e70zNJXHpL13bjzS2WEIC+RVdeFTCFgKngsQTTMWNBodnRX5BwZA1BwByfvR?= =?iso-8859-1?q?o6+CWrAhhLgcdkfwY88kxjCmLN3hwrrG2VYR3nEcun5rCNOzfKx5S+tl3uGa?= =?iso-8859-1?q?zBd+CJ3Zy45KHj2axbwQxDp6dEt+CO3qLzJji5grD0Rfxbw48ePloxBO+0AH?= =?iso-8859-1?q?L8pA2Ulp6oS/ClWxpf5jqfYfZzY1irEYEDKQ4Izsw+nq1FzQeWS4k806wBza?= =?iso-8859-1?q?woA+z14MpBzjBUZQpMLDrs+lXr+M6Ne9AIVO6zX3OHAwlonex073VEXgA03P?= =?iso-8859-1?q?2+rTQnDXWFH2JhZJ3Uph4RmMBx3nlEJ+CyQwDbLfAyyGq2q6ef9kDLCbSDqr?= =?iso-8859-1?q?j6h0KGVhdVwz1T6qCOaWWbjfFqH3iuVz4Vm6MHsJO8mNNsX8r5LxyMTF8olc?= =?iso-8859-1?q?l73hQlLUhJILyryDzV1dKCua8ORaiCVilUj1UxBuF2YPrVVpUgePIAGk/jDI?= =?iso-8859-1?q?6GUZj4oBPkZcydgag+vswVAkw+5/mxxTJlsMIF4TNg+migCfjeaGBNuEwlQ2?= =?iso-8859-1?q?hPmQMPaiWFYGz1waTj127i/QZbgpCMQNUhFQT5495ieFGK0WWl2sTDupUbK7?= =?iso-8859-1?q?mu+NbU7ej/1KM47lC4plBAdUIwOoupxKma89kNiMMUv+EEtFx63qziMR3jNd?= =?iso-8859-1?q?net+jBzPCwtRphGnJUAs9jTXi+cG73upunMaz4Ul2IbmFfnIwv00E8HsKeb0?= =?iso-8859-1?q?Nz5p5BhHWrXOkig79sN8jzoApUxBWP7fUoMPKaMvVcMjD6nohmk4prHsLB7K?= =?iso-8859-1?q?yHOCGQAcQqtTBzlb/bYnxqYZmVQm41r+489AKT/otlRjiMpulJZAckVNT6bT?= =?iso-8859-1?q?dqEmhmLLkXr6UaNxTYCE/BSA6qA6Au6eNL7UK9cfoxmgM80b8zgXHkdZoK7e?= =?iso-8859-1?q?mpddbJqdvIJ04nGdDaVg1nSIkrSJXyW8JRSpqzxFH2OfyMzFdzeAL6uE8ViQ?= =?iso-8859-1?q?HizM69AQjLGOAYhPnCtNuWwuqg+UVWl6hVnAHWu5ogVap8bjpHhtssZdRbub?= =?iso-8859-1?q?+iEN6Uaxwe3vRSQMXZFrg2uKNlJqxgg53qwbVYhdgCcFDcJ+xkY51oFdJBcQ?= =?iso-8859-1?q?W0ghsQwsiIJTOA6MdxXVz/1trpEKwJsPmtoCyifsOug9SspQA6rCXZPwCfR8?= =?iso-8859-1?q?CRlPHy8hHoMnE/vcNCaB3zq6rxBS+yhudcLgJbKyHL4olKf9RWXR0OXoNqOF?= =?iso-8859-1?q?eSLVla?= x-forefront-antispam-report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:PAVPR03MB10102.eurprd03.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230040)(1800799024)(376014)(7416014)(366016)(38070700018);DIR:OUT;SFP:1101; x-ms-exchange-antispam-messagedata-chunkcount: 1 x-ms-exchange-antispam-messagedata-0: =?iso-8859-1?q?NzWm29EZ8JppSLvy1YkbJng?= =?iso-8859-1?q?NZg0xepYeLtwCoPglUO5x2pUpFIvJGuGFUN1wNyMAA4PM03H3DPeQYIKMvvO?= =?iso-8859-1?q?AJjTg7hGQ+i7lGUikqQWlx8KABzbDbzEU9L3ma3ujRfJYyL523Y0pWQStQqu?= =?iso-8859-1?q?e0auNImklvIuzOTsc5iS7SdyqynTQBXZXTCWxzUW9Bj3+mcLRGqqMRVS+ueX?= =?iso-8859-1?q?UKabjgA8luN5Q4CgF3HaZa9GiEbM2pkZlu+f/iEleQZyltaw3msamfE8gcuT?= =?iso-8859-1?q?1y7BodyebnMT03e5aAyZijaJODZQZ0gFeO6tjqDOlNBo9d6COYdYJR1H6+v/?= =?iso-8859-1?q?3xaO4/1wKcGIbFeecLbOOytasHnhytQ+b24NF5rSfOfrL2g7d3CTeg30MbL4?= =?iso-8859-1?q?Tmh4pkvCj6R48nAgygaY50jLcD4psizxc9QpsIXwNtmI0zTqTMB6MeG7D8jt?= =?iso-8859-1?q?4xWkyJJ0cjhZoSHFlydy7WPt34VMPtY5u92C2OVnBXLNAV0mvIkePxQIj68g?= =?iso-8859-1?q?eBewKi72LiMLAemZwFQLcPSmFUdUF+op8nWspzTl8z6QHgXW5uHXsvSXGub/?= =?iso-8859-1?q?p8QacfY2wZpDYxH3TcTlgRhxuFMZLkmk3ATiRs/jBg5SHvyuBPa2uL0o0wcL?= =?iso-8859-1?q?ra2gYfaxBMfJpzuikFVqNZ3H3BaqUOsPTvF/JKDpnvVO/CyXkokchVIIiMlO?= =?iso-8859-1?q?1prX612kWT1LH2EZGevxElHb03r/xiNyWATZn5kz9FOaIG74LlzltS6TTLrz?= =?iso-8859-1?q?uVhEugsJZ/QYmHN9jOhCkCFbyOWd/iJu1eN7xVIZ1eIta/KH0O69PvdrzZdR?= =?iso-8859-1?q?6jO8kM8V9jvUGSLS0VX62jUx5HeaEH9igfg64Gm1n/GVuq6vKX9F4gil1WFj?= =?iso-8859-1?q?l8IOmeT43MoJkGHZ5FWs2SXAJWO8gnsQHN4u9ZNx7RjjBlBoHkibIq+YR2x4?= =?iso-8859-1?q?U2SwwiNR8w4/B5E/ZMUqN91LEx06gXJ8M4FHshwIxQgQnWjbzNb5LxLyP7rY?= =?iso-8859-1?q?fCuCg9nLNfCANL/ZAeTVVSFG220rUG0MYOllpOHAcqZBOw2x9Ld7dHB5ptfW?= =?iso-8859-1?q?9FcAYR2Q9AzUnKo+S/JdN3Md1l9gnRlDo9rjtAQ0hVk3qGcE4Y/Pvgo4Zgtg?= =?iso-8859-1?q?sNyeZGbvzFG7suTPU7+DZu9klt3BMW6pwH6vdwFc0p3mQNqzPOanvI2+T+5V?= =?iso-8859-1?q?6rbIHvvXe0p/X7Ci/zeFd2e3v5Jdhd6FQcCABzKGrBppD6Q24zCUzPcly+/7?= =?iso-8859-1?q?fp7RBYpyP5J3nFdLu8dxtGXqn6suXYYC1j2fr7YRBQR5cmFPMZK5M5f2rvVD?= =?iso-8859-1?q?JJshbe7Yeg2EQpwzh0d1JRJ3vGCWGhDC1r2yNA7VKq1wVGZgmCAToaP6V2G5?= =?iso-8859-1?q?DRu9NpexrvYh3jTMl9kFIqCoSTEW5I8sxYuOwx5Npirptb199kflvlfrvMVO?= =?iso-8859-1?q?rC734UP2YXXFvxE8HFZSgESzv0BeQOFDrF7OMSUM/49TBEHNvGBq4QgZPaV5?= =?iso-8859-1?q?B0vOslS+KqoNNMacdohrWa5I4cItQsLBPZuIcbbVpndUgtHIJGsEUOKSHSZ3?= =?iso-8859-1?q?xyU7z10fsEpM64i/ucPc7G8cucXxtOtNhFpr88B1tOZb1uJNNGlFRyx1Sbn9?= =?iso-8859-1?q?SBftEjxqP3vaxxtWbEJtmd1Bxsl9tMdo5aKHMwQ=3D=3D?= MIME-Version: 1.0 X-OriginatorOrg: epam.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-AuthSource: PAVPR03MB10102.eurprd03.prod.outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: a1ad0abb-2df3-4554-9942-08dd45236388 X-MS-Exchange-CrossTenant-originalarrivaltime: 04 Feb 2025 13:54:04.8717 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: b41b72d0-4e9f-4c26-8a69-f949f367c91d X-MS-Exchange-CrossTenant-mailboxtype: HOSTED X-MS-Exchange-CrossTenant-userprincipalname: k+tkADKPEDqrKHTCczeJdCPj1Br4NdvXJjWe3ewV0hAK+JmX5ZzWyWfiNtDiose0XbKhLzQ0y8jENgR3IlZ+Aw== X-MS-Exchange-Transport-CrossTenantHeadersStamped: AS8PR03MB10120 From: Stewart Hildebrand Enable the use of IOMMU + PCI in dom0 without having to specify "pci-passthrough=yes". We rely on dom0 to initialize the PCI controller and perform a PHYSDEVOP_pci_device_add call to add each device to SMMU. Enable pci_init() for initializing Xen's internal PCI subsystem, and allow PHYSDEVOP_pci_device_add when pci-passthrough is disabled. is_pci_passthrough_enabled() is not an Arm-only construct, so remove the x86 definition of the function. Signed-off-by: Stewart Hildebrand Signed-off-by: Mykyta Poturai --- hmm. Since dec9e02f3190 ("xen: avoid generation of stub header") Should we also move is_pci_passthrough_enabled() back to xen/arch/arm/include/asm/pci.h ? Not sure if PPC/RISC-V will plan on using this check. v6->v7: * remove x86 definition of is_pci_passthrough_enabled() * update comments * make pci_physdev_op checks stricter v5->v6: * new patch - this effectively replaces ("Revert "xen/arm: Add cmdline boot option "pci-passthrough = """) --- xen/arch/arm/pci/pci.c | 5 +++-- xen/arch/x86/include/asm/pci.h | 6 ------ xen/drivers/pci/physdev.c | 4 ++-- 3 files changed, 5 insertions(+), 10 deletions(-) diff --git a/xen/arch/arm/pci/pci.c b/xen/arch/arm/pci/pci.c index 78b97beaef..f2281e81aa 100644 --- a/xen/arch/arm/pci/pci.c +++ b/xen/arch/arm/pci/pci.c @@ -16,6 +16,7 @@ #include #include #include +#include #include #include @@ -83,9 +84,9 @@ static int __init pci_init(void) { /* * Enable PCI passthrough when has been enabled explicitly - * (pci-passthrough=on). + * (pci-passthrough=on) or IOMMU is present and enabled. */ - if ( !pci_passthrough_enabled ) + if ( !is_pci_passthrough_enabled() && !iommu_enabled ) return 0; pci_segments_init(); diff --git a/xen/arch/x86/include/asm/pci.h b/xen/arch/x86/include/asm/pci.h index fd5480d67d..720fcc7f09 100644 --- a/xen/arch/x86/include/asm/pci.h +++ b/xen/arch/x86/include/asm/pci.h @@ -49,12 +49,6 @@ bool pci_ro_mmcfg_decode(unsigned long mfn, unsigned int *seg, extern int pci_mmcfg_config_num; extern struct acpi_mcfg_allocation *pci_mmcfg_config; -/* Unlike ARM, PCI passthrough is always enabled for x86. */ -static always_inline bool is_pci_passthrough_enabled(void) -{ - return true; -} - void arch_pci_init_pdev(struct pci_dev *pdev); static inline bool pci_check_bar(const struct pci_dev *pdev, diff --git a/xen/drivers/pci/physdev.c b/xen/drivers/pci/physdev.c index 0161a85e1e..d8a49cadf3 100644 --- a/xen/drivers/pci/physdev.c +++ b/xen/drivers/pci/physdev.c @@ -19,7 +19,7 @@ ret_t pci_physdev_op(int cmd, XEN_GUEST_HANDLE_PARAM(void) arg) struct pci_dev_info pdev_info; nodeid_t node = NUMA_NO_NODE; - if ( !is_pci_passthrough_enabled() ) + if ( !is_pci_passthrough_enabled() && !iommu_enabled ) return -EOPNOTSUPP; ret = -EFAULT; @@ -57,7 +57,7 @@ ret_t pci_physdev_op(int cmd, XEN_GUEST_HANDLE_PARAM(void) arg) case PHYSDEVOP_pci_device_remove: { struct physdev_pci_device dev; - if ( !is_pci_passthrough_enabled() ) + if ( !is_pci_passthrough_enabled() && !iommu_enabled ) return -EOPNOTSUPP; ret = -EFAULT;