From patchwork Thu Sep 24 13:10:29 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Paul Durrant X-Patchwork-Id: 11797239 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 87142618 for ; Thu, 24 Sep 2020 13:11:39 +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 4786A206B8 for ; Thu, 24 Sep 2020 13:11:39 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=xen.org header.i=@xen.org header.b="5Jtne1md" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 4786A206B8 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 1kLR1T-0004eB-EH; Thu, 24 Sep 2020 13:10:55 +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 1kLR1S-0004Um-3L for xen-devel@lists.xenproject.org; Thu, 24 Sep 2020 13:10:54 +0000 X-Inumbo-ID: 23b9f42a-e357-449b-85c5-640266d3eb41 Received: from mail.xenproject.org (unknown [104.130.215.37]) by us1-amaz-eas2.inumbo.com (Halon) with ESMTPS id 23b9f42a-e357-449b-85c5-640266d3eb41; Thu, 24 Sep 2020 13:10:44 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Content-Transfer-Encoding:Content-Type:MIME-Version: References:In-Reply-To:Message-Id:Date:Subject:Cc:To:From; bh=CPUexMLg8ao8lm/8jd1JmUvn37ZSha6TCkkS8O3dnDc=; b=5Jtne1mdYuYW6LCliYS4o88fFC 0iNh1O8nP5wJQ6OAFmM+Tyfx93zKGdA3NDvRUuGliFRMIrHrpysJISMsDoWqsQm1kasdiuZpD13Yv PrLpbNhnqs5N9NQjJ1N4IXfnzLtyYQ0BasyRY8vwlv9OGiEbIRVJUIxMSbJEzx4/rKCA=; Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1kLR1H-0006gD-Bt; Thu, 24 Sep 2020 13:10:43 +0000 Received: from host86-176-94-160.range86-176.btcentralplus.com ([86.176.94.160] helo=u2f063a87eabd5f.home) by xenbits.xenproject.org with esmtpsa (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1kLR1H-0002DB-4J; Thu, 24 Sep 2020 13:10:43 +0000 From: Paul Durrant To: xen-devel@lists.xenproject.org Cc: Paul Durrant , Jan Beulich , Ian Jackson , Wei Liu , Andrew Cooper , George Dunlap , Julien Grall , Stefano Stabellini , =?utf-8?q?Roger_Pau_Monn=C3=A9?= Subject: [PATCH v9 7/8] x86/time: add a domain context record for tsc_info... Date: Thu, 24 Sep 2020 14:10:29 +0100 Message-Id: <20200924131030.1876-8-paul@xen.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200924131030.1876-1-paul@xen.org> References: <20200924131030.1876-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: , 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: Whilst the record definition 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 Reviewed-by: Jan Beulich Acked-by: Wei Liu --- Cc: Ian Jackson Cc: Wei Liu Cc: Andrew Cooper Cc: George Dunlap Cc: Julien Grall Cc: Stefano Stabellini Cc: "Roger Pau Monné" v8: - Removed stray blank line v7: - New in v7 --- tools/misc/xen-domctx.c | 11 +++++++++++ xen/arch/x86/time.c | 34 +++++++++++++++++++++++++++++++++- xen/include/asm-x86/time.h | 5 +++-- xen/include/public/save.h | 13 ++++++++++++- 4 files changed, 59 insertions(+), 4 deletions(-) diff --git a/tools/misc/xen-domctx.c b/tools/misc/xen-domctx.c index 6ead7ea89d..e582a79678 100644 --- a/tools/misc/xen-domctx.c +++ b/tools/misc/xen-domctx.c @@ -59,7 +59,17 @@ static void dump_header(void) printf(" HEADER: magic %#x, version %u\n", h->magic, h->version); +} + +static void dump_tsc_info(void) +{ + DOMAIN_SAVE_TYPE(TSC_INFO) *t; + + GET_PTR(t); + printf(" TSC_INFO: mode: %u incarnation: %u\n" + " khz %u elapsed_nsec: %"PRIu64"\n", + t->mode, t->incarnation, t->khz, t->elapsed_nsec); } static void print_binary(const char *prefix, const void *val, size_t size, @@ -251,6 +261,7 @@ int main(int argc, char **argv) { case DOMAIN_SAVE_CODE(HEADER): dump_header(); break; case DOMAIN_SAVE_CODE(SHARED_INFO): dump_shared_info(); break; + case DOMAIN_SAVE_CODE(TSC_INFO): dump_tsc_info(); break; case DOMAIN_SAVE_CODE(END): dump_end(); break; default: printf("Unknown type %u: skipping\n", desc->typecode); diff --git a/xen/arch/x86/time.c b/xen/arch/x86/time.c index 8938c0f435..25731f7df4 100644 --- a/xen/arch/x86/time.c +++ b/xen/arch/x86/time.c @@ -26,6 +26,7 @@ #include #include #include +#include #include #include #include @@ -2334,7 +2335,7 @@ int host_tsc_is_safe(void) * called to collect tsc-related data only for save file or live * migrate; called after last rdtsc is done on this incarnation */ -void tsc_get_info(struct domain *d, uint32_t *tsc_mode, +void tsc_get_info(const struct domain *d, uint32_t *tsc_mode, uint64_t *elapsed_nsec, uint32_t *gtsc_khz, uint32_t *incarnation) { @@ -2451,6 +2452,37 @@ int tsc_set_info(struct domain *d, return 0; } +static int save_tsc_info(const struct domain *d, struct domain_context *c, + bool dry_run) +{ + struct domain_tsc_info_context ctxt; + + if ( !dry_run ) + tsc_get_info(d, &ctxt.mode, &ctxt.elapsed_nsec, &ctxt.khz, + &ctxt.incarnation); + + return DOMAIN_SAVE_ENTRY(TSC_INFO, c, 0, &ctxt, sizeof(ctxt)); +} + +static int load_tsc_info(struct domain *d, struct domain_context *c) +{ + struct domain_tsc_info_context ctxt; + unsigned int i; + int rc; + + rc = DOMAIN_LOAD_ENTRY(TSC_INFO, c, &i, &ctxt, sizeof(ctxt)); + if ( rc ) + return rc; + + if ( i ) /* expect only a single instance */ + return -ENXIO; + + return tsc_set_info(d, ctxt.mode, ctxt.elapsed_nsec, ctxt.khz, + ctxt.incarnation); +} + +DOMAIN_REGISTER_SAVE_LOAD(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/asm-x86/time.h b/xen/include/asm-x86/time.h index f347311cc4..7f2ce6226a 100644 --- a/xen/include/asm-x86/time.h +++ b/xen/include/asm-x86/time.h @@ -59,8 +59,9 @@ u64 gtsc_to_gtime(struct domain *d, u64 tsc); int tsc_set_info(struct domain *d, uint32_t tsc_mode, uint64_t elapsed_nsec, uint32_t gtsc_khz, uint32_t incarnation); -void tsc_get_info(struct domain *d, uint32_t *tsc_mode, uint64_t *elapsed_nsec, - uint32_t *gtsc_khz, uint32_t *incarnation); +void tsc_get_info(const struct domain *d, uint32_t *tsc_mode, + uint64_t *elapsed_nsec, uint32_t *gtsc_khz, + uint32_t *incarnation); void force_update_vcpu_system_time(struct vcpu *v); diff --git a/xen/include/public/save.h b/xen/include/public/save.h index 0e855a4b97..aeb17298eb 100644 --- a/xen/include/public/save.h +++ b/xen/include/public/save.h @@ -93,7 +93,18 @@ struct domain_shared_info_context { DECLARE_DOMAIN_SAVE_TYPE(SHARED_INFO, 2, struct domain_shared_info_context); -#define DOMAIN_SAVE_CODE_MAX 2 +#if defined(__i386__) || defined(__x86_64__) +struct domain_tsc_info_context { + uint32_t mode; + uint32_t incarnation; + uint64_t elapsed_nsec; + uint32_t khz; +}; + +DECLARE_DOMAIN_SAVE_TYPE(TSC_INFO, 3, struct domain_tsc_info_context); +#endif + +#define DOMAIN_SAVE_CODE_MAX 3 #endif /* defined(__XEN__) || defined(__XEN_TOOLS__) */