From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.8 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS, URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id C4004C4360C for ; Sun, 13 Oct 2019 09:09:04 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id A7CF4206A3 for ; Sun, 13 Oct 2019 09:09:04 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728766AbfJMJJC (ORCPT ); Sun, 13 Oct 2019 05:09:02 -0400 Received: from mx1.redhat.com ([209.132.183.28]:37946 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728311AbfJMJJB (ORCPT ); Sun, 13 Oct 2019 05:09:01 -0400 Received: from mail-wr1-f72.google.com (mail-wr1-f72.google.com [209.85.221.72]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 9E31E3DE31 for ; Sun, 13 Oct 2019 09:09:00 +0000 (UTC) Received: by mail-wr1-f72.google.com with SMTP id o10so7007025wrm.22 for ; Sun, 13 Oct 2019 02:09:00 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:in-reply-to:references:date :message-id:mime-version; bh=nAWhy7odG0FujfQYmHKfpv+5JLZcSg6B+H4R/Q0IQ00=; b=UIC1I1EIfcmOTUUJzFm5MQXu0wH0Xhk0ZW9Vmnt8zrx8QHoH+w19GIkaxGMpcdGCew wF1/pWEP2guyJ1Qn0+byJt2tTjczrjnWzQAnyOqWQsM5Wm7Qovl/K0JejHiPWpAhjf11 dWnOPh4CceYiscfc1ysA6FW4zQUlkoxWBJu64V5oTqYZw2t06NXB1QXxrnmuXb+uVYRM kYfAVHp3G3fD8pOfqZOKy153Xl6TNxFgjZluOKjpGsYBVCX/yB7rR5KDQNsUuofBvXeq cj3C/686fUyPvbe6RK/U+Z0AJqBH3/5c2VO9j/IAcCwn0igNhi5X02o+tb4+ZU7PNFDi ELFQ== X-Gm-Message-State: APjAAAXnBnToV9zxkeYeAQdUspRPD3qwRJeLkfoDGvM0UHQMHUhs7RxA 5VcmARDfOyeLMfRNEe+r7CsndUzcjjVULpuwR49dsMpjT0pNE7KOXyEun0MKGMC67wvhwcOishb TgzHHoSyX2JIUJkfL96xYKp1g X-Received: by 2002:adf:ed43:: with SMTP id u3mr20961620wro.236.1570957739330; Sun, 13 Oct 2019 02:08:59 -0700 (PDT) X-Google-Smtp-Source: APXvYqzIzwmhjGUXEM93sW2zs2h1TtgmZHS84QZDWIvG2/HpyyINs7Rab5/h4zGKNtRA36lQ1oOFCw== X-Received: by 2002:adf:ed43:: with SMTP id u3mr20961575wro.236.1570957738796; Sun, 13 Oct 2019 02:08:58 -0700 (PDT) Received: from vitty.brq.redhat.com ([95.82.135.110]) by smtp.gmail.com with ESMTPSA id a18sm20772149wrs.27.2019.10.13.02.08.57 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 13 Oct 2019 02:08:58 -0700 (PDT) From: Vitaly Kuznetsov To: Zhenzhong Duan , linux-kernel@vger.kernel.org Cc: linux-hyperv@vger.kernel.org, kvm@vger.kernel.org, kys@microsoft.com, haiyangz@microsoft.com, sthemmin@microsoft.com, sashal@kernel.org, tglx@linutronix.de, mingo@redhat.com, bp@alien8.de, pbonzini@redhat.com, rkrcmar@redhat.com, sean.j.christopherson@intel.com, wanpengli@tencent.com, jmattson@google.com, joro@8bytes.org, boris.ostrovsky@oracle.com, jgross@suse.com, sstabellini@kernel.org, peterz@infradead.org, Zhenzhong Duan , "H. Peter Anvin" Subject: Re: [PATCH v5 1/5] Revert "KVM: X86: Fix setup the virt_spin_lock_key before static key get initialized" In-Reply-To: <1570439071-9814-2-git-send-email-zhenzhong.duan@oracle.com> References: <1570439071-9814-1-git-send-email-zhenzhong.duan@oracle.com> <1570439071-9814-2-git-send-email-zhenzhong.duan@oracle.com> Date: Sun, 13 Oct 2019 11:08:56 +0200 Message-ID: <87imot57x3.fsf@vitty.brq.redhat.com> MIME-Version: 1.0 Content-Type: text/plain Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Zhenzhong Duan writes: > This reverts commit 34226b6b70980a8f81fff3c09a2c889f77edeeff. > > Commit 8990cac6e5ea ("x86/jump_label: Initialize static branching > early") adds jump_label_init() call in setup_arch() to make static > keys initialized early, so we could use the original simpler code > again. > > The similar change for XEN is in commit 090d54bcbc54 ("Revert > "x86/paravirt: Set up the virt_spin_lock_key after static keys get > initialized"") > > Signed-off-by: Zhenzhong Duan > Cc: Paolo Bonzini > Cc: Radim Krcmar > Cc: Sean Christopherson > Cc: Vitaly Kuznetsov > Cc: Wanpeng Li > Cc: Jim Mattson > Cc: Joerg Roedel > Cc: Thomas Gleixner > Cc: Ingo Molnar > Cc: Borislav Petkov > Cc: "H. Peter Anvin" > --- > arch/x86/kernel/kvm.c | 12 +++--------- > 1 file changed, 3 insertions(+), 9 deletions(-) > > diff --git a/arch/x86/kernel/kvm.c b/arch/x86/kernel/kvm.c > index e820568..3bc6a266 100644 > --- a/arch/x86/kernel/kvm.c > +++ b/arch/x86/kernel/kvm.c > @@ -527,13 +527,6 @@ static void kvm_smp_send_call_func_ipi(const struct cpumask *mask) > } > } > > -static void __init kvm_smp_prepare_cpus(unsigned int max_cpus) > -{ > - native_smp_prepare_cpus(max_cpus); > - if (kvm_para_has_hint(KVM_HINTS_REALTIME)) > - static_branch_disable(&virt_spin_lock_key); > -} > - > static void __init kvm_smp_prepare_boot_cpu(void) > { > /* > @@ -633,7 +626,6 @@ static void __init kvm_guest_init(void) > apic_set_eoi_write(kvm_guest_apic_eoi_write); > > #ifdef CONFIG_SMP > - smp_ops.smp_prepare_cpus = kvm_smp_prepare_cpus; > smp_ops.smp_prepare_boot_cpu = kvm_smp_prepare_boot_cpu; > if (kvm_para_has_feature(KVM_FEATURE_PV_SCHED_YIELD) && > !kvm_para_has_hint(KVM_HINTS_REALTIME) && > @@ -835,8 +827,10 @@ void __init kvm_spinlock_init(void) > if (!kvm_para_has_feature(KVM_FEATURE_PV_UNHALT)) > return; > > - if (kvm_para_has_hint(KVM_HINTS_REALTIME)) > + if (kvm_para_has_hint(KVM_HINTS_REALTIME)) { > + static_branch_disable(&virt_spin_lock_key); > return; > + } > > /* Don't use the pvqspinlock code if there is only 1 vCPU. */ > if (num_possible_cpus() == 1) Reviewed-by: Vitaly Kuznetsov -- Vitaly