From patchwork Thu Jan 7 17:29:21 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jonathan Creekmore X-Patchwork-Id: 7978541 Return-Path: X-Original-To: patchwork-xen-devel@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id DA8F3BEEE5 for ; Thu, 7 Jan 2016 17:32:37 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id E0C3020122 for ; Thu, 7 Jan 2016 17:32: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 B1A2020109 for ; Thu, 7 Jan 2016 17:32: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 1aHENn-0006u5-NT; Thu, 07 Jan 2016 17:29:55 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1aHENl-0006sv-TJ for xen-devel@lists.xenproject.org; Thu, 07 Jan 2016 17:29:54 +0000 Received: from [85.158.139.211] by server-17.bemta-5.messagelabs.com id DC/F8-21901-190AE865; Thu, 07 Jan 2016 17:29:53 +0000 X-Env-Sender: jonathan.creekmore@gmail.com X-Msg-Ref: server-16.tower-206.messagelabs.com!1452187789!14256647!1 X-Originating-IP: [209.85.160.182] 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 39893 invoked from network); 7 Jan 2016 17:29:50 -0000 Received: from mail-yk0-f182.google.com (HELO mail-yk0-f182.google.com) (209.85.160.182) by server-16.tower-206.messagelabs.com with AES128-GCM-SHA256 encrypted SMTP; 7 Jan 2016 17:29:50 -0000 Received: by mail-yk0-f182.google.com with SMTP id a85so259679114ykb.1 for ; Thu, 07 Jan 2016 09:29:50 -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=wKRu8FbMJBuvY/JZBZPsaDle2kNz3Uac0Wo6HkIAJ3w=; b=GtveMNxUV0RTO2jZZKA/ig7hv4t50ysYYcgvOYrqOHiZq940BwOO3pRxWmXKnnyWMH wCbXk0QKCnj0aacMv1dg085O9Dk131+jKMac/tbd73k2eLcRj2Frdio+rz7Rx8CXXP9u qMfXra5dlYgvraYkdULo6tnuQHMbildQdkXa9njSFStMi6esC4U99di69DQ/urInu/AD KChdn4ceQR77F4eeptqoopcurDrtljaEbWrKoBgQLaaV0aBQPAa7pqJ82TJ48Z4z7Giv 9PS2AlDRN8Ev1xX6yMLiSa+2qHaPRZ1lDLNA9LzbjKSRIi0h1vn3AKEZ9b4IWzx+4Ywr zqrw== X-Received: by 10.129.4.23 with SMTP id 23mr66974102ywe.88.1452187789567; Thu, 07 Jan 2016 09:29:49 -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.48 (version=TLS1 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 07 Jan 2016 09:29:49 -0800 (PST) From: Jonathan Creekmore To: xen-devel@lists.xenproject.org Date: Thu, 7 Jan 2016 11:29:21 -0600 Message-Id: <1452187761-38328-6-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 5/5] sched: Use the auto-generated list of schedulers 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 Instead of having a manually-curated list of schedulers, use the array that was auto-generated simply by compiling in the scheduler files as the sole source of truth of the available schedulers. CC: George Dunlap CC: Dario Faggioli Signed-off-by: Jonathan Creekmore Acked-by: Dario Faggioli Reviewed-by: Andrew Cooper Reviewed-by: Doug Goldstein --- Changed since v1: * Simplify the calculation of the number of schedulers * Make the scheduler ops structures static to their files --- xen/common/sched_arinc653.c | 2 +- xen/common/sched_credit.c | 2 +- xen/common/sched_credit2.c | 2 +- xen/common/sched_rt.c | 2 +- xen/common/schedule.c | 24 +++++++----------------- xen/include/xen/sched-if.h | 5 ----- 6 files changed, 11 insertions(+), 26 deletions(-) diff --git a/xen/common/sched_arinc653.c b/xen/common/sched_arinc653.c index 3b59514..0606988 100644 --- a/xen/common/sched_arinc653.c +++ b/xen/common/sched_arinc653.c @@ -724,7 +724,7 @@ a653sched_adjust_global(const struct scheduler *ops, * callback functions. * The symbol must be visible to the rest of Xen at link time. */ -const struct scheduler sched_arinc653_def = { +static const struct scheduler sched_arinc653_def = { .name = "ARINC 653 Scheduler", .opt_name = "arinc653", .sched_id = XEN_SCHEDULER_ARINC653, diff --git a/xen/common/sched_credit.c b/xen/common/sched_credit.c index e586248..028e41b 100644 --- a/xen/common/sched_credit.c +++ b/xen/common/sched_credit.c @@ -1991,7 +1991,7 @@ static void csched_tick_resume(const struct scheduler *ops, unsigned int cpu) static struct csched_private _csched_priv; -const struct scheduler sched_credit_def = { +static const struct scheduler sched_credit_def = { .name = "SMP Credit Scheduler", .opt_name = "credit", .sched_id = XEN_SCHEDULER_CREDIT, diff --git a/xen/common/sched_credit2.c b/xen/common/sched_credit2.c index 38b02d0..78220a7 100644 --- a/xen/common/sched_credit2.c +++ b/xen/common/sched_credit2.c @@ -2194,7 +2194,7 @@ csched2_deinit(const struct scheduler *ops) static struct csched2_private _csched2_priv; -const struct scheduler sched_credit2_def = { +static const struct scheduler sched_credit2_def = { .name = "SMP Credit Scheduler rev2", .opt_name = "credit2", .sched_id = XEN_SCHEDULER_CREDIT2, diff --git a/xen/common/sched_rt.c b/xen/common/sched_rt.c index 7640cd0..2e5430f 100644 --- a/xen/common/sched_rt.c +++ b/xen/common/sched_rt.c @@ -1170,7 +1170,7 @@ rt_dom_cntl( static struct rt_private _rt_priv; -const struct scheduler sched_rtds_def = { +static const struct scheduler sched_rtds_def = { .name = "SMP RTDS Scheduler", .opt_name = "rtds", .sched_id = XEN_SCHEDULER_RTDS, diff --git a/xen/common/schedule.c b/xen/common/schedule.c index 2f98a48..91e53c1 100644 --- a/xen/common/schedule.c +++ b/xen/common/schedule.c @@ -64,20 +64,10 @@ static void poll_timer_fn(void *data); 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 -}; +extern const struct scheduler *__start_schedulers_array[], *__end_schedulers_array[]; +extern const size_t schedulers_array_size; +#define NUM_SCHEDULERS (__end_schedulers_array - __start_schedulers_array) +static const struct scheduler **schedulers = __start_schedulers_array; static struct scheduler __read_mostly ops; @@ -1468,7 +1458,7 @@ void __init scheduler_init(void) open_softirq(SCHEDULE_SOFTIRQ, schedule); - for ( i = 0; i < ARRAY_SIZE(schedulers); i++ ) + for ( i = 0; i < NUM_SCHEDULERS; i++) { if ( schedulers[i]->global_init && schedulers[i]->global_init() < 0 ) schedulers[i] = NULL; @@ -1479,7 +1469,7 @@ void __init scheduler_init(void) if ( !ops.name ) { printk("Could not find scheduler: %s\n", opt_sched); - for ( i = 0; i < ARRAY_SIZE(schedulers); i++ ) + for ( i = 0; i < NUM_SCHEDULERS; i++ ) if ( schedulers[i] ) { ops = *schedulers[i]; @@ -1599,7 +1589,7 @@ struct scheduler *scheduler_alloc(unsigned int sched_id, int *perr) int i; struct scheduler *sched; - for ( i = 0; i < ARRAY_SIZE(schedulers); i++ ) + for ( i = 0; i < NUM_SCHEDULERS; i++ ) if ( schedulers[i] && schedulers[i]->sched_id == sched_id ) goto found; *perr = -ENOENT; diff --git a/xen/include/xen/sched-if.h b/xen/include/xen/sched-if.h index 9c6e0f5..66dc9c8 100644 --- a/xen/include/xen/sched-if.h +++ b/xen/include/xen/sched-if.h @@ -165,11 +165,6 @@ struct scheduler { void (*tick_resume) (const struct scheduler *, unsigned int); }; -extern const struct scheduler sched_credit_def; -extern const struct scheduler sched_credit2_def; -extern const struct scheduler sched_arinc653_def; -extern const struct scheduler sched_rtds_def; - #define REGISTER_SCHEDULER(x) static const struct scheduler *x##_entry \ __used_section(".data.schedulers") = &x;