From patchwork Fri Mar 10 21:42:27 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sean Christopherson X-Patchwork-Id: 67766 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:5915:0:0:0:0:0 with SMTP id v21csp1122338wrd; Fri, 10 Mar 2023 14:08:36 -0800 (PST) X-Google-Smtp-Source: AK7set9R5dv8vENtF1aI0wplBdcHvLmvN8lk3cdOK+0appwSLjJpJ3VQn8WYfdC0X11wEeDSOLTR X-Received: by 2002:a05:6a21:6da0:b0:c0:defb:d27f with SMTP id wl32-20020a056a216da000b000c0defbd27fmr3450007pzb.6.1678486116551; Fri, 10 Mar 2023 14:08:36 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1678486116; cv=none; d=google.com; s=arc-20160816; b=FPcOJguVMOAfmIoqQ8SUJvxJsSm1yi32dCD2AnX1sCvr5LV/xRO1jwTsToldF1ZV19 sjaS9mZXH2/7gzeZrKzIzZpvyHFLN1eBz86XAt7o6smnXG2fp7e8U0ev5saUi07T2PwP qYNzHRYMC9ZmQCrMbD7TnLe79iZqK6Oq6+j4khpEYOCtDpFem6oNeHdT0O40LitMpQDn RfOxKwmZLZSILfV8drQhogp+GoGaiuTzeHEVTwALZFhqSxR73wTJAcs0FGWCMtcV06mm tmQrw/HxZLnLRhpGCnjCpzEDu75F6gylCrO2ni953bVRWx3egovcsJMzz7nSTjZqdX+k wE7g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:cc:to:from:subject:message-id:references :mime-version:in-reply-to:date:reply-to:dkim-signature; bh=rC7W/TqT22prVrI7aB30rmCsROsWsHiXQzcC62nOUVE=; b=niTWW9HtjoieEcORlu7+bZxb0aEe6dOywyLiW75ZyeOXkv5zwxanaVnjLHCrI6z67Y QBEq9tc3wGOrvBC2t02Sq+wMEW74QrkLtraBcB5F/DR1lxOY36MNFXLxceQW4ecyda7M rWOxScsEWTSF0on1KK/4W2tJgtKNqvKJNXfFDLAxmg3p8ublYe9cQ8y5UnmjLWMTC2j6 wW6jO6mROBAUuw4/0TaHC7jww/+xNxk1Uz1XIwSnkH03Hyh0LH4+M2L0HK3/bWOgBFBF awQVAUWBrnwxlstoq7EXiRju8O8lkJ6yDR4SglhXgj21gVsI2DHrAzz1Ff9Yd29m31Ep s+lw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@google.com header.s=20210112 header.b=iECHnkG4; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=google.com Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id f16-20020a63f110000000b004fc27d3a2f1si704058pgi.797.2023.03.10.14.08.21; Fri, 10 Mar 2023 14:08:36 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@google.com header.s=20210112 header.b=iECHnkG4; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=google.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231219AbjCJVoc (ORCPT + 99 others); Fri, 10 Mar 2023 16:44:32 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:59152 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232008AbjCJVnw (ORCPT ); Fri, 10 Mar 2023 16:43:52 -0500 Received: from mail-pj1-x1049.google.com (mail-pj1-x1049.google.com [IPv6:2607:f8b0:4864:20::1049]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id C7B45460AD for ; Fri, 10 Mar 2023 13:43:12 -0800 (PST) Received: by mail-pj1-x1049.google.com with SMTP id l10-20020a17090a598a00b0023b28afea55so360308pji.0 for ; Fri, 10 Mar 2023 13:43:12 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20210112; t=1678484582; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:reply-to:from:to:cc:subject:date:message-id:reply-to; bh=rC7W/TqT22prVrI7aB30rmCsROsWsHiXQzcC62nOUVE=; b=iECHnkG467xDPY1Eiyle7PL8wxFL51+1TZWXikdwu7gxUwWYDClHEPwSxUkrC7y1tw JsHpy7ESprLNxI1z6el5lumWkookOk26kZFLngxJOpaoXmYFvIUxmO2Z3YMTSTMqIQeX mor/+/cf7/r9Ji4q/wqCG2D6rgx2ygg/NGxGn8p+oLZu6E/OQoFCYoLc8DF+RsFDIizT 7SxysKD8Pm2rYQPzLc+XO2OPfqtbAnh+e1RapTgRfkDj0w9c4Akii85ZVOc45tG/Dtyf 7HlzdUFeWE6mVhVKR+epAv0h0Jd8KoihYHJAQ0DRhTYD2jz8Zsh3eE7UZxFE6t6qr3W6 0whQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1678484582; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:reply-to:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=rC7W/TqT22prVrI7aB30rmCsROsWsHiXQzcC62nOUVE=; b=JJk/VX2YyLj7rYsxiVbeG2rvR37YHJ6oTUCAB7VH35D6v8kRGbg6nIhR0/9aJwKgN1 ll2k4l3xOfMfkiL31HnVmJObJVIjDiNR3UuIxS47Y7b82SwaxImcnGWxJ2Vmug5QXVlR ncyFD0H6R/hK5ZWfHW74K90WL2qYhWQXlI1hzSaDcgmG+VmsnPGSgaVcWI62cVuJzqYy C7SJ/r5P69z44vxmsVyTK9FBMqqV8e2hJtwES/YIaCYKurDkhuSAEqjooxTcSzhBNcz0 8KXOAtb0fTgh2zVDcv+TvdbiCH0y2F7bVrPwTzIDx+FK84INXNNfnlTSr3G8+tPp9t+0 UuxA== X-Gm-Message-State: AO0yUKVXWWCtTd6ojq9UP1aH3Oj/Fq0g04iQIJiVVlyAhHlhb3gaO/VL UhPfVVfJLFRzM970hzEEm6AlP6alIbI= X-Received: from zagreus.c.googlers.com ([fda3:e722:ac3:cc00:7f:e700:c0a8:5c37]) (user=seanjc job=sendgmr) by 2002:a17:902:efce:b0:19b:5233:51d8 with SMTP id ja14-20020a170902efce00b0019b523351d8mr10727175plb.13.1678484582474; Fri, 10 Mar 2023 13:43:02 -0800 (PST) Reply-To: Sean Christopherson Date: Fri, 10 Mar 2023 13:42:27 -0800 In-Reply-To: <20230310214232.806108-1-seanjc@google.com> Mime-Version: 1.0 References: <20230310214232.806108-1-seanjc@google.com> X-Mailer: git-send-email 2.40.0.rc1.284.g88254d51c5-goog Message-ID: <20230310214232.806108-14-seanjc@google.com> Subject: [PATCH v2 13/18] x86/virt: KVM: Open code cpu_has_svm() into kvm_is_svm_supported() From: Sean Christopherson To: Thomas Gleixner , Ingo Molnar , Borislav Petkov , Dave Hansen , x86@kernel.org, Sean Christopherson , Paolo Bonzini Cc: linux-kernel@vger.kernel.org, kvm@vger.kernel.org, Andrew Cooper , Kai Huang , Chao Gao X-Spam-Status: No, score=-9.6 required=5.0 tests=BAYES_00,DKIMWL_WL_MED, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_NONE, SPF_HELO_NONE,SPF_PASS,USER_IN_DEF_DKIM_WL autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1760020258250042075?= X-GMAIL-MSGID: =?utf-8?q?1760020258250042075?= Fold the guts of cpu_has_svm() into kvm_is_svm_supported(), its sole remaining user. No functional change intended. Signed-off-by: Sean Christopherson --- arch/x86/include/asm/virtext.h | 28 ---------------------------- arch/x86/kvm/svm/svm.c | 11 ++++++++--- 2 files changed, 8 insertions(+), 31 deletions(-) diff --git a/arch/x86/include/asm/virtext.h b/arch/x86/include/asm/virtext.h index be50c414efe4..632575e257d8 100644 --- a/arch/x86/include/asm/virtext.h +++ b/arch/x86/include/asm/virtext.h @@ -22,35 +22,7 @@ /* * SVM functions: */ - -/** Check if the CPU has SVM support - * - * You can use the 'msg' arg to get a message describing the problem, - * if the function returns zero. Simply pass NULL if you are not interested - * on the messages; gcc should take care of not generating code for - * the messages on this case. - */ -static inline int cpu_has_svm(const char **msg) -{ - if (boot_cpu_data.x86_vendor != X86_VENDOR_AMD && - boot_cpu_data.x86_vendor != X86_VENDOR_HYGON) { - if (msg) - *msg = "not amd or hygon"; - return 0; - } - - if (!boot_cpu_has(X86_FEATURE_SVM)) { - if (msg) - *msg = "svm not available"; - return 0; - } - return 1; -} - - /** Disable SVM on the current CPU - * - * You should call this only if cpu_has_svm() returned true. */ static inline void cpu_svm_disable(void) { diff --git a/arch/x86/kvm/svm/svm.c b/arch/x86/kvm/svm/svm.c index 541dd978a94b..2934f185960d 100644 --- a/arch/x86/kvm/svm/svm.c +++ b/arch/x86/kvm/svm/svm.c @@ -523,11 +523,16 @@ static void svm_init_osvw(struct kvm_vcpu *vcpu) static bool kvm_is_svm_supported(void) { int cpu = raw_smp_processor_id(); - const char *msg; u64 vm_cr; - if (!cpu_has_svm(&msg)) { - pr_err("SVM not supported by CPU %d, %s\n", cpu, msg); + if (boot_cpu_data.x86_vendor != X86_VENDOR_AMD && + boot_cpu_data.x86_vendor != X86_VENDOR_HYGON) { + pr_err("CPU %d isn't AMD or Hygon\n", cpu); + return false; + } + + if (!boot_cpu_has(X86_FEATURE_SVM)) { + pr_err("SVM not supported by CPU %d\n", cpu); return false; }