From patchwork Tue May 28 10:32:55 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: =?utf-8?b?SsO8cmdlbiBHcm/Dnw==?= X-Patchwork-Id: 10964643 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id B1CB01575 for ; Tue, 28 May 2019 10:35:19 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id A332C2839C for ; Tue, 28 May 2019 10:35:19 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 9748D27C2D; Tue, 28 May 2019 10:35:19 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-5.2 required=2.0 tests=BAYES_00,MAILING_LIST_MULTI, RCVD_IN_DNSWL_MED autolearn=ham version=3.3.1 Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) (using TLSv1.2 with cipher AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 32037285A7 for ; Tue, 28 May 2019 10:35:19 +0000 (UTC) Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.89) (envelope-from ) id 1hVZQx-0006UJ-K6; Tue, 28 May 2019 10:34:19 +0000 Received: from all-amaz-eas1.inumbo.com ([34.197.232.57] helo=us1-amaz-eas2.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.89) (envelope-from ) id 1hVZQF-0004w2-Pn for xen-devel@lists.xenproject.org; Tue, 28 May 2019 10:33:35 +0000 X-Inumbo-ID: 07986500-8134-11e9-a7ef-7b7bed8cb1e5 Received: from mx1.suse.de (unknown [195.135.220.15]) by us1-amaz-eas2.inumbo.com (Halon) with ESMTPS id 07986500-8134-11e9-a7ef-7b7bed8cb1e5; Tue, 28 May 2019 10:33:28 +0000 (UTC) X-Virus-Scanned: by amavisd-new at test-mx.suse.de Received: from relay2.suse.de (unknown [195.135.220.254]) by mx1.suse.de (Postfix) with ESMTP id 6F90AAE8D; Tue, 28 May 2019 10:33:27 +0000 (UTC) From: Juergen Gross To: xen-devel@lists.xenproject.org Date: Tue, 28 May 2019 12:32:55 +0200 Message-Id: <20190528103313.1343-43-jgross@suse.com> X-Mailer: git-send-email 2.16.4 In-Reply-To: <20190528103313.1343-1-jgross@suse.com> References: <20190528103313.1343-1-jgross@suse.com> Subject: [Xen-devel] [PATCH 42/60] xen/sched: add a scheduler_percpu_init() function X-BeenThere: xen-devel@lists.xenproject.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Cc: Juergen Gross , Stefano Stabellini , Wei Liu , Konrad Rzeszutek Wilk , George Dunlap , Andrew Cooper , Ian Jackson , Tim Deegan , Julien Grall , Jan Beulich , Dario Faggioli , =?utf-8?q?Roger_Pau_Monn=C3=A9?= MIME-Version: 1.0 Errors-To: xen-devel-bounces@lists.xenproject.org Sender: "Xen-devel" X-Virus-Scanned: ClamAV using ClamSMTP For support of core scheduling the scheduler cpu callback for CPU_STARTING has to be moved into a dedicated function called by start_secondary() as it needs to run before spin_debug_enable() then due to potentially calling xfree(). Signed-off-by: Juergen Gross --- RFC V2: fix ARM build --- xen/arch/arm/smpboot.c | 2 ++ xen/arch/x86/smpboot.c | 2 ++ xen/common/schedule.c | 19 ++++++++++++------- xen/include/xen/sched.h | 1 + 4 files changed, 17 insertions(+), 7 deletions(-) diff --git a/xen/arch/arm/smpboot.c b/xen/arch/arm/smpboot.c index f756444362..9a6582f2a6 100644 --- a/xen/arch/arm/smpboot.c +++ b/xen/arch/arm/smpboot.c @@ -350,6 +350,8 @@ void start_secondary(unsigned long boot_phys_offset, setup_cpu_sibling_map(cpuid); + scheduler_percpu_init(cpuid); + /* Run local notifiers */ notify_cpu_starting(cpuid); /* diff --git a/xen/arch/x86/smpboot.c b/xen/arch/x86/smpboot.c index 153bfbb4b7..7e95b2cdac 100644 --- a/xen/arch/x86/smpboot.c +++ b/xen/arch/x86/smpboot.c @@ -382,6 +382,8 @@ void start_secondary(void *unused) set_cpu_sibling_map(cpu); + scheduler_percpu_init(cpu); + init_percpu_time(); setup_secondary_APIC_clock(); diff --git a/xen/common/schedule.c b/xen/common/schedule.c index 837e183004..b4e87e2a58 100644 --- a/xen/common/schedule.c +++ b/xen/common/schedule.c @@ -2040,6 +2040,15 @@ static void cpu_schedule_down(unsigned int cpu) xfree(sd); } +void scheduler_percpu_init(unsigned int cpu) +{ + struct scheduler *sched = per_cpu(scheduler, cpu); + struct sched_resource *sd = get_sched_res(cpu); + + if ( system_state != SYS_STATE_resume ) + sched_init_pdata(sched, sd->sched_priv, cpu); +} + static int cpu_schedule_callback( struct notifier_block *nfb, unsigned long action, void *hcpu) { @@ -2058,8 +2067,8 @@ static int cpu_schedule_callback( * data can avoid implementing alloc_pdata. init_pdata may, however, be * necessary/useful in this case too (e.g., it can contain the "register * the pCPU to the scheduler" part). alloc_pdata (if present) is called - * during CPU_UP_PREPARE. init_pdata (if present) is called during - * CPU_STARTING. + * during CPU_UP_PREPARE. init_pdata (if present) is called before + * CPU_STARTING in scheduler_percpu_init(). * * On the other hand, at teardown, we need to reverse what has been done * during initialization, and then free the per-pCPU specific data. This @@ -2082,10 +2091,6 @@ static int cpu_schedule_callback( */ switch ( action ) { - case CPU_STARTING: - if ( system_state != SYS_STATE_resume ) - sched_init_pdata(sched, sd->sched_priv, cpu); - break; case CPU_UP_PREPARE: if ( system_state != SYS_STATE_resume ) rc = cpu_schedule_up(cpu); @@ -2206,7 +2211,7 @@ void __init scheduler_init(void) get_sched_res(0)->curr = idle_vcpu[0]->sched_unit; get_sched_res(0)->sched_priv = sched_alloc_pdata(&ops, 0); BUG_ON(IS_ERR(get_sched_res(0)->sched_priv)); - sched_init_pdata(&ops, get_sched_res(0)->sched_priv, 0); + scheduler_percpu_init(0); } /* diff --git a/xen/include/xen/sched.h b/xen/include/xen/sched.h index d5bf61ced0..af4c934e0b 100644 --- a/xen/include/xen/sched.h +++ b/xen/include/xen/sched.h @@ -675,6 +675,7 @@ void __domain_crash(struct domain *d); void noreturn asm_domain_crash_synchronous(unsigned long addr); void scheduler_init(void); +void scheduler_percpu_init(unsigned int cpu); int sched_init_vcpu(struct vcpu *v); void sched_destroy_vcpu(struct vcpu *v); int sched_init_domain(struct domain *d, int poolid);