From patchwork Wed Feb 17 18:02:45 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Douglas Goldstein X-Patchwork-Id: 8341861 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 106F89FC82 for ; Wed, 17 Feb 2016 18:05:37 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 1BF35202EB for ; Wed, 17 Feb 2016 18:05:36 +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 1E2F120263 for ; Wed, 17 Feb 2016 18:05:35 +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 1aW6RM-0005NI-Hw; Wed, 17 Feb 2016 18:03:04 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1aW6RL-0005Mt-59 for xen-devel@lists.xen.org; Wed, 17 Feb 2016 18:03:03 +0000 Received: from [85.158.137.68] by server-10.bemta-3.messagelabs.com id 0F/CF-02807-6D5B4C65; Wed, 17 Feb 2016 18:03:02 +0000 X-Env-Sender: cardoe@cardoe.com X-Msg-Ref: server-12.tower-31.messagelabs.com!1455732180!23090793!1 X-Originating-IP: [209.85.161.171] 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 1188 invoked from network); 17 Feb 2016 18:03:01 -0000 Received: from mail-yw0-f171.google.com (HELO mail-yw0-f171.google.com) (209.85.161.171) by server-12.tower-31.messagelabs.com with AES128-GCM-SHA256 encrypted SMTP; 17 Feb 2016 18:03:01 -0000 Received: by mail-yw0-f171.google.com with SMTP id u200so19677444ywf.0 for ; Wed, 17 Feb 2016 10:03:01 -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:in-reply-to:references; bh=2VPyM2HxsdGB3NXXHzXhHlHFT1hHv5W13ywKnW/RLJk=; b=ZiXjM4xuTNZdhhNewcTGho6hX49Y/ABz0ss7HD/zaRSafrc1VzqY691dxPSlEURS2z 0iWz4+AO2IwvyyzSsfuzKpulxfw00Njx14Bsp1FJpglil2J0h9LhoKYr5Z/gUUu2R913 VTmIgzkHtYQ+sRE2h4AuSlb+ic/d89ntgPe0c= 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:in-reply-to :references; bh=2VPyM2HxsdGB3NXXHzXhHlHFT1hHv5W13ywKnW/RLJk=; b=baktvP9bKgLujAPsZWky9IiIA9vAzUPOSsctvUV7ynmXPYErrMdW7Doh4MM1QyOLes BT/ALpcuXG9LMgAkML2VMUdtRovE3rCwQENMG0ZqcMys+xlA1iRUy0lKyX5FJwUzF25J R8DiLce8YWcQaTgBtPwt45cGVeWPMSscRwaKbsi7LcT9EqTGRiKU+6643zDehKOCaicU uCOkJe/zE+Vn9ymJkcLSxSgS02LeyCLsEfhifeaXTrFCycbnt3fr5qgHSM2x+lNL+yqy dGoRMsx/edPtxLgjNEqIULHyaDizoRIa3/Lu6vadeNxr6HO9oYWJQLJ8ScFbUazUzBlE U0nA== X-Gm-Message-State: AG10YOSwTr6tL90hIEN2cAcBxJ5Dtd4PtO6yrFmI81byVNvGGKhaiEYwyEQmm2LpUAXkew== X-Received: by 10.13.251.135 with SMTP id l129mr1602514ywf.283.1455732180219; Wed, 17 Feb 2016 10:03:00 -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 h131sm1561540ywb.25.2016.02.17.10.02.58 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 17 Feb 2016 10:02:59 -0800 (PST) From: Doug Goldstein To: xen-devel@lists.xen.org Date: Wed, 17 Feb 2016 12:02:45 -0600 Message-Id: <1455732165-27027-2-git-send-email-cardoe@cardoe.com> X-Mailer: git-send-email 2.4.10 In-Reply-To: <1455732165-27027-1-git-send-email-cardoe@cardoe.com> References: <1455732165-27027-1-git-send-email-cardoe@cardoe.com> Cc: Keir Fraser , Doug Goldstein , Jan Beulich , Andrew Cooper Subject: [Xen-devel] [PATCH v4 2/2] build: convert xenoprof to Kconfig 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 Convert the xenoprof x86 build time option to Kconfig. CC: Keir Fraser CC: Jan Beulich CC: Andrew Cooper Reviewed-by: Andrew Cooper Signed-off-by: Doug Goldstein Acked-by: Jan Beulich --- CC: Keir Fraser CC: Jan Beulich CC: Andrew Cooper change since v3: - move xenoprof entry to the main sources list - combine 'default' and 'bool' into 'def_bool' change since v2: - require EXPERT for XENOPROF as suggested by Jan Beulich change since v1: - fix name of Kconfig entry as suggested by Andrew Cooper --- xen/arch/x86/Makefile | 2 +- xen/arch/x86/Rules.mk | 3 --- xen/common/Kconfig | 13 +++++++++++++ xen/common/Makefile | 2 +- 4 files changed, 15 insertions(+), 5 deletions(-) diff --git a/xen/arch/x86/Makefile b/xen/arch/x86/Makefile index 434d985..1bcb08b 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-$(xenoprof) += oprofile +subdir-$(CONFIG_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 94e4efd..14519e3 100644 --- a/xen/arch/x86/Rules.mk +++ b/xen/arch/x86/Rules.mk @@ -3,15 +3,12 @@ HAS_NUMA := y HAS_CORE_PARKING := y -xenoprof := y CFLAGS += -I$(BASEDIR)/include 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/common/Kconfig b/xen/common/Kconfig index 6f404b4..49de790 100644 --- a/xen/common/Kconfig +++ b/xen/common/Kconfig @@ -84,6 +84,19 @@ config LATE_HWDOM If unsure, say N. +# Adds support for Xenoprof +config XENOPROF + def_bool y + prompt "Xen Oprofile Support" if EXPERT = "y" + depends on X86 + ---help--- + Xen OProfile (Xenoprof) is a system-wide profiler for Xen virtual + machine environments, capable of profiling the Xen virtual machine + monitor, multiple Linux guest operating systems, and applications + running on them. + + If unsure, say Y. + # Enable/Disable XSM support config XSM bool "Xen Security Modules support" diff --git a/xen/common/Makefile b/xen/common/Makefile index 0d76efe..57f4ed7 100644 --- a/xen/common/Makefile +++ b/xen/common/Makefile @@ -57,13 +57,13 @@ obj-y += vm_event.o obj-y += vmap.o obj-y += vsprintf.o obj-y += wait.o +obj-$(CONFIG_XENOPROF) += xenoprof.o obj-y += xmalloc_tlsf.o obj-bin-$(CONFIG_X86) += $(foreach n,decompress bunzip2 unxz unlzma unlzo unlz4 earlycpio,$(n).init.o) obj-$(perfc) += perfc.o obj-$(crash_debug) += gdbstub.o -obj-$(xenoprof) += xenoprof.o obj-$(CONFIG_COMPAT) += $(addprefix compat/,domain.o kernel.o memory.o multicall.o tmem_xen.o xlat.o)