From patchwork Tue Oct 12 21:22:00 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Oleksandr Tyshchenko X-Patchwork-Id: 12553707 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 mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 50BAEC433F5 for ; Tue, 12 Oct 2021 21:22:39 +0000 (UTC) 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 mail.kernel.org (Postfix) with ESMTPS id EBE75600D3 for ; Tue, 12 Oct 2021 21:22:38 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.1 mail.kernel.org EBE75600D3 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=lists.xenproject.org Received: from list by lists.xenproject.org with outflank-mailman.207649.363532 (Exim 4.92) (envelope-from ) id 1maPE7-00041n-O8; Tue, 12 Oct 2021 21:22:23 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 207649.363532; Tue, 12 Oct 2021 21:22:23 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1maPE7-00041g-KX; Tue, 12 Oct 2021 21:22:23 +0000 Received: by outflank-mailman (input) for mailman id 207649; Tue, 12 Oct 2021 21:22:22 +0000 Received: from us1-rack-iad1.inumbo.com ([172.99.69.81]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1maPE6-00041a-FA for xen-devel@lists.xenproject.org; Tue, 12 Oct 2021 21:22:22 +0000 Received: from mail-lf1-x12a.google.com (unknown [2a00:1450:4864:20::12a]) by us1-rack-iad1.inumbo.com (Halon) with ESMTPS id e02ae445-c6d6-4d34-9df3-36664bd133d4; Tue, 12 Oct 2021 21:22:20 +0000 (UTC) Received: by mail-lf1-x12a.google.com with SMTP id x27so2435913lfa.9 for ; Tue, 12 Oct 2021 14:22:20 -0700 (PDT) Received: from otyshchenko.router ([212.22.223.21]) by smtp.gmail.com with ESMTPSA id t19sm1225435lfl.30.2021.10.12.14.22.18 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Tue, 12 Oct 2021 14:22:19 -0700 (PDT) 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: e02ae445-c6d6-4d34-9df3-36664bd133d4 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=cYWMzG7Y4+yIuZtYg+IWHufWttwrsUzPWk+Z4Hhpz4I=; b=JBk76p/EuLGWECDn/lOJCwUFYt9gAi3lWvxRzhW/Pa/xPalPosXakHPPw2Pp0M8mkP F4KNxviHeMTuu5BpfRzZ7X9ezIHyUEUFRpMhwfyt52eXHlzQQiGFkBaKVPdw9EdkVa4E 7Idjsz5eCqD649z5ZmVKJiRHynISTkRsw70ZphmIGLrtaRK3Ev/6jhrqpQfsQT4UwrjG GuT4d+3DmUtXFSEpeYFbSRvPKeCNkYtSy6tMs+iKPdcso/TEUx7vyd6rDqLDX8b4U52N UHy1IoE79VACShggtpwmukN9C/VssKRoPdyPiIXS43C3Xc+H413BcfCPoDCGEPBs11uO 8Qsg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=cYWMzG7Y4+yIuZtYg+IWHufWttwrsUzPWk+Z4Hhpz4I=; b=ik4VL4or8lEIU6mf0CracQ0KHiA4XcDD/eYdlb3rgrHXITsauusGljOCkhUchqm9ar qmrF9lUcAK5djVPWX6NbdLy9iSFe7TB4BdTI7MG0bFSljrreIaJYARQD65Re6G8CuijI rRgLAfeFcUgbVO8PXfPZD8AMe+0fBGKoB1Za6i6o6BYvz6+oaGWP89ryTHRflOMk5yzv uYF8Qj6X21FtedhUg4wOzzxVMbJudKAwm2ykmxNQF6NdnQRX1oMXGUJ2Rd28Y5bgq3S4 gTuxP//3b54i8ywSqFiaCdky5XtolUcvo2PfjMbINM3ksiMSwuvdJ10MNO6WfsZW0msr zbig== X-Gm-Message-State: AOAM533yD4RmtnoVF7BRI7///Bs/jCP0vAXL9SFWvScmg5pqV2oHf7tn HljLNmn36X6yjljE1yfWz63z/HDco6Q= X-Google-Smtp-Source: ABdhPJzbD0THil8C1CqmLH+7H60ROzatxU8kXixYOC3xlyuebbY/0D+xbT/+WG8z2aVrO2VVWvIwCg== X-Received: by 2002:a05:6512:b29:: with SMTP id w41mr36353870lfu.508.1634073739570; Tue, 12 Oct 2021 14:22:19 -0700 (PDT) From: Oleksandr Tyshchenko To: xen-devel@lists.xenproject.org Cc: Oleksandr Tyshchenko , Ian Jackson , Wei Liu , Anthony PERARD , Andrew Cooper , George Dunlap , Jan Beulich , Julien Grall , Stefano Stabellini , Juergen Gross , Volodymyr Babchuk , =?utf-8?q?Roger_Pau_Monn?= =?utf-8?q?=C3=A9?= Subject: [PATCH V6 1/2] xen/arm: Introduce gpaddr_bits field to struct xen_domctl_getdomaininfo Date: Wed, 13 Oct 2021 00:22:00 +0300 Message-Id: <1634073720-27901-1-git-send-email-olekstysh@gmail.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <9e6e1378-7ee3-b692-b57d-29b597160661@gmail.com> References: <9e6e1378-7ee3-b692-b57d-29b597160661@gmail.com> From: Oleksandr Tyshchenko We need to pass info about maximum supported guest physical address space size to the toolstack on Arm in order to properly calculate the base and size of the extended region (safe range) for the guest. The extended region is unused address space which could be safely used by domain for foreign/grant mappings on Arm. The extended region itself will be handled by the subsequent patch. Currently the same guest physical address space size is used for all guests (p2m_ipa_bits variable on Arm, the x86 equivalent is hap_paddr_bits). Add an explicit padding after "gpaddr_bits" field and also (while at it) after "domain" field. Also make sure that full structure is cleared in all cases by moving the clearing into getdomaininfo(). Currently it is only cleared by the sysctl caller (and only once). Please note, we do not need to bump XEN_DOMCTL_INTERFACE_VERSION as a bump has already occurred in this release cycle. But we do need to bump XEN_SYSCTL_INTERFACE_VERSION as the structure is re-used in a sysctl. Suggested-by: Julien Grall Signed-off-by: Oleksandr Tyshchenko Reviewed-by: Ian Jackson Reviewed-by: Jan Beulich --- Changes RFC -> V2: - update patch subject/description - replace arch-specific sub-struct with common gpaddr_bits field and update code to reflect that Changes V2 -> V3: - make the field uint8_t and add uint8_t pad[7] after - remove leading blanks in libxl.h Changes V3 -> V4: - also print gpaddr_bits from output_physinfo() - add Michal's R-b Changes V4 -> V5: - update patch subject and description - drop Michal's R-b - pass gpaddr_bits via createdomain domctl (struct xen_arch_domainconfig) Changes V5 -> V6: - update patch subject and description - pass gpaddr_bits via getdomaininfo domctl (struct xen_domctl_getdomaininfo) Changes V6 -> V7: - update patch description - do not bump XEN_DOMCTL_INTERFACE_VERSION - bump XEN_SYSCTL_INTERFACE_VERSION - add explicit paddings - clear the full structure in getdomaininfo() - add Ian's R-b --- tools/include/libxl.h | 8 ++++++++ tools/include/xenctrl.h | 1 + tools/libs/ctrl/xc_domain.c | 1 + tools/libs/light/libxl_domain.c | 1 + tools/libs/light/libxl_types.idl | 1 + xen/arch/arm/domctl.c | 2 ++ xen/arch/x86/domctl.c | 1 + xen/common/domctl.c | 6 +++--- xen/common/sysctl.c | 2 +- xen/include/public/domctl.h | 3 +++ xen/include/public/sysctl.h | 2 +- 11 files changed, 23 insertions(+), 5 deletions(-) diff --git a/tools/include/libxl.h b/tools/include/libxl.h index b9ba16d..deb5022 100644 --- a/tools/include/libxl.h +++ b/tools/include/libxl.h @@ -874,6 +874,14 @@ typedef struct libxl__ctx libxl_ctx; #define LIBXL_HAVE_DOMINFO_NEVER_STOP 1 /* + * LIBXL_HAVE_DOMINFO_GPADDR_BITS + * + * If this is defined, libxl_dominfo will contain an uint8 field called + * gpaddr_bits, containing the guest physical address space size. + */ +#define LIBXL_HAVE_DOMINFO_GPADDR_BITS 1 + +/* * LIBXL_HAVE_QXL * * If defined, then the libxl_vga_interface_type will contain another value: diff --git a/tools/include/xenctrl.h b/tools/include/xenctrl.h index a306399..07b96e6 100644 --- a/tools/include/xenctrl.h +++ b/tools/include/xenctrl.h @@ -462,6 +462,7 @@ typedef struct xc_dominfo { unsigned int max_vcpu_id; xen_domain_handle_t handle; unsigned int cpupool; + uint8_t gpaddr_bits; struct xen_arch_domainconfig arch_config; } xc_dominfo_t; diff --git a/tools/libs/ctrl/xc_domain.c b/tools/libs/ctrl/xc_domain.c index 23322b7..b155d6a 100644 --- a/tools/libs/ctrl/xc_domain.c +++ b/tools/libs/ctrl/xc_domain.c @@ -396,6 +396,7 @@ int xc_domain_getinfo(xc_interface *xch, info->nr_online_vcpus = domctl.u.getdomaininfo.nr_online_vcpus; info->max_vcpu_id = domctl.u.getdomaininfo.max_vcpu_id; info->cpupool = domctl.u.getdomaininfo.cpupool; + info->gpaddr_bits = domctl.u.getdomaininfo.gpaddr_bits; info->arch_config = domctl.u.getdomaininfo.arch_config; memcpy(info->handle, domctl.u.getdomaininfo.handle, diff --git a/tools/libs/light/libxl_domain.c b/tools/libs/light/libxl_domain.c index 51a6127..544a9bf 100644 --- a/tools/libs/light/libxl_domain.c +++ b/tools/libs/light/libxl_domain.c @@ -306,6 +306,7 @@ void libxl__xcinfo2xlinfo(libxl_ctx *ctx, xlinfo->vcpu_max_id = xcinfo->max_vcpu_id; xlinfo->vcpu_online = xcinfo->nr_online_vcpus; xlinfo->cpupool = xcinfo->cpupool; + xlinfo->gpaddr_bits = xcinfo->gpaddr_bits; xlinfo->domain_type = (xcinfo->flags & XEN_DOMINF_hvm_guest) ? LIBXL_DOMAIN_TYPE_HVM : LIBXL_DOMAIN_TYPE_PV; } diff --git a/tools/libs/light/libxl_types.idl b/tools/libs/light/libxl_types.idl index 3f9fff6..2df7258 100644 --- a/tools/libs/light/libxl_types.idl +++ b/tools/libs/light/libxl_types.idl @@ -357,6 +357,7 @@ libxl_dominfo = Struct("dominfo",[ ("vcpu_max_id", uint32), ("vcpu_online", uint32), ("cpupool", uint32), + ("gpaddr_bits", uint8), ("domain_type", libxl_domain_type), ], dir=DIR_OUT) diff --git a/xen/arch/arm/domctl.c b/xen/arch/arm/domctl.c index b7d27f3..6245af6 100644 --- a/xen/arch/arm/domctl.c +++ b/xen/arch/arm/domctl.c @@ -20,6 +20,8 @@ void arch_get_domain_info(const struct domain *d, { /* All ARM domains use hardware assisted paging. */ info->flags |= XEN_DOMINF_hap; + + info->gpaddr_bits = p2m_ipa_bits; } static int handle_vuart_init(struct domain *d, diff --git a/xen/arch/x86/domctl.c b/xen/arch/x86/domctl.c index 26a76d2..7d102e0 100644 --- a/xen/arch/x86/domctl.c +++ b/xen/arch/x86/domctl.c @@ -151,6 +151,7 @@ void arch_get_domain_info(const struct domain *d, info->flags |= XEN_DOMINF_hap; info->arch_config.emulation_flags = d->arch.emulation_flags; + info->gpaddr_bits = hap_paddr_bits; } static int do_vmtrace_op(struct domain *d, struct xen_domctl_vmtrace_op *op, diff --git a/xen/common/domctl.c b/xen/common/domctl.c index 12d6144..2d07a12 100644 --- a/xen/common/domctl.c +++ b/xen/common/domctl.c @@ -69,10 +69,10 @@ void getdomaininfo(struct domain *d, struct xen_domctl_getdomaininfo *info) int flags = XEN_DOMINF_blocked; struct vcpu_runstate_info runstate; + memset(info, 0, sizeof(*info)); + info->domain = d->domain_id; info->max_vcpu_id = XEN_INVALID_MAX_VCPU_ID; - info->nr_online_vcpus = 0; - info->ssidref = 0; /* * - domain is marked as blocked only if all its vcpus are blocked @@ -95,7 +95,7 @@ void getdomaininfo(struct domain *d, struct xen_domctl_getdomaininfo *info) info->cpu_time = cpu_time; - info->flags = (info->nr_online_vcpus ? flags : 0) | + info->flags |= (info->nr_online_vcpus ? flags : 0) | ((d->is_dying == DOMDYING_dead) ? XEN_DOMINF_dying : 0) | (d->is_shut_down ? XEN_DOMINF_shutdown : 0) | (d->controller_pause_count > 0 ? XEN_DOMINF_paused : 0) | diff --git a/xen/common/sysctl.c b/xen/common/sysctl.c index 3558641..a7ab95d 100644 --- a/xen/common/sysctl.c +++ b/xen/common/sysctl.c @@ -76,7 +76,7 @@ long do_sysctl(XEN_GUEST_HANDLE_PARAM(xen_sysctl_t) u_sysctl) case XEN_SYSCTL_getdomaininfolist: { struct domain *d; - struct xen_domctl_getdomaininfo info = { 0 }; + struct xen_domctl_getdomaininfo info; u32 num_domains = 0; rcu_read_lock(&domlist_read_lock); diff --git a/xen/include/public/domctl.h b/xen/include/public/domctl.h index 4cb3f66..46acc8f 100644 --- a/xen/include/public/domctl.h +++ b/xen/include/public/domctl.h @@ -106,6 +106,7 @@ struct xen_domctl_createdomain { struct xen_domctl_getdomaininfo { /* OUT variables. */ domid_t domain; /* Also echoed in domctl.domain */ + uint16_t pad1; /* Domain is scheduled to die. */ #define _XEN_DOMINF_dying 0 #define XEN_DOMINF_dying (1U<<_XEN_DOMINF_dying) @@ -150,6 +151,8 @@ struct xen_domctl_getdomaininfo { uint32_t ssidref; xen_domain_handle_t handle; uint32_t cpupool; + uint8_t gpaddr_bits; /* Guest physical address space size. */ + uint8_t pad2[7]; struct xen_arch_domainconfig arch_config; }; typedef struct xen_domctl_getdomaininfo xen_domctl_getdomaininfo_t; diff --git a/xen/include/public/sysctl.h b/xen/include/public/sysctl.h index 039ccf8..41ef7a2 100644 --- a/xen/include/public/sysctl.h +++ b/xen/include/public/sysctl.h @@ -35,7 +35,7 @@ #include "domctl.h" #include "physdev.h" -#define XEN_SYSCTL_INTERFACE_VERSION 0x00000013 +#define XEN_SYSCTL_INTERFACE_VERSION 0x00000014 /* * Read console content from Xen buffer ring.