From patchwork Thu Jan 7 17:29:18 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jonathan Creekmore X-Patchwork-Id: 7978501 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 6313D9F54F for ; Thu, 7 Jan 2016 17:31:44 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 5CB0420109 for ; Thu, 7 Jan 2016 17:31:43 +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 4030A20122 for ; Thu, 7 Jan 2016 17:31:42 +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 1aHENi-0006qB-Lf; Thu, 07 Jan 2016 17:29:50 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1aHENg-0006p2-Is for xen-devel@lists.xenproject.org; Thu, 07 Jan 2016 17:29:48 +0000 Received: from [85.158.139.211] by server-12.bemta-5.messagelabs.com id 84/A1-12831-B80AE865; Thu, 07 Jan 2016 17:29:47 +0000 X-Env-Sender: jonathan.creekmore@gmail.com X-Msg-Ref: server-13.tower-206.messagelabs.com!1452187784!14275247!1 X-Originating-IP: [209.85.160.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 2672 invoked from network); 7 Jan 2016 17:29:45 -0000 Received: from mail-yk0-f179.google.com (HELO mail-yk0-f179.google.com) (209.85.160.179) by server-13.tower-206.messagelabs.com with AES128-GCM-SHA256 encrypted SMTP; 7 Jan 2016 17:29:45 -0000 Received: by mail-yk0-f179.google.com with SMTP id x67so337388864ykd.2 for ; Thu, 07 Jan 2016 09:29:45 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=+MfuM48x1Q89QCUS0cmvrqBiNVm/P5jT6wLM0XyiyME=; b=G7kFKzwD8Zdzo5QizVI4/lVBnleO3V5a8ZZDghPEBFQNr0r2fmFakMLZE9fW/IO6M+ 9BPFRlyB7OgZfVKOWoRG3lZieB+SLTA7q1NsHuhS+Vkb1YGFbEjq8IdN1y8Q1Vlhh8SN TSVWNmAdJZEsZp/28MdVeZnHHz8TjUoiPAF46aU+NwEYbJkze0s2IPAyn4ARoKBSWJh+ p93cDiyxkr5ahdO/xK5ajIqr1puWSzMQH0qis/YT5qAhvS93zHR6r2eKFft1wfTTU2dB X6bPhBhxu/M+tKvEVcdXT3sb5LFcF8ml/Ac/goRBXL4/+D53ymwuU5KmVzh2YvK7kZAj +DxA== X-Received: by 10.13.235.134 with SMTP id u128mr76809087ywe.26.1452187784189; Thu, 07 Jan 2016 09:29:44 -0800 (PST) Received: from Nebula.lan (c-68-34-224-206.hsd1.al.comcast.net. [68.34.224.206]) by smtp.gmail.com with ESMTPSA id n4sm6450475ywn.18.2016.01.07.09.29.42 (version=TLS1 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 07 Jan 2016 09:29:43 -0800 (PST) From: Jonathan Creekmore To: xen-devel@lists.xenproject.org Date: Thu, 7 Jan 2016 11:29:18 -0600 Message-Id: <1452187761-38328-3-git-send-email-jonathan.creekmore@gmail.com> X-Mailer: git-send-email 2.6.4 In-Reply-To: <1452187761-38328-1-git-send-email-jonathan.creekmore@gmail.com> References: <1452187761-38328-1-git-send-email-jonathan.creekmore@gmail.com> Cc: George Dunlap , Jonathan Creekmore , Dario Faggioli Subject: [Xen-devel] [PATCH v3 2/5] build: Hook the schedulers into 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_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, 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 the schedulers to be independently enabled or disabled at compile-time. To match existing behavior, all four schedulers are compiled in by default, although the Credit2, RTDS, and ARINC653 are marked EXPERIMENTAL to match their not currently supported status. CC: George Dunlap CC: Dario Faggioli Signed-off-by: Jonathan Creekmore Reviewed-by: Doug Goldstein --- Changed since v2: * Hid the scheduler menu behind the EXPERT option * Provide static inlines for credit functions that are assumed to be always available * Provide an absolute default of the credit scheduler if the scheduler menu is not visible Changed since v1: * Marked credit2 as EXPERIMENTAL * Removed confusing language from the commit message * Alphabetize the schedulers --- xen/common/Kconfig | 67 +++++++++++++++++++++++++++++++++++++++++++++++++ xen/common/Makefile | 8 +++--- xen/common/schedule.c | 12 +++++++-- xen/include/xen/sched.h | 5 ++++ 4 files changed, 86 insertions(+), 6 deletions(-) diff --git a/xen/common/Kconfig b/xen/common/Kconfig index 046e257..db7411b 100644 --- a/xen/common/Kconfig +++ b/xen/common/Kconfig @@ -51,4 +51,71 @@ config KEXEC If unsure, say Y. +# Enable schedulers +menu "Schedulers" + visible if EXPERT = "y" + +config SCHED_CREDIT + bool "Credit scheduler support" + default y + ---help--- + The traditional credit scheduler is a general purpose scheduler. + + If unsure, say Y. + +config SCHED_CREDIT2 + bool "Credit2 scheduler support (EXPERIMENTAL)" + default y + ---help--- + The credit2 scheduler is a general purpose scheduler that is + optimized for lower latency and higher VM density. + + If unsure, say Y. + +config SCHED_RTDS + bool "RTDS scheduler support (EXPERIMENTAL)" + default y + ---help--- + The RTDS scheduler is a soft and firm real-time scheduler for + multicore, targeted for embedded, automotive, graphics and gaming + in the cloud, and general low-latency workloads. + + If unsure, say N. + +config SCHED_ARINC653 + bool "ARINC653 scheduler support (EXPERIMENTAL)" + default y + ---help--- + The ARINC653 scheduler is a hard real-time scheduler for single + cores, targeted for avionics, drones, and medical devices. + + If unsure, say N. + +choice + prompt "Default Scheduler?" + default SCHED_CREDIT_DEFAULT if SCHED_CREDIT + default SCHED_CREDIT2_DEFAULT if SCHED_CREDIT2 + default SCHED_RTDS_DEFAULT if SCHED_RTDS + default SCHED_ARINC653_DEFAULT if SCHED_ARINC653 + + config SCHED_CREDIT_DEFAULT + bool "Credit Scheduler" if SCHED_CREDIT + config SCHED_CREDIT2_DEFAULT + bool "Credit2 Scheduler" if SCHED_CREDIT2 + config SCHED_RTDS_DEFAULT + bool "RT Scheduler" if SCHED_RTDS + config SCHED_ARINC653_DEFAULT + bool "ARINC653 Scheduler" if SCHED_ARINC653 +endchoice + +config SCHED_DEFAULT + string + default "credit" if SCHED_CREDIT_DEFAULT + default "credit2" if SCHED_CREDIT2_DEFAULT + default "rtds" if SCHED_RTDS_DEFAULT + default "arinc653" if SCHED_ARINC653_DEFAULT + default "credit" + +endmenu + endmenu diff --git a/xen/common/Makefile b/xen/common/Makefile index 8ab15ba..29a5916 100644 --- a/xen/common/Makefile +++ b/xen/common/Makefile @@ -30,10 +30,10 @@ obj-y += rangeset.o obj-y += radix-tree.o obj-y += rbtree.o obj-y += rcupdate.o -obj-y += sched_credit.o -obj-y += sched_credit2.o -obj-y += sched_arinc653.o -obj-y += sched_rt.o +obj-$(CONFIG_SCHED_ARINC653) += sched_arinc653.o +obj-$(CONFIG_SCHED_CREDIT) += sched_credit.o +obj-$(CONFIG_SCHED_CREDIT2) += sched_credit2.o +obj-$(CONFIG_SCHED_RTDS) += sched_rt.o obj-y += schedule.o obj-y += shutdown.o obj-y += softirq.o diff --git a/xen/common/schedule.c b/xen/common/schedule.c index d121896..2f98a48 100644 --- a/xen/common/schedule.c +++ b/xen/common/schedule.c @@ -38,8 +38,8 @@ #include #include -/* opt_sched: scheduler - default to credit */ -static char __initdata opt_sched[10] = "credit"; +/* opt_sched: scheduler - default to configured value */ +static char __initdata opt_sched[10] = CONFIG_SCHED_DEFAULT; string_param("sched", opt_sched); /* if sched_smt_power_savings is set, @@ -65,10 +65,18 @@ DEFINE_PER_CPU(struct schedule_data, schedule_data); DEFINE_PER_CPU(struct scheduler *, scheduler); static const struct scheduler *schedulers[] = { +#ifdef CONFIG_SCHED_CREDIT &sched_credit_def, +#endif +#ifdef CONFIG_SCHED_CREDIT2 &sched_credit2_def, +#endif +#ifdef CONFIG_SCHED_ARINC653 &sched_arinc653_def, +#endif +#ifdef CONFIG_SCHED_RTDS &sched_rtds_def, +#endif }; static struct scheduler __read_mostly ops; diff --git a/xen/include/xen/sched.h b/xen/include/xen/sched.h index fc61fc3..246338e 100644 --- a/xen/include/xen/sched.h +++ b/xen/include/xen/sched.h @@ -850,8 +850,13 @@ static inline bool_t is_vcpu_online(const struct vcpu *v) return !test_bit(_VPF_down, &v->pause_flags); } +#ifdef CONFIG_SCHED_CREDIT void set_vcpu_migration_delay(unsigned int delay); unsigned int get_vcpu_migration_delay(void); +#else +static inline void set_vcpu_migration_delay(unsigned int delay) { } +static inline unsigned int get_vcpu_migration_delay(void) { return 0; } +#endif extern bool_t sched_smt_power_savings;