From patchwork Thu May 14 10:44:15 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paul Durrant X-Patchwork-Id: 11548475 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 8193790 for ; Thu, 14 May 2020 10:46:35 +0000 (UTC) Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 5CB092053B for ; Thu, 14 May 2020 10:46:35 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (1024-bit key) header.d=xen.org header.i=@xen.org header.b="4gNl2eOw" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 5CB092053B Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=xen.org Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=xen-devel-bounces@lists.xenproject.org Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jZBLy-0004Av-8W; Thu, 14 May 2020 10:44:38 +0000 Received: from all-amaz-eas1.inumbo.com ([34.197.232.57] helo=us1-amaz-eas2.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jZBLx-0004Aa-4r for xen-devel@lists.xenproject.org; Thu, 14 May 2020 10:44:37 +0000 X-Inumbo-ID: e2303dea-95cf-11ea-a468-12813bfff9fa Received: from mail.xenproject.org (unknown [104.130.215.37]) by us1-amaz-eas2.inumbo.com (Halon) with ESMTPS id e2303dea-95cf-11ea-a468-12813bfff9fa; Thu, 14 May 2020 10:44:27 +0000 (UTC) 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=b9T3VeNPVxqhKc11ERGW3Ko1mTMz/vBpR5z7eveF6nE=; b=4gNl2eOwTytWx7+/tUDUjMUR0p uBRn4zyHzPlVf9qNouO/wSVuNg4dy+g1rsKv6ka2USlJYHX5kBcuRDgkX2a3GJYwen8YsQuIzf9WE BFz9V+zvVn8E25TsnBquXJoyWzSLAqljcD/eGwCNPIizWjsqihnHaIZG+HjAn4mvZJdM=; Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jZBLm-0004aS-Po; Thu, 14 May 2020 10:44:26 +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 1jZBLm-0000sH-Gh; Thu, 14 May 2020 10:44:26 +0000 From: Paul Durrant To: xen-devel@lists.xenproject.org Subject: [PATCH v3 4/5] common/domain: add a domain context record for shared_info... Date: Thu, 14 May 2020 11:44:15 +0100 Message-Id: <20200514104416.16657-5-paul@xen.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200514104416.16657-1-paul@xen.org> References: <20200514104416.16657-1-paul@xen.org> MIME-Version: 1.0 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" 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 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 | 73 +++++++++++++++++++++++++++++++++++++++ xen/common/domain.c | 60 ++++++++++++++++++++++++++++++++ xen/include/public/save.h | 11 +++++- 3 files changed, 143 insertions(+), 1 deletion(-) diff --git a/tools/misc/xen-domctx.c b/tools/misc/xen-domctx.c index 243325dfce..b2fed5eae7 100644 --- a/tools/misc/xen-domctx.c +++ b/tools/misc/xen-domctx.c @@ -31,6 +31,7 @@ #include #include +#include #include #include #include @@ -61,6 +62,76 @@ static void dump_header(void) } +static void print_binary(const char *prefix, void *val, size_t size, + const char *suffix) +{ + printf("%s", prefix); + + while (size--) + { + uint8_t octet = *(uint8_t *)val++; + unsigned int i; + + for ( i = 0; i < 8; i++ ) + { + printf("%u", octet & 1); + octet >>= 1; + } + } + + printf("%s", suffix); +} + +static void dump_shared_info(void) +{ + DOMAIN_SAVE_TYPE(SHARED_INFO) *s; + shared_info_any_t *info; + unsigned int i; + + GET_PTR(s); + + printf(" SHARED_INFO: has_32bit_shinfo: %s buffer_size: %u\n", + s->has_32bit_shinfo ? "true" : "false", s->buffer_size); + + info = (shared_info_any_t *)s->buffer; + +#define GET_FIELD_PTR(_f) \ + (s->has_32bit_shinfo ? (void *)&(info->x32._f) : (void *)&(info->x64._f)) +#define GET_FIELD_SIZE(_f) \ + (s->has_32bit_shinfo ? sizeof(info->x32._f) : sizeof(info->x64._f)) +#define GET_FIELD(_f) \ + (s->has_32bit_shinfo ? info->x32._f : info->x64._f) + + /* Array lengths are the same for 32-bit and 64-bit shared info */ + + for ( i = 0; i < ARRAY_SIZE(info->x64.evtchn_pending); i++ ) + { + const char *prefix = !i ? + " evtchn_pending: " : + " "; + + print_binary(prefix, GET_FIELD_PTR(evtchn_pending[0]), + GET_FIELD_SIZE(evtchn_pending[0]), "\n"); + } + + for ( i = 0; i < ARRAY_SIZE(info->x64.evtchn_mask); i++ ) + { + const char *prefix = !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; @@ -167,12 +238,14 @@ int main(int argc, char **argv) if ( (typecode < 0 || typecode == desc->typecode) && (instance < 0 || instance == desc->instance) ) { + 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(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..e4518cd28d 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,65 @@ int continue_hypercall_on_cpu( return 0; } +static int save_shared_info(const struct domain *d, struct domain_context *c, + bool dry_run) +{ + struct domain_shared_info_context ctxt = { .buffer_size = PAGE_SIZE }; + size_t hdr_size = offsetof(typeof(ctxt), buffer); + int rc; + + rc = DOMAIN_SAVE_BEGIN(SHARED_INFO, c, 0); + if ( rc ) + return rc; + +#ifdef CONFIG_COMPAT + if ( !dry_run ) + ctxt.has_32bit_shinfo = has_32bit_shinfo(d); +#endif + + rc = domain_save_data(c, &ctxt, hdr_size); + if ( rc ) + return rc; + + rc = 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 = offsetof(typeof(ctxt), buffer); + unsigned int i; + int rc; + + rc = DOMAIN_LOAD_BEGIN(SHARED_INFO, c, &i); + if ( rc || i ) /* expect only a single instance */ + return rc; + + rc = domain_load_data(c, &ctxt, hdr_size); + if ( rc ) + return rc; + + if ( ctxt.pad[0] || ctxt.pad[1] || ctxt.pad[2] || + ctxt.buffer_size != PAGE_SIZE ) + return -EINVAL; + +#ifdef CONFIG_COMPAT + d->arch.has_32bit_shinfo = ctxt.has_32bit_shinfo; +#endif + + rc = domain_load_data(c, d->shared_info, ctxt.buffer_size); + if ( rc ) + return rc; + + return domain_load_end(c); +} + +DOMAIN_REGISTER_SAVE_RESTORE(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 834c031c51..2b633cf03d 100644 --- a/xen/include/public/save.h +++ b/xen/include/public/save.h @@ -73,7 +73,16 @@ struct domain_save_header { }; DECLARE_DOMAIN_SAVE_TYPE(HEADER, 1, struct domain_save_header); -#define DOMAIN_SAVE_CODE_MAX 1 +struct domain_shared_info_context { + uint8_t has_32bit_shinfo; + uint8_t pad[3]; + 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 #endif /* defined(__XEN__) || defined(__XEN_TOOLS__) */