From patchwork Thu Jul 27 07:38:07 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jan Beulich X-Patchwork-Id: 13329089 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 EBBA7C001E0 for ; Thu, 27 Jul 2023 07:38:25 +0000 (UTC) Received: from list by lists.xenproject.org with outflank-mailman.570805.892969 (Exim 4.92) (envelope-from ) id 1qOvZg-0000Qz-3R; Thu, 27 Jul 2023 07:38:16 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 570805.892969; Thu, 27 Jul 2023 07:38:16 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qOvZg-0000Qs-0H; Thu, 27 Jul 2023 07:38:16 +0000 Received: by outflank-mailman (input) for mailman id 570805; Thu, 27 Jul 2023 07:38: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 1qOvZe-0000FZ-9d for xen-devel@lists.xenproject.org; Thu, 27 Jul 2023 07:38:14 +0000 Received: from EUR05-AM6-obe.outbound.protection.outlook.com (mail-am6eur05on20627.outbound.protection.outlook.com [2a01:111:f400:7e1b::627]) by se1-gles-flk1.inumbo.com (Halon) with ESMTPS id 8a26532c-2c50-11ee-8613-37d641c3527e; Thu, 27 Jul 2023 09:38:12 +0200 (CEST) Received: from DU2PR04MB8790.eurprd04.prod.outlook.com (2603:10a6:10:2e1::23) by DBBPR04MB8026.eurprd04.prod.outlook.com (2603:10a6:10:1ed::6) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6631.29; Thu, 27 Jul 2023 07:38:09 +0000 Received: from DU2PR04MB8790.eurprd04.prod.outlook.com ([fe80::e5cf:5743:ab60:b14e]) by DU2PR04MB8790.eurprd04.prod.outlook.com ([fe80::e5cf:5743:ab60:b14e%5]) with mapi id 15.20.6631.026; Thu, 27 Jul 2023 07:38:09 +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: 8a26532c-2c50-11ee-8613-37d641c3527e ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=dpLkLxMeWipIXfdCY25mI1kARJQhsvnEy2Q3VqRrpnYjlndNkp6MPIzuQQ/wQtKT9fh/P8cldfvRmZ6WcpunK5Q/pE0BGAisJYv2ARPa2KazTwgRLq2BuKYOI6oxVIR/mXoOgHuJQFMuFx+6LVgRblOpkWvoVI/LYs79Xvy4FwZmSrLT0eS3CgGWitOYEwetGoj0XJmBCog83v9IEMUVUVLfgRMDDai5t2JhZiAu2DeT0yY4Y84OktXQUMFtJ7rcNS+DYBf7bGnWiYvxiI2xZWSshPq2SxrzxjFrT+5d8W3UqjagiADmuh+4duXq9U2MBxxJpj1u3tmgH7eE+Jz1Kg== 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=taHtIzeBIdPQZ8hfsCK1k6WHI3O8TZ4BTx1jK1HZDlM=; b=CL1Pm90bMihvxK3goMiwpNxApJdm3mPBengCooGA43ZkMx9XUwKx/Pay+B31c9IPOpB6uYxCBLuMvFsjhl1anWbmKm+OJx26+Am3r+OTg4WQZvEDUPrJw62WdyRFvHlHLB7yj684vrOmaLPlSaAZx1GBjzdOt3LMbdUUQxVHUluiPHQwevBosuuqffL/IBQVc1J3tkZwyynf/F+nhGjgZXzcbEsSQrapmENB2MfRJtUQFAzXx1FeVUmOQ6pBZ0aJBGgScqAsVB6dHVvKIMl76rhrV51E8MHx75ZpphiCUl1ITJHMMHSO5jMh2am5jLi1Ba4aFeWzLJNjp0wSIN6QYQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=suse.com; dmarc=pass action=none header.from=suse.com; dkim=pass header.d=suse.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=taHtIzeBIdPQZ8hfsCK1k6WHI3O8TZ4BTx1jK1HZDlM=; b=nPYKliH+B/aR+3Iq+2lMIu+iHa3iWDBQKHrkEEmwi2L1+1YWSGtuA9arV45lVHbhXtTWxydGaRbmrFRkpfBPXSgdPMQsGFxWDC3ZIQCktWPQuZk6hbv9Xi4w8KzISThDQnNn75vAPvhDzaDpflRCRbICDGXSYKzXv7S269aJC9wRk639OGbPy9GA8yW2ULG/4w/5wBK6e5tHqZk3M5+riFcxeU3sNKDQ7aFJ4FxjNF67LVSRv7vge05keJ/7sGcF4Qlt0BpK9wanJsQy9mtnGMLZGnMInfrikaDCR2+tFdAB5H39PZTD6QnrW3FoFn9Hy7+20aXJD0YcmNnvaDvLFw== Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=suse.com; Message-ID: Date: Thu, 27 Jul 2023 09:38:07 +0200 User-Agent: Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:102.0) Gecko/20100101 Thunderbird/102.13.0 Subject: [PATCH v3 1/3] restrict concept of pIRQ to x86 Content-Language: en-US From: Jan Beulich To: "xen-devel@lists.xenproject.org" Cc: Andrew Cooper , George Dunlap , Julien Grall , Stefano Stabellini , Wei Liu , =?utf-8?q?Roger_Pau_Monn=C3=A9?= , Bertrand Marquis , Volodymyr Babchuk References: <7cb0d24e-2bda-dcda-4874-2c01ba179947@suse.com> In-Reply-To: <7cb0d24e-2bda-dcda-4874-2c01ba179947@suse.com> X-ClientProxiedBy: FR2P281CA0144.DEUP281.PROD.OUTLOOK.COM (2603:10a6:d10:98::18) To DU2PR04MB8790.eurprd04.prod.outlook.com (2603:10a6:10:2e1::23) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: DU2PR04MB8790:EE_|DBBPR04MB8026:EE_ X-MS-Office365-Filtering-Correlation-Id: 76c16a22-ddc8-483e-4177-08db8e746cce X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 6pslMkiDn1JtJT0lHkUYCjfK0yjDPRJE4YZPiKIzv8z/hy/rAiaJWiA9KylgHEbImyNQyHlVkCO7DFRVmV+n7RoOgy5+cybxHOsdjpyKQpnn5WCYrvTf7WCxGMz//R0nxeVJhmx5LFSi9JfxUUXgtC15rbROjlP+P0/7laDYtrnxa/ubrb8S2MztjFAWJ4Sjp5kGsIAQii2o6AsANTDLHnDyPrO7HZAAYUkTSZFAWbhZpvKcTSSnFOdlDch+WzDHGwIpIyVMiXOiEbbgI2w4XnhmCbD+nC6mmeNv41yqvUUqg9ALRAIMvSNtomE1Jh9lxNmQyQNgBY7qzZVeQ5o/+5V++nMg+RjqfXyvHKF90B4eTj5gP0TqtMImZmGmT0PQAATPiIq7GTrBFFVygUMLFxGA69Ukol1aQk4mHNI00fak1YSeFGu52P0LjPPSOI3f+vwKNV/9xD5pJoYK8fCaiv4r3lfQKadkhGmDVhVRPT1cYMsxJ8mFY4/u22DAPfNl6OMxhxgmblNAdE15znMvXrR7egnCdhqFiHNcJ5nBk/16rB8ki8CKj/Et2H+L6MK04jBaJfAsbDFf01g+CE+53aKLoIDiEkns/eEI1GvSg7Ha01uIyusbwSBk1TqgIuU+hCNoSVIj3DUDvuKfm6A3PQ== X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:DU2PR04MB8790.eurprd04.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230028)(346002)(396003)(39860400002)(136003)(366004)(376002)(451199021)(6486002)(478600001)(83380400001)(6506007)(26005)(6512007)(6916009)(4326008)(54906003)(66556008)(66476007)(66946007)(186003)(2616005)(38100700002)(31686004)(8936002)(8676002)(5660300002)(2906002)(316002)(41300700001)(86362001)(31696002)(36756003)(45980500001)(43740500002);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?q?p12+ZWmNp5gn3Tre9xglk59h+Wfm?= =?utf-8?q?bONXhWWY6v/A1zu73kUSBCgZXxkwvXVNZOyLXTM7dd9V14F8K9ImEoh2GKNJLpbVT?= =?utf-8?q?cuAqZ6+WoiFzqaOuvRVAWnp4VzQKXJkG3Wyq3h4bLFedbhP6NFbmEiggqacynJXKr?= =?utf-8?q?hTWKofymuf7+VCJ4pleRKGGwCg10suiPWT6utC0YvzF5vRon9pvFZ1kq073LKkMPJ?= =?utf-8?q?j8bPywf0vYk2b2oVInFBSuiXPuhREX8iwyBKN1X7FFVBgOtnrAlGqpX3NHyewtDs2?= =?utf-8?q?q4GyVuX24FEH36brL4LEyQSWN+5QJAwMEQlYg4ZjWCq4NFc6XqLTXhu2OUEZvyBdb?= =?utf-8?q?tLOJ21uUgSvejsTBaFIXRvGLfDfD0xdPbDCAVLVP/fWPd9t3t+hyvUSZMhX/WRn+/?= =?utf-8?q?tn0OT2/UKo7GNBPX3hbq77e1Guluhnqq+8rGqers7pfUq3mCn/AOwbDatZhEGqpyo?= =?utf-8?q?SNmaFuk6k2h3kOu6y1j5/mu0zKZxfgEQ+tDG69JldV1f3fkFqcCdilXCYdOA7QN7v?= =?utf-8?q?O2zaMwmHG78xgxE5A3ads2vXvR/ImxJ85T89mIdnmNO5+jqYDpZUBbFG0BoBAeZHu?= =?utf-8?q?mZl0U1/YLrxMVYhW33uKK9cXZmqaHuKmhcKM0OLM8pfB7RWtnADZReL+F7IkdFyo2?= =?utf-8?q?esypgT/8aamzKQVFjIxmPAmsxEe0u6Ip91jjQ6ITsC7wnHYetbxv32rNyeFWZQnRZ?= =?utf-8?q?xuI/VPlIdRkik5iFO5X9LAWkJ7lxtZ2ensVO2uJ9sxzkO5QTzMcll1BrMGS7JMPu0?= =?utf-8?q?SvT9ZLBmJQuMPDyGoDRNdqEGLBmKid0Z4iqeAj0oRW1MoXaJ3gSsvTd8oTZ+HFI8n?= =?utf-8?q?QBRmmaMewjjaR9jP2ly93ql9/dVHAkL44bi6sP3VsZAkn9zXT6etKaWV/Z8cZs3kP?= =?utf-8?q?660aK1Zbu89R95yvO1JpkSP5CpuYaEwOvWi5dHPesS5d2e0CXdhEDvZK2ADTBEUuz?= =?utf-8?q?o4gVzMjISdSEZZC732OZF47JLj48puZQLR5Cs7BsBnXuIizSA8P43ePhPzzQKokow?= =?utf-8?q?tSBCy4L7qfDxKujsisHqdaYVy7Q1Z90u7vSwMaNMVwNZqfMDSGBMOYQqu83a3SufZ?= =?utf-8?q?NIuyXJ3CZRRJqs4/LpxrSlq32y38WDoFUnsVmzrbBgSEMq1sNPb+nuqHn5W0j3HfC?= =?utf-8?q?LI7wAq8+jQgYVz+lCW2wKA2FNGlj6HKTjd/gBop1iy39tZYKk0s0m0jbJDlyxAcBo?= =?utf-8?q?mkxkm8phwly6dB3dzfA3bymRJcPBiHT/BVs1rbO3p+lW9ZAxKCJEO8CgIbKSOyaCn?= =?utf-8?q?ChcObv2vvuBoQ+oHCvrFkMHCm7wo3CchMQrxKRwek41szGkT0pgil+hVAGeb0QEgN?= =?utf-8?q?54PEaLWmDsYs7kHqTkbG30kuT7sO7bnz238D7+fBFHsc2bVB2bjZqw+k3X1J7GcOH?= =?utf-8?q?qWA/aJNcFywSfqR5EZn8S1G3wm0Lw4oqKSA45LJ01cxQV1GcPHkmRlJYx0S+GpY4I?= =?utf-8?q?8lWBbDctXwcixyVsVeK4p5XSHBzbO3Y3fu7C1fgSylqBPz+4pLiCxVbxbqrPWDWep?= =?utf-8?q?OfDgjEWxQtrr?= X-OriginatorOrg: suse.com X-MS-Exchange-CrossTenant-Network-Message-Id: 76c16a22-ddc8-483e-4177-08db8e746cce X-MS-Exchange-CrossTenant-AuthSource: DU2PR04MB8790.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 27 Jul 2023 07:38:09.7606 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: f7a17af6-1c5c-4a36-aa8b-f5be247aa4ba X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: EpjO4hO3cF0JxkUdOJEXxijokyqF4+mTgfJ+kVK8nfetsHO3bHHLAz8hC3UiUIG+IK51ObhzgLsjRenBEC3ocQ== X-MS-Exchange-Transport-CrossTenantHeadersStamped: DBBPR04MB8026 ... by way of a new arch-selectable Kconfig control. Note that some smaller pieces of code are left without #ifdef, to keep things better readable. Hence items like ECS_PIRQ, nr_static_irqs, or domain_pirq_to_irq() remain uniformly. As to XEN_DOMCTL_irq_permission - this, despite having a uniformly available wrapper in libxc, is unused on Arm: libxl bypasses those calls, and the Python and OCamL bindings have no users at all. Signed-off-by: Jan Beulich Acked-by: Julien Grall --- v3: Move #ifdef in xen/common/domctl.c around the entire sub-op. Re-base. v2: New. --- a/docs/misc/xen-command-line.pandoc +++ b/docs/misc/xen-command-line.pandoc @@ -1136,7 +1136,7 @@ introduced with the Nehalem architecture intended as an emergency option for people who first chose fast, then change their minds to secure, and wish not to reboot.** -### extra_guest_irqs +### extra_guest_irqs (x86) > `= [][,]` > Default: `32,` --- a/xen/arch/arm/include/asm/irq.h +++ b/xen/arch/arm/include/asm/irq.h @@ -52,7 +52,6 @@ struct arch_irq_desc { extern const unsigned int nr_irqs; #define nr_static_irqs NR_IRQS -#define arch_hwdom_irqs(domid) NR_IRQS struct irq_desc; struct irqaction; --- a/xen/arch/x86/Kconfig +++ b/xen/arch/x86/Kconfig @@ -25,6 +25,7 @@ config X86 select HAS_PCI select HAS_PCI_MSI select HAS_PDX + select HAS_PIRQ select HAS_SCHED_GRANULARITY select HAS_UBSAN select HAS_VPCI if HVM --- a/xen/common/Kconfig +++ b/xen/common/Kconfig @@ -56,6 +56,9 @@ config HAS_KEXEC config HAS_PDX bool +config HAS_PIRQ + bool + config HAS_PMAP bool --- a/xen/common/domain.c +++ b/xen/common/domain.c @@ -350,6 +350,8 @@ static int late_hwdom_init(struct domain #endif } +#ifdef CONFIG_HAS_PIRQ + static unsigned int __read_mostly extra_hwdom_irqs; static unsigned int __read_mostly extra_domU_irqs = 32; @@ -364,6 +366,8 @@ static int __init cf_check parse_extra_g } custom_param("extra_guest_irqs", parse_extra_guest_irqs); +#endif /* CONFIG_HAS_PIRQ */ + static int __init cf_check parse_dom0_param(const char *s) { const char *ss; @@ -682,6 +686,7 @@ struct domain *domain_create(domid_t dom if ( is_system_domain(d) && !is_idle_domain(d) ) return d; +#ifdef CONFIG_HAS_PIRQ if ( !is_idle_domain(d) ) { if ( !is_hardware_domain(d) ) @@ -693,6 +698,7 @@ struct domain *domain_create(domid_t dom radix_tree_init(&d->pirq_tree); } +#endif if ( (err = arch_domain_create(d, config, flags)) != 0 ) goto fail; @@ -784,7 +790,9 @@ struct domain *domain_create(domid_t dom { evtchn_destroy(d); evtchn_destroy_final(d); +#ifdef CONFIG_HAS_PIRQ radix_tree_destroy(&d->pirq_tree, free_pirq_struct); +#endif } if ( init_status & INIT_watchdog ) watchdog_domain_destroy(d); @@ -1180,7 +1188,9 @@ static void cf_check complete_domain_des evtchn_destroy_final(d); +#ifdef CONFIG_HAS_PIRQ radix_tree_destroy(&d->pirq_tree, free_pirq_struct); +#endif xfree(d->vcpu); @@ -1893,6 +1903,8 @@ long do_vm_assist(unsigned int cmd, unsi } #endif +#ifdef CONFIG_HAS_PIRQ + struct pirq *pirq_get_info(struct domain *d, int pirq) { struct pirq *info = pirq_info(d, pirq); @@ -1922,6 +1934,8 @@ void cf_check free_pirq_struct(void *ptr call_rcu(&pirq->rcu_head, _free_pirq_struct); } +#endif /* CONFIG_HAS_PIRQ */ + struct migrate_info { long (*func)(void *data); void *data; --- a/xen/common/domctl.c +++ b/xen/common/domctl.c @@ -648,6 +648,7 @@ long do_domctl(XEN_GUEST_HANDLE_PARAM(xe } break; +#ifdef CONFIG_HAS_PIRQ case XEN_DOMCTL_irq_permission: { unsigned int pirq = op->u.irq_permission.pirq, irq; @@ -667,6 +668,7 @@ long do_domctl(XEN_GUEST_HANDLE_PARAM(xe ret = irq_deny_access(d, irq); break; } +#endif case XEN_DOMCTL_iomem_permission: { --- a/xen/common/event_channel.c +++ b/xen/common/event_channel.c @@ -567,6 +567,7 @@ static int evtchn_bind_ipi(evtchn_bind_i return rc; } +#ifdef CONFIG_HAS_PIRQ static void link_pirq_port(int port, struct evtchn *chn, struct vcpu *v) { @@ -592,9 +593,11 @@ static void unlink_pirq_port(struct evtc chn->u.pirq.prev_port; } +#endif /* CONFIG_HAS_PIRQ */ static int evtchn_bind_pirq(evtchn_bind_pirq_t *bind) { +#ifdef CONFIG_HAS_PIRQ struct evtchn *chn; struct domain *d = current->domain; struct vcpu *v = d->vcpu[0]; @@ -664,6 +667,9 @@ static int evtchn_bind_pirq(evtchn_bind_ write_unlock(&d->event_lock); return rc; +#else /* !CONFIG_HAS_PIRQ */ + return -EOPNOTSUPP; +#endif } @@ -696,6 +702,7 @@ int evtchn_close(struct domain *d1, int case ECS_UNBOUND: break; +#ifdef CONFIG_HAS_PIRQ case ECS_PIRQ: { struct pirq *pirq = pirq_info(d1, chn1->u.pirq.irq); @@ -705,14 +712,13 @@ int evtchn_close(struct domain *d1, int pirq_guest_unbind(d1, pirq); pirq->evtchn = 0; pirq_cleanup_check(pirq, d1); -#ifdef CONFIG_X86 if ( is_hvm_domain(d1) && domain_pirq_to_irq(d1, pirq->pirq) > 0 ) unmap_domain_pirq_emuirq(d1, pirq->pirq); -#endif } unlink_pirq_port(chn1, d1->vcpu[chn1->notify_vcpu_id]); break; } +#endif case ECS_VIRQ: { struct vcpu *v; @@ -1122,6 +1128,8 @@ int evtchn_bind_vcpu(evtchn_port_t port, case ECS_INTERDOMAIN: chn->notify_vcpu_id = v->vcpu_id; break; + +#ifdef CONFIG_HAS_PIRQ case ECS_PIRQ: if ( chn->notify_vcpu_id == v->vcpu_id ) break; @@ -1131,6 +1139,8 @@ int evtchn_bind_vcpu(evtchn_port_t port, cpumask_of(v->processor)); link_pirq_port(port, chn, v); break; +#endif + default: rc = -EINVAL; break; --- a/xen/include/xen/sched.h +++ b/xen/include/xen/sched.h @@ -438,12 +438,14 @@ struct domain struct grant_table *grant_table; +#ifdef CONFIG_HAS_PIRQ /* * Interrupt to event-channel mappings and other per-guest-pirq data. * Protected by the domain's event-channel spinlock. */ struct radix_tree_root pirq_tree; unsigned int nr_pirqs; +#endif unsigned int options; /* copy of createdomain flags */