Received: by 2002:a05:6a10:f3d0:0:0:0:0 with SMTP id a16csp661173pxv; Fri, 9 Jul 2021 06:23:59 -0700 (PDT) X-Google-Smtp-Source: ABdhPJy5AAft1WxdOB7POlM7LuIs3KTwBWWVPD6R2U8Vswk1oueDu1pm50kaZ0v+bKh7Kfz+jlYI X-Received: by 2002:a05:6602:71c:: with SMTP id f28mr14237748iox.161.1625837039350; Fri, 09 Jul 2021 06:23:59 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1625837039; cv=none; d=google.com; s=arc-20160816; b=h6OHRn3ggKi1e/bOfU4lykB2t7yWg4/0fxEv3PSTbqKx6IesLvS9abee5XZhtmpiku rcyaj+ZS6e3b89ML3vbJU/KlHmnv3FGIJfHKylYa+btpk32NJnSAwx9EpFsVSw6q9de4 r/ZGSoA2+DJqSw5p07uUYE8mMLBzNlOXDwvA0RTmRaAPe6aD9fODeWW1niEm+j7vKA0K uBiDG2MK4MkIsXoSQQ5Mw/j7IHC8TwBDapmHdiTTu+U/UotkC3m7ZuYNWocbRRAfiARB cw64jVBNpRtpiZEU4MiefaKDfLCsvms7ZNsgoh9ivj4SC7kacDSDE0LNkJfffJEsR2OS fcEA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=4OVK+d1s/mSywZ494LmUAkUrcFQ2OeIQ0gVd46WIVCk=; b=Ise8+Wjly/kg53qX/bxORWJkJ5e8JlyuRaEbek2BXSugSRrobC+ILxKDbzWh/eMRnH TbcOJayIpA6dUkfY6ds3V2N6ulLsFpQ392Z1ruS2yQIWH0eEx4BQTZ6GXx2taL1dwYSA Yj3B1Gq/bBe10zqc/DYMFrvkzXCLKlwdkDwggmmxaULlR/5lqS1oq987q4M5I/EuRhvr l8JsbqZLgqv8FcD9wwFDAnBwHtyB4pzCiYHF8YhSv1x9acOEjAo1FJwjJ/DhmJXWLge7 xU0W2fab2QD5eEWljFI/KF+7clDlIABmBqWaSlw25SLHxcg9Z8d1QsCNZy4/7jwuTqUx QikQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=jsLIAn2t; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id u12si385363ilg.116.2021.07.09.06.23.47; Fri, 09 Jul 2021 06:23:59 -0700 (PDT) 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; Authentication-Results: mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=jsLIAn2t; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232838AbhGINYz (ORCPT + 99 others); Fri, 9 Jul 2021 09:24:55 -0400 Received: from mail.kernel.org ([198.145.29.99]:56494 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232588AbhGINYn (ORCPT ); Fri, 9 Jul 2021 09:24:43 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id 52D5E611B0; Fri, 9 Jul 2021 13:21:59 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1625836919; bh=oHQ1gm4eQNg1mKCYKYKsR+xSheM7O4CGggSF8u4Jz4c=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=jsLIAn2tiRyh/ASITMjhCy+QgrcaU9USDN1Ox0A/hDJfH6tythiHVzxzq2q78bTx8 cxv79hojGPHYWh192+EGMsfHUPn8X7hmxTA/RSS21jhK1u3GnlnB4ReBrvNHH0ar8R tlRnqhYRC2rFx2ea40l2JZM9AZibTSndwdZRPB/M= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Peter Gonda , Alper Gun , Marc Orr , Paolo Bonzini Subject: [PATCH 4.19 30/34] KVM: SVM: Call SEV Guest Decommission if ASID binding fails Date: Fri, 9 Jul 2021 15:20:46 +0200 Message-Id: <20210709131701.044926822@linuxfoundation.org> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20210709131644.969303901@linuxfoundation.org> References: <20210709131644.969303901@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Alper Gun commit 934002cd660b035b926438244b4294e647507e13 upstream. Send SEV_CMD_DECOMMISSION command to PSP firmware if ASID binding fails. If a failure happens after a successful LAUNCH_START command, a decommission command should be executed. Otherwise, guest context will be unfreed inside the AMD SP. After the firmware will not have memory to allocate more SEV guest context, LAUNCH_START command will begin to fail with SEV_RET_RESOURCE_LIMIT error. The existing code calls decommission inside sev_unbind_asid, but it is not called if a failure happens before guest activation succeeds. If sev_bind_asid fails, decommission is never called. PSP firmware has a limit for the number of guests. If sev_asid_binding fails many times, PSP firmware will not have resources to create another guest context. Cc: stable@vger.kernel.org Fixes: 59414c989220 ("KVM: SVM: Add support for KVM_SEV_LAUNCH_START command") Reported-by: Peter Gonda Signed-off-by: Alper Gun Reviewed-by: Marc Orr Signed-off-by: Paolo Bonzini Message-Id: <20210610174604.2554090-1-alpergun@google.com> Signed-off-by: Greg Kroah-Hartman --- arch/x86/kvm/svm.c | 32 +++++++++++++++++++++----------- 1 file changed, 21 insertions(+), 11 deletions(-) --- a/arch/x86/kvm/svm.c +++ b/arch/x86/kvm/svm.c @@ -1791,9 +1791,25 @@ static void sev_asid_free(struct kvm *kv __sev_asid_free(sev->asid); } -static void sev_unbind_asid(struct kvm *kvm, unsigned int handle) +static void sev_decommission(unsigned int handle) { struct sev_data_decommission *decommission; + + if (!handle) + return; + + decommission = kzalloc(sizeof(*decommission), GFP_KERNEL); + if (!decommission) + return; + + decommission->handle = handle; + sev_guest_decommission(decommission, NULL); + + kfree(decommission); +} + +static void sev_unbind_asid(struct kvm *kvm, unsigned int handle) +{ struct sev_data_deactivate *data; if (!handle) @@ -1811,15 +1827,7 @@ static void sev_unbind_asid(struct kvm * sev_guest_df_flush(NULL); kfree(data); - decommission = kzalloc(sizeof(*decommission), GFP_KERNEL); - if (!decommission) - return; - - /* decommission handle */ - decommission->handle = handle; - sev_guest_decommission(decommission, NULL); - - kfree(decommission); + sev_decommission(handle); } static struct page **sev_pin_memory(struct kvm *kvm, unsigned long uaddr, @@ -6469,8 +6477,10 @@ static int sev_launch_start(struct kvm * /* Bind ASID to this guest */ ret = sev_bind_asid(kvm, start->handle, error); - if (ret) + if (ret) { + sev_decommission(start->handle); goto e_free_session; + } /* return handle to userspace */ params.handle = start->handle;