From patchwork Fri Mar 18 19:04:16 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dario Faggioli X-Patchwork-Id: 8623251 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 4813A9F6E1 for ; Fri, 18 Mar 2016 19:06:49 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 240BC20373 for ; Fri, 18 Mar 2016 19:06:48 +0000 (UTC) Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) (using TLSv1.2 with cipher AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 06BF32022A for ; Fri, 18 Mar 2016 19:06:47 +0000 (UTC) Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from ) id 1agzh8-0008Sa-4V; Fri, 18 Mar 2016 19:04:22 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from ) id 1agzh7-0008S9-6e for xen-devel@lists.xenproject.org; Fri, 18 Mar 2016 19:04:21 +0000 Received: from [85.158.137.68] by server-7.bemta-3.messagelabs.com id EF/58-04060-4315CE65; Fri, 18 Mar 2016 19:04:20 +0000 X-Env-Sender: raistlin.df@gmail.com X-Msg-Ref: server-14.tower-31.messagelabs.com!1458327859!30137812!1 X-Originating-IP: [74.125.82.65] X-SpamReason: No, hits=0.7 required=7.0 tests=BODY_RANDOM_LONG, RCVD_ILLEGAL_IP X-StarScan-Received: X-StarScan-Version: 8.11; banners=-,-,- X-VirusChecked: Checked Received: (qmail 47779 invoked from network); 18 Mar 2016 19:04:19 -0000 Received: from mail-wm0-f65.google.com (HELO mail-wm0-f65.google.com) (74.125.82.65) by server-14.tower-31.messagelabs.com with AES128-GCM-SHA256 encrypted SMTP; 18 Mar 2016 19:04:19 -0000 Received: by mail-wm0-f65.google.com with SMTP id l68so8151372wml.3 for ; Fri, 18 Mar 2016 12:04:19 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=sender:subject:from:to:cc:date:message-id:in-reply-to:references :user-agent:mime-version:content-transfer-encoding; bh=bx5hUyvGC5jf1OsAKVp1G3XWa+1KMUWsb/EzMns17eo=; b=Q7NBEEuKdoiuJkUObOow0Q4pETqxHAFgsnXEPF474jqcV4tWdpXoiWNhI+C+KknPtc 9qkYc+sqmWlFUldH2hVivTLqwTyAmF0MEbomonT5xNHfDGx4W85PJZ+rCMRTU/o6gpTM NBcY0C6WXvnAF5R9N1zFZWQzDGTIQdoDRE/riaelFvDFv9UKj5WUDb0AwxeWHR9nqjtR LVzQAKVFLBXQ44OgRqDZ+PNp1IpRSTFe7l/XcLbisa5dm+qceWDPx8N2TnekoDbypyDJ lHQp24J8FTHYvVYOnBNzSPcCXhUliAj0tu5bDVC5VQ0iZCqfQkIgWZIM+3tLsyXs24yu MFXg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:sender:subject:from:to:cc:date:message-id :in-reply-to:references:user-agent:mime-version :content-transfer-encoding; bh=bx5hUyvGC5jf1OsAKVp1G3XWa+1KMUWsb/EzMns17eo=; b=BYANSNdhfbf/mrCtonCuAbai7MlwNzh+U0eKQKvlGUypNtgVqWaZwlQSCwma86ind+ tkMcjsCOIAMRSbhSyBIm+zK+pdNX0zTRtaioQ0HkICjrjMchdXMdfg3DiFuCQjEI06Xh +FBAK0i4zo9UpaScxCmo0HyTVV+Wos1aQV39nWeWlukFkjDiybZ3EDm/bAaiCjZVeYNX bTXoQ+0kp4UzpX8v0jUsAaRlRJknn0hes1kHU40VNkvr+RtRA8TUwA1gkh04gq84gM3P p0sd/C+aNSR9NJY3Dzvms8kSc/3D4/5QIfKanH6JKwA+Rjrumu6luClZPCArpXOXWxSV kDug== X-Gm-Message-State: AD7BkJLbBrmQi5j7FzoC6Z5qIDegB9woCUMEZNSPUwMIc1cURc0tUEcCc1qYIkyemOXaMg== X-Received: by 10.28.215.79 with SMTP id o76mr905106wmg.95.1458327859342; Fri, 18 Mar 2016 12:04:19 -0700 (PDT) Received: from Solace.station (net-2-35-170-8.cust.vodafonedsl.it. [2.35.170.8]) by smtp.gmail.com with ESMTPSA id v82sm573451wmv.6.2016.03.18.12.04.17 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 18 Mar 2016 12:04:18 -0700 (PDT) From: Dario Faggioli To: xen-devel@lists.xenproject.org Date: Fri, 18 Mar 2016 20:04:16 +0100 Message-ID: <20160318190416.8117.57233.stgit@Solace.station> In-Reply-To: <20160318185524.8117.74837.stgit@Solace.station> References: <20160318185524.8117.74837.stgit@Solace.station> User-Agent: StGit/0.17.1-dirty MIME-Version: 1.0 Cc: Juergen Gross , George Dunlap , Robert VanVossen , Josh Whitehead , Meng Xu , Jan Beulich Subject: [Xen-devel] [PATCH 03/16] xen: sched: make implementing .alloc_pdata optional X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xen.org Sender: "Xen-devel" 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 The .alloc_pdata scheduler hook must, before this change, be implemented by all schedulers --even those ones that don't need to allocate anything. Make it possible to just use the SCHED_OP(), like for the other hooks, by using ERR_PTR() and IS_ERR() for error reporting. This: - makes NULL a variant of success; - allows for errors other than ENOMEM to be properly communicated (if ever necessary). This, in turn, means that schedulers not needing to allocate any per-pCPU data, can avoid implementing the hook. In fact, the artificial implementation of .alloc_pdata in the ARINC653 is removed (and, while there, nuke .free_pdata too, as it is equally useless). Signed-off-by: Dario Faggioli Reviewed-by: Meng Xu --- Cc: George Dunlap Cc: Robert VanVossen Cc: Josh Whitehead Cc: Meng Xu Cc: Jan Beulich Cc: Juergen Gross --- Changes from v1: * use IS_ERR() and friends to deal with the return value of alloc_pdata, as suggested during review. --- xen/common/sched_arinc653.c | 31 ------------------------------- xen/common/sched_credit.c | 4 ++-- xen/common/sched_credit2.c | 2 +- xen/common/sched_rt.c | 7 +++---- xen/common/schedule.c | 18 ++++++++---------- xen/include/xen/sched-if.h | 1 + 6 files changed, 15 insertions(+), 48 deletions(-) diff --git a/xen/common/sched_arinc653.c b/xen/common/sched_arinc653.c index 8a11a2f..b79fcdf 100644 --- a/xen/common/sched_arinc653.c +++ b/xen/common/sched_arinc653.c @@ -456,34 +456,6 @@ a653sched_free_vdata(const struct scheduler *ops, void *priv) } /** - * This function allocates scheduler-specific data for a physical CPU - * - * We do not actually make use of any per-CPU data but the hypervisor expects - * a non-NULL return value - * - * @param ops Pointer to this instance of the scheduler structure - * - * @return Pointer to the allocated data - */ -static void * -a653sched_alloc_pdata(const struct scheduler *ops, int cpu) -{ - /* return a non-NULL value to keep schedule.c happy */ - return SCHED_PRIV(ops); -} - -/** - * This function frees scheduler-specific data for a physical CPU - * - * @param ops Pointer to this instance of the scheduler structure - */ -static void -a653sched_free_pdata(const struct scheduler *ops, void *pcpu, int cpu) -{ - /* nop */ -} - -/** * This function allocates scheduler-specific data for a domain * * We do not actually make use of any per-domain data but the hypervisor @@ -737,9 +709,6 @@ static const struct scheduler sched_arinc653_def = { .free_vdata = a653sched_free_vdata, .alloc_vdata = a653sched_alloc_vdata, - .free_pdata = a653sched_free_pdata, - .alloc_pdata = a653sched_alloc_pdata, - .free_domdata = a653sched_free_domdata, .alloc_domdata = a653sched_alloc_domdata, diff --git a/xen/common/sched_credit.c b/xen/common/sched_credit.c index 305889a..288749f 100644 --- a/xen/common/sched_credit.c +++ b/xen/common/sched_credit.c @@ -532,12 +532,12 @@ csched_alloc_pdata(const struct scheduler *ops, int cpu) /* Allocate per-PCPU info */ spc = xzalloc(struct csched_pcpu); if ( spc == NULL ) - return NULL; + return ERR_PTR(-ENOMEM); if ( !alloc_cpumask_var(&spc->balance_mask) ) { xfree(spc); - return NULL; + return ERR_PTR(-ENOMEM); } spin_lock_irqsave(&prv->lock, flags); diff --git a/xen/common/sched_credit2.c b/xen/common/sched_credit2.c index 7ddad38..36dc9ee 100644 --- a/xen/common/sched_credit2.c +++ b/xen/common/sched_credit2.c @@ -2044,7 +2044,7 @@ csched2_alloc_pdata(const struct scheduler *ops, int cpu) printk("%s: cpu %d not online yet, deferring initializatgion\n", __func__, cpu); - return (void *)1; + return NULL; } static void diff --git a/xen/common/sched_rt.c b/xen/common/sched_rt.c index d98bfb6..ac8019f 100644 --- a/xen/common/sched_rt.c +++ b/xen/common/sched_rt.c @@ -665,7 +665,7 @@ rt_alloc_pdata(const struct scheduler *ops, int cpu) spin_unlock_irqrestore(old_lock, flags); if ( !alloc_cpumask_var(&_cpumask_scratch[cpu]) ) - return NULL; + return ERR_PTR(-ENOMEM); if ( prv->repl_timer == NULL ) { @@ -673,13 +673,12 @@ rt_alloc_pdata(const struct scheduler *ops, int cpu) prv->repl_timer = xzalloc(struct timer); if ( prv->repl_timer == NULL ) - return NULL; + return ERR_PTR(-ENOMEM); init_timer(prv->repl_timer, repl_timer_handler, (void *)ops, cpu); } - /* 1 indicates alloc. succeed in schedule.c */ - return (void *)1; + return NULL; } static void diff --git a/xen/common/schedule.c b/xen/common/schedule.c index 0627eb5..1adc0e2 100644 --- a/xen/common/schedule.c +++ b/xen/common/schedule.c @@ -1491,9 +1491,9 @@ static int cpu_schedule_up(unsigned int cpu) if ( idle_vcpu[cpu] == NULL ) return -ENOMEM; - if ( (ops.alloc_pdata != NULL) && - ((sd->sched_priv = ops.alloc_pdata(&ops, cpu)) == NULL) ) - return -ENOMEM; + sd->sched_priv = SCHED_OP(&ops, alloc_pdata, cpu); + if ( IS_ERR(sd->sched_priv) ) + return PTR_ERR(sd->sched_priv); return 0; } @@ -1503,8 +1503,7 @@ static void cpu_schedule_down(unsigned int cpu) struct schedule_data *sd = &per_cpu(schedule_data, cpu); struct scheduler *sched = per_cpu(scheduler, cpu); - if ( sd->sched_priv != NULL ) - SCHED_OP(sched, free_pdata, sd->sched_priv, cpu); + SCHED_OP(sched, free_pdata, sd->sched_priv, cpu); SCHED_OP(sched, free_vdata, idle_vcpu[cpu]->sched_priv); idle_vcpu[cpu]->sched_priv = NULL; @@ -1599,9 +1598,8 @@ void __init scheduler_init(void) idle_domain->max_vcpus = nr_cpu_ids; if ( alloc_vcpu(idle_domain, 0, 0) == NULL ) BUG(); - if ( ops.alloc_pdata && - !(this_cpu(schedule_data).sched_priv = ops.alloc_pdata(&ops, 0)) ) - BUG(); + this_cpu(schedule_data).sched_priv = SCHED_OP(&ops, alloc_pdata, 0); + BUG_ON(IS_ERR(this_cpu(schedule_data).sched_priv)); SCHED_OP(&ops, init_pdata, this_cpu(schedule_data).sched_priv, 0); } @@ -1644,8 +1642,8 @@ int schedule_cpu_switch(unsigned int cpu, struct cpupool *c) idle = idle_vcpu[cpu]; ppriv = SCHED_OP(new_ops, alloc_pdata, cpu); - if ( ppriv == NULL ) - return -ENOMEM; + if ( IS_ERR(ppriv) ) + return PTR_ERR(ppriv); SCHED_OP(new_ops, init_pdata, ppriv, cpu); vpriv = SCHED_OP(new_ops, alloc_vdata, idle, idle->domain->sched_priv); if ( vpriv == NULL ) diff --git a/xen/include/xen/sched-if.h b/xen/include/xen/sched-if.h index 70c08c6..560cba5 100644 --- a/xen/include/xen/sched-if.h +++ b/xen/include/xen/sched-if.h @@ -9,6 +9,7 @@ #define __XEN_SCHED_IF_H__ #include +#include /* A global pointer to the initial cpupool (POOL0). */ extern struct cpupool *cpupool0;