From patchwork Fri Feb 19 04:25:56 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Douglas Goldstein X-Patchwork-Id: 8356101 Return-Path: X-Original-To: patchwork-xen-devel@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id EC4E09F88A for ; Fri, 19 Feb 2016 04:29:29 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id F380B20416 for ; Fri, 19 Feb 2016 04:29:28 +0000 (UTC) Received: from lists.xen.org (lists.xenproject.org [50.57.142.19]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id D163E203F1 for ; Fri, 19 Feb 2016 04:29:27 +0000 (UTC) Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1aWce7-0007Rv-U9; Fri, 19 Feb 2016 04:26:23 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1aWce6-0007Pp-F1 for xen-devel@lists.xen.org; Fri, 19 Feb 2016 04:26:22 +0000 Received: from [193.109.254.147] by server-10.bemta-14.messagelabs.com id 22/26-25438-D6996C65; Fri, 19 Feb 2016 04:26:21 +0000 X-Env-Sender: cardoe@cardoe.com X-Msg-Ref: server-10.tower-27.messagelabs.com!1455855979!25042508!1 X-Originating-IP: [209.85.161.169] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 7.35.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 8174 invoked from network); 19 Feb 2016 04:26:20 -0000 Received: from mail-yw0-f169.google.com (HELO mail-yw0-f169.google.com) (209.85.161.169) by server-10.tower-27.messagelabs.com with AES128-GCM-SHA256 encrypted SMTP; 19 Feb 2016 04:26:20 -0000 Received: by mail-yw0-f169.google.com with SMTP id g127so58979493ywf.2 for ; Thu, 18 Feb 2016 20:26:20 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=cardoe.com; s=google; h=from:to:cc:subject:date:message-id; bh=Hrnc+L/JnT71fcjDOLw6SwCtq3HGlDCkIOS8abE+d5Q=; b=MlO+IJCKr4gsNvfcAWFL4JoBgqUaH6mGzz0y96cqrDPMFRriOrZF6hjFv77yDX1j3J 5x5GAXaniLgesjiO5UhaghdXY70+X7YYi3ezr8tGt8jQZKXrDNo1yyH7k2tM/9WCFJN6 pEqpmGelK3LMzuf30SIXtjA081zIzah5EFQXs= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=Hrnc+L/JnT71fcjDOLw6SwCtq3HGlDCkIOS8abE+d5Q=; b=cCpLPakXv2YfSDCmPzcakxNVyaNw23OERQ3wO8Qox7sBXZOmUoz1z/jq3/tJbUMFT3 rmBiRb9h/aDAoMoIYRm29u+UaTwDvmbS2LMeH6P67Uax56plRBSkUfpeOW1UyGs3t8AU pJHr5+SEX/Q3UZ5Ez4ZbaAiFHjtGptBtcHZF1h+SoC8kf1DAR787T1lk1VYgJW4U1rVp ePQ5B5ag31SYOtOFpbOf5/8YxxJtLpZgloL6Owg1hDihcZ7rIhUdWhksx/uDWBxVodwy f4wlbJgsy2DHKTWkn30hyOcU8TZ7LUTY83lRSsikA2X2cZBij9MvQsWofM3aSiFruKPI 9+WA== X-Gm-Message-State: AG10YOTWuK4B43jX7bSa54JqKrpl67rU81Ofy/gnqwwJjluNNk5fdgSlyQq2ihPm69GBzw== X-Received: by 10.129.91.6 with SMTP id p6mr6354424ywb.325.1455855979325; Thu, 18 Feb 2016 20:26:19 -0800 (PST) Received: from swanson.lan (c-68-46-196-185.hsd1.al.comcast.net. [68.46.196.185]) by smtp.gmail.com with ESMTPSA id z129sm7310089ywb.26.2016.02.18.20.26.17 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 18 Feb 2016 20:26:17 -0800 (PST) From: Doug Goldstein To: xen-devel@lists.xen.org Date: Thu, 18 Feb 2016 22:25:56 -0600 Message-Id: <1455855957-764-1-git-send-email-cardoe@cardoe.com> X-Mailer: git-send-email 2.4.10 Cc: Keir Fraser , Doug Goldstein , Jan Beulich , Andrew Cooper Subject: [Xen-devel] [PATCH v5 1/2] xenoprof: fix up ability to disable it X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org X-Spam-Status: No, score=-4.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_MED, T_DKIM_INVALID, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Allow Xenoprof to be fully disabled when toggling the option off. Signed-off-by: Doug Goldstein Reviewed-by: Andrew Cooper --- CC: Keir Fraser CC: Jan Beulich CC: Andrew Cooper change since v4: - as much as possible disabled by CONFIG_XENOPROF as suggested by Andrew Cooper change since v3: - drop (void)var; from static inlines - fix typo that broke build (must have forgotten to do XEN_CONFIG_EXPERT=y make change since v2: - move all functions in xenoprof.h inside CONFIG_XENOPROF as suggested by Andrew Cooper change since v1: - switch to #define empty 'functions' as suggested by Andrew Cooper --- xen/arch/x86/Makefile | 2 +- xen/arch/x86/Rules.mk | 2 ++ xen/arch/x86/x86_64/compat/entry.S | 4 ++++ xen/arch/x86/x86_64/entry.S | 4 ++++ xen/include/asm-x86/config.h | 1 - xen/include/asm-x86/xenoprof.h | 21 +++++++++++++++++++++ xen/include/xen/xenoprof.h | 27 +++++++++++++++++++++------ 7 files changed, 53 insertions(+), 8 deletions(-) diff --git a/xen/arch/x86/Makefile b/xen/arch/x86/Makefile index 8e6e901..434d985 100644 --- a/xen/arch/x86/Makefile +++ b/xen/arch/x86/Makefile @@ -3,7 +3,7 @@ subdir-y += cpu subdir-y += genapic subdir-y += hvm subdir-y += mm -subdir-y += oprofile +subdir-$(xenoprof) += oprofile subdir-y += x86_64 obj-bin-y += alternative.init.o diff --git a/xen/arch/x86/Rules.mk b/xen/arch/x86/Rules.mk index a1cdae0..94e4efd 100644 --- a/xen/arch/x86/Rules.mk +++ b/xen/arch/x86/Rules.mk @@ -10,6 +10,8 @@ CFLAGS += -I$(BASEDIR)/include/asm-x86/mach-generic CFLAGS += -I$(BASEDIR)/include/asm-x86/mach-default CFLAGS += '-D__OBJECT_LABEL__=$(subst /,$$,$(subst -,_,$(subst $(BASEDIR)/,,$(CURDIR))/$@))' +CFLAGS-$(xenoprof) += -DCONFIG_XENOPROF + # Prevent floating-point variables from creeping into Xen. CFLAGS += -msoft-float diff --git a/xen/arch/x86/x86_64/compat/entry.S b/xen/arch/x86/x86_64/compat/entry.S index 8cb8bca..927439d 100644 --- a/xen/arch/x86/x86_64/compat/entry.S +++ b/xen/arch/x86/x86_64/compat/entry.S @@ -345,6 +345,10 @@ compat_crash_page_fault: #define compat_kexec_op do_ni_hypercall #endif +#ifndef CONFIG_XENOPROF +#define compat_xenoprof_op do_ni_hypercall +#endif + ENTRY(compat_hypercall_table) .quad compat_set_trap_table /* 0 */ .quad do_mmu_update diff --git a/xen/arch/x86/x86_64/entry.S b/xen/arch/x86/x86_64/entry.S index fc81a93..e0f5c83 100644 --- a/xen/arch/x86/x86_64/entry.S +++ b/xen/arch/x86/x86_64/entry.S @@ -682,6 +682,10 @@ ENTRY(exception_table) #define do_kexec_op do_ni_hypercall #endif +#ifndef CONFIG_XENOPROF +#define do_xenoprof_op do_ni_hypercall +#endif + ENTRY(hypercall_table) .quad do_set_trap_table /* 0 */ .quad do_mmu_update diff --git a/xen/include/asm-x86/config.h b/xen/include/asm-x86/config.h index d97877d..a45d3ee 100644 --- a/xen/include/asm-x86/config.h +++ b/xen/include/asm-x86/config.h @@ -47,7 +47,6 @@ #define CONFIG_VGA 1 #define CONFIG_VIDEO 1 -#define CONFIG_XENOPROF 1 #define CONFIG_WATCHDOG 1 #define CONFIG_MULTIBOOT 1 diff --git a/xen/include/asm-x86/xenoprof.h b/xen/include/asm-x86/xenoprof.h index b006ddc..dca4223 100644 --- a/xen/include/asm-x86/xenoprof.h +++ b/xen/include/asm-x86/xenoprof.h @@ -22,6 +22,8 @@ #ifndef __ASM_X86_XENOPROF_H__ #define __ASM_X86_XENOPROF_H__ +#ifdef CONFIG_XENOPROF + int nmi_reserve_counters(void); int nmi_setup_events(void); int nmi_enable_virq(void); @@ -67,10 +69,29 @@ void xenoprof_backtrace(struct vcpu *, const struct cpu_user_regs *, "xenoprof/x86 with autotranslated mode enabled" \ "isn't supported yet\n"); \ } while (0) + int passive_domain_do_rdmsr(unsigned int msr, uint64_t *msr_content); int passive_domain_do_wrmsr(unsigned int msr, uint64_t msr_content); void passive_domain_destroy(struct vcpu *v); +#else + +static inline int passive_domain_do_rdmsr(unsigned int msr, + uint64_t *msr_content) +{ + return 0; +} + +static inline int passive_domain_do_wrmsr(unsigned int msr, + uint64_t msr_content) +{ + return 0; +} + +static inline void passive_domain_destroy(struct vcpu *v) {} + +#endif /* CONFIG_XENOPROF */ + #endif /* __ASM_X86_XENOPROF_H__ */ /* diff --git a/xen/include/xen/xenoprof.h b/xen/include/xen/xenoprof.h index 9b9ef56..8f045ab 100644 --- a/xen/include/xen/xenoprof.h +++ b/xen/include/xen/xenoprof.h @@ -14,6 +14,12 @@ #include #include +#define PMU_OWNER_NONE 0 +#define PMU_OWNER_XENOPROF 1 +#define PMU_OWNER_HVM 2 + +#ifdef CONFIG_XENOPROF + #define XENOPROF_DOMAIN_IGNORED 0 #define XENOPROF_DOMAIN_ACTIVE 1 #define XENOPROF_DOMAIN_PASSIVE 2 @@ -64,19 +70,28 @@ struct xenoprof { #endif struct domain; + +int acquire_pmu_ownership(int pmu_ownership); +void release_pmu_ownership(int pmu_ownership); + int is_active(struct domain *d); int is_passive(struct domain *d); void free_xenoprof_pages(struct domain *d); int xenoprof_add_trace(struct vcpu *, uint64_t pc, int mode); -#define PMU_OWNER_NONE 0 -#define PMU_OWNER_XENOPROF 1 -#define PMU_OWNER_HVM 2 -int acquire_pmu_ownership(int pmu_ownership); -void release_pmu_ownership(int pmu_ownership); - void xenoprof_log_event(struct vcpu *, const struct cpu_user_regs *, uint64_t pc, int mode, int event); +#else +static inline int acquire_pmu_ownership(int pmu_ownership) +{ + return 1; +} + +static inline void release_pmu_ownership(int pmu_ownership) +{ +} +#endif /* CONFIG_XENOPROF */ + #endif /* __XEN__XENOPROF_H__ */