| Message ID | 20200327185012.1795-4-paul@xen.org (mailing list archive) |
|---|---|
| State | Superseded |
| Headers | show |
| Series | domain context infrastructure | expand |
On 27.03.2020 19:50, Paul Durrant wrote: > This tools is analogous to 'xen-hvmctx' which presents HVM context. > Subsequent patches will add 'dump' functions when new records are > introduced. > > Signed-off-by: Paul Durrant <paul@xen.org> > --- > Cc: Ian Jackson <ian.jackson@eu.citrix.com> > Cc: Wei Liu <wl@xen.org> > --- > .gitignore | 1 + > tools/misc/Makefile | 4 ++ > tools/misc/xen-ctx.c | 144 +++++++++++++++++++++++++++++++++++++++++++ Is xen-ctx a good choice of a name, considering we already have not only xen-hvmctx, but also xenctx? If the new functionality isn't a good fit for either, perhaps its name would better reflect its connection to save/restore records? xen-sr-dump looks pretty clumsy to me, but still seems better than a name easily mixed up with others. Jan
> -----Original Message----- > From: Jan Beulich <jbeulich@suse.com> > Sent: 30 March 2020 11:54 > To: Paul Durrant <paul@xen.org> > Cc: xen-devel@lists.xenproject.org; Ian Jackson <ian.jackson@eu.citrix.com>; Wei Liu <wl@xen.org> > Subject: Re: [PATCH 3/5] tools/misc: add xen-ctx to present domain context > > On 27.03.2020 19:50, Paul Durrant wrote: > > This tools is analogous to 'xen-hvmctx' which presents HVM context. > > Subsequent patches will add 'dump' functions when new records are > > introduced. > > > > Signed-off-by: Paul Durrant <paul@xen.org> > > --- > > Cc: Ian Jackson <ian.jackson@eu.citrix.com> > > Cc: Wei Liu <wl@xen.org> > > --- > > .gitignore | 1 + > > tools/misc/Makefile | 4 ++ > > tools/misc/xen-ctx.c | 144 +++++++++++++++++++++++++++++++++++++++++++ > > Is xen-ctx a good choice of a name, considering we already have not > only xen-hvmctx, but also xenctx? If the new functionality isn't a > good fit for either, perhaps its name would better reflect its > connection to save/restore records? xen-sr-dump looks pretty clumsy > to me, but still seems better than a name easily mixed up with > others. How about xen-domctx? Paul > > Jan
On 03.04.2020 17:20, Paul Durrant wrote: >> -----Original Message----- >> From: Jan Beulich <jbeulich@suse.com> >> Sent: 30 March 2020 11:54 >> To: Paul Durrant <paul@xen.org> >> Cc: xen-devel@lists.xenproject.org; Ian Jackson <ian.jackson@eu.citrix.com>; Wei Liu <wl@xen.org> >> Subject: Re: [PATCH 3/5] tools/misc: add xen-ctx to present domain context >> >> On 27.03.2020 19:50, Paul Durrant wrote: >>> This tools is analogous to 'xen-hvmctx' which presents HVM context. >>> Subsequent patches will add 'dump' functions when new records are >>> introduced. >>> >>> Signed-off-by: Paul Durrant <paul@xen.org> >>> --- >>> Cc: Ian Jackson <ian.jackson@eu.citrix.com> >>> Cc: Wei Liu <wl@xen.org> >>> --- >>> .gitignore | 1 + >>> tools/misc/Makefile | 4 ++ >>> tools/misc/xen-ctx.c | 144 +++++++++++++++++++++++++++++++++++++++++++ >> >> Is xen-ctx a good choice of a name, considering we already have not >> only xen-hvmctx, but also xenctx? If the new functionality isn't a >> good fit for either, perhaps its name would better reflect its >> connection to save/restore records? xen-sr-dump looks pretty clumsy >> to me, but still seems better than a name easily mixed up with >> others. > > How about xen-domctx? Hmm, maybe. Seeing this is about PV pieces, xen-pvctx might also be an option. Jan
> -----Original Message----- > From: Jan Beulich <jbeulich@suse.com> > Sent: 03 April 2020 16:30 > To: paul@xen.org > Cc: xen-devel@lists.xenproject.org; 'Ian Jackson' <ian.jackson@eu.citrix.com>; 'Wei Liu' <wl@xen.org> > Subject: Re: [PATCH 3/5] tools/misc: add xen-ctx to present domain context > > On 03.04.2020 17:20, Paul Durrant wrote: > >> -----Original Message----- > >> From: Jan Beulich <jbeulich@suse.com> > >> Sent: 30 March 2020 11:54 > >> To: Paul Durrant <paul@xen.org> > >> Cc: xen-devel@lists.xenproject.org; Ian Jackson <ian.jackson@eu.citrix.com>; Wei Liu <wl@xen.org> > >> Subject: Re: [PATCH 3/5] tools/misc: add xen-ctx to present domain context > >> > >> On 27.03.2020 19:50, Paul Durrant wrote: > >>> This tools is analogous to 'xen-hvmctx' which presents HVM context. > >>> Subsequent patches will add 'dump' functions when new records are > >>> introduced. > >>> > >>> Signed-off-by: Paul Durrant <paul@xen.org> > >>> --- > >>> Cc: Ian Jackson <ian.jackson@eu.citrix.com> > >>> Cc: Wei Liu <wl@xen.org> > >>> --- > >>> .gitignore | 1 + > >>> tools/misc/Makefile | 4 ++ > >>> tools/misc/xen-ctx.c | 144 +++++++++++++++++++++++++++++++++++++++++++ > >> > >> Is xen-ctx a good choice of a name, considering we already have not > >> only xen-hvmctx, but also xenctx? If the new functionality isn't a > >> good fit for either, perhaps its name would better reflect its > >> connection to save/restore records? xen-sr-dump looks pretty clumsy > >> to me, but still seems better than a name easily mixed up with > >> others. > > > > How about xen-domctx? > > Hmm, maybe. Seeing this is about PV pieces, xen-pvctx might also be > an option. Yes, that would work but it also implies it might only be valid for PV domains. I also prefer 'domctx' since it better matches the name I chose for the framework. Paul
diff --git a/.gitignore b/.gitignore index 4ca679ddbc..72b807141f 100644 --- a/.gitignore +++ b/.gitignore @@ -206,6 +206,7 @@ tools/misc/cpuperf/cpuperf-xen tools/misc/xc_shadow tools/misc/xen_cpuperf tools/misc/xen-cpuid +tools/misc/xen-ctx tools/misc/xen-detect tools/misc/xen-diag tools/misc/xen-tmem-list-parse diff --git a/tools/misc/Makefile b/tools/misc/Makefile index 63947bfadc..6347bb24e9 100644 --- a/tools/misc/Makefile +++ b/tools/misc/Makefile @@ -30,6 +30,7 @@ INSTALL_SBIN += xenpm INSTALL_SBIN += xenwatchdogd INSTALL_SBIN += xen-livepatch INSTALL_SBIN += xen-diag +INSTALL_SBIN += xen-ctx INSTALL_SBIN += $(INSTALL_SBIN-y) # Everything to be installed in a private bin/ @@ -108,6 +109,9 @@ xen-livepatch: xen-livepatch.o xen-diag: xen-diag.o $(CC) $(LDFLAGS) -o $@ $< $(LDLIBS_libxenctrl) $(APPEND_LDFLAGS) +xen-ctx: xen-ctx.o + $(CC) $(LDFLAGS) -o $@ $< $(LDLIBS_libxenctrl) $(APPEND_LDFLAGS) + xen-lowmemd: xen-lowmemd.o $(CC) $(LDFLAGS) -o $@ $< $(LDLIBS_libxenevtchn) $(LDLIBS_libxenctrl) $(LDLIBS_libxenstore) $(APPEND_LDFLAGS) diff --git a/tools/misc/xen-ctx.c b/tools/misc/xen-ctx.c new file mode 100644 index 0000000000..c31dd5d8e9 --- /dev/null +++ b/tools/misc/xen-ctx.c @@ -0,0 +1,144 @@ +/* + * xen-ctx.c + * + * Print out domain save records in a human-readable way. + * + * Copyright Amazon.com Inc. or its affiliates. + * + * Permission is hereby granted, free of charge, to any person obtaining a + * copy of this software and associated documentation files (the "Software"), + * to deal in the Software without restriction, including without limitation + * the rights to use, copy, modify, merge, publish, distribute, sublicense, + * and/or sell copies of the Software, and to permit persons to whom the + * Software is furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in + * all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL + * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING + * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER + * DEALINGS IN THE SOFTWARE. + */ + +#include <inttypes.h> +#include <stdio.h> +#include <stdlib.h> +#include <string.h> +#include <errno.h> + +#include <xenctrl.h> +#include <xen/xen.h> +#include <xen/domctl.h> +#include <xen/save.h> + +static void *buf = NULL; +static size_t len, off; + +#define READ(_x) do { \ + if ( len - off < sizeof (_x) ) \ + { \ + fprintf(stderr, "Error: need another %lu bytes, only %lu available",\ + sizeof(_x), len - off); \ + exit(1); \ + } \ + memcpy(&(_x), buf + off, sizeof (_x)); \ + off += sizeof (_x); \ +} while (0) + +static void dump_header(void) +{ + DOMAIN_SAVE_TYPE(HEADER) h; + READ(h); + printf(" HEADER: magic %#x, version %u\n", + h.magic, h.version); +} + +static void dump_end(void) +{ + DOMAIN_SAVE_TYPE(END) e; + READ(e); + printf(" END\n"); +} + +int main(int argc, char **argv) +{ + uint32_t domid; + unsigned int entry; + xc_interface *xch; + int rc; + + if ( argc != 2 || !argv[1] || (rc = atoi(argv[1])) < 0 ) + { + fprintf(stderr, "usage: %s <domid>\n", argv[0]); + exit(1); + } + domid = rc; + + xch = xc_interface_open(0,0,0); + if ( !xch ) + { + fprintf(stderr, "Error: can't open libxc handle\n"); + exit(1); + } + + rc = xc_domain_getcontext(xch, domid, 0, 0, 0); + if ( rc < 0 ) + { + fprintf(stderr, "Error: can't get record length for dom %u: %s\n", + domid, strerror(errno)); + exit(1); + } + len = rc; + + buf = malloc(len); + if ( !buf ) + { + fprintf(stderr, "Error: can't allocate %lu bytes\n", len); + exit(1); + } + + rc = xc_domain_getcontext(xch, domid, 0, buf, len); + if ( rc < 0 ) + { + fprintf(stderr, "Error: can't get domain record for dom %u: %s\n", + domid, strerror(errno)); + exit(1); + } + len = rc; + off = 0; + + printf("Domain save records for d%u\n", domid); + + entry = 0; + for (;;) { + struct domain_save_descriptor desc; + + READ(desc); + printf("[%u] type %u instance %u, length %u\n", entry++, + desc.typecode, desc.instance, desc.length); + + switch (desc.typecode) + { + case DOMAIN_SAVE_CODE(HEADER): dump_header(); break; + case DOMAIN_SAVE_CODE(END): dump_end(); return 0; + default: + printf("Unknown type %u: skipping\n", desc.typecode); + off += desc.length; + break; + } + } +} + +/* + * Local variables: + * mode: C + * c-file-style: "BSD" + * c-basic-offset: 4 + * tab-width: 4 + * indent-tabs-mode: nil + * End: + */
This tools is analogous to 'xen-hvmctx' which presents HVM context. Subsequent patches will add 'dump' functions when new records are introduced. Signed-off-by: Paul Durrant <paul@xen.org> --- Cc: Ian Jackson <ian.jackson@eu.citrix.com> Cc: Wei Liu <wl@xen.org> --- .gitignore | 1 + tools/misc/Makefile | 4 ++ tools/misc/xen-ctx.c | 144 +++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 149 insertions(+) create mode 100644 tools/misc/xen-ctx.c