From patchwork Wed Feb 17 14:37:35 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Douglas Goldstein X-Patchwork-Id: 8339661 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 D0F2C9F38B for ; Wed, 17 Feb 2016 14:40:45 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id E3BEB203AB for ; Wed, 17 Feb 2016 14:40:44 +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 EFE3A203A9 for ; Wed, 17 Feb 2016 14:40:43 +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 1aW3FE-00057N-PP; Wed, 17 Feb 2016 14:38:20 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1aW3FD-00056e-7U for xen-devel@lists.xen.org; Wed, 17 Feb 2016 14:38:19 +0000 Received: from [85.158.139.211] by server-4.bemta-5.messagelabs.com id 9D/77-12635-AD584C65; Wed, 17 Feb 2016 14:38:18 +0000 X-Env-Sender: cardoe@cardoe.com X-Msg-Ref: server-15.tower-206.messagelabs.com!1455719897!14666226!1 X-Originating-IP: [209.85.161.179] 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 50888 invoked from network); 17 Feb 2016 14:38:17 -0000 Received: from mail-yw0-f179.google.com (HELO mail-yw0-f179.google.com) (209.85.161.179) by server-15.tower-206.messagelabs.com with AES128-GCM-SHA256 encrypted SMTP; 17 Feb 2016 14:38:17 -0000 Received: by mail-yw0-f179.google.com with SMTP id u200so14328210ywf.0 for ; Wed, 17 Feb 2016 06:38:17 -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=DXAIRnAP6ijMDyRaoxsT4R9EYP/l8a4w+VE8EX8rgAU=; b=VLQOkUnmTZ6K+Iie0L22ctk9/kbi1zRIw7ijvwP938xbbjhqVpsGyaokIkY2fpittG tDBPaLQfrcVZK7KQenHma2UlV7Htg9yC7WXLI13KlyVoiDuBj41ElqO5/ZfjIGLBJ9bJ Dz9H3SHS0++EXYRyThgCezCzcLOqVNyjvT8wo= 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=DXAIRnAP6ijMDyRaoxsT4R9EYP/l8a4w+VE8EX8rgAU=; b=D2TrPCVoguatIYuwxAMq53jFcNJNUkk63gPmEgc1aYQoTqp1AmZnYJMuaPsZ1GKMx7 iCb58gy3sBki/uNC+YzJv/7mbAaXuam4x6dxlexFAUGYuUunqXLqTbgPHIOjhQP/La0Y k6TxDzGQQtAb3Mis5L9g2AA5ZJcR5OV+8C0pYv5568gjSmNLZsDIQhAD0HuEnGq72/ul 2/EHwHRSM3AwZ9rdIa12fugvqeVLwVXwaSAamHxLjZN4zIB5DGnRkC/f6oAilI+JycM0 zmzD/zFtKOvYs+yCoMtoIYd0yhGEW3kJs8/I0YNnUhIzlGLq6mvyZ+7Hrhf6WzRSXu9s xUIQ== X-Gm-Message-State: AG10YOTkKVbT5Mci5rDAg33hkYiVd+xRRpq2TS7bD98iPTjoa5TWN530O6MERdAYZuEkFQ== X-Received: by 10.13.230.74 with SMTP id p71mr1007828ywe.138.1455719896969; Wed, 17 Feb 2016 06:38:16 -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 r84sm926178ywe.54.2016.02.17.06.38.15 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 17 Feb 2016 06:38:15 -0800 (PST) From: Doug Goldstein To: xen-devel@lists.xen.org Date: Wed, 17 Feb 2016 08:37:35 -0600 Message-Id: <1455719856-20465-5-git-send-email-cardoe@cardoe.com> X-Mailer: git-send-email 2.4.10 In-Reply-To: <1455719856-20465-1-git-send-email-cardoe@cardoe.com> References: <1455719856-20465-1-git-send-email-cardoe@cardoe.com> Cc: Keir Fraser , Doug Goldstein , Jan Beulich , Andrew Cooper Subject: [Xen-devel] [PATCH v3 3/3] 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 --- CC: Keir Fraser CC: Jan Beulich CC: Andrew Cooper 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 | 14 ++++++++++++++ xen/common/Makefile | 2 +- 4 files changed, 16 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..e4ba46d 100644 --- a/xen/common/Kconfig +++ b/xen/common/Kconfig @@ -84,6 +84,20 @@ config LATE_HWDOM If unsure, say N. +# Adds support for Xenoprof +config XENOPROF + bool + prompt "Xen Oprofile Support" if EXPERT = "y" + default 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 6e82b33..126d373 100644 --- a/xen/common/Makefile +++ b/xen/common/Makefile @@ -62,7 +62,7 @@ obj-bin-$(CONFIG_X86) += $(foreach n,decompress bunzip2 unxz unlzma unlzo unlz4 obj-$(perfc) += perfc.o obj-$(crash_debug) += gdbstub.o -obj-$(xenoprof) += xenoprof.o +obj-$(CONFIG_XENOPROF) += xenoprof.o obj-$(CONFIG_COMPAT) += $(addprefix compat/,domain.o kernel.o memory.o multicall.o tmem_xen.o xlat.o)