From nobody Sat Apr 20 00:28:50 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=fail; 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 ARC-Seal: i=1; a=rsa-sha256; t=1590051603; cv=none; d=zohomail.com; s=zohoarc; b=TEtkcZLccdr858zz/TBE2owKUy6X3hWeUXrGgAV1Q869BE/Rjt30p13E8nFWLRmEOJY7YBifBheKZQUXzEAl4+Qyh5K0c7V4o+9rV4K+y8gLGFVS5H3MLvK8SbuDEvZGJ6diydGuCIhM9/NEgPPzFl+SLDMm5gyheKKzeDLg4dk= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1590051603; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=l7LfIwH4Qwi+PKHHgB16HyW1BuWSKpamDKSJlCwi4Co=; b=XeFzdnOASJtMA++JlwpcYN9aU0pdJskwyP6Ss05jlwjyL6R801Yrtzs74W1U66viI7T4Wwz3l91KWrJAA6vju27RtIur5gt32jNzVeTqFtCgbYyUkD+bnMYwC0csQEVprUHj7kKuxoZwDVaVOlE9KaFZCoc9CMTTftIuWNznbU0= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; 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 Return-Path: Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) by mx.zohomail.com with SMTPS id 1590051603702172.68946909685735; Thu, 21 May 2020 02:00:03 -0700 (PDT) Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jbh3J-0000xq-41; Thu, 21 May 2020 08:59:45 +0000 Received: from us1-rack-iad1.inumbo.com ([172.99.69.81]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jbh3H-0000xJ-N9 for xen-devel@lists.xenproject.org; Thu, 21 May 2020 08:59:43 +0000 Received: from mail.xenproject.org (unknown [104.130.215.37]) by us1-rack-iad1.inumbo.com (Halon) with ESMTPS id 693d80ec-9b41-11ea-b07b-bc764e2007e4; Thu, 21 May 2020 08:59:43 +0000 (UTC) Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jbh3G-0005Ox-4a; Thu, 21 May 2020 08:59:42 +0000 Received: from 54-240-197-224.amazon.com ([54.240.197.224] helo=u2f063a87eabd5f.cbg10.amazon.com) by xenbits.xenproject.org with esmtpsa (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.89) (envelope-from ) id 1jbh3F-0000wi-Rm; Thu, 21 May 2020 08:59:42 +0000 X-Inumbo-ID: 693d80ec-9b41-11ea-b07b-bc764e2007e4 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Content-Transfer-Encoding:MIME-Version:References: In-Reply-To:Message-Id:Date:Subject:Cc:To:From:Sender:Reply-To:Content-Type: Content-ID:Content-Description:Resent-Date:Resent-From:Resent-Sender: Resent-To:Resent-Cc:Resent-Message-ID:List-Id:List-Help:List-Unsubscribe: List-Subscribe:List-Post:List-Owner:List-Archive; bh=l7LfIwH4Qwi+PKHHgB16HyW1BuWSKpamDKSJlCwi4Co=; b=VGBwrgMURZ2Uc7HVcO6oQ02NhK eDbPpp0Bw9PchBy19ybxSXTpMFciaafrEs6tniuR6d0g05Nh0MzkgAs4ZpqCkG0SsBJDOZO5U8l45 PPL/RCg02ZNzxf7QdqXKqve9A4ywRfsc1AWb6HPZ9rmCTvJcSAK7o/U/wMRLXDFmFSlM=; From: Paul Durrant To: xen-devel@lists.xenproject.org Subject: [PATCH v4 4/5] common/domain: add a domain context record for shared_info... Date: Thu, 21 May 2020 09:59:31 +0100 Message-Id: <20200521085932.10508-5-paul@xen.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200521085932.10508-1-paul@xen.org> References: <20200521085932.10508-1-paul@xen.org> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-BeenThere: xen-devel@lists.xenproject.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Cc: Stefano Stabellini , Julien Grall , Wei Liu , Andrew Cooper , Paul Durrant , Ian Jackson , George Dunlap , Jan Beulich Errors-To: xen-devel-bounces@lists.xenproject.org Sender: "Xen-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Type: text/plain; charset="utf-8" From: Paul Durrant ... and update xen-domctx to dump some information describing the record. NOTE: The domain may or may not be using the embedded vcpu_info array so ultimately separate context records will be added for vcpu_info when this becomes necessary. Signed-off-by: Paul Durrant --- Cc: Ian Jackson Cc: Wei Liu Cc: Andrew Cooper Cc: George Dunlap Cc: Jan Beulich Cc: Julien Grall Cc: Stefano Stabellini v4: - Addressed comments from Jan v3: - Actually dump some of the content of shared_info v2: - Drop the header change to define a 'Xen' page size and instead use a variable length struct now that the framework makes this is feasible - Guard use of 'has_32bit_shinfo' in common code with CONFIG_COMPAT --- tools/misc/xen-domctx.c | 78 +++++++++++++++++++++++++++++++++++++++ xen/common/domain.c | 59 +++++++++++++++++++++++++++++ xen/include/public/save.h | 13 ++++++- 3 files changed, 149 insertions(+), 1 deletion(-) diff --git a/tools/misc/xen-domctx.c b/tools/misc/xen-domctx.c index 243325dfce..6ead7ea89d 100644 --- a/tools/misc/xen-domctx.c +++ b/tools/misc/xen-domctx.c @@ -31,6 +31,7 @@ #include =20 #include +#include #include #include #include @@ -61,6 +62,82 @@ static void dump_header(void) =20 } =20 +static void print_binary(const char *prefix, const void *val, size_t size, + const char *suffix) +{ + printf("%s", prefix); + + while ( size-- ) + { + uint8_t octet =3D *(const uint8_t *)val++; + unsigned int i; + + for ( i =3D 0; i < 8; i++ ) + { + printf("%u", octet & 1); + octet >>=3D 1; + } + } + + printf("%s", suffix); +} + +static void dump_shared_info(void) +{ + DOMAIN_SAVE_TYPE(SHARED_INFO) *s; + bool has_32bit_shinfo; + shared_info_any_t *info; + unsigned int i, n; + + GET_PTR(s); + has_32bit_shinfo =3D s->flags & DOMAIN_SAVE_32BIT_SHINFO; + + printf(" SHARED_INFO: has_32bit_shinfo: %s buffer_size: %u\n", + has_32bit_shinfo ? "true" : "false", s->buffer_size); + + info =3D (shared_info_any_t *)s->buffer; + +#define GET_FIELD_PTR(_f) \ + (has_32bit_shinfo ? \ + (const void *)&(info->x32._f) : \ + (const void *)&(info->x64._f)) +#define GET_FIELD_SIZE(_f) \ + (has_32bit_shinfo ? sizeof(info->x32._f) : sizeof(info->x64._f)) +#define GET_FIELD(_f) \ + (has_32bit_shinfo ? info->x32._f : info->x64._f) + + n =3D has_32bit_shinfo ? + ARRAY_SIZE(info->x32.evtchn_pending) : + ARRAY_SIZE(info->x64.evtchn_pending); + + for ( i =3D 0; i < n; i++ ) + { + const char *prefix =3D !i ? + " evtchn_pending: " : + " "; + + print_binary(prefix, GET_FIELD_PTR(evtchn_pending[0]), + GET_FIELD_SIZE(evtchn_pending[0]), "\n"); + } + + for ( i =3D 0; i < n; i++ ) + { + const char *prefix =3D !i ? + " evtchn_mask: " : + " "; + + print_binary(prefix, GET_FIELD_PTR(evtchn_mask[0]), + GET_FIELD_SIZE(evtchn_mask[0]), "\n"); + } + + printf(" wc: version: %u sec: %u nsec: %u\n", + GET_FIELD(wc_version), GET_FIELD(wc_sec), GET_FIELD(wc_nsec)); + +#undef GET_FIELD +#undef GET_FIELD_SIZE +#undef GET_FIELD_PTR +} + static void dump_end(void) { DOMAIN_SAVE_TYPE(END) *e; @@ -173,6 +250,7 @@ int main(int argc, char **argv) switch (desc->typecode) { case DOMAIN_SAVE_CODE(HEADER): dump_header(); break; + case DOMAIN_SAVE_CODE(SHARED_INFO): dump_shared_info(); break; case DOMAIN_SAVE_CODE(END): dump_end(); break; default: printf("Unknown type %u: skipping\n", desc->typecode); diff --git a/xen/common/domain.c b/xen/common/domain.c index 7cc9526139..14e96c3bc2 100644 --- a/xen/common/domain.c +++ b/xen/common/domain.c @@ -33,6 +33,7 @@ #include #include #include +#include #include #include #include @@ -1649,6 +1650,64 @@ int continue_hypercall_on_cpu( return 0; } =20 +static int save_shared_info(const struct domain *d, struct domain_context = *c, + bool dry_run) +{ + struct domain_shared_info_context ctxt =3D { +#ifdef CONFIG_COMPAT + .flags =3D has_32bit_shinfo(d) ? DOMAIN_SAVE_32BIT_SHINFO : 0, +#endif + .buffer_size =3D sizeof(shared_info_t), + }; + size_t hdr_size =3D offsetof(typeof(ctxt), buffer); + int rc; + + rc =3D DOMAIN_SAVE_BEGIN(SHARED_INFO, c, 0); + if ( rc ) + return rc; + + rc =3D domain_save_data(c, &ctxt, hdr_size); + if ( rc ) + return rc; + + rc =3D domain_save_data(c, d->shared_info, ctxt.buffer_size); + if ( rc ) + return rc; + + return domain_save_end(c); +} + +static int load_shared_info(struct domain *d, struct domain_context *c) +{ + struct domain_shared_info_context ctxt; + size_t hdr_size =3D offsetof(typeof(ctxt), buffer); + unsigned int i; + int rc; + + rc =3D DOMAIN_LOAD_BEGIN(SHARED_INFO, c, &i); + if ( rc || i ) /* expect only a single instance */ + return rc; + + rc =3D domain_load_data(c, &ctxt, hdr_size); + if ( rc ) + return rc; + + if ( ctxt.buffer_size !=3D sizeof(shared_info_t) ) + return -EINVAL; + +#ifdef CONFIG_COMPAT + has_32bit_shinfo(d) =3D ctxt.flags & DOMAIN_SAVE_32BIT_SHINFO; +#endif + + rc =3D domain_load_data(c, d->shared_info, sizeof(shared_info_t)); + if ( rc ) + return rc; + + return domain_load_end(c); +} + +DOMAIN_REGISTER_SAVE_LOAD(SHARED_INFO, save_shared_info, load_shared_info); + /* * Local variables: * mode: C diff --git a/xen/include/public/save.h b/xen/include/public/save.h index 551dbbddb8..0e855a4b97 100644 --- a/xen/include/public/save.h +++ b/xen/include/public/save.h @@ -82,7 +82,18 @@ struct domain_save_header { }; DECLARE_DOMAIN_SAVE_TYPE(HEADER, 1, struct domain_save_header); =20 -#define DOMAIN_SAVE_CODE_MAX 1 +struct domain_shared_info_context { + uint32_t flags; + +#define DOMAIN_SAVE_32BIT_SHINFO 0x00000001 + + uint32_t buffer_size; + uint8_t buffer[XEN_FLEX_ARRAY_DIM]; /* Implementation specific size */ +}; + +DECLARE_DOMAIN_SAVE_TYPE(SHARED_INFO, 2, struct domain_shared_info_context= ); + +#define DOMAIN_SAVE_CODE_MAX 2 =20 #endif /* defined(__XEN__) || defined(__XEN_TOOLS__) */ =20 --=20 2.20.1