From nobody Mon May 20 22:43:19 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org; arc=pass (i=1 dmarc=pass fromdomain=amd.com); dmarc=pass(p=quarantine dis=none) header.from=amd.com ARC-Seal: i=2; a=rsa-sha256; t=1705040128; cv=pass; d=zohomail.com; s=zohoarc; b=iarMj7gSxYqUuAO1TauiJv3aYdBMDd+v9Fsz5Eh7aMSWlGxDngmCa1X0fxU4Sf3sPZP1tloOBEDMrRLMK4+Mwg9yjoK5CTWyF3gZysfdJBY7BF3CI47uaCrgc/6YT3gayCeRD2Ha1BnQI9XNBrlVWpGxFXblYP34MS7r0yNqYCk= ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1705040128; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=UY1dhgmm/7iGPInQH0m8WagUQ03lrwhilTFth0736UM=; b=V8eo3b0tuovyivPOgF4jazIQLXii6t4WgTfLsaY06jRLnvjdPsX0buFM5EE6XN8lhjgsjut9bUfSyFZ5AIhsTd0pZo5R9krumc7bLb2KoIwHtZG6mhVUOcJwX/wK7rUcrd0uSoe0HWw7Mqf+weKKqhVc6Gr+shahWVhwpbb2F30= ARC-Authentication-Results: i=2; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org; arc=pass (i=1 dmarc=pass fromdomain=amd.com); dmarc=pass header.from= (p=quarantine dis=none) Return-Path: Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) by mx.zohomail.com with SMTPS id 1705040128850364.10778329963887; Thu, 11 Jan 2024 22:15:28 -0800 (PST) Received: from list by lists.xenproject.org with outflank-mailman.666638.1037394 (Exim 4.92) (envelope-from ) id 1rOAox-0000V0-At; Fri, 12 Jan 2024 06:15:11 +0000 Received: by outflank-mailman (output) from mailman id 666638.1037394; Fri, 12 Jan 2024 06:15:11 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1rOAox-0000Ut-5y; Fri, 12 Jan 2024 06:15:11 +0000 Received: by outflank-mailman (input) for mailman id 666638; Fri, 12 Jan 2024 06:15:09 +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 1rOAov-0000At-TU for xen-devel@lists.xenproject.org; Fri, 12 Jan 2024 06:15:09 +0000 Received: from NAM02-DM3-obe.outbound.protection.outlook.com (mail-dm3nam02on20600.outbound.protection.outlook.com [2a01:111:f403:2405::600]) by se1-gles-sth1.inumbo.com (Halon) with ESMTPS id ef574fd8-b111-11ee-98f0-6d05b1d4d9a1; Fri, 12 Jan 2024 07:15:09 +0100 (CET) Received: from CH0PR03CA0004.namprd03.prod.outlook.com (2603:10b6:610:b0::9) by DM6PR12MB4156.namprd12.prod.outlook.com (2603:10b6:5:218::17) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7181.21; Fri, 12 Jan 2024 06:15:05 +0000 Received: from DS3PEPF000099D5.namprd04.prod.outlook.com (2603:10b6:610:b0:cafe::40) by CH0PR03CA0004.outlook.office365.com (2603:10b6:610:b0::9) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7181.19 via Frontend Transport; Fri, 12 Jan 2024 06:15:04 +0000 Received: from SATLEXMB04.amd.com (165.204.84.17) by DS3PEPF000099D5.mail.protection.outlook.com (10.167.17.6) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.7181.14 via Frontend Transport; Fri, 12 Jan 2024 06:15:04 +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.34; Fri, 12 Jan 2024 00:14:41 -0600 X-Outflank-Mailman: Message body and most headers restored to incoming version 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: ef574fd8-b111-11ee-98f0-6d05b1d4d9a1 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=YaV7FnLR7ifVUz5RQO+gDNH1KTtTC/gcKh2mw5+dcx972lUvNKIYbc2d9eOpUh6agA/3UK81pXyf4N3UQqVmevDwP7OjroEBZmweXfAMHbVJuXm8GlVviJyo6WSDCKjoECAUQ6yjuhnwne7VbxL8R3Y38/rFyGZGtAJuHMNHSipSn4NtL/3k2qg0ghqMy6cz5OSge4G77ZEbLJP0RIpEIqu2XVZFMOXx5kOT7ny4zhJrwjF7lRFdLQZB2u4wilbaaxJPfNqqyVS40X7RvtMaQ56yaNb73SarAxVw5nlXfLMzc+SSed482XznuhqpapJnAs79FCuZu/rUPcEqni3FfQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; 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=UY1dhgmm/7iGPInQH0m8WagUQ03lrwhilTFth0736UM=; b=W1X0g/6qxoMI55E2WBGbi5kQZUKDJxSG55mwm/HfR+5Yw5H19LGQMLvDRQptgOga7hZLsiWrtcQEB2wYVTyhXiUXCDDF7yGL77Xxb0zDpFbdNRz9FCQL+I84YDDSAusqzDDHLNp3VQu7my8a7p5j05947xzivpeQSPa4/NBkzv4icm1VTV7IGd1f4MSdViuh+DoMpnEraTBkjrrqv90/dWBMvCfxk412yDGJpmW/OjweCde7CYvNQIJRBHQiIa70LY5mhaUpEdZ81P7W1l084RL8Yepj5vBY5WV3TOnesF8vg0IfL9i8pen6h8NonN2dNAkvuxqF/NFtfFba9DV1Mg== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 165.204.84.17) smtp.rcpttodomain=lists.xenproject.org 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=UY1dhgmm/7iGPInQH0m8WagUQ03lrwhilTFth0736UM=; b=1z3ejlsSCP7BjUMwzrWQIMpfeuUN2Few1c2PwhGgGX2WP7s3dcTTDVsNrhDAIT2MtUX1trndXSuXpTfJ1+jM3CG9iUKODTsh8Su/+A4ktJ6LO/ek01HY8VVRHySXfdeD/fwtdipH3oF43BHU/rArCuK4mJUDlXEANN46wP158MA= 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 (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) client-ip=192.237.175.120; envelope-from=xen-devel-bounces@lists.xenproject.org; helo=lists.xenproject.org; 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: CC: Jan Beulich , Andrew Cooper , =?UTF-8?q?Roger=20Pau=20Monn=C3=A9?= , Wei Liu , George Dunlap , Julien Grall , Stefano Stabellini , Anthony PERARD , "Juergen Gross" , "Daniel P . Smith" , Stewart Hildebrand , Huang Rui , Jiqian Chen , Huang Rui Subject: [RFC XEN PATCH v5 1/5] xen/vpci: Clear all vpci status of device Date: Fri, 12 Jan 2024 14:13:13 +0800 Message-ID: <20240112061317.418658-2-Jiqian.Chen@amd.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20240112061317.418658-1-Jiqian.Chen@amd.com> References: <20240112061317.418658-1-Jiqian.Chen@amd.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable 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: DS3PEPF000099D5:EE_|DM6PR12MB4156:EE_ X-MS-Office365-Filtering-Correlation-Id: 979ceaec-63db-4e40-5866-08dc1335d175 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 4Ce10cm9VV5qt2iduExnwW/XdFVKtmB1NVUYdaOZ8V2+D/yAhv3Fkki0eEowzaRR021/MltdgPrHz5rd6212WEoXE1bQlX4So4vYZVbMlXEc2tcBSA2Hv+NE99Ubqx9CTwYXdK8rX8qnzpZmgBLV3e06wVIxPWm1BH0s0KShBSJf5oH4gP3P1inJW6r20vTvJ3JRu0TiNI3OBlQs4Y6e+XI6w6Dn8yv/TL+8r8Lu8Y38YzCnzUkkXJIex57vLLFuILREIpROOyLM8WqK2OOoDt+IFFMX6f+YXnmKHHBVbGFLpnm7ziKA+P+gvsgsw5J3Ogn2ZOKMnbM0I+3kNefHoD0kQ7l0v+WT+x1ydjL2nQaGaMC8SWIH6UcJtzyKdmoRDkirp2WHcgfEfp+KKuO9NeSsWt/Nvx3GyC7jiag6X1ZwyzGM9JrA35ie1h15wuHOmBajGalnA8bSWFNGtBJy3wKFh+yBHcuEZZ+CA13JLHhxR7BLOiBenS9oFvUGr84gONurmjXbII5JNUpeROzrUG4zEDKH103SQ0gKEMLuvVrFfn1ch8YKALE+07U0jwR9W39EwEj+AH77dPkhWow+mCp/uXiPvHuM79Fg+evZrwbZGJspj8jbnHGLCdddDsQ8lUx0dsMhYa4xzvRzT32mqhd+UJARkagSOhAQe+/WuFmsySwLH6+2cF9ZHNWxThjE7V3N0GXZVPHNvq28/YPW+vcMnpUCTZnpjc40Xl/esJELm+4zFrkzpO61LoZ7+cvFSyJGBQFkth58t3O53UdpBw== 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:(13230031)(4636009)(39860400002)(346002)(376002)(396003)(136003)(230922051799003)(64100799003)(451199024)(1800799012)(186009)(82310400011)(46966006)(36840700001)(40470700004)(70206006)(70586007)(7696005)(26005)(36756003)(1076003)(336012)(2616005)(426003)(16526019)(6666004)(86362001)(82740400003)(36860700001)(81166007)(356005)(83380400001)(41300700001)(47076005)(478600001)(4326008)(40460700003)(40480700001)(7416002)(2906002)(5660300002)(316002)(54906003)(8936002)(8676002)(6916009)(36900700001);DIR:OUT;SFP:1101; X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 12 Jan 2024 06:15:04.6840 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 979ceaec-63db-4e40-5866-08dc1335d175 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: DS3PEPF000099D5.namprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM6PR12MB4156 X-ZohoMail-DKIM: pass (identity @amd.com) X-ZM-MESSAGEID: 1705040130336100001 Content-Type: text/plain; charset="utf-8" When a device has been reset on dom0 side, the vpci on Xen side won't get notification, so the cached state in vpci is all out of date compare with the real device state. To solve that problem, add a new hypercall to clear all vpci device state. When the state of device is reset on dom0 side, dom0 can call this hypercall to notify vpci. Co-developed-by: Huang Rui Signed-off-by: Jiqian Chen Reviewed-by: Stefano Stabellini Reviewed-by: Stewart Hildebrand --- xen/arch/x86/hvm/hypercall.c | 1 + xen/drivers/pci/physdev.c | 36 ++++++++++++++++++++++++++++++++++++ xen/drivers/vpci/vpci.c | 10 ++++++++++ xen/include/public/physdev.h | 7 +++++++ xen/include/xen/vpci.h | 6 ++++++ 5 files changed, 60 insertions(+) diff --git a/xen/arch/x86/hvm/hypercall.c b/xen/arch/x86/hvm/hypercall.c index eeb73e1aa5d0..6ad5b4d5f11f 100644 --- a/xen/arch/x86/hvm/hypercall.c +++ b/xen/arch/x86/hvm/hypercall.c @@ -84,6 +84,7 @@ long hvm_physdev_op(int cmd, XEN_GUEST_HANDLE_PARAM(void)= arg) case PHYSDEVOP_pci_mmcfg_reserved: case PHYSDEVOP_pci_device_add: case PHYSDEVOP_pci_device_remove: + case PHYSDEVOP_pci_device_state_reset: case PHYSDEVOP_dbgp_op: if ( !is_hardware_domain(currd) ) return -ENOSYS; diff --git a/xen/drivers/pci/physdev.c b/xen/drivers/pci/physdev.c index 42db3e6d133c..73dc8f058b0e 100644 --- a/xen/drivers/pci/physdev.c +++ b/xen/drivers/pci/physdev.c @@ -2,6 +2,7 @@ #include #include #include +#include =20 #ifndef COMPAT typedef long ret_t; @@ -67,6 +68,41 @@ ret_t pci_physdev_op(int cmd, XEN_GUEST_HANDLE_PARAM(voi= d) arg) break; } =20 + case PHYSDEVOP_pci_device_state_reset: { + struct physdev_pci_device dev; + struct pci_dev *pdev; + pci_sbdf_t sbdf; + + if ( !is_pci_passthrough_enabled() ) + return -EOPNOTSUPP; + + ret =3D -EFAULT; + if ( copy_from_guest(&dev, arg, 1) !=3D 0 ) + break; + sbdf =3D PCI_SBDF(dev.seg, dev.bus, dev.devfn); + + ret =3D xsm_resource_setup_pci(XSM_PRIV, sbdf.sbdf); + if ( ret ) + break; + + pcidevs_lock(); + pdev =3D pci_get_pdev(NULL, sbdf); + if ( !pdev ) + { + pcidevs_unlock(); + ret =3D -ENODEV; + break; + } + + write_lock(&pdev->domain->pci_lock); + ret =3D vpci_reset_device_state(pdev); + write_unlock(&pdev->domain->pci_lock); + pcidevs_unlock(); + if ( ret ) + printk(XENLOG_ERR "%pp: failed to reset PCI device state\n", &= sbdf); + break; + } + default: ret =3D -ENOSYS; break; diff --git a/xen/drivers/vpci/vpci.c b/xen/drivers/vpci/vpci.c index 72ef277c4f8e..c6df2c6a9561 100644 --- a/xen/drivers/vpci/vpci.c +++ b/xen/drivers/vpci/vpci.c @@ -107,6 +107,16 @@ int vpci_add_handlers(struct pci_dev *pdev) =20 return rc; } + +int vpci_reset_device_state(struct pci_dev *pdev) +{ + ASSERT(pcidevs_locked()); + ASSERT(rw_is_write_locked(&pdev->domain->pci_lock)); + + vpci_remove_device(pdev); + return vpci_add_handlers(pdev); +} + #endif /* __XEN__ */ =20 static int vpci_register_cmp(const struct vpci_register *r1, diff --git a/xen/include/public/physdev.h b/xen/include/public/physdev.h index f0c0d4727c0b..f5bab1f29779 100644 --- a/xen/include/public/physdev.h +++ b/xen/include/public/physdev.h @@ -296,6 +296,13 @@ DEFINE_XEN_GUEST_HANDLE(physdev_pci_device_add_t); */ #define PHYSDEVOP_prepare_msix 30 #define PHYSDEVOP_release_msix 31 +/* + * Notify the hypervisor that a PCI device has been reset, so that any + * internally cached state is regenerated. Should be called after any + * device reset performed by the hardware domain. + */ +#define PHYSDEVOP_pci_device_state_reset 32 + struct physdev_pci_device { /* IN */ uint16_t seg; diff --git a/xen/include/xen/vpci.h b/xen/include/xen/vpci.h index d20c301a3db3..6ec83ce9ae13 100644 --- a/xen/include/xen/vpci.h +++ b/xen/include/xen/vpci.h @@ -30,6 +30,7 @@ int __must_check vpci_add_handlers(struct pci_dev *pdev); =20 /* Remove all handlers and free vpci related structures. */ void vpci_remove_device(struct pci_dev *pdev); +int __must_check vpci_reset_device_state(struct pci_dev *pdev); =20 /* Add/remove a register handler. */ int __must_check vpci_add_register_mask(struct vpci *vpci, @@ -262,6 +263,11 @@ static inline int vpci_add_handlers(struct pci_dev *pd= ev) =20 static inline void vpci_remove_device(struct pci_dev *pdev) { } =20 +static inline int __must_check vpci_reset_device_state(struct pci_dev *pde= v) +{ + return 0; +} + static inline void vpci_dump_msi(void) { } =20 static inline uint32_t vpci_read(pci_sbdf_t sbdf, unsigned int reg, --=20 2.34.1 From nobody Mon May 20 22:43:19 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org; arc=pass (i=1 dmarc=pass fromdomain=amd.com); dmarc=pass(p=quarantine dis=none) header.from=amd.com ARC-Seal: i=2; a=rsa-sha256; t=1705040135; cv=pass; d=zohomail.com; s=zohoarc; b=LIUmL8pfiRMCekYhexnsdcbUOGRYAtxhLWd/QZoaQI4+Wfjekq819wo9ovdh/F9N3NA7LBDFtY0n5tJvzate7ebtqfujNfAvfWajYxNIg8CCHS8QcpQpOnz6rJgTswNXTiepAz2F/8GAGlgDtr5wYBsWz8/upVknyqbJCF4/VGk= ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1705040135; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=hT7olkd/7ks/vk3IK/hSUDJvUuE/1TeMe3oCQr0a9xg=; b=R1vl2+f92iNlaaElAc18ZeWoUTf5n2+I9bXvXVp28TsVOxD5wlPt2vHYfrktQH026QsMRmch/n+xUPw8djjRvEZ3C40Poh7gPl14vdQjzNL5zdbebBwe2cIwa/GsPbAgwL6ZHHBn5czeOe4rLuh4xUKLBPZ5BV/PJB95TbO7SWo= ARC-Authentication-Results: i=2; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org; arc=pass (i=1 dmarc=pass fromdomain=amd.com); dmarc=pass header.from= (p=quarantine dis=none) Return-Path: Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) by mx.zohomail.com with SMTPS id 1705040135873415.32756287282245; Thu, 11 Jan 2024 22:15:35 -0800 (PST) Received: from list by lists.xenproject.org with outflank-mailman.666641.1037402 (Exim 4.92) (envelope-from ) id 1rOAp4-0000qu-G7; Fri, 12 Jan 2024 06:15:18 +0000 Received: by outflank-mailman (output) from mailman id 666641.1037402; Fri, 12 Jan 2024 06:15:18 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1rOAp4-0000pz-DC; Fri, 12 Jan 2024 06:15:18 +0000 Received: by outflank-mailman (input) for mailman id 666641; Fri, 12 Jan 2024 06:15:17 +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 1rOAp2-0000lq-Vh for xen-devel@lists.xenproject.org; Fri, 12 Jan 2024 06:15:16 +0000 Received: from NAM10-DM6-obe.outbound.protection.outlook.com (mail-dm6nam10on20613.outbound.protection.outlook.com [2a01:111:f400:7e88::613]) by se1-gles-flk1.inumbo.com (Halon) with ESMTPS id f2a87704-b111-11ee-9b0f-b553b5be7939; Fri, 12 Jan 2024 07:15:15 +0100 (CET) Received: from CH0PR04CA0053.namprd04.prod.outlook.com (2603:10b6:610:77::28) by PH7PR12MB8105.namprd12.prod.outlook.com (2603:10b6:510:2b7::14) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7181.21; Fri, 12 Jan 2024 06:15:10 +0000 Received: from DS3PEPF000099D4.namprd04.prod.outlook.com (2603:10b6:610:77:cafe::39) by CH0PR04CA0053.outlook.office365.com (2603:10b6:610:77::28) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7181.19 via Frontend Transport; Fri, 12 Jan 2024 06:15:10 +0000 Received: from SATLEXMB04.amd.com (165.204.84.17) by DS3PEPF000099D4.mail.protection.outlook.com (10.167.17.5) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.7181.14 via Frontend Transport; Fri, 12 Jan 2024 06:15:09 +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.34; Fri, 12 Jan 2024 00:14:45 -0600 X-Outflank-Mailman: Message body and most headers restored to incoming version 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: f2a87704-b111-11ee-9b0f-b553b5be7939 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=nEK9yXfO6tP5hio9WqBB9KCPYb94o2r08SrzJhzSf8aJAFBQzqdkxUfhQb1cXyETqAQQumbasCptenl/AV44CvdwzkLcaV72IVHVbOg4oXalrsY8PcWwup+af3onL9ZL8BZ1Pi1LZNIEb+vCW9hYmXOxceiBGYxdO0GJnZWMsclMnb4cfWbGafkgF0drv1ShhDnCLZ/flv1xc2BLuWH4r8tmXajn4ZQXyMVtLl6sWig113ocVWW2F9k0immmCPKkNFwzKukhgjfntCOSyqJiTrWmSXGJ2+GzWrdghLOw1NVBSH2gUS2WtfRfMF+jg76z2JFvnzDKEglJEcknBYpzow== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; 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=hT7olkd/7ks/vk3IK/hSUDJvUuE/1TeMe3oCQr0a9xg=; b=FkIMwASHzRsLEFy9zOMTXIRY7iaqq2P7cm+1aT1tqcOe0PV4etJoybGcK45rHh8rb6V4+bbFxtkMKG0NPaffAyg3eau+FNWWM2/xoGZWNCJD31+le/lxcBfvUku6xIrY3zrnTZF0kYxsf7mLCsVXQghmT37eKyw03tMDfnTyxp+CIqElwlEyjcj3OdFejLpme7KRctdjH2UA8xdMyTp2Xpj3Ta0ZG2S2TvKQE7esudSDXftShXin5QOsLrSZ7asb5ROH7dS2XFidZ38HSEflJn6YAXVfWJgKCtf/M1ufEaXgxa4B5nv2Vrn8Cc46YRLoV1QMcKrTMIHhvuF3j9NOsQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 165.204.84.17) smtp.rcpttodomain=lists.xenproject.org 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=hT7olkd/7ks/vk3IK/hSUDJvUuE/1TeMe3oCQr0a9xg=; b=CvvpoFdo79N8RYBwtScGWo4oqBpzvW9V+SdXb81KaTmVVuZLjNjJaicmmJBelAMljsfVSLWf1+R47037AUJSy86ujRFnmt9Ne5Em2rGXvxnKW1yr3rpz328qDylbjeZ4k1keZeEG58JsbEOzCOk1f8B+DOI4wp86ggdj3JR0qZY= 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 (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) client-ip=192.237.175.120; envelope-from=xen-devel-bounces@lists.xenproject.org; helo=lists.xenproject.org; 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: CC: Jan Beulich , Andrew Cooper , =?UTF-8?q?Roger=20Pau=20Monn=C3=A9?= , Wei Liu , George Dunlap , Julien Grall , Stefano Stabellini , Anthony PERARD , "Juergen Gross" , "Daniel P . Smith" , Stewart Hildebrand , Huang Rui , Jiqian Chen , Huang Rui Subject: [RFC XEN PATCH v5 2/5] x86/pvh: Allow (un)map_pirq when dom0 is PVH Date: Fri, 12 Jan 2024 14:13:14 +0800 Message-ID: <20240112061317.418658-3-Jiqian.Chen@amd.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20240112061317.418658-1-Jiqian.Chen@amd.com> References: <20240112061317.418658-1-Jiqian.Chen@amd.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable 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: DS3PEPF000099D4:EE_|PH7PR12MB8105:EE_ X-MS-Office365-Filtering-Correlation-Id: 020d4c8b-736c-4e90-b461-08dc1335d477 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 8VvNN+qndOmFudVWRF7+yZpliVTmD811oq9YaaXy0cexfFrrHq9DnU2/GToL9ypivKazqqqsS3I9XbIVip5BYfp0rwcodGceOIs+WVrIGpQDGf6Bv62l+uY9S/djUrO/vJ2iZaSoLpYIiNRkSo/RzbSXgXlvn5JU5MKE92ulHr03igej3yS9pKwyUkWhTSmKpYA1I7RDDOBqW5GadSTtMxR/7cZGBtR19/5SKQzvJHLGlWgi6+IjCO52uWrsnE2lTnf8Xfk/DrDbiYsn3eu+9scSrFoEozbyKixmff91Jsc8tqNHIg8PQ9C8ac6KQ+D6+QjKyjfz8u296+Y5unXYv94wMgHrsJiPCajgh8byjoa5x+3Un6aj/MqwaZ4fpNzDl1lSMHM88oWk/cxFLQJkZHaPjsb5ly46seQjQvE8KwPpEPOBvk596JzQ8lScnl9fxSslftHXwe+RRkHOxJua/cZQe4gZEKlEGszxqqg/X6tcCyWr0XZ+XLTC/xn5QhlQ/WJkhIqVewRtQEHD/7X/jz7EBb+aPzldl/2k0R3iYIT5FiQvIT5TcrQZ8nxCTcXiFxsuR4BncRDFwDIe0L38DKwP7fUyBPyI0wQD7KxEpV5CWZ6sO13tJAEwe0dR2PfBsk2U8EM28GDRTj51BOB+DPGwonr++9u/5wdrSSWA/zBW2RFngI1wDDWAq1CxrfK/Ahlc/6ouTPyzoikDZAlaIp3RsneNvuBony1MFL5+sAp7Q6iqYOAymXghMxM5xoyejQfIEh3J5yLhj0zUfinunA== 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:(13230031)(4636009)(346002)(39860400002)(376002)(396003)(136003)(230922051799003)(451199024)(64100799003)(82310400011)(186009)(1800799012)(36840700001)(46966006)(40470700004)(7696005)(6666004)(478600001)(426003)(336012)(26005)(1076003)(16526019)(2616005)(6916009)(316002)(36756003)(8936002)(8676002)(70586007)(70206006)(54906003)(356005)(81166007)(82740400003)(83380400001)(47076005)(86362001)(4326008)(36860700001)(5660300002)(7416002)(2906002)(41300700001)(40480700001)(40460700003)(36900700001);DIR:OUT;SFP:1101; X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 12 Jan 2024 06:15:09.7639 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 020d4c8b-736c-4e90-b461-08dc1335d477 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: DS3PEPF000099D4.namprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: PH7PR12MB8105 X-ZohoMail-DKIM: pass (identity @amd.com) X-ZM-MESSAGEID: 1705040136296100001 Content-Type: text/plain; charset="utf-8" If run Xen with PVH dom0 and hvm domU, hvm will map a pirq for a passthrough device by using gsi, see xen_pt_realize->xc_physdev_map_pirq and pci_add_dm_done->xc_physdev_map_pirq. Then xc_physdev_map_pirq will call into Xen, but in hvm_physdev_op, PHYSDEVOP_map_pirq is not allowed because currd is PVH dom0 and PVH has no X86_EMU_USE_PIRQ flag, it will fail at has_pirq check. So, allow PHYSDEVOP_map_pirq when dom0 is PVH and also allow PHYSDEVOP_unmap_pirq for the failed path to unmap pirq. And add a new check to prevent self map when caller has no PIRQ flag. Co-developed-by: Huang Rui Signed-off-by: Jiqian Chen Reviewed-by: Stefano Stabellini --- xen/arch/x86/hvm/hypercall.c | 2 ++ xen/arch/x86/physdev.c | 22 ++++++++++++++++++++++ 2 files changed, 24 insertions(+) diff --git a/xen/arch/x86/hvm/hypercall.c b/xen/arch/x86/hvm/hypercall.c index 6ad5b4d5f11f..493998b42ec5 100644 --- a/xen/arch/x86/hvm/hypercall.c +++ b/xen/arch/x86/hvm/hypercall.c @@ -74,6 +74,8 @@ long hvm_physdev_op(int cmd, XEN_GUEST_HANDLE_PARAM(void)= arg) { case PHYSDEVOP_map_pirq: case PHYSDEVOP_unmap_pirq: + break; + case PHYSDEVOP_eoi: case PHYSDEVOP_irq_status_query: case PHYSDEVOP_get_free_pirq: diff --git a/xen/arch/x86/physdev.c b/xen/arch/x86/physdev.c index 47c4da0af7e1..7f2422c2a483 100644 --- a/xen/arch/x86/physdev.c +++ b/xen/arch/x86/physdev.c @@ -303,11 +303,22 @@ ret_t do_physdev_op(int cmd, XEN_GUEST_HANDLE_PARAM(v= oid) arg) case PHYSDEVOP_map_pirq: { physdev_map_pirq_t map; struct msi_info msi; + struct domain *d; =20 ret =3D -EFAULT; if ( copy_from_guest(&map, arg, 1) !=3D 0 ) break; =20 + d =3D rcu_lock_domain_by_any_id(map.domid); + if ( d =3D=3D NULL ) + return -ESRCH; + if ( !is_pv_domain(d) && !has_pirq(d) ) + { + rcu_unlock_domain(d); + return -EOPNOTSUPP; + } + rcu_unlock_domain(d); + switch ( map.type ) { case MAP_PIRQ_TYPE_MSI_SEG: @@ -341,11 +352,22 @@ ret_t do_physdev_op(int cmd, XEN_GUEST_HANDLE_PARAM(v= oid) arg) =20 case PHYSDEVOP_unmap_pirq: { struct physdev_unmap_pirq unmap; + struct domain *d; =20 ret =3D -EFAULT; if ( copy_from_guest(&unmap, arg, 1) !=3D 0 ) break; =20 + d =3D rcu_lock_domain_by_any_id(unmap.domid); + if ( d =3D=3D NULL ) + return -ESRCH; + if ( !is_pv_domain(d) && !has_pirq(d) ) + { + rcu_unlock_domain(d); + return -EOPNOTSUPP; + } + rcu_unlock_domain(d); + ret =3D physdev_unmap_pirq(unmap.domid, unmap.pirq); break; } --=20 2.34.1 From nobody Mon May 20 22:43:19 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org; arc=pass (i=1 dmarc=pass fromdomain=amd.com); dmarc=pass(p=quarantine dis=none) header.from=amd.com ARC-Seal: i=2; a=rsa-sha256; t=1705040137; cv=pass; d=zohomail.com; s=zohoarc; b=VlIqNP/lK5NCB2cicqjYe4SlvD6e1Sfp3+ewyoAhr/Wqqn5RTZ+iObSnrec5tzYkMp5PSWM1ojM9DHrT7d2XsRVCU9d4okgKy+Cvw1nls+tt2f2D3igupFlZlknaZm9WNlwPUxgAWdPimOzCoScHSl6MJ2KSCru/rXQCNsIYFrE= ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1705040137; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=QdiTH6i1r8SUyWtxRAbifltVDLUobikXsc/LwaGqRtA=; b=DUzPVSkiYP27a2jjwEa+HCZ1ZK2WGGf+LVyrmwWSP/cnhENF+Z9TtIw5CYeK9J8U8BWM5suO6vs9Ow/rdp2ptAflJGoorGMAqna85QBGjImapGnmKz3IrwhlCLQRuU81oa3pK8BB5v+j6kXmYzJw5S7auoMMkYwuLWwQyIDf9p8= ARC-Authentication-Results: i=2; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org; arc=pass (i=1 dmarc=pass fromdomain=amd.com); dmarc=pass header.from= (p=quarantine dis=none) Return-Path: Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) by mx.zohomail.com with SMTPS id 170504013790073.44200239879854; Thu, 11 Jan 2024 22:15:37 -0800 (PST) Received: from list by lists.xenproject.org with outflank-mailman.666643.1037412 (Exim 4.92) (envelope-from ) id 1rOAp6-0001B3-Pd; Fri, 12 Jan 2024 06:15:20 +0000 Received: by outflank-mailman (output) from mailman id 666643.1037412; Fri, 12 Jan 2024 06:15:20 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1rOAp6-0001Ap-LU; Fri, 12 Jan 2024 06:15:20 +0000 Received: by outflank-mailman (input) for mailman id 666643; Fri, 12 Jan 2024 06:15:19 +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 1rOAp5-0000lq-AQ for xen-devel@lists.xenproject.org; Fri, 12 Jan 2024 06:15:19 +0000 Received: from NAM12-DM6-obe.outbound.protection.outlook.com (mail-dm6nam12on20600.outbound.protection.outlook.com [2a01:111:f403:2417::600]) by se1-gles-flk1.inumbo.com (Halon) with ESMTPS id f3ef2f34-b111-11ee-9b0f-b553b5be7939; Fri, 12 Jan 2024 07:15:17 +0100 (CET) Received: from DM6PR11CA0017.namprd11.prod.outlook.com (2603:10b6:5:190::30) by SA0PR12MB7073.namprd12.prod.outlook.com (2603:10b6:806:2d5::8) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7181.21; Fri, 12 Jan 2024 06:15:13 +0000 Received: from DS3PEPF000099D7.namprd04.prod.outlook.com (2603:10b6:5:190:cafe::56) by DM6PR11CA0017.outlook.office365.com (2603:10b6:5:190::30) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7181.21 via Frontend Transport; Fri, 12 Jan 2024 06:15:12 +0000 Received: from SATLEXMB04.amd.com (165.204.84.17) by DS3PEPF000099D7.mail.protection.outlook.com (10.167.17.8) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.7181.14 via Frontend Transport; Fri, 12 Jan 2024 06:15:12 +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.34; Fri, 12 Jan 2024 00:15:08 -0600 X-Outflank-Mailman: Message body and most headers restored to incoming version 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: f3ef2f34-b111-11ee-9b0f-b553b5be7939 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=N0VsFMxWNGHW+cNTDprSeMNEDXJZvXLGx5MZJRFTHz2IBvk6u/YK1VE63OnexPC8e87TGNDrD7PH1GRSAu5UPxqq+jVN82dTdOpd6MzqqPJsTHd18hDgP+SGc/tJCQCUkT/2GFgpcSzjjBetd4q85AdiOhZDIQUoOnkrfiuNvs7tgvCbDORB3V6mTLEK6GkqOF3V86Vx4iD8JdN8i9hZsoTHUAdysiBgVEulB3GSMU3fS+p5DNPn/lWSEJ+At6DIY4kgNnX0Y7ne9fj1iDEDsdV648VjrcacoyFfzG8r2LNiyRa0t2QzRgvwbzlTjJis3jq+rIEn4NJND4+SD3fJ3g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; 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=QdiTH6i1r8SUyWtxRAbifltVDLUobikXsc/LwaGqRtA=; b=Qm5TDkFVsawzxNgwfR35mZNaLLRaH54LWSqiR5CvwC5w7Cqt4dsSyUYphT1GJHxUB7wxvBcXGJ7S5+MvdhzsDe66nMjAhKY3qi1/poQmwc0lMhDezJdFyXMXJx6PNqnwXP5FyXnf0QvtoByvG/nngHQfppMvrq8yLIig+Lnw68DZ3hhlqnsdb+OALxAqWc+PjxzP3vYBMUk815tx1bt2mi7gZTN5NDVOXiu69KJGAelK1WpDeON8Md6n28VPgr/VL0LV2vJXSJvoUEUJiT6jtOU1i0+Qn2khZa8T7oN7AnGkxEVm38+x9eI/zzIbdWAVv91AbwF6ddoWJjh/i2Lrfg== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 165.204.84.17) smtp.rcpttodomain=lists.xenproject.org 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=QdiTH6i1r8SUyWtxRAbifltVDLUobikXsc/LwaGqRtA=; b=4COLBEAgtBz17vW8GRpQyRRM6Vx/3AFQxiYA+PszCdKhYPBkkVMCK3IGGsO6/W753dy+yjvAoJH9UtAtpl+B6TYYcqIn9Kxffyt05faxltQxyZ44z6fGnjZ5Hf2Rv44YCRgaehP2NEr3uQG3mtnNT6OF42yB6EyBrvfDf+89Kos= 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 (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) client-ip=192.237.175.120; envelope-from=xen-devel-bounces@lists.xenproject.org; helo=lists.xenproject.org; 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: CC: Jan Beulich , Andrew Cooper , =?UTF-8?q?Roger=20Pau=20Monn=C3=A9?= , Wei Liu , George Dunlap , Julien Grall , Stefano Stabellini , Anthony PERARD , "Juergen Gross" , "Daniel P . Smith" , Stewart Hildebrand , Huang Rui , Jiqian Chen , Huang Rui Subject: [RFC XEN PATCH v5 3/5] x86/pvh: Add PHYSDEVOP_setup_gsi for PVH dom0 Date: Fri, 12 Jan 2024 14:13:15 +0800 Message-ID: <20240112061317.418658-4-Jiqian.Chen@amd.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20240112061317.418658-1-Jiqian.Chen@amd.com> References: <20240112061317.418658-1-Jiqian.Chen@amd.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable 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: DS3PEPF000099D7:EE_|SA0PR12MB7073:EE_ X-MS-Office365-Filtering-Correlation-Id: d720b8a1-5326-4eb9-0ff5-08dc1335d619 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 6/W2SHCW4qIvbqdEYyFsHQhcWH+U9nv6wEdune/EvkUXtVO7J/rsZnxfabkllsiA/tw996gt61rE0mSt3+8Nap6s0ySMigyDexsqY7INVcwJrjYue3aLXiAB/i6GiM7uftidp+Ym8diWP8pL70aBkV9NNFVXyCd/L1sP66bcQG5aC73rleXWr81WIP/LyVf1Wm7WkIrgXkkDjbWywUxt1qoqtwlh4h69AQci/SnVmVAljUqUw+Dhn4RYesgJVd8epNrH0Z8TxdOO9SYOFsvWri574Km3mDMt8JC/x9/t8unFoq74A+b/TBf+3pQNLmKx6MgNDGSJeCJhN8Z69Ry0Mh10RCaXz0RjaA/l9Z5r7LxWkco64iDeyAziXSXVO3mLzm7l+1C4iOalhOkbaxjxnSyzOoLFQiaZJX4RBufqpOleQISPx0zd9KygQ8T9W4rDMcFJSVLrB29Y3DoFepsVAddfyfqPDj4JwzBSw02R2cih8o8fn7gsz6xDC9KumKEJ8zBy3BHFRePwAih2XJdMVx7SVLB4HRWqqzgURhbvd6Z/AVvH6geGF2cOxP88/dkr4teA+Ka7LA50s5bJB8gXCoBSRp3yGp8Ye4onouUDVjLzhkVO/kcEjp9xtiinbsViyFZTHgDm+Cj95/R2jAZzy7Lj98WxcKeilPQrLN4qAHuo2+9QgS8Tg5Xca7gJf0TaI+PtrkW66v4j598sjFOaapCnxPa/cvnEsyT/TrLoGjb1rzBwJl6E7dWebpNb3gSGefIHESehuhSjhPrwpLx0Og== 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:(13230031)(4636009)(136003)(396003)(39860400002)(346002)(376002)(230922051799003)(1800799012)(82310400011)(451199024)(186009)(64100799003)(36840700001)(46966006)(40470700004)(40480700001)(40460700003)(86362001)(36756003)(356005)(81166007)(82740400003)(36860700001)(7696005)(6666004)(8676002)(8936002)(4326008)(5660300002)(16526019)(47076005)(2616005)(1076003)(426003)(336012)(26005)(70206006)(6916009)(316002)(54906003)(70586007)(4744005)(2906002)(7416002)(41300700001)(478600001)(36900700001);DIR:OUT;SFP:1101; X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 12 Jan 2024 06:15:12.4991 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: d720b8a1-5326-4eb9-0ff5-08dc1335d619 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: DS3PEPF000099D7.namprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: SA0PR12MB7073 X-ZohoMail-DKIM: pass (identity @amd.com) X-ZM-MESSAGEID: 1705040138277100003 Content-Type: text/plain; charset="utf-8" On PVH dom0, the gsis don't get registered, but the gsi of a passthrough device must be configured for it to be able to be mapped into a hvm domU. On Linux kernel side, it calles PHYSDEVOP_setup_gsi for passthrough devices to register gsi when dom0 is PVH. So, add PHYSDEVOP_setup_gsi for above purpose. Co-developed-by: Huang Rui Signed-off-by: Jiqian Chen --- xen/arch/x86/hvm/hypercall.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/xen/arch/x86/hvm/hypercall.c b/xen/arch/x86/hvm/hypercall.c index 493998b42ec5..46f51ee459f6 100644 --- a/xen/arch/x86/hvm/hypercall.c +++ b/xen/arch/x86/hvm/hypercall.c @@ -76,6 +76,12 @@ long hvm_physdev_op(int cmd, XEN_GUEST_HANDLE_PARAM(void= ) arg) case PHYSDEVOP_unmap_pirq: break; =20 + case PHYSDEVOP_setup_gsi: + if ( !is_hardware_domain(currd) ) + return -EOPNOTSUPP; + ASSERT(!has_pirq(currd)); + break; + case PHYSDEVOP_eoi: case PHYSDEVOP_irq_status_query: case PHYSDEVOP_get_free_pirq: --=20 2.34.1 From nobody Mon May 20 22:43:19 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org; arc=pass (i=1 dmarc=pass fromdomain=amd.com); dmarc=pass(p=quarantine dis=none) header.from=amd.com ARC-Seal: i=2; a=rsa-sha256; t=1705040141; cv=pass; d=zohomail.com; s=zohoarc; b=Bb/5gd40uLuYEb2kXzSFoki3ctCta7BqR2ssHSbKwIVimf/4IK9uhlSAWxUb+zGmA7l4xLLIR4+kkNpVQYa5JkSNgxJhUgWTs9d8TsVoP9Ushcy8DJZPkbwBFhCRZwaOOIKvokXuD1nzlQdZ2VLugUp3AHQBfgdYKyyjajzIzug= ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1705040141; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=2XjwE0ZYBirR+9vRd4V2Cvbo4ZpC70gMeKjuI4Ig4FA=; b=CKuSdn6eYmVzI4XiWpCgDvJH1S616QC1q3otgCv2aPk6TzNKNoLFHrPbOtwdZn/JZenZRTDlpBwy4fWtYyA2tAvFigy4T0WDqQioI/Tt0E5UmnwLBRTwa+dpBzHLAD4YHVb+pfIl3Ao8DB5y1wNiGTQ2MR8aDYOHHcpj+e9flNs= ARC-Authentication-Results: i=2; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org; arc=pass (i=1 dmarc=pass fromdomain=amd.com); dmarc=pass header.from= (p=quarantine dis=none) Return-Path: Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) by mx.zohomail.com with SMTPS id 17050401413201002.1078010211706; Thu, 11 Jan 2024 22:15:41 -0800 (PST) Received: from list by lists.xenproject.org with outflank-mailman.666644.1037422 (Exim 4.92) (envelope-from ) id 1rOAp8-0001TZ-7R; Fri, 12 Jan 2024 06:15:22 +0000 Received: by outflank-mailman (output) from mailman id 666644.1037422; Fri, 12 Jan 2024 06:15:22 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1rOAp8-0001TO-4a; Fri, 12 Jan 2024 06:15:22 +0000 Received: by outflank-mailman (input) for mailman id 666644; Fri, 12 Jan 2024 06:15:20 +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 1rOAp6-0000At-Qz for xen-devel@lists.xenproject.org; Fri, 12 Jan 2024 06:15:20 +0000 Received: from NAM02-DM3-obe.outbound.protection.outlook.com (mail-dm3nam02on20601.outbound.protection.outlook.com [2a01:111:f403:2405::601]) by se1-gles-sth1.inumbo.com (Halon) with ESMTPS id f5df63f5-b111-11ee-98f0-6d05b1d4d9a1; Fri, 12 Jan 2024 07:15:20 +0100 (CET) Received: from CH0PR04CA0056.namprd04.prod.outlook.com (2603:10b6:610:77::31) by DM4PR12MB7600.namprd12.prod.outlook.com (2603:10b6:8:108::5) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7181.21; Fri, 12 Jan 2024 06:15:16 +0000 Received: from DS3PEPF000099D4.namprd04.prod.outlook.com (2603:10b6:610:77:cafe::23) by CH0PR04CA0056.outlook.office365.com (2603:10b6:610:77::31) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7181.17 via Frontend Transport; Fri, 12 Jan 2024 06:15:16 +0000 Received: from SATLEXMB04.amd.com (165.204.84.17) by DS3PEPF000099D4.mail.protection.outlook.com (10.167.17.5) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.7181.14 via Frontend Transport; Fri, 12 Jan 2024 06:15:16 +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.34; Fri, 12 Jan 2024 00:15:12 -0600 X-Outflank-Mailman: Message body and most headers restored to incoming version 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: f5df63f5-b111-11ee-98f0-6d05b1d4d9a1 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=OVjEO65u3PvvoYn6+tVPooJsGlJE7tzEm/y3AaMU+yCzTKQR6AHNLSBRZWTT0mNdKtqJYp8tDgBfUwXclzMYCajJCYJ/3EJx8LKmdjhWPTLm5/NiwidI1D3Q+KVxjWW0tF0TM+gVKuaW48gEytNz1r+jUhrBUxT8FGM/mJqIP33yw4ce2hhX+3dJ9Qi3LnxrXar/bHr0/dTtJXfc8VBYTbmFgCXVkMjclTJEP1sCHnlCRdBouQsQkYnA3ujYxKlPvtyxZbadMBa6JvVoBTugubiRME9pSwdhMhJ1gF5AVyxLIJHBqlQhbJ3/D+kFbGhgQ5tMuNahD0LKD5nQ2Qpulg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; 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=2XjwE0ZYBirR+9vRd4V2Cvbo4ZpC70gMeKjuI4Ig4FA=; b=bwK+3Z3+aFx9YsoFfKFnOefPtHmE4SDP4p6VUTcY1aCMx/dcI0D+7n4AIUTYKcAW4KNCbGA+3t4OWPAF22DwmfqoEOcQWnKjyXwo64WvW6ogh483syz9h+ckjeV4/vkbDn/lswz0wlLaEfVO5bFZWiBmOpbYkt/7TCEU+SIJ7Iq/o557bJ0ytD2wMfs3Dfexfffb9hypdfBE24pZc36MwHxfsB3/Hk1gqOCyDsyYVrSaBvmKcQgxLhAhFwNrd7uF1s7cRkMspBaxEAPo3C3MZURVkWKa3p64zETRh4e0Qjhtf/MN+je8zafZFTvLKlIDNaKRJmqxfevkwgnWnuuURw== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 165.204.84.17) smtp.rcpttodomain=lists.xenproject.org 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=2XjwE0ZYBirR+9vRd4V2Cvbo4ZpC70gMeKjuI4Ig4FA=; b=TuM0NasNi9aK6h4S5TWv3F9uo/pH9IE5H4l9wwRR0x4TrCojulT27HJox5zhnx6lEX5Ox69ht4+BgRI3U/B4++Z+iPpeKQ89ydm7Hh/XZaR5pNLL3lD/YI8bcotRlHo5gD6FmvB9Uljfn6DQw1UziDBrcvSxrIevKcf+twTkxgY= 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 (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) client-ip=192.237.175.120; envelope-from=xen-devel-bounces@lists.xenproject.org; helo=lists.xenproject.org; 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: CC: Jan Beulich , Andrew Cooper , =?UTF-8?q?Roger=20Pau=20Monn=C3=A9?= , Wei Liu , George Dunlap , Julien Grall , Stefano Stabellini , Anthony PERARD , "Juergen Gross" , "Daniel P . Smith" , Stewart Hildebrand , Huang Rui , Jiqian Chen , Huang Rui Subject: [RFC XEN PATCH v5 4/5] libxl: Use gsi instead of irq for mapping pirq Date: Fri, 12 Jan 2024 14:13:16 +0800 Message-ID: <20240112061317.418658-5-Jiqian.Chen@amd.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20240112061317.418658-1-Jiqian.Chen@amd.com> References: <20240112061317.418658-1-Jiqian.Chen@amd.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable 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: DS3PEPF000099D4:EE_|DM4PR12MB7600:EE_ X-MS-Office365-Filtering-Correlation-Id: aaf71274-9745-4c66-d1d3-08dc1335d865 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: hQsL2RBNwlftdQ30v5qNAOIulStzYOm5ZiA+YeQlmoUG2+v/+yp8ty97ASsBpsbsiMLCdKEqPSU/3/zug/VNGK25YlmlIqWrPPnQ5yl+lZQqWTqFnFsTg7E3m2zQ/mjN/3Vx20O7kTGCu6lBGrwi4N8yq0XRCOF3Mb3etSh86nkEf9H0leANbrwTl02J2q9P/eafw3v5x5o4YnJDLZggr70DnV1wzHwL1jgF+Y92onn/MseWTHtlx2cwmw/h6/583qJbSIHZcV2r/9uU8KUfKyd5JjlFxuuVG5UUhKsQPpHgvl2YvOHIV8pfKlUfPPkIIwder4FNov7lZAXAoBGZrgSKK97B59cclb256JLnpJlznnxrrXIhedv09ft/CWC53TV2BMO9Z9mfbOdcNcF+660kTwO+ZRKm3ezT3Rs776AmTN8jMZ2K0b5rlaak9OvBisdf4+gctFz7OBUvX3aD7TDnUmuAcgYnFySmeZ7K/znhzQRehWd0utOkVlk5YQT8HZ8DAFTtIvx6TNe/Z+AqFUF18ANTyaYzqVefdGAzBXMXas/TMI2xQTcPVNeyTQoY9u4/b9+FDX2K11ZgBZxN8E4mCLga19h890YIPvJTjMnCrz2/vYAsV84dEmK/j86W2k84woj/ITPcKQ8QjUDYyfycJtOPQ7eoxW1mAcLPeaLxYkWqUxChuKIl79o7bHUG/F38X/63jfT3FQo2Mf5C1yszCPHquUUDjMIMg2WeLfDs5Cuy4tt/u0DbKIFaBji1V2jSx2YubVZYh8zgqnpx2w== 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:(13230031)(4636009)(39860400002)(136003)(396003)(346002)(376002)(230922051799003)(64100799003)(451199024)(82310400011)(1800799012)(186009)(40470700004)(46966006)(36840700001)(70206006)(70586007)(36756003)(6916009)(316002)(54906003)(7696005)(478600001)(41300700001)(8936002)(8676002)(4326008)(7416002)(2906002)(82740400003)(5660300002)(83380400001)(81166007)(356005)(47076005)(426003)(40460700003)(40480700001)(36860700001)(1076003)(26005)(86362001)(336012)(2616005)(16526019)(36900700001);DIR:OUT;SFP:1101; X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 12 Jan 2024 06:15:16.3576 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: aaf71274-9745-4c66-d1d3-08dc1335d865 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: DS3PEPF000099D4.namprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM4PR12MB7600 X-ZohoMail-DKIM: pass (identity @amd.com) X-ZM-MESSAGEID: 1705040142281100001 Content-Type: text/plain; charset="utf-8" In PVH dom0, it uses the linux local interrupt mechanism, when it allocs irq for a gsi, it is dynamic, and follow the principle of applying first, distributing first. And the irq number is alloced from small to large, but the applying gsi number is not, may gsi 38 comes before gsi 28, that causes the irq number is not equal with the gsi number. And when passthrough a device, xl wants to use gsi to map pirq, see pci_add_dm_done->xc_physdev_map_pirq, but the gsi number is got from file /sys/bus/pci/devices//irq in current code, so it will fail when mapping. So, use real gsi number read from gsi sysfs. Co-developed-by: Huang Rui Signed-off-by: Jiqian Chen Reviewed-by: Stefano Stabellini --- tools/libs/light/libxl_pci.c | 25 +++++++++++++++++++++++-- 1 file changed, 23 insertions(+), 2 deletions(-) diff --git a/tools/libs/light/libxl_pci.c b/tools/libs/light/libxl_pci.c index 96cb4da0794e..a1c6e82631e9 100644 --- a/tools/libs/light/libxl_pci.c +++ b/tools/libs/light/libxl_pci.c @@ -1478,8 +1478,19 @@ static void pci_add_dm_done(libxl__egc *egc, fclose(f); if (!pci_supp_legacy_irq()) goto out_no_irq; - sysfs_path =3D GCSPRINTF(SYSFS_PCI_DEV"/"PCI_BDF"/irq", pci->domain, + sysfs_path =3D GCSPRINTF(SYSFS_PCI_DEV"/"PCI_BDF"/gsi", pci->domain, pci->bus, pci->dev, pci->func); + + if ( access(sysfs_path, F_OK) !=3D 0 ) { + if ( errno =3D=3D ENOENT ) + sysfs_path =3D GCSPRINTF(SYSFS_PCI_DEV"/"PCI_BDF"/irq", pci->d= omain, + pci->bus, pci->dev, pci->func); + else { + LOGED(ERROR, domainid, "Can't access %s", sysfs_path); + goto out_no_irq; + } + } + f =3D fopen(sysfs_path, "r"); if (f =3D=3D NULL) { LOGED(ERROR, domainid, "Couldn't open %s", sysfs_path); @@ -2229,9 +2240,19 @@ skip_bar: if (!pci_supp_legacy_irq()) goto skip_legacy_irq; =20 - sysfs_path =3D GCSPRINTF(SYSFS_PCI_DEV"/"PCI_BDF"/irq", pci->domain, + sysfs_path =3D GCSPRINTF(SYSFS_PCI_DEV"/"PCI_BDF"/gsi", pci->domain, pci->bus, pci->dev, pci->func); =20 + if ( access(sysfs_path, F_OK) !=3D 0 ) { + if ( errno =3D=3D ENOENT ) + sysfs_path =3D GCSPRINTF(SYSFS_PCI_DEV"/"PCI_BDF"/irq", pci->d= omain, + pci->bus, pci->dev, pci->func); + else { + LOGED(ERROR, domid, "Can't access %s", sysfs_path); + goto skip_legacy_irq; + } + } + f =3D fopen(sysfs_path, "r"); if (f =3D=3D NULL) { LOGED(ERROR, domid, "Couldn't open %s", sysfs_path); --=20 2.34.1 From nobody Mon May 20 22:43:19 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org; arc=pass (i=1 dmarc=pass fromdomain=amd.com); dmarc=pass(p=quarantine dis=none) header.from=amd.com ARC-Seal: i=2; a=rsa-sha256; t=1705040147; cv=pass; d=zohomail.com; s=zohoarc; b=QN6TRd9LeF6e7bWJLffr5vBTzwLV77G0y6U9g+aZqisB50jVEBSHgg2WkHMjrofebh018TfbMg0tMMBGVS94dQhpBHyRvkjs0UBdcjAT2LCSdTdP+0iqqe1RAnqw+VE7kbI4v7pfQLT9oXTOl6Xfus0/B1TZKun1h07vWzUMj2I= ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1705040147; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=PSkLYrAo95Wea4+HG7BuppVa+CyaaIyZn3k0KcMeVOM=; b=nEOc62wd/PWlKCYGke8rFJwPKocuzHEwrOz+D4HfXOcZVW/RxaajOh8yg3I5QsCTCrj3gcdJkQaaRkBLmojlkHwsPsBWvwqjtHtH+06jzoNbgxxb3eMTfUfza8uJjj9D0YbUFTGl+BHT/3U23ttpdiv/TYZ+3uClzMuiro6ketY= ARC-Authentication-Results: i=2; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org; arc=pass (i=1 dmarc=pass fromdomain=amd.com); dmarc=pass header.from= (p=quarantine dis=none) Return-Path: Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) by mx.zohomail.com with SMTPS id 1705040147042959.5181246325161; Thu, 11 Jan 2024 22:15:47 -0800 (PST) Received: from list by lists.xenproject.org with outflank-mailman.666645.1037433 (Exim 4.92) (envelope-from ) id 1rOApF-000214-GC; Fri, 12 Jan 2024 06:15:29 +0000 Received: by outflank-mailman (output) from mailman id 666645.1037433; Fri, 12 Jan 2024 06:15:29 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1rOApF-00020v-Bs; Fri, 12 Jan 2024 06:15:29 +0000 Received: by outflank-mailman (input) for mailman id 666645; Fri, 12 Jan 2024 06:15:27 +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 1rOApD-0000lq-Nk for xen-devel@lists.xenproject.org; Fri, 12 Jan 2024 06:15:27 +0000 Received: from NAM02-DM3-obe.outbound.protection.outlook.com (mail-dm3nam02on20600.outbound.protection.outlook.com [2a01:111:f403:2405::600]) by se1-gles-flk1.inumbo.com (Halon) with ESMTPS id f8448d00-b111-11ee-9b0f-b553b5be7939; Fri, 12 Jan 2024 07:15:25 +0100 (CET) Received: from CH2PR14CA0005.namprd14.prod.outlook.com (2603:10b6:610:60::15) by CY8PR12MB7515.namprd12.prod.outlook.com (2603:10b6:930:93::6) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7181.19; Fri, 12 Jan 2024 06:15:20 +0000 Received: from DS3PEPF000099D9.namprd04.prod.outlook.com (2603:10b6:610:60:cafe::f6) by CH2PR14CA0005.outlook.office365.com (2603:10b6:610:60::15) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7181.19 via Frontend Transport; Fri, 12 Jan 2024 06:15:20 +0000 Received: from SATLEXMB04.amd.com (165.204.84.17) by DS3PEPF000099D9.mail.protection.outlook.com (10.167.17.10) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.7181.14 via Frontend Transport; Fri, 12 Jan 2024 06:15:20 +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.34; Fri, 12 Jan 2024 00:15:16 -0600 X-Outflank-Mailman: Message body and most headers restored to incoming version 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: f8448d00-b111-11ee-9b0f-b553b5be7939 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=VAVSCJYFwHIdovrr4N6QiUnWEu3KwFi6T00bg2NvFWRqV4HJw3H1gFE6DwMlKO8LSQoSIhqDmn785ehkTJpZGCpTic3wH0PHduOCENXs9wBmIOaaqoVI8O+9PUZNKOkVIWghiYuJofe/jc2D9hLPwB22ccWds8/ITfEh+7cFqk8TQwWkweQnDywpZ/2voofQ7Zkj0OdZipwvwAV9pIz/D4XNjMlexTjYfyVqcybTeSKErORSMrBS4qvsCetjNLomgr0VLOOUj6KBkXGSAZZADu+C6WOmcqm9DW4jNO3yQJ5O4Bbkhi27DRlifaCgUJQPV7cAsrwBoa5JtCod46HiYw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; 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=PSkLYrAo95Wea4+HG7BuppVa+CyaaIyZn3k0KcMeVOM=; b=NOYXnsKZTXzIIz74DC0T5lnDjFihVFVAtbRky2/Uhns7psBfH2jRSqczHbgnqSqGKoCp9h9T3Xyq0zs/SmV5S9fVuaeOfU+m2Sl7GbQ7PbIImnXk5on31/xwdvU7HXo/VdvCW1zByxBUKKLtsODxoKthO9KAU63LiSGNy64TCMQfroG2jrGS6HFbBoNbQ/kMUU9Cac+5kj179yAbMvbVFtkJuupb6LE/EkGJUXwKXHbRPLwTizMiIWgVh6ajhZDxoUzijuS67eIVJZfgRMtqrmyub/J0J1Att2RM+jbTr1ygyglzfnJ8SXbASV6SF7PRo2GVzOPA5zfKMYpIAklwdg== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 165.204.84.17) smtp.rcpttodomain=lists.xenproject.org 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=PSkLYrAo95Wea4+HG7BuppVa+CyaaIyZn3k0KcMeVOM=; b=eIzMRbrDDMEolzdkoDbJKlUzatUDOCVgSJk7Bn30355IUrh5+4B3Ctxr3LA4Bl6q3op4A2ETOQh65dGa+y8y2vZuMdB/XCioFS51QJ5TAO8lb/Y1uJiB1fCW9t8X39aF2vT4HzYVUc/8rUlpT1KytUC6tCCYWZtc91ChPhLQgYc= 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 (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) client-ip=192.237.175.120; envelope-from=xen-devel-bounces@lists.xenproject.org; helo=lists.xenproject.org; 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: CC: Jan Beulich , Andrew Cooper , =?UTF-8?q?Roger=20Pau=20Monn=C3=A9?= , Wei Liu , George Dunlap , Julien Grall , Stefano Stabellini , Anthony PERARD , "Juergen Gross" , "Daniel P . Smith" , Stewart Hildebrand , Huang Rui , Jiqian Chen , Huang Rui Subject: [RFC XEN PATCH v5 5/5] domctl: Add XEN_DOMCTL_gsi_permission to grant gsi Date: Fri, 12 Jan 2024 14:13:17 +0800 Message-ID: <20240112061317.418658-6-Jiqian.Chen@amd.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20240112061317.418658-1-Jiqian.Chen@amd.com> References: <20240112061317.418658-1-Jiqian.Chen@amd.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable 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: DS3PEPF000099D9:EE_|CY8PR12MB7515:EE_ X-MS-Office365-Filtering-Correlation-Id: e28c13e0-239e-4a61-bcb3-08dc1335daa5 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: hRt08wOhZtQQ5iUEfWVxVBnv1BKULd5sGNPpE6dnxplP3oFebyZf2Uaw12VUfHnRT6To/IrKfUGHSqxWkrDbWHDL9S0/IDn6XekXJTQUWYTSeCG+OIdKh/9dG+dgIlpiv+ZyKXPsUPYCAtgd5cuoG+6eB0AFvGoS1rl3u8Wrf+TZoSIOW6akZO3xmSbemc3B9QS3P94KvhLNojI6/D/4rxKk8AaLT9UwEByoxO1oGd6XRm3QNnOC3wyO1xyg1qBVFEy9Sct0hQPPKdWymFVy928DAvsuvT9KEs1WLwtdkSMBKycVWayBryXExIBxRKzuJX9Jgsx9W/92b1aSk0SUZIaDcC4B9rciBEgleKGCBUpFwDdtUr2CSm91z9Gm7dUmncZvyXfXugd4wm+876fPXNUzpn+nHMjKiPHcDhFw0Yu3oXIpRhJVQZikYUVHF/pd+O5q1KFPaa6+zbbJ7MWZ3kkP/wBHk1QvaU96x1ipcI/it+D7O98HGL2XY2hWgAIWZCuEEdauxROke2xKr4FnkGCdBVexEilJkEPuM20TusWTtIQPnIUCEzZL1WZdyZGPx9wgFWnx04+b5yVs98c0nyfkmAHtSPyvDFSHIdVrcNVPzTXRuscMrdPz7+yifPZr/vbP0YGl65HfAX1iUhI78iDMXYZ74690j+9oNSwdFTUcT+r9wcNaLHh0ualZx7jRcbSLdVoppQ60Plz4Q2Fv9FqYRIMazwXar+bgJ1I8u8BG7nNYIy5Fn3ybavP+zWyfI1V3D4YGIPlw81eMqaJpAg== 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:(13230031)(4636009)(346002)(396003)(39860400002)(376002)(136003)(230922051799003)(186009)(451199024)(82310400011)(64100799003)(1800799012)(46966006)(40470700004)(36840700001)(83380400001)(7416002)(86362001)(26005)(1076003)(2616005)(5660300002)(2906002)(336012)(16526019)(426003)(8936002)(316002)(8676002)(6916009)(70586007)(70206006)(54906003)(7696005)(4326008)(478600001)(82740400003)(41300700001)(81166007)(356005)(47076005)(36860700001)(40480700001)(40460700003)(36756003)(36900700001);DIR:OUT;SFP:1101; X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 12 Jan 2024 06:15:20.1475 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: e28c13e0-239e-4a61-bcb3-08dc1335daa5 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: DS3PEPF000099D9.namprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: CY8PR12MB7515 X-ZohoMail-DKIM: pass (identity @amd.com) X-ZM-MESSAGEID: 1705040148304100001 Content-Type: text/plain; charset="utf-8" Some type of domain don't have PIRQ, like PVH, when passthrough a device to guest on PVH dom0, callstack pci_add_dm_done->XEN_DOMCTL_irq_permission will failed at domain_pirq_to_irq. So, add a new hypercall to grant/revoke gsi permission when dom0 is not PV or dom0 has not PIRQ flag. Co-developed-by: Huang Rui Signed-off-by: Jiqian Chen --- tools/include/xenctrl.h | 5 +++++ tools/libs/ctrl/xc_domain.c | 15 +++++++++++++++ tools/libs/light/libxl_pci.c | 16 ++++++++++++++-- xen/arch/x86/domctl.c | 31 +++++++++++++++++++++++++++++++ xen/include/public/domctl.h | 9 +++++++++ xen/xsm/flask/hooks.c | 1 + 6 files changed, 75 insertions(+), 2 deletions(-) diff --git a/tools/include/xenctrl.h b/tools/include/xenctrl.h index 2ef8b4e05422..519c860a00d5 100644 --- a/tools/include/xenctrl.h +++ b/tools/include/xenctrl.h @@ -1382,6 +1382,11 @@ int xc_domain_irq_permission(xc_interface *xch, uint32_t pirq, bool allow_access); =20 +int xc_domain_gsi_permission(xc_interface *xch, + uint32_t domid, + uint32_t gsi, + bool allow_access); + int xc_domain_iomem_permission(xc_interface *xch, uint32_t domid, unsigned long first_mfn, diff --git a/tools/libs/ctrl/xc_domain.c b/tools/libs/ctrl/xc_domain.c index f2d9d14b4d9f..448ba2c59ae1 100644 --- a/tools/libs/ctrl/xc_domain.c +++ b/tools/libs/ctrl/xc_domain.c @@ -1394,6 +1394,21 @@ int xc_domain_irq_permission(xc_interface *xch, return do_domctl(xch, &domctl); } =20 +int xc_domain_gsi_permission(xc_interface *xch, + uint32_t domid, + uint32_t gsi, + bool allow_access) +{ + struct xen_domctl domctl =3D {}; + + domctl.cmd =3D XEN_DOMCTL_gsi_permission; + domctl.domain =3D domid; + domctl.u.gsi_permission.gsi =3D gsi; + domctl.u.gsi_permission.allow_access =3D allow_access; + + return do_domctl(xch, &domctl); +} + int xc_domain_iomem_permission(xc_interface *xch, uint32_t domid, unsigned long first_mfn, diff --git a/tools/libs/light/libxl_pci.c b/tools/libs/light/libxl_pci.c index a1c6e82631e9..4136a860a048 100644 --- a/tools/libs/light/libxl_pci.c +++ b/tools/libs/light/libxl_pci.c @@ -1421,6 +1421,8 @@ static void pci_add_dm_done(libxl__egc *egc, uint32_t flag =3D XEN_DOMCTL_DEV_RDM_RELAXED; uint32_t domainid =3D domid; bool isstubdom =3D libxl_is_stubdom(ctx, domid, &domainid); + int gsi; + bool has_gsi =3D true; =20 /* Convenience aliases */ bool starting =3D pas->starting; @@ -1482,6 +1484,7 @@ static void pci_add_dm_done(libxl__egc *egc, pci->bus, pci->dev, pci->func); =20 if ( access(sysfs_path, F_OK) !=3D 0 ) { + has_gsi =3D false; if ( errno =3D=3D ENOENT ) sysfs_path =3D GCSPRINTF(SYSFS_PCI_DEV"/"PCI_BDF"/irq", pci->d= omain, pci->bus, pci->dev, pci->func); @@ -1497,6 +1500,7 @@ static void pci_add_dm_done(libxl__egc *egc, goto out_no_irq; } if ((fscanf(f, "%u", &irq) =3D=3D 1) && irq) { + gsi =3D irq; r =3D xc_physdev_map_pirq(ctx->xch, domid, irq, &irq); if (r < 0) { LOGED(ERROR, domainid, "xc_physdev_map_pirq irq=3D%d (error=3D= %d)", @@ -1505,7 +1509,10 @@ static void pci_add_dm_done(libxl__egc *egc, rc =3D ERROR_FAIL; goto out; } - r =3D xc_domain_irq_permission(ctx->xch, domid, irq, 1); + if ( has_gsi ) + r =3D xc_domain_gsi_permission(ctx->xch, domid, gsi, 1); + if ( !has_gsi || r =3D=3D -EOPNOTSUPP ) + r =3D xc_domain_irq_permission(ctx->xch, domid, irq, 1); if (r < 0) { LOGED(ERROR, domainid, "xc_domain_irq_permission irq=3D%d (error=3D%d)", irq, r= ); @@ -2185,6 +2192,7 @@ static void pci_remove_detached(libxl__egc *egc, FILE *f; uint32_t domainid =3D prs->domid; bool isstubdom; + bool has_gsi =3D true; =20 /* Convenience aliases */ libxl_device_pci *const pci =3D &prs->pci; @@ -2244,6 +2252,7 @@ skip_bar: pci->bus, pci->dev, pci->func); =20 if ( access(sysfs_path, F_OK) !=3D 0 ) { + has_gsi =3D false; if ( errno =3D=3D ENOENT ) sysfs_path =3D GCSPRINTF(SYSFS_PCI_DEV"/"PCI_BDF"/irq", pci->d= omain, pci->bus, pci->dev, pci->func); @@ -2270,7 +2279,10 @@ skip_bar: */ LOGED(ERROR, domid, "xc_physdev_unmap_pirq irq=3D%d", irq); } - rc =3D xc_domain_irq_permission(ctx->xch, domid, irq, 0); + if ( has_gsi ) + rc =3D xc_domain_gsi_permission(ctx->xch, domid, irq, 0); + if ( !has_gsi || rc =3D=3D -EOPNOTSUPP ) + rc =3D xc_domain_irq_permission(ctx->xch, domid, irq, 0); if (rc < 0) { LOGED(ERROR, domid, "xc_domain_irq_permission irq=3D%d", irq); } diff --git a/xen/arch/x86/domctl.c b/xen/arch/x86/domctl.c index 3c0ea8554107..75f23f511ac1 100644 --- a/xen/arch/x86/domctl.c +++ b/xen/arch/x86/domctl.c @@ -237,6 +237,37 @@ long arch_do_domctl( break; } =20 + case XEN_DOMCTL_gsi_permission: + { + unsigned int gsi =3D domctl->u.gsi_permission.gsi; + int allow =3D domctl->u.gsi_permission.allow_access; + + if ( is_pv_domain(current->domain) || has_pirq(current->domain) ) + { + ret =3D -EOPNOTSUPP; + break; + } + + if ( gsi >=3D nr_irqs_gsi ) + { + ret =3D -EINVAL; + break; + } + + if ( !irq_access_permitted(current->domain, gsi) || + xsm_irq_permission(XSM_HOOK, d, gsi, allow) ) + { + ret =3D -EPERM; + break; + } + + if ( allow ) + ret =3D irq_permit_access(d, gsi); + else + ret =3D irq_deny_access(d, gsi); + break; + } + case XEN_DOMCTL_getpageframeinfo3: { unsigned int num =3D domctl->u.getpageframeinfo3.num; diff --git a/xen/include/public/domctl.h b/xen/include/public/domctl.h index a33f9ec32b08..47e95f9ee824 100644 --- a/xen/include/public/domctl.h +++ b/xen/include/public/domctl.h @@ -447,6 +447,13 @@ struct xen_domctl_irq_permission { }; =20 =20 +/* XEN_DOMCTL_gsi_permission */ +struct xen_domctl_gsi_permission { + uint32_t gsi; + uint8_t allow_access; /* flag to specify enable/disable of x86 gsi = access */ +}; + + /* XEN_DOMCTL_iomem_permission */ struct xen_domctl_iomem_permission { uint64_aligned_t first_mfn;/* first page (physical page number) in ran= ge */ @@ -1277,6 +1284,7 @@ struct xen_domctl { #define XEN_DOMCTL_vmtrace_op 84 #define XEN_DOMCTL_get_paging_mempool_size 85 #define XEN_DOMCTL_set_paging_mempool_size 86 +#define XEN_DOMCTL_gsi_permission 87 #define XEN_DOMCTL_gdbsx_guestmemio 1000 #define XEN_DOMCTL_gdbsx_pausevcpu 1001 #define XEN_DOMCTL_gdbsx_unpausevcpu 1002 @@ -1299,6 +1307,7 @@ struct xen_domctl { struct xen_domctl_setdomainhandle setdomainhandle; struct xen_domctl_setdebugging setdebugging; struct xen_domctl_irq_permission irq_permission; + struct xen_domctl_gsi_permission gsi_permission; struct xen_domctl_iomem_permission iomem_permission; struct xen_domctl_ioport_permission ioport_permission; struct xen_domctl_hypercall_init hypercall_init; diff --git a/xen/xsm/flask/hooks.c b/xen/xsm/flask/hooks.c index 78225f68c15c..376076865198 100644 --- a/xen/xsm/flask/hooks.c +++ b/xen/xsm/flask/hooks.c @@ -685,6 +685,7 @@ static int cf_check flask_domctl(struct domain *d, int = cmd) case XEN_DOMCTL_shadow_op: case XEN_DOMCTL_ioport_permission: case XEN_DOMCTL_ioport_mapping: + case XEN_DOMCTL_gsi_permission: #endif #ifdef CONFIG_HAS_PASSTHROUGH /* --=20 2.34.1