From patchwork Wed Jun 7 00:44:49 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sean Christopherson X-Patchwork-Id: 104163 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:994d:0:b0:3d9:f83d:47d9 with SMTP id k13csp3767678vqr; Tue, 6 Jun 2023 17:54:13 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ7yQ6MJFkhbpm6l+iFCvZ3RLYUyfFJ18CXiH0C1O+LNPpIBhRcuDmbo7xI7PeEmYFqXEp5q X-Received: by 2002:a17:902:e9d5:b0:1b0:56cf:b89d with SMTP id 21-20020a170902e9d500b001b056cfb89dmr10581572plk.12.1686099252646; Tue, 06 Jun 2023 17:54:12 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1686099252; cv=none; d=google.com; s=arc-20160816; b=a31zNwRs2EoXMj6Wrcss5ptfdb5rOOyxpPLkUgwPX+9+Qu+FXOOM94+WEmmJKCqWhf pLi4LiS/p2WTpI88IIeKF5WUbhRFiCE5yz1xh0BiZsi2NkMf0W60oCVPUAN+BUaj5+Ea GvuGH+humKtwRmmCw36SzISTpSP0N2IFlfIEJJrLvqeDj8bVp6lSb+7qHfwOJyxavGsv ojB8X3Awtv0rafbj1ErWBpgMe/d1SSlZGnZBpUmA64QN+7whjR6dTrc72HxLJZwF6Chn FPV0C8By0JOxQmt5jGb/5uOx6LLuhKau9WH8KVBUohL6BsCglA5803RQwT2dLf5X/OTQ jz1Q== 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:mime-version:date :reply-to:dkim-signature; bh=hMS6TbY8tUGzqJGlK30/5JW8c0xokG6mdD0HyuMym4c=; b=f3xk8fFIA5hTkE4uchaHBg+NVnQABqDxSSz/h1xsdzQUNmRSpeK91EtPOtEcvoXl1n VbmtR4BTrjyNV5/V9pZ+s59xSVvTgBJ9fVYPdavyMiK9a7RLaCCUeQeY5bXzc+FGYcHy XIV2DxkEBGlOtRTJLo5svNKhDm+Sd6la9dyQO7Wi+xrYiX2MvJ1ruHtJNy8W56DLel+6 OnNnzEbpI271TeQI2mzz/dU04VdOvtiSBWFQVYI/vrxvKiWak+IerVBuLRLFZ1eh30ez F8k2AHIRpMTArhX3jjtCx77A9DPyFxDRyBzTe8uc5Q7AXTpTK5GmG3tpdwu1cMOgpqKk UL+A== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@google.com header.s=20221208 header.b=bLXpMocQ; 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 k5-20020a170902ba8500b001aae741abafsi7788057pls.440.2023.06.06.17.54.00; Tue, 06 Jun 2023 17:54:12 -0700 (PDT) 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=20221208 header.b=bLXpMocQ; 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 S240281AbjFGAo6 (ORCPT + 99 others); Tue, 6 Jun 2023 20:44:58 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:48156 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S240084AbjFGAox (ORCPT ); Tue, 6 Jun 2023 20:44:53 -0400 Received: from mail-pf1-x449.google.com (mail-pf1-x449.google.com [IPv6:2607:f8b0:4864:20::449]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 664121998 for ; Tue, 6 Jun 2023 17:44:52 -0700 (PDT) Received: by mail-pf1-x449.google.com with SMTP id d2e1a72fcca58-661fcfbafdaso22611b3a.1 for ; Tue, 06 Jun 2023 17:44:52 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20221208; t=1686098692; x=1688690692; h=cc:to:from:subject:message-id:mime-version:date:reply-to:from:to:cc :subject:date:message-id:reply-to; bh=hMS6TbY8tUGzqJGlK30/5JW8c0xokG6mdD0HyuMym4c=; b=bLXpMocQLVlgyJX48+fNsXuNuM9x0oWnbwgQpxhl2OGtsR0eBHw4IX2VH6y8JNS15x 0UU/0aae9lBH4zkmKaJVAuCIqdW+hnjodM0BmN8R6pAb/81Xtc8euHbPR9HbPjVoBsH8 WGArn1IvSJZdFeUSLZXBJDYeC0u4QeR77eSsTsDkcV8tXs7CV3szzx5mRn55gYLrbbIV qvwDDeu/7Ypd6FuCzo5y4CBGG20wKcNV5ghrOcnGzeM366XQEP/SErkXmlrtloHvLtOj UoeRaSp8dTmZdCZiOjFnO1Kgtuj3TQGmTeF0f8yOuKjZANnqTNEQY2Pj0GIpcIie0wPq W4Nw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1686098692; x=1688690692; h=cc:to:from:subject:message-id:mime-version:date:reply-to :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=hMS6TbY8tUGzqJGlK30/5JW8c0xokG6mdD0HyuMym4c=; b=dis56qG2Acloyz+3q/lSud1O7IM/4EvM8DN3vwIv9ZYR4E6m+B9pzAm4OW2TraDGv5 nbGep3Ei7iwSTSWv5YABrZjKh6SW4UhGZH4xJgQrZ2lMPe/c7CLQwiFj2dXzm9sTRsAQ J5RhH2HlWzkcSpFpBrge1EpmKa9Y8DcBwHQvS/4d2EhCfFbdDsKk74i/Z8mbcdKkUIzx D8fyYkBGyVBFVYmDHAcGFjTIL2/ZGeJh4xdOucs/kde3wG/q25/AEXaJ5knCUsuyNorJ N1KZieVrTvrsfEQ9QfZnvSxbZpZvKKQeYeEVckuueoORGmsc8CFi+UcOhuyDDGvgNEhq ufpw== X-Gm-Message-State: AC+VfDwGvjHci5seWAecKE9PgMCJNzuBdZEx5dJ1SOjSH9Nsfx4DyPPa YX0KipswB0cl+O7JpS9f5lXsTJQp+Mk= X-Received: from zagreus.c.googlers.com ([fda3:e722:ac3:cc00:7f:e700:c0a8:5c37]) (user=seanjc job=sendgmr) by 2002:a05:6a00:cca:b0:63a:ff2a:bf9f with SMTP id b10-20020a056a000cca00b0063aff2abf9fmr1626897pfv.2.1686098691939; Tue, 06 Jun 2023 17:44:51 -0700 (PDT) Reply-To: Sean Christopherson Date: Tue, 6 Jun 2023 17:44:49 -0700 Mime-Version: 1.0 X-Mailer: git-send-email 2.41.0.162.gfafddb0af9-goog Message-ID: <20230607004449.1421131-1-seanjc@google.com> Subject: [PATCH] KVM: SVM: WARN, but continue, if misc_cg_set_capacity() fails From: Sean Christopherson To: Sean Christopherson , Paolo Bonzini Cc: kvm@vger.kernel.org, linux-kernel@vger.kernel.org, Alexander Mikhalitsyn 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,T_SCC_BODY_TEXT_LINE,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?1768003209544874457?= X-GMAIL-MSGID: =?utf-8?q?1768003209544874457?= WARN and continue if misc_cg_set_capacity() fails, as the only scenario in which it can fail is if the specified resource is invalid, which should never happen when CONFIG_KVM_AMD_SEV=y. Deliberately not bailing "fixes" a theoretical bug where KVM would leak the ASID bitmaps on failure, which again can't happen. If the impossible should happen, the end result is effectively the same with respect to SEV and SEV-ES (they are unusable), while continuing on has the advantage of letting KVM load, i.e. userspace can still run non-SEV guests. Reported-by: Alexander Mikhalitsyn Signed-off-by: Sean Christopherson --- arch/x86/kvm/svm/sev.c | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) base-commit: 6d1bc9754b04075d938b47cf7f7800814b8911a7 diff --git a/arch/x86/kvm/svm/sev.c b/arch/x86/kvm/svm/sev.c index d65578d8784d..07756b7348ae 100644 --- a/arch/x86/kvm/svm/sev.c +++ b/arch/x86/kvm/svm/sev.c @@ -2216,9 +2216,7 @@ void __init sev_hardware_setup(void) } sev_asid_count = max_sev_asid - min_sev_asid + 1; - if (misc_cg_set_capacity(MISC_CG_RES_SEV, sev_asid_count)) - goto out; - + WARN_ON_ONCE(misc_cg_set_capacity(MISC_CG_RES_SEV, sev_asid_count)); sev_supported = true; /* SEV-ES support requested? */ @@ -2243,9 +2241,7 @@ void __init sev_hardware_setup(void) goto out; sev_es_asid_count = min_sev_asid - 1; - if (misc_cg_set_capacity(MISC_CG_RES_SEV_ES, sev_es_asid_count)) - goto out; - + WARN_ON_ONCE(misc_cg_set_capacity(MISC_CG_RES_SEV_ES, sev_es_asid_count)); sev_es_supported = true; out: