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=-26.3 required=3.0 tests=BAYES_00,DKIMWL_WL_MED, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_CR_TRAILER,INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS, USER_AGENT_GIT,USER_IN_DEF_DKIM_WL 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 90B34C43460 for ; Thu, 22 Apr 2021 02:11:38 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 61EA5613C3 for ; Thu, 22 Apr 2021 02:11:38 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234165AbhDVCML (ORCPT ); Wed, 21 Apr 2021 22:12:11 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:42920 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233989AbhDVCMJ (ORCPT ); Wed, 21 Apr 2021 22:12:09 -0400 Received: from mail-yb1-xb4a.google.com (mail-yb1-xb4a.google.com [IPv6:2607:f8b0:4864:20::b4a]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id B0DBBC06138B for ; Wed, 21 Apr 2021 19:11:33 -0700 (PDT) Received: by mail-yb1-xb4a.google.com with SMTP id c1-20020a5b0bc10000b02904e7c6399b20so18226595ybr.12 for ; Wed, 21 Apr 2021 19:11:33 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20161025; h=reply-to:date:in-reply-to:message-id:mime-version:references :subject:from:to:cc; bh=8s0SzW+l4+6E9FQkwta1CXoWCr5k2rhkG3YB86R5vGE=; b=IUFr8Ehv63gVs8gd2PTxTfVtoYJynmAwaRBpO0kkEzY6jD1vvWafZxEu2vY0QGWooS F+WJevqvw5evQnOgKlzmHMXL/W6wcKb0iB7CXpIEjDwqdr3AKjmoT/mw9MEX0hFLHzoO gdXAL6HAnU94i0nUW0Zc8hn+psMX5XJTsmCfiLNM7ZcpziQJckPI++f3VX2an/IoLNhN QtFymOYkFRVuguzd2eJy2MCb1PvcYSf9hC7iuekDiBX1Ib9uops0Vu63mIb7m9udrNNr Yzsu5hXegUFAva10ZkmRbTYQ5l60RciHsmYXs8zuGqCgHHwCva3uHFGvVGZv53OTE3to eYDA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:reply-to:date:in-reply-to:message-id :mime-version:references:subject:from:to:cc; bh=8s0SzW+l4+6E9FQkwta1CXoWCr5k2rhkG3YB86R5vGE=; b=aO2a3P/NEKqJEqBBLrC8Ef5QhsFa1aF+9g5tipWOvLA46JUo5jOetT57HRPk2DhBAF ZOFP+1+lKVZ+FUce6t5ZO01WT3wx037uhISTRLUuuh/P19Av4MYSyYm7GptMEzun2TKV kb1viPcFM9qJsd6n77z+VykB+rx4pXfttb0134vDaeQ1ds6iGgu61P33+0O3aFQmxAVf PocV3iabthMD2ag1LU7tqftRgCCcLwQmrXU07sC+PCAmWhSjnx8O6uUmAI5+FFZyGokn Zmdkd/pfGipz0m7sQkQrUDkqTAWc8xtNo2X90Vz+24aGbuM4sb0YvDycd0buPEdGMhFp wuhA== X-Gm-Message-State: AOAM533DQniKlNgnDI8U/H15WpStdHgpKu8qmuHXRXrFf0YSIPe+bmcU lxSuuAwHCDimdhjnB5pvoQd61TUv7a0= X-Google-Smtp-Source: ABdhPJzwHVJWWNDZJHDzs4jU5ocsCu8TZvEQiZm0Q3IKhnmau9VhTIcLindMSL/WbKeNGrazpmgd3spmeog= X-Received: from seanjc798194.pdx.corp.google.com ([2620:15c:f:10:e012:374c:592:6194]) (user=seanjc job=sendgmr) by 2002:a25:14d4:: with SMTP id 203mr1322961ybu.261.1619057492934; Wed, 21 Apr 2021 19:11:32 -0700 (PDT) Reply-To: Sean Christopherson Date: Wed, 21 Apr 2021 19:11:12 -0700 In-Reply-To: <20210422021125.3417167-1-seanjc@google.com> Message-Id: <20210422021125.3417167-3-seanjc@google.com> Mime-Version: 1.0 References: <20210422021125.3417167-1-seanjc@google.com> X-Mailer: git-send-email 2.31.1.498.g6c1eba8ee3d-goog Subject: [PATCH v5 02/15] KVM: SVM: Free sev_asid_bitmap during init if SEV setup fails From: Sean Christopherson To: Paolo Bonzini , Dave Hansen , Andy Lutomirski , Peter Zijlstra Cc: Sean Christopherson , Vitaly Kuznetsov , Wanpeng Li , Jim Mattson , Joerg Roedel , kvm@vger.kernel.org, linux-kernel@vger.kernel.org, Borislav Petkov , Tom Lendacky , Brijesh Singh Content-Type: text/plain; charset="UTF-8" Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Free sev_asid_bitmap if the reclaim bitmap allocation fails, othwerise KVM will unnecessarily keep the bitmap when SEV is not fully enabled. Freeing the page is also necessary to avoid introducing a bug when a future patch eliminates svm_sev_enabled() in favor of using the global 'sev' flag directly. While sev_hardware_enabled() checks max_sev_asid, which is true even if KVM setup fails, 'sev' will be true if and only if KVM setup fully succeeds. Fixes: 33af3a7ef9e6 ("KVM: SVM: Reduce WBINVD/DF_FLUSH invocations") Cc: Tom Lendacky Signed-off-by: Sean Christopherson --- arch/x86/kvm/svm/sev.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/arch/x86/kvm/svm/sev.c b/arch/x86/kvm/svm/sev.c index b4e471b0a231..5ff8a202cc01 100644 --- a/arch/x86/kvm/svm/sev.c +++ b/arch/x86/kvm/svm/sev.c @@ -1788,8 +1788,11 @@ void __init sev_hardware_setup(void) goto out; sev_reclaim_asid_bitmap = bitmap_zalloc(max_sev_asid, GFP_KERNEL); - if (!sev_reclaim_asid_bitmap) + if (!sev_reclaim_asid_bitmap) { + bitmap_free(sev_asid_bitmap); + sev_asid_bitmap = NULL; goto out; + } pr_info("SEV supported: %u ASIDs\n", max_sev_asid - min_sev_asid + 1); sev_supported = true; -- 2.31.1.498.g6c1eba8ee3d-goog