All of lore.kernel.org
 help / color / mirror / Atom feed
From: Roger Pau Monne <roger.pau@citrix.com>
To: <xen-devel@lists.xenproject.org>
Cc: Andrew Cooper <andrew.cooper3@citrix.com>,
	Roger Pau Monne <roger.pau@citrix.com>,
	Ian Jackson <iwj@xenproject.org>, Wei Liu <wl@xen.org>
Subject: [PATCH v3 02/13] libs/guest: allow fetching a specific CPUID leaf from a cpu policy
Date: Fri, 30 Apr 2021 17:52:00 +0200	[thread overview]
Message-ID: <20210430155211.3709-3-roger.pau@citrix.com> (raw)
In-Reply-To: <20210430155211.3709-1-roger.pau@citrix.com>

Introduce an interface that returns a specific leaf/subleaf from a cpu
policy in xen_cpuid_leaf_t format.

This is useful to callers can peek data from the opaque
xc_cpu_policy_t type.

No caller of the interface introduced on this patch.

Note that callers of find_leaf need to be slightly adjusted to use the
new helper parameters.

Signed-off-by: Roger Pau Monné <roger.pau@citrix.com>
---
Changes since v1:
 - Use find leaf.
---
 tools/include/xenctrl.h         |  3 +++
 tools/libs/guest/xg_cpuid_x86.c | 38 ++++++++++++++++++++++++++++-----
 2 files changed, 36 insertions(+), 5 deletions(-)

diff --git a/tools/include/xenctrl.h b/tools/include/xenctrl.h
index 27cec1b93ff..cbca7209e34 100644
--- a/tools/include/xenctrl.h
+++ b/tools/include/xenctrl.h
@@ -2608,6 +2608,9 @@ int xc_cpu_policy_set_domain(xc_interface *xch, uint32_t domid,
 int xc_cpu_policy_serialise(xc_interface *xch, const xc_cpu_policy_t policy,
                             xen_cpuid_leaf_t *leaves, uint32_t *nr_leaves,
                             xen_msr_entry_t *msrs, uint32_t *nr_msrs);
+int xc_cpu_policy_get_cpuid(xc_interface *xch, const xc_cpu_policy_t policy,
+                            uint32_t leaf, uint32_t subleaf,
+                            xen_cpuid_leaf_t *out);
 
 int xc_get_cpu_levelling_caps(xc_interface *xch, uint32_t *caps);
 int xc_get_cpu_featureset(xc_interface *xch, uint32_t index,
diff --git a/tools/libs/guest/xg_cpuid_x86.c b/tools/libs/guest/xg_cpuid_x86.c
index 0c9b3a960f0..de27826f415 100644
--- a/tools/libs/guest/xg_cpuid_x86.c
+++ b/tools/libs/guest/xg_cpuid_x86.c
@@ -280,9 +280,9 @@ static int compare_leaves(const void *l, const void *r)
 
 static xen_cpuid_leaf_t *find_leaf(
     xen_cpuid_leaf_t *leaves, unsigned int nr_leaves,
-    const struct xc_xend_cpuid *xend)
+    unsigned int leaf, unsigned int subleaf)
 {
-    const xen_cpuid_leaf_t key = { xend->leaf, xend->subleaf };
+    const xen_cpuid_leaf_t key = { leaf, subleaf };
 
     return bsearch(&key, leaves, nr_leaves, sizeof(*leaves), compare_leaves);
 }
@@ -365,9 +365,12 @@ static int xc_cpuid_xend_policy(
     rc = -EINVAL;
     for ( ; xend->leaf != XEN_CPUID_INPUT_UNUSED; ++xend )
     {
-        xen_cpuid_leaf_t *cur_leaf = find_leaf(cur, nr_cur, xend);
-        const xen_cpuid_leaf_t *def_leaf = find_leaf(def, nr_def, xend);
-        const xen_cpuid_leaf_t *host_leaf = find_leaf(host, nr_host, xend);
+        xen_cpuid_leaf_t *cur_leaf = find_leaf(cur, nr_cur,
+                                               xend->leaf, xend->subleaf);
+        const xen_cpuid_leaf_t *def_leaf = find_leaf(def, nr_def,
+                                                     xend->leaf, xend->subleaf);
+        const xen_cpuid_leaf_t *host_leaf = find_leaf(host, nr_host, xend->leaf,
+                                                      xend->subleaf);
 
         if ( cur_leaf == NULL || def_leaf == NULL || host_leaf == NULL )
         {
@@ -822,3 +825,28 @@ int xc_cpu_policy_serialise(xc_interface *xch, const xc_cpu_policy_t p,
     errno = 0;
     return 0;
 }
+
+int xc_cpu_policy_get_cpuid(xc_interface *xch, const xc_cpu_policy_t policy,
+                            uint32_t leaf, uint32_t subleaf,
+                            xen_cpuid_leaf_t *out)
+{
+    unsigned int nr_leaves = ARRAY_SIZE(policy->leaves);
+    xen_cpuid_leaf_t *tmp;
+    int rc;
+
+    rc = xc_cpu_policy_serialise(xch, policy, policy->leaves, &nr_leaves,
+                                 NULL, 0);
+    if ( rc )
+        return rc;
+
+    tmp = find_leaf(policy->leaves, nr_leaves, leaf, subleaf);
+    if ( !tmp )
+    {
+        /* Unable to find a matching leaf. */
+        errno = ENOENT;
+        return -1;
+    }
+
+    *out = *tmp;
+    return 0;
+}
-- 
2.31.1



  parent reply	other threads:[~2021-04-30 15:54 UTC|newest]

Thread overview: 38+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-04-30 15:51 [PATCH v3 00/13] libs/guest: new CPUID/MSR interface Roger Pau Monne
2021-04-30 15:51 ` [PATCH v3 01/13] libxl: don't ignore the return value from xc_cpuid_apply_policy Roger Pau Monne
2021-05-04 14:07   ` Anthony PERARD
2021-04-30 15:52 ` Roger Pau Monne [this message]
2021-05-04 11:59   ` [PATCH v3 02/13] libs/guest: allow fetching a specific CPUID leaf from a cpu policy Andrew Cooper
2021-05-04 13:47     ` Roger Pau Monné
2021-05-04 15:46       ` Andrew Cooper
2021-04-30 15:52 ` [PATCH v3 03/13] libs/guest: allow fetching a specific MSR entry " Roger Pau Monne
2021-05-03 10:41   ` Jan Beulich
2021-05-04 10:56     ` Roger Pau Monné
2021-05-04 11:40       ` Jan Beulich
2021-05-04 11:58         ` Roger Pau Monné
2021-05-04 17:11           ` Andrew Cooper
2021-05-05  7:38             ` Jan Beulich
2021-04-30 15:52 ` [PATCH v3 04/13] libs/guest: allow updating a cpu policy CPUID data Roger Pau Monne
2021-05-04 16:19   ` Andrew Cooper
2021-04-30 15:52 ` [PATCH v3 05/13] libs/guest: allow updating a cpu policy MSR data Roger Pau Monne
2021-05-04 16:20   ` Andrew Cooper
2021-04-30 15:52 ` [PATCH v3 06/13] libs/guest: introduce helper to check cpu policy compatibility Roger Pau Monne
2021-05-04 16:27   ` Andrew Cooper
2021-04-30 15:52 ` [PATCH v3 07/13] libs/guest: obtain a compatible cpu policy from two input ones Roger Pau Monne
2021-05-03 10:43   ` Jan Beulich
2021-05-04 11:56     ` Roger Pau Monné
2021-05-04 12:12       ` Jan Beulich
2021-05-04 16:50   ` Andrew Cooper
2021-04-30 15:52 ` [PATCH v3 08/13] libs/guest: make a cpu policy compatible with older Xen versions Roger Pau Monne
2021-05-03 11:09   ` Jan Beulich
2021-05-04 15:34     ` Roger Pau Monné
2021-05-05  7:42       ` Jan Beulich
2021-05-06 10:23         ` Roger Pau Monné
2021-05-06 10:52           ` Jan Beulich
2021-04-30 15:52 ` [PATCH v3 09/13] libs/guest: introduce helper set cpu topology in cpu policy Roger Pau Monne
2021-04-30 15:52 ` [PATCH v3 10/13] libs/guest: rework xc_cpuid_xend_policy Roger Pau Monne
2021-04-30 15:52 ` [PATCH v3 11/13] libs/guest: apply a featureset into a cpu policy Roger Pau Monne
2021-04-30 15:52 ` [PATCH v3 12/13] libs/{light,guest}: implement xc_cpuid_apply_policy in libxl Roger Pau Monne
2021-05-04 14:08   ` Anthony PERARD
2021-04-30 15:52 ` [PATCH v3 13/13] libs/guest: (re)move xc_cpu_policy_apply_cpuid Roger Pau Monne
2021-05-04 14:08   ` Anthony PERARD

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20210430155211.3709-3-roger.pau@citrix.com \
    --to=roger.pau@citrix.com \
    --cc=andrew.cooper3@citrix.com \
    --cc=iwj@xenproject.org \
    --cc=wl@xen.org \
    --cc=xen-devel@lists.xenproject.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.