From nobody Fri Nov 22 18:06:21 2024 Delivered-To: importer@patchew.org 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; 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; dmarc=pass(p=reject dis=none) header.from=cloud.com ARC-Seal: i=1; a=rsa-sha256; t=1715962158; cv=none; d=zohomail.com; s=zohoarc; b=FH4upAHuazHovl08+XJAaRrS0DzcDbqTHgthOWyhhtWD0HetK28QzMJaTB5Tfja2/Cq83+JSIMBJdlMbZs3Do8LE9cK7+x3OncwxxJIf2/mmy8tMyVCnO7as456OywjO3TwurBjof/EuTM2PkhYPBRaPEX4NNWiYMr/jqqJa2Dk= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1715962158; h=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=47z4kOfo9ItA11lex/Eyo+IH6kKUzEGtdLK3F1DkmDk=; b=VqQyeuWNNBvcTi+TN9YtM7HCfd3u5tXrRnx5WYOPeFSaBfX4TFNuw7T4KaHEm3nmXUDxO+6qe/mCvHhvqcI8yTDDVhK7sNL7r4C2KrLlJpfFoGwh4fObInlOXLjmrBwS/ddLfUBMOGFKydWShlakIUFIFNy7bkrgjlCEGiVZ9rQ= ARC-Authentication-Results: i=1; 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; dmarc=pass header.from= (p=reject dis=none) Return-Path: Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) by mx.zohomail.com with SMTPS id 1715962158403722.665275256342; Fri, 17 May 2024 09:09:18 -0700 (PDT) Received: from list by lists.xenproject.org with outflank-mailman.724318.1129572 (Exim 4.92) (envelope-from ) id 1s808V-0002OH-Ny; Fri, 17 May 2024 16:08:47 +0000 Received: by outflank-mailman (output) from mailman id 724318.1129572; Fri, 17 May 2024 16:08:47 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1s808V-0002OA-L4; Fri, 17 May 2024 16:08:47 +0000 Received: by outflank-mailman (input) for mailman id 724318; Fri, 17 May 2024 16:08:46 +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 1s808U-0001vE-63 for xen-devel@lists.xenproject.org; Fri, 17 May 2024 16:08:46 +0000 Received: from mail-ed1-x530.google.com (mail-ed1-x530.google.com [2a00:1450:4864:20::530]) by se1-gles-flk1.inumbo.com (Halon) with ESMTPS id bbc50613-1467-11ef-b4bb-af5377834399; Fri, 17 May 2024 18:08:43 +0200 (CEST) Received: by mail-ed1-x530.google.com with SMTP id 4fb4d7f45d1cf-5723edf0ae5so4808011a12.0 for ; Fri, 17 May 2024 09:08:43 -0700 (PDT) Received: from EMEAENGAAD19049.citrite.net (default-46-102-197-194.interdsl.co.uk. [46.102.197.194]) by smtp.gmail.com with ESMTPSA id a640c23a62f3a-a5a60eabd3csm739104366b.108.2024.05.17.09.08.42 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 17 May 2024 09:08:42 -0700 (PDT) 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: bbc50613-1467-11ef-b4bb-af5377834399 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=cloud.com; s=cloud; t=1715962123; x=1716566923; darn=lists.xenproject.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=47z4kOfo9ItA11lex/Eyo+IH6kKUzEGtdLK3F1DkmDk=; b=HkimycW2o+/Z7pT/KZErLCpSCN/w2C5R3mZXIe7+8G3j1TMn7ot26BMeaRRER81mK7 4xjskPpVsSDfg479n6scw175ZyMKLdHKLyw6NjDo+ig1FP4Fm6/fJUCxQiaPl77k9IFP NNl64wT/eEOYbUzzoZrSiVAZUT7tM5Y8mw5hY= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1715962123; x=1716566923; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=47z4kOfo9ItA11lex/Eyo+IH6kKUzEGtdLK3F1DkmDk=; b=NjiYK8fNYc8XdqZ/HlsJ2IHYq3QAAiD9AY5+WnYQMaI/gvii5EpdOzw98kMqYr6l45 w4FpfURTAG4P5NUhpna8mjxA/umPN8OQSIgQhMd70SKFGMgGFUD7ad1F6xKtjKwme44u /Xw81V8NK5Ss7QO0AuST0qoS3tPgVfA4gDYl37BGjnOsvjMyef6RQBigScFSigmOhuEx UCGfpZUVeBZWRIUjrNUvqVo9I9JVY6gPdXJB0QKcCGqG4gQewylDGuC+oXUpfADa0PWM Rz2sK3F1f31HlLSDMzE1eqWUVTkECcqG+x5x8io7fNXRJQ5kooKMhZq6F/h/aRhem4R1 4isQ== X-Gm-Message-State: AOJu0YxmTlrw6hft8VUXT3vpgAihWJGtBdiIL5n+Yu9/WhyCOsyTiEBN rwFQChnAm4Z0p54CMz5DUUEd6CGdS7F8XaIoHjwITbOL5y1DB4AtjBOJov6JMgz+YDpuJRXW2xX I X-Google-Smtp-Source: AGHT+IFgiQRDPF0oHWJ8+7Wpfmo+yOeD6YdIfm4YPI93QPYfCMxj1b2B8mv9T+MnBIZG1pYqEL4RMg== X-Received: by 2002:a17:907:3f0d:b0:a55:8f2a:950d with SMTP id a640c23a62f3a-a5a2d53b28amr1991370966b.16.1715962122854; Fri, 17 May 2024 09:08:42 -0700 (PDT) From: Alejandro Vallejo To: Xen-devel Cc: Alejandro Vallejo , Anthony PERARD , Juergen Gross Subject: [PATCH v2 2/2] tools/xg: Clean up xend-style overrides for CPU policies Date: Fri, 17 May 2024 17:08:35 +0100 Message-Id: X-Mailer: git-send-email 2.34.1 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @cloud.com) X-ZM-MESSAGEID: 1715962159997100003 Content-Type: text/plain; charset="utf-8" Factor out policy getters/setters from both (CPUID and MSR) policy override functions. Additionally, use host policy rather than featureset when preparing the cur policy, saving one hypercall and several lines of boilerplate. No functional change intended. Signed-off-by: Alejandro Vallejo --- v2: * Cosmetic change to comment (// into /**/). * Added missing null pointer check to MSR override function. --- tools/libs/guest/xg_cpuid_x86.c | 445 ++++++++++---------------------- 1 file changed, 130 insertions(+), 315 deletions(-) diff --git a/tools/libs/guest/xg_cpuid_x86.c b/tools/libs/guest/xg_cpuid_x8= 6.c index 4f4b86b59470..74bca0e65b69 100644 --- a/tools/libs/guest/xg_cpuid_x86.c +++ b/tools/libs/guest/xg_cpuid_x86.c @@ -36,6 +36,34 @@ enum { #define bitmaskof(idx) (1u << ((idx) & 31)) #define featureword_of(idx) ((idx) >> 5) =20 +static int deserialize_policy(xc_interface *xch, xc_cpu_policy_t *policy) +{ + uint32_t err_leaf =3D -1, err_subleaf =3D -1, err_msr =3D -1; + int rc; + + rc =3D x86_cpuid_copy_from_buffer(&policy->policy, policy->leaves, + policy->nr_leaves, &err_leaf, &err_sub= leaf); + if ( rc ) + { + if ( err_leaf !=3D -1 ) + ERROR("Failed to deserialise CPUID (err leaf %#x, subleaf %#x)= (%d =3D %s)", + err_leaf, err_subleaf, -rc, strerror(-rc)); + return rc; + } + + rc =3D x86_msr_copy_from_buffer(&policy->policy, policy->msrs, + policy->nr_msrs, &err_msr); + if ( rc ) + { + if ( err_msr !=3D -1 ) + ERROR("Failed to deserialise MSR (err MSR %#x) (%d =3D %s)", + err_msr, -rc, strerror(-rc)); + return rc; + } + + return 0; +} + int xc_get_cpu_levelling_caps(xc_interface *xch, uint32_t *caps) { struct xen_sysctl sysctl =3D {}; @@ -260,102 +288,34 @@ static int compare_leaves(const void *l, const void = *r) return 0; } =20 -static xen_cpuid_leaf_t *find_leaf( - xen_cpuid_leaf_t *leaves, unsigned int nr_leaves, - const struct xc_xend_cpuid *xend) +static xen_cpuid_leaf_t *find_leaf(xc_cpu_policy_t *p, + const struct xc_xend_cpuid *xend) { const xen_cpuid_leaf_t key =3D { xend->leaf, xend->subleaf }; =20 - return bsearch(&key, leaves, nr_leaves, sizeof(*leaves), compare_leave= s); + return bsearch(&key, p->leaves, ARRAY_SIZE(p->leaves), + sizeof(*p->leaves), compare_leaves); } =20 -static int xc_cpuid_xend_policy( - xc_interface *xch, uint32_t domid, const struct xc_xend_cpuid *xend) +static int xc_cpuid_xend_policy(xc_interface *xch, uint32_t domid, + const struct xc_xend_cpuid *xend, + xc_cpu_policy_t *host, + xc_cpu_policy_t *def, + xc_cpu_policy_t *cur) { - int rc; - bool hvm; - xc_domaininfo_t di; - unsigned int nr_leaves, nr_msrs; - uint32_t err_leaf =3D -1, err_subleaf =3D -1, err_msr =3D -1; - /* - * Three full policies. The host, default for the domain type, - * and domain current. - */ - xen_cpuid_leaf_t *host =3D NULL, *def =3D NULL, *cur =3D NULL; - unsigned int nr_host, nr_def, nr_cur; - - if ( (rc =3D xc_domain_getinfo_single(xch, domid, &di)) < 0 ) - { - PERROR("Failed to obtain d%d info", domid); - rc =3D -errno; - goto fail; - } - hvm =3D di.flags & XEN_DOMINF_hvm_guest; - - rc =3D xc_cpu_policy_get_size(xch, &nr_leaves, &nr_msrs); - if ( rc ) - { - PERROR("Failed to obtain policy info size"); - rc =3D -errno; - goto fail; - } - - rc =3D -ENOMEM; - if ( (host =3D calloc(nr_leaves, sizeof(*host))) =3D=3D NULL || - (def =3D calloc(nr_leaves, sizeof(*def))) =3D=3D NULL || - (cur =3D calloc(nr_leaves, sizeof(*cur))) =3D=3D NULL ) - { - ERROR("Unable to allocate memory for %u CPUID leaves", nr_leaves); - goto fail; - } - - /* Get the domain's current policy. */ - nr_msrs =3D 0; - nr_cur =3D nr_leaves; - rc =3D get_domain_cpu_policy(xch, domid, &nr_cur, cur, &nr_msrs, NULL); - if ( rc ) - { - PERROR("Failed to obtain d%d current policy", domid); - rc =3D -errno; - goto fail; - } - - /* Get the domain type's default policy. */ - nr_msrs =3D 0; - nr_def =3D nr_leaves; - rc =3D get_system_cpu_policy(xch, hvm ? XEN_SYSCTL_cpu_policy_hvm_defa= ult - : XEN_SYSCTL_cpu_policy_pv_default, - &nr_def, def, &nr_msrs, NULL); - if ( rc ) - { - PERROR("Failed to obtain %s def policy", hvm ? "hvm" : "pv"); - rc =3D -errno; - goto fail; - } - - /* Get the host policy. */ - nr_msrs =3D 0; - nr_host =3D nr_leaves; - rc =3D get_system_cpu_policy(xch, XEN_SYSCTL_cpu_policy_host, - &nr_host, host, &nr_msrs, NULL); - if ( rc ) - { - PERROR("Failed to obtain host policy"); - rc =3D -errno; - goto fail; - } + if ( !xend ) + return 0; =20 - rc =3D -EINVAL; for ( ; xend->leaf !=3D XEN_CPUID_INPUT_UNUSED; ++xend ) { - xen_cpuid_leaf_t *cur_leaf =3D find_leaf(cur, nr_cur, xend); - const xen_cpuid_leaf_t *def_leaf =3D find_leaf(def, nr_def, xend); - const xen_cpuid_leaf_t *host_leaf =3D find_leaf(host, nr_host, xen= d); + xen_cpuid_leaf_t *cur_leaf =3D find_leaf(cur, xend); + const xen_cpuid_leaf_t *def_leaf =3D find_leaf(def, xend); + const xen_cpuid_leaf_t *host_leaf =3D find_leaf(host, xend); =20 if ( cur_leaf =3D=3D NULL || def_leaf =3D=3D NULL || host_leaf =3D= =3D NULL ) { ERROR("Missing leaf %#x, subleaf %#x", xend->leaf, xend->suble= af); - goto fail; + return -EINVAL; } =20 for ( unsigned int i =3D 0; i < ARRAY_SIZE(xend->policy); i++ ) @@ -384,7 +344,7 @@ static int xc_cpuid_xend_policy( { ERROR("Bad character '%c' in policy[%d] string '%s'", xend->policy[i][j], i, xend->policy[i]); - goto fail; + return -EINVAL; } =20 clear_bit(31 - j, cur_reg); @@ -394,25 +354,7 @@ static int xc_cpuid_xend_policy( } } =20 - /* Feed the transformed currrent policy back up to Xen. */ - rc =3D xc_set_domain_cpu_policy(xch, domid, nr_cur, cur, 0, NULL, - &err_leaf, &err_subleaf, &err_msr); - if ( rc ) - { - PERROR("Failed to set d%d's policy (err leaf %#x, subleaf %#x, msr= %#x)", - domid, err_leaf, err_subleaf, err_msr); - rc =3D -errno; - goto fail; - } - - /* Success! */ - - fail: - free(cur); - free(def); - free(host); - - return rc; + return 0; } =20 static int compare_msr(const void *l, const void *r) @@ -426,107 +368,37 @@ static int compare_msr(const void *l, const void *r) return lhs->idx < rhs->idx ? -1 : 1; } =20 -static xen_msr_entry_t *find_msr( - xen_msr_entry_t *msrs, unsigned int nr_msrs, - uint32_t index) +static xen_msr_entry_t *find_msr(xc_cpu_policy_t *p, + uint32_t index) { const xen_msr_entry_t key =3D { .idx =3D index }; =20 - return bsearch(&key, msrs, nr_msrs, sizeof(*msrs), compare_msr); + return bsearch(&key, p->msrs, ARRAY_SIZE(p->msrs), + sizeof(*p->msrs), compare_msr); } =20 - static int xc_msr_policy(xc_interface *xch, domid_t domid, - const struct xc_msr *msr) + const struct xc_msr *msr, + xc_cpu_policy_t *host, + xc_cpu_policy_t *def, + xc_cpu_policy_t *cur) { - int rc; - bool hvm; - xc_domaininfo_t di; - unsigned int nr_leaves, nr_msrs; - uint32_t err_leaf =3D -1, err_subleaf =3D -1, err_msr =3D -1; - /* - * Three full policies. The host, default for the domain type, - * and domain current. - */ - xen_msr_entry_t *host =3D NULL, *def =3D NULL, *cur =3D NULL; - unsigned int nr_host, nr_def, nr_cur; - - if ( (rc =3D xc_domain_getinfo_single(xch, domid, &di)) < 0 ) - { - PERROR("Failed to obtain d%d info", domid); - rc =3D -errno; - goto out; - } - hvm =3D di.flags & XEN_DOMINF_hvm_guest; - - rc =3D xc_cpu_policy_get_size(xch, &nr_leaves, &nr_msrs); - if ( rc ) - { - PERROR("Failed to obtain policy info size"); - rc =3D -errno; - goto out; - } - - if ( (host =3D calloc(nr_msrs, sizeof(*host))) =3D=3D NULL || - (def =3D calloc(nr_msrs, sizeof(*def))) =3D=3D NULL || - (cur =3D calloc(nr_msrs, sizeof(*cur))) =3D=3D NULL ) - { - ERROR("Unable to allocate memory for %u CPUID leaves", nr_leaves); - rc =3D -ENOMEM; - goto out; - } - - /* Get the domain's current policy. */ - nr_leaves =3D 0; - nr_cur =3D nr_msrs; - rc =3D get_domain_cpu_policy(xch, domid, &nr_leaves, NULL, &nr_cur, cu= r); - if ( rc ) - { - PERROR("Failed to obtain d%d current policy", domid); - rc =3D -errno; - goto out; - } - - /* Get the domain type's default policy. */ - nr_leaves =3D 0; - nr_def =3D nr_msrs; - rc =3D get_system_cpu_policy(xch, hvm ? XEN_SYSCTL_cpu_policy_hvm_defa= ult - : XEN_SYSCTL_cpu_policy_pv_default, - &nr_leaves, NULL, &nr_def, def); - if ( rc ) - { - PERROR("Failed to obtain %s def policy", hvm ? "hvm" : "pv"); - rc =3D -errno; - goto out; - } - - /* Get the host policy. */ - nr_leaves =3D 0; - nr_host =3D nr_msrs; - rc =3D get_system_cpu_policy(xch, XEN_SYSCTL_cpu_policy_host, - &nr_leaves, NULL, &nr_host, host); - if ( rc ) - { - PERROR("Failed to obtain host policy"); - rc =3D -errno; - goto out; - } + if ( !msrs ) + return 0; =20 for ( ; msr->index !=3D XC_MSR_INPUT_UNUSED; ++msr ) { - xen_msr_entry_t *cur_msr =3D find_msr(cur, nr_cur, msr->index); - const xen_msr_entry_t *def_msr =3D find_msr(def, nr_def, msr->inde= x); - const xen_msr_entry_t *host_msr =3D find_msr(host, nr_host, msr->i= ndex); - unsigned int i; + xen_msr_entry_t *cur_msr =3D find_msr(cur, msr->index); + const xen_msr_entry_t *def_msr =3D find_msr(def, msr->index); + const xen_msr_entry_t *host_msr =3D find_msr(host, msr->index); =20 if ( cur_msr =3D=3D NULL || def_msr =3D=3D NULL || host_msr =3D=3D= NULL ) { ERROR("Missing MSR %#x", msr->index); - rc =3D -ENOENT; - goto out; + return -ENOENT; } =20 - for ( i =3D 0; i < ARRAY_SIZE(msr->policy) - 1; i++ ) + for ( size_t i =3D 0; i < ARRAY_SIZE(msr->policy) - 1; i++ ) { bool val; =20 @@ -542,8 +414,7 @@ static int xc_msr_policy(xc_interface *xch, domid_t dom= id, { ERROR("MSR index %#x: bad character '%c' in policy string = '%s'", msr->index, msr->policy[i], msr->policy); - rc =3D -EINVAL; - goto out; + return -EINVAL; } =20 if ( val ) @@ -553,25 +424,7 @@ static int xc_msr_policy(xc_interface *xch, domid_t do= mid, } } =20 - /* Feed the transformed policy back up to Xen. */ - rc =3D xc_set_domain_cpu_policy(xch, domid, 0, NULL, nr_cur, cur, - &err_leaf, &err_subleaf, &err_msr); - if ( rc ) - { - PERROR("Failed to set d%d's policy (err leaf %#x, subleaf %#x, msr= %#x)", - domid, err_leaf, err_subleaf, err_msr); - rc =3D -errno; - goto out; - } - - /* Success! */ - - out: - free(cur); - free(def); - free(host); - - return rc; + return 0; } =20 int xc_cpuid_apply_policy(xc_interface *xch, uint32_t domid, bool restore, @@ -583,14 +436,16 @@ int xc_cpuid_apply_policy(xc_interface *xch, uint32_t= domid, bool restore, int rc; bool hvm; xc_domaininfo_t di; - struct xc_cpu_policy *p =3D xc_cpu_policy_init(); - unsigned int i, nr_leaves =3D ARRAY_SIZE(p->leaves), nr_msrs =3D 0; - uint32_t err_leaf =3D -1, err_subleaf =3D -1, err_msr =3D -1; - uint32_t host_featureset[FEATURESET_NR_ENTRIES] =3D {}; - uint32_t len =3D ARRAY_SIZE(host_featureset); =20 - if ( !p ) - return -ENOMEM; + struct xc_cpu_policy *host =3D xc_cpu_policy_init(); + struct xc_cpu_policy *def =3D xc_cpu_policy_init(); + struct xc_cpu_policy *cur =3D xc_cpu_policy_init(); + + if ( !host || !def || !cur ) + { + rc =3D -ENOMEM; + goto out; + } =20 if ( (rc =3D xc_domain_getinfo_single(xch, domid, &di)) < 0 ) { @@ -600,21 +455,19 @@ int xc_cpuid_apply_policy(xc_interface *xch, uint32_t= domid, bool restore, } hvm =3D di.flags & XEN_DOMINF_hvm_guest; =20 - /* Get the host policy. */ - rc =3D xc_get_cpu_featureset(xch, XEN_SYSCTL_cpu_featureset_host, - &len, host_featureset); - /* Tolerate "buffer too small", as we've got the bits we need. */ - if ( rc && errno !=3D ENOBUFS ) + /* Get the raw host policy */ + rc =3D xc_cpu_policy_get_system(xch, XEN_SYSCTL_cpu_policy_host, host); + if ( rc ) { - PERROR("Failed to obtain host featureset"); + PERROR("Failed to obtain host policy"); rc =3D -errno; goto out; } =20 /* Get the domain's default policy. */ - rc =3D get_system_cpu_policy(xch, hvm ? XEN_SYSCTL_cpu_policy_hvm_defa= ult - : XEN_SYSCTL_cpu_policy_pv_default, - &nr_leaves, p->leaves, &nr_msrs, NULL); + rc =3D xc_cpu_policy_get_system(xch, hvm ? XEN_SYSCTL_cpu_policy_hvm_d= efault + : XEN_SYSCTL_cpu_policy_pv_defa= ult, + def); if ( rc ) { PERROR("Failed to obtain %s default policy", hvm ? "hvm" : "pv"); @@ -622,14 +475,8 @@ int xc_cpuid_apply_policy(xc_interface *xch, uint32_t = domid, bool restore, goto out; } =20 - rc =3D x86_cpuid_copy_from_buffer(&p->policy, p->leaves, nr_leaves, - &err_leaf, &err_subleaf); - if ( rc ) - { - ERROR("Failed to deserialise CPUID (err leaf %#x, subleaf %#x) (%d= =3D %s)", - err_leaf, err_subleaf, -rc, strerror(-rc)); - goto out; - } + /* Copy the deserialised default policy to modify it */ + memcpy(cur, def, sizeof(*cur)); =20 if ( restore ) { @@ -647,18 +494,18 @@ int xc_cpuid_apply_policy(xc_interface *xch, uint32_t= domid, bool restore, * - Re-enable features which have become (possibly) off by defaul= t. */ =20 - p->policy.basic.rdrand =3D test_bit(X86_FEATURE_RDRAND, host_featu= reset); - p->policy.feat.hle =3D test_bit(X86_FEATURE_HLE, host_featureset); - p->policy.feat.rtm =3D test_bit(X86_FEATURE_RTM, host_featureset); + cur->policy.basic.rdrand =3D host->policy.basic.rdrand; + cur->policy.feat.hle =3D host->policy.feat.hle; + cur->policy.feat.rtm =3D host->policy.feat.rtm; =20 if ( hvm ) { - p->policy.feat.mpx =3D test_bit(X86_FEATURE_MPX, host_features= et); + cur->policy.feat.mpx =3D host->policy.feat.mpx; } =20 - p->policy.basic.max_leaf =3D min(p->policy.basic.max_leaf, 0xdu); - p->policy.feat.max_subleaf =3D 0; - p->policy.extd.max_leaf =3D min(p->policy.extd.max_leaf, 0x8000001= c); + cur->policy.basic.max_leaf =3D min(cur->policy.basic.max_leaf, 0xd= u); + cur->policy.feat.max_subleaf =3D 0; + cur->policy.extd.max_leaf =3D min(cur->policy.extd.max_leaf, 0x800= 0001c); } =20 if ( featureset ) @@ -666,7 +513,7 @@ int xc_cpuid_apply_policy(xc_interface *xch, uint32_t d= omid, bool restore, uint32_t disabled_features[FEATURESET_NR_ENTRIES], feat[FEATURESET_NR_ENTRIES] =3D {}; static const uint32_t deep_features[] =3D INIT_DEEP_FEATURES; - unsigned int i, b; + unsigned int b; =20 /* * The user supplied featureset may be shorter or longer than @@ -677,14 +524,14 @@ int xc_cpuid_apply_policy(xc_interface *xch, uint32_t= domid, bool restore, =20 /* Check for truncated set bits. */ rc =3D -EOPNOTSUPP; - for ( i =3D user_len; i < nr_features; ++i ) + for ( size_t i =3D user_len; i < nr_features; ++i ) if ( featureset[i] !=3D 0 ) goto out; =20 memcpy(feat, featureset, sizeof(*featureset) * user_len); =20 /* Disable deep dependencies of disabled features. */ - for ( i =3D 0; i < ARRAY_SIZE(disabled_features); ++i ) + for ( size_t i =3D 0; i < ARRAY_SIZE(disabled_features); ++i ) disabled_features[i] =3D ~feat[i] & deep_features[i]; =20 for ( b =3D 0; b < sizeof(disabled_features) * CHAR_BIT; ++b ) @@ -695,24 +542,24 @@ int xc_cpuid_apply_policy(xc_interface *xch, uint32_t= domid, bool restore, !(dfs =3D x86_cpu_policy_lookup_deep_deps(b)) ) continue; =20 - for ( i =3D 0; i < ARRAY_SIZE(disabled_features); ++i ) + for ( size_t i =3D 0; i < ARRAY_SIZE(disabled_features); ++i ) { feat[i] &=3D ~dfs[i]; disabled_features[i] &=3D ~dfs[i]; } } =20 - x86_cpu_featureset_to_policy(feat, &p->policy); + x86_cpu_featureset_to_policy(feat, &cur->policy); } else { - p->policy.extd.itsc =3D itsc; + cur->policy.extd.itsc =3D itsc; =20 if ( hvm ) { - p->policy.basic.pae =3D pae; - p->policy.basic.vmx =3D nested_virt; - p->policy.extd.svm =3D nested_virt; + cur->policy.basic.pae =3D pae; + cur->policy.basic.vmx =3D nested_virt; + cur->policy.extd.svm =3D nested_virt; } } =20 @@ -722,8 +569,8 @@ int xc_cpuid_apply_policy(xc_interface *xch, uint32_t d= omid, bool restore, * On hardware without CPUID Faulting, PV guests see real topology. * As a consequence, they also need to see the host htt/cmp fields. */ - p->policy.basic.htt =3D test_bit(X86_FEATURE_HTT, host_featu= reset); - p->policy.extd.cmp_legacy =3D test_bit(X86_FEATURE_CMP_LEGACY, hos= t_featureset); + cur->policy.basic.htt =3D host->policy.basic.htt; + cur->policy.extd.cmp_legacy =3D host->policy.extd.cmp_legacy; } else { @@ -731,28 +578,28 @@ int xc_cpuid_apply_policy(xc_interface *xch, uint32_t= domid, bool restore, * Topology for HVM guests is entirely controlled by Xen. For now= , we * hardcode APIC_ID =3D vcpu_id * 2 to give the illusion of no SMT. */ - p->policy.basic.htt =3D true; - p->policy.extd.cmp_legacy =3D false; + cur->policy.basic.htt =3D true; + cur->policy.extd.cmp_legacy =3D false; =20 /* * Leaf 1 EBX[23:16] is Maximum Logical Processors Per Package. * Update to reflect vLAPIC_ID =3D vCPU_ID * 2, but make sure to a= void * overflow. */ - if ( !p->policy.basic.lppp ) - p->policy.basic.lppp =3D 2; - else if ( !(p->policy.basic.lppp & 0x80) ) - p->policy.basic.lppp *=3D 2; + if ( !cur->policy.basic.lppp ) + cur->policy.basic.lppp =3D 2; + else if ( !(cur->policy.basic.lppp & 0x80) ) + cur->policy.basic.lppp *=3D 2; =20 - switch ( p->policy.x86_vendor ) + switch ( cur->policy.x86_vendor ) { case X86_VENDOR_INTEL: - for ( i =3D 0; (p->policy.cache.subleaf[i].type && - i < ARRAY_SIZE(p->policy.cache.raw)); ++i ) + for ( size_t i =3D 0; (cur->policy.cache.subleaf[i].type && + i < ARRAY_SIZE(cur->policy.cache.raw)); ++= i ) { - p->policy.cache.subleaf[i].cores_per_package =3D - (p->policy.cache.subleaf[i].cores_per_package << 1) | = 1; - p->policy.cache.subleaf[i].threads_per_cache =3D 0; + cur->policy.cache.subleaf[i].cores_per_package =3D + (cur->policy.cache.subleaf[i].cores_per_package << 1) = | 1; + cur->policy.cache.subleaf[i].threads_per_cache =3D 0; } break; =20 @@ -772,49 +619,45 @@ int xc_cpuid_apply_policy(xc_interface *xch, uint32_t= domid, bool restore, * apic_id_size values greater than 7. Limit the value to * 7 for now. */ - if ( p->policy.extd.nc < 0x7f ) + if ( cur->policy.extd.nc < 0x7f ) { - if ( p->policy.extd.apic_id_size !=3D 0 && p->policy.extd.= apic_id_size < 0x7 ) - p->policy.extd.apic_id_size++; + if ( cur->policy.extd.apic_id_size !=3D 0 && cur->policy.e= xtd.apic_id_size < 0x7 ) + cur->policy.extd.apic_id_size++; =20 - p->policy.extd.nc =3D (p->policy.extd.nc << 1) | 1; + cur->policy.extd.nc =3D (cur->policy.extd.nc << 1) | 1; } break; } } =20 - nr_leaves =3D ARRAY_SIZE(p->leaves); - rc =3D x86_cpuid_copy_to_buffer(&p->policy, p->leaves, &nr_leaves); - if ( rc ) + if ( xend || msr ) { - ERROR("Failed to serialise CPUID (%d =3D %s)", -rc, strerror(-rc)); - goto out; + /* The overrides are over the serialised form of the policy */ + if ( (rc =3D xc_cpu_policy_serialise(xch, cur)) ) + goto out; + + if ( (rc =3D xc_cpuid_xend_policy(xch, domid, xend, host, def, cur= )) ) + goto out; + if ( (rc =3D xc_msr_policy(xch, domid, msr, host, def, cur)) ) + goto out; + + if ( (rc =3D deserialize_policy(xch, cur)) ) + goto out; } =20 - rc =3D xc_set_domain_cpu_policy(xch, domid, nr_leaves, p->leaves, 0, N= ULL, - &err_leaf, &err_subleaf, &err_msr); + rc =3D xc_cpu_policy_set_domain(xch, domid, cur); if ( rc ) { - PERROR("Failed to set d%d's policy (err leaf %#x, subleaf %#x, msr= %#x)", - domid, err_leaf, err_subleaf, err_msr); rc =3D -errno; goto out; } =20 - if ( xend && (rc =3D xc_cpuid_xend_policy(xch, domid, xend)) ) - goto out; - - if ( msr ) - { - rc =3D xc_msr_policy(xch, domid, msr); - if ( rc ) - goto out; - } - rc =3D 0; =20 out: - xc_cpu_policy_destroy(p); + xc_cpu_policy_destroy(def); + xc_cpu_policy_destroy(host); + xc_cpu_policy_destroy(cur); =20 return rc; } @@ -834,34 +677,6 @@ void xc_cpu_policy_destroy(xc_cpu_policy_t *policy) } } =20 -static int deserialize_policy(xc_interface *xch, xc_cpu_policy_t *policy) -{ - uint32_t err_leaf =3D -1, err_subleaf =3D -1, err_msr =3D -1; - int rc; - - rc =3D x86_cpuid_copy_from_buffer(&policy->policy, policy->leaves, - policy->nr_leaves, &err_leaf, &err_sub= leaf); - if ( rc ) - { - if ( err_leaf !=3D -1 ) - ERROR("Failed to deserialise CPUID (err leaf %#x, subleaf %#x)= (%d =3D %s)", - err_leaf, err_subleaf, -rc, strerror(-rc)); - return rc; - } - - rc =3D x86_msr_copy_from_buffer(&policy->policy, policy->msrs, - policy->nr_msrs, &err_msr); - if ( rc ) - { - if ( err_msr !=3D -1 ) - ERROR("Failed to deserialise MSR (err MSR %#x) (%d =3D %s)", - err_msr, -rc, strerror(-rc)); - return rc; - } - - return 0; -} - int xc_cpu_policy_get_system(xc_interface *xch, unsigned int policy_idx, xc_cpu_policy_t *policy) { --=20 2.34.1