From: Paul Durrant <paul@xen.org>
To: xen-devel@lists.xenproject.org
Cc: "Paul Durrant" <pdurrant@amazon.com>,
"Jan Beulich" <jbeulich@suse.com>,
"Ian Jackson" <iwj@xenproject.org>, "Wei Liu" <wl@xen.org>,
"Andrew Cooper" <andrew.cooper3@citrix.com>,
"George Dunlap" <george.dunlap@citrix.com>,
"Julien Grall" <julien@xen.org>,
"Stefano Stabellini" <sstabellini@kernel.org>,
"Roger Pau Monné" <roger.pau@citrix.com>
Subject: [PATCH v10 06/11] x86/time: add a domain context record for tsc_info...
Date: Thu, 8 Oct 2020 19:57:30 +0100 [thread overview]
Message-ID: <20201008185735.29875-7-paul@xen.org> (raw)
In-Reply-To: <20201008185735.29875-1-paul@xen.org>
From: Paul Durrant <pdurrant@amazon.com>
... and update xen-domctx to dump some information describing the record.
NOTE: Whilst the record is x86 specific, it is visible directly in the common
header as context record numbers should be unique across all
architectures.
Signed-off-by: Paul Durrant <pdurrant@amazon.com>
Reviewed-by: Jan Beulich <jbeulich@suse.com>
---
Cc: Ian Jackson <iwj@xenproject.org>
Cc: Wei Liu <wl@xen.org>
Cc: Andrew Cooper <andrew.cooper3@citrix.com>
Cc: George Dunlap <george.dunlap@citrix.com>
Cc: Julien Grall <julien@xen.org>
Cc: Stefano Stabellini <sstabellini@kernel.org>
Cc: "Roger Pau Monné" <roger.pau@citrix.com>
v10:
- Re-base
- Amend the specification now there is one
- Kept Jan's R-b as the changes are cosmetic
v8:
- Removed stray blank line
v7:
- New in v7
---
docs/specs/domain-context.md | 32 ++++++++++++++++++++++++++++++++
tools/misc/xen-domctx.c | 12 ++++++++++++
xen/arch/x86/time.c | 30 ++++++++++++++++++++++++++++++
xen/include/public/save.h | 8 ++++++++
4 files changed, 82 insertions(+)
diff --git a/docs/specs/domain-context.md b/docs/specs/domain-context.md
index 95e9f9d1ab..8aa3466d96 100644
--- a/docs/specs/domain-context.md
+++ b/docs/specs/domain-context.md
@@ -155,6 +155,38 @@ The record body contains the following fields:
| `buffer` | The shared info (`length` being architecture |
| | dependent[4]) |
+### TSC_INFO
+
+```
+ 0 1 2 3 4 5 6 7 octet
++-------+-------+-------+-------+-------+-------+-------+-------+
+| type == 3 | instance == 0 |
++-------------------------------+-------------------------------+
+| length == 20 |
++-------------------------------+-------------------------------+
+| mode | khz |
++-------------------------------+-------------------------------+
+| nsec |
++-------------------------------+-------------------------------+
+| incarnation |
++-------------------------------+
+```
+
+The record body contains the following fields:
+
+| Field | Description |
+|---------------|-----------------------------------------------|
+| `mode` | 0x00000000: Default (emulate if necessary) |
+| | 0x00000001: Always emulate |
+| | 0x00000002: Never emulate |
+| | |
+| `khz` | The TSC frequency in kHz |
+| | |
+| `nsec` | Elapsed time in nanoseconds |
+| | |
+| `incarnation` | Incarnation (counter indicating how many |
+| | times the TSC value has been set) |
+
* * *
[1] See https://xenbits.xen.org/gitweb/?p=xen.git;a=blob;f=docs/designs/non-cooperative-migration.md
diff --git a/tools/misc/xen-domctx.c b/tools/misc/xen-domctx.c
index 5ea6de50d1..1a5dfb9d5a 100644
--- a/tools/misc/xen-domctx.c
+++ b/tools/misc/xen-domctx.c
@@ -136,6 +136,17 @@ static void dump_shared_info(void)
#undef GET_FIELD_PTR
}
+static void dump_tsc_info(void)
+{
+ struct domain_context_tsc_info *t;
+
+ GET_PTR(t);
+
+ printf(" TSC_INFO: mode: %u incarnation: %u\n"
+ " khz %u nsec: %"PRIu64"\n",
+ t->mode, t->incarnation, t->khz, t->nsec);
+}
+
static void dump_end(void)
{
struct domain_context_end *e;
@@ -225,6 +236,7 @@ int main(int argc, char **argv)
{
case DOMAIN_CONTEXT_START: dump_start(); break;
case DOMAIN_CONTEXT_SHARED_INFO: dump_shared_info(); break;
+ case DOMAIN_CONTEXT_TSC_INFO: dump_tsc_info(); break;
case DOMAIN_CONTEXT_END: dump_end(); break;
default:
printf("Unknown type %u: skipping\n", rec->type);
diff --git a/xen/arch/x86/time.c b/xen/arch/x86/time.c
index 8938c0f435..aec4bfb0f3 100644
--- a/xen/arch/x86/time.c
+++ b/xen/arch/x86/time.c
@@ -26,6 +26,7 @@
#include <xen/symbols.h>
#include <xen/keyhandler.h>
#include <xen/guest_access.h>
+#include <xen/save.h>
#include <asm/io.h>
#include <asm/iocap.h>
#include <asm/msr.h>
@@ -2451,6 +2452,35 @@ int tsc_set_info(struct domain *d,
return 0;
}
+static int save_tsc_info(struct domain *d, struct domain_ctxt_state *c,
+ bool dry_run)
+{
+ struct domain_context_tsc_info t = {};
+
+ if ( !dry_run )
+ tsc_get_info(d, &t.mode, &t.nsec, &t.khz, &t.incarnation);
+
+ return domain_save_ctxt_rec(c, DOMAIN_CONTEXT_TSC_INFO, 0, &t, sizeof(t));
+}
+
+static int load_tsc_info(struct domain *d, struct domain_ctxt_state *c)
+{
+ struct domain_context_tsc_info t;
+ unsigned int i;
+ int rc;
+
+ rc = domain_load_ctxt_rec(c, DOMAIN_CONTEXT_TSC_INFO, &i, &t, sizeof(t));
+ if ( rc )
+ return rc;
+
+ if ( i ) /* expect only a single instance */
+ return -ENXIO;
+
+ return tsc_set_info(d, t.mode, t.nsec, t.khz, t.incarnation);
+}
+
+DOMAIN_REGISTER_CTXT_TYPE(TSC_INFO, save_tsc_info, load_tsc_info);
+
/* vtsc may incur measurable performance degradation, diagnose with this */
static void dump_softtsc(unsigned char key)
{
diff --git a/xen/include/public/save.h b/xen/include/public/save.h
index bccbaadd0b..86881864cf 100644
--- a/xen/include/public/save.h
+++ b/xen/include/public/save.h
@@ -50,6 +50,7 @@ enum {
DOMAIN_CONTEXT_END,
DOMAIN_CONTEXT_START,
DOMAIN_CONTEXT_SHARED_INFO,
+ DOMAIN_CONTEXT_TSC_INFO,
/* New types go here */
DOMAIN_CONTEXT_NR_TYPES
};
@@ -69,6 +70,13 @@ struct domain_context_shared_info {
uint8_t buffer[XEN_FLEX_ARRAY_DIM];
};
+struct domain_context_tsc_info {
+ uint32_t mode;
+ uint32_t khz;
+ uint64_t nsec;
+ uint32_t incarnation;
+};
+
/* Terminating entry */
struct domain_context_end {};
--
2.20.1
next prev parent reply other threads:[~2020-10-08 18:58 UTC|newest]
Thread overview: 30+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-10-08 18:57 [PATCH v10 00/11] domain context infrastructure Paul Durrant
2020-10-08 18:57 ` [PATCH v10 01/11] docs / include: introduce a new framework for 'domain context' records Paul Durrant
2020-10-19 13:46 ` Jan Beulich
2021-01-25 18:25 ` Andrew Cooper
2021-01-26 8:55 ` Jan Beulich
2021-01-25 18:18 ` Andrew Cooper
2021-01-26 9:31 ` Jan Beulich
2020-10-08 18:57 ` [PATCH v10 02/11] xen: introduce implementation of save/restore of 'domain context' Paul Durrant
2020-10-19 14:07 ` Jan Beulich
2021-01-25 18:36 ` Andrew Cooper
2020-10-08 18:57 ` [PATCH v10 03/11] xen/common/domctl: introduce XEN_DOMCTL_get/set_domain_context Paul Durrant
2020-10-19 14:30 ` Jan Beulich
2020-10-19 15:06 ` Jan Beulich
2020-10-08 18:57 ` [PATCH v10 04/11] tools/misc: add xen-domctx to present domain context Paul Durrant
2020-10-08 18:57 ` [PATCH v10 05/11] common/domain: add a domain context record for shared_info Paul Durrant
2020-10-19 15:25 ` Jan Beulich
2021-01-25 19:11 ` Andrew Cooper
2020-10-08 18:57 ` Paul Durrant [this message]
2021-01-25 19:24 ` [PATCH v10 06/11] x86/time: add a domain context record for tsc_info Andrew Cooper
2020-10-08 18:57 ` [PATCH v10 07/11] docs/specs: add missing definitions to libxc-migration-stream Paul Durrant
2021-01-25 19:28 ` Andrew Cooper
2020-10-08 18:57 ` [PATCH v10 08/11] docs / tools: specify migration v4 to include DOMAIN_CONTEXT Paul Durrant
2021-01-25 19:43 ` Andrew Cooper
2020-10-08 18:57 ` [PATCH v10 09/11] tools/python: modify libxc.py to verify v4 stream Paul Durrant
2021-01-25 19:45 ` Andrew Cooper
2020-10-08 18:57 ` [PATCH v10 10/11] tools/libs/guest: add code to restore a v4 libxc stream Paul Durrant
2021-01-25 20:04 ` Andrew Cooper
2020-10-08 18:57 ` [PATCH v10 11/11] tools/libs/guest: add code to save " Paul Durrant
2021-01-25 20:11 ` Andrew Cooper
2021-01-25 20:15 ` [PATCH v10 00/11] domain context infrastructure Andrew Cooper
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=20201008185735.29875-7-paul@xen.org \
--to=paul@xen.org \
--cc=andrew.cooper3@citrix.com \
--cc=george.dunlap@citrix.com \
--cc=iwj@xenproject.org \
--cc=jbeulich@suse.com \
--cc=julien@xen.org \
--cc=pdurrant@amazon.com \
--cc=roger.pau@citrix.com \
--cc=sstabellini@kernel.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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).