Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18;
From:   Tom Lendacky <thomas.lendacky@amd.com>
To:     kvm@vger.kernel.org, linux-kernel@vger.kernel.org, x86@kernel.org
Cc:     Paolo Bonzini <pbonzini@redhat.com>,
        Jim Mattson <jmattson@google.com>,
        Joerg Roedel <joro@8bytes.org>,
        Sean Christopherson <sean.j.christopherson@intel.com>,
        Vitaly Kuznetsov <vkuznets@redhat.com>,
        Wanpeng Li <wanpengli@tencent.com>,
        Borislav Petkov <bp@alien8.de>, Ingo Molnar <mingo@redhat.com>,
        Thomas Gleixner <tglx@linutronix.de>,
        Brijesh Singh <brijesh.singh@amd.com>
Subject: [PATCH v3 02/34] KVM: SVM: Remove the call to sev_platform_status() during setup
Date:   Mon,  9 Nov 2020 16:25:28 -0600
Message-Id: <1b420ccfe763099dee756e935ce3909cee11d141.1604960760.git.thomas.lendacky@amd.com>
In-Reply-To: <cover.1604960760.git.thomas.lendacky@amd.com>
References: <cover.1604960760.git.thomas.lendacky@amd.com>
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit
MIME-Version: 1.0
X-MS-Exchange-MessageSentRepresentingType: 1
Received: from tlendack-t1.amd.com (165.204.77.1) by SN1PR12CA0113.namprd12.prod.outlook.com (2603:10b6:802:21::48) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3541.21 via Frontend Transport; Mon, 9 Nov 2020 22:26:30 +0000
X-MS-PublicTrafficType: Email
X-MS-Office365-Filtering-HT: Tenant
X-MS-Office365-Filtering-Correlation-Id: 79f9d326-8876-43ec-8b45-08d884fe822c
X-MS-TrafficTypeDiagnostic: DM6PR12MB4058:
X-MS-Exchange-Transport-Forked: True
X-Microsoft-Antispam-PRVS: <DM6PR12MB405877D53C3553D9B8560666ECEA0@DM6PR12MB4058.namprd12.prod.outlook.com>
X-MS-Oob-TLC-OOBClassifiers: OLM:7691;
X-MS-Exchange-SenderADCheck: 1
X-Microsoft-Antispam: BCL:0;
X-Microsoft-Antispam-Message-Info: ELstBj5BK0wHuefz1jGCejFP8BiythMpU39LKVnidxkWzhpUTen49qRLS9DBSxSrEjKmrPPAOTbSZAiRmsI7xHLsv8PPKNANP9G9SAJw2dfg93eTvRQwu8Dc89QmfioF2M2vmlZOjFiJOR4T5ay0s9f3/vE6FVzqDeBNqMEtO0cGwGj5MiwPDr8o5VA4XyhoHMtZwHPhNqmlX0UPOzdtC5RIvWsnBRmnAHndO2gvguqe96W7fLTbrKs9RSfKUEG0gHxzwPgC8ykW5S4p62qZ28mcqX6R78DVv2NzniZaTywMXCpQ+ACA33dlM850mooYuGk6bobX9nfnOnZ5r7gQOw==
X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:DM5PR12MB1355.namprd12.prod.outlook.com;PTR:;CAT:NONE;SFS:(4636009)(346002)(376002)(396003)(136003)(39860400002)(366004)(2616005)(956004)(8676002)(16526019)(54906003)(316002)(86362001)(4326008)(26005)(8936002)(7416002)(36756003)(5660300002)(52116002)(7696005)(66556008)(66476007)(66946007)(6486002)(478600001)(83380400001)(2906002)(186003);DIR:OUT;SFP:1101;
X-MS-Exchange-AntiSpam-MessageData: ISmsFScE87uw/NN1Yx51eMGCmtRMoKYNmgjOC2e72KB5KPTAwVedbiKklleBvAHFmg1j8vWqdqZqb/wR/9eWNFobOQVks4N6mGrOEzuKPjXR2RHPm6v9Z5JQGFbmSINnM1L/VIKTAam76P3YdwnOcFHSuEfq1rpFtTkES4Q0hgBJ+sPrGbRgRQZmlOSnaS6/seRxHKX+ZoUPafbODcQgJRiwTl+tHkJgRnLeeSMyz7ZxkZIyrBngF35Tt2btuCjtjRLo6Ng17ao+x1rR0yglU59ecD19w12MZGLdEgvYJBK/CKPzmZ2jhdIuJLwOWQwX673RIArsNCh7vNZvBbx/6ghTaa/OC3icpSGXOOCOA/nl9RlqV+op09avlm+Rss5OLct/fmsoWIa5wshGwT3zjV+FSTPGjOO6FNh30pDKkY0R7zpg+9WgxnKBEvBz6B8VUTuhZlXYYYFUgStp3gDs+S5VHamIatFA/AyRr4e5kIgVk8Y+pbXCKQsekFrrtDHoAK89ATGFqV51EZIIEtWyBqY6gWMOBEzDXtVMrI01EP6gKe3O1utQL0WfdJ/lmt495F002L0cTUJ36WL/Bhnny1Q1+pN15c264FoEEYYiNM51SChK1C2liyaoujAJ+cxXK5iqHRfc5lBZFwC7HKcBQw==
X-OriginatorOrg: amd.com
X-MS-Exchange-CrossTenant-Network-Message-Id: 79f9d326-8876-43ec-8b45-08d884fe822c
X-MS-Exchange-CrossTenant-AuthSource: DM5PR12MB1355.namprd12.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 09 Nov 2020 22:26:31.5551
 (UTC)
X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted
X-MS-Exchange-CrossTenant-Id: 3dd8961f-e488-4e60-8e11-a82d994e183d
X-MS-Exchange-CrossTenant-MailboxType: HOSTED
X-MS-Exchange-CrossTenant-UserPrincipalName: gUl1WVMFXVQA05kNmershwvqfLpFaxejLUSrpv5uhKE7KJzo8NawicDpcRdbuCaOJF2wFEM0DCGrWY7cGJhuUg==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM6PR12MB4058
Precedence: bulk
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

From: Tom Lendacky <thomas.lendacky@amd.com>

When both KVM support and the CCP driver are built into the kernel instead
of as modules, KVM initialization can happen before CCP initialization. As
a result, sev_platform_status() will return a failure when it is called
from sev_hardware_setup(), when this isn't really an error condition.

Since sev_platform_status() doesn't need to be called at this time anyway,
remove the invocation from sev_hardware_setup().

Signed-off-by: Tom Lendacky <thomas.lendacky@amd.com>
---
 arch/x86/kvm/svm/sev.c | 22 +---------------------
 1 file changed, 1 insertion(+), 21 deletions(-)

diff --git a/arch/x86/kvm/svm/sev.c b/arch/x86/kvm/svm/sev.c
index c0b14106258a..a4ba5476bf42 100644
--- a/arch/x86/kvm/svm/sev.c
+++ b/arch/x86/kvm/svm/sev.c
@@ -1127,9 +1127,6 @@ void sev_vm_destroy(struct kvm *kvm)
 
 int __init sev_hardware_setup(void)
 {
-	struct sev_user_data_status *status;
-	int rc;
-
 	/* Maximum number of encrypted guests supported simultaneously */
 	max_sev_asid = cpuid_ecx(0x8000001F);
 
@@ -1148,26 +1145,9 @@ int __init sev_hardware_setup(void)
 	if (!sev_reclaim_asid_bitmap)
 		return 1;
 
-	status = kmalloc(sizeof(*status), GFP_KERNEL);
-	if (!status)
-		return 1;
-
-	/*
-	 * Check SEV platform status.
-	 *
-	 * PLATFORM_STATUS can be called in any state, if we failed to query
-	 * the PLATFORM status then either PSP firmware does not support SEV
-	 * feature or SEV firmware is dead.
-	 */
-	rc = sev_platform_status(status, NULL);
-	if (rc)
-		goto err;
-
 	pr_info("SEV supported\n");
 
-err:
-	kfree(status);
-	return rc;
+	return 0;
 }
 
 void sev_hardware_teardown(void)
-- 
2.28.0