From nobody Wed Dec 17 11:54:51 2025 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 65E6AC7EE26 for ; Mon, 22 May 2023 16:13:29 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229812AbjEVQN1 (ORCPT ); Mon, 22 May 2023 12:13:27 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:57646 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229806AbjEVQNY (ORCPT ); Mon, 22 May 2023 12:13:24 -0400 Received: from smtp-relay-internal-0.canonical.com (smtp-relay-internal-0.canonical.com [185.125.188.122]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 6D5EDB6 for ; Mon, 22 May 2023 09:13:23 -0700 (PDT) Received: from mail-ej1-f70.google.com (mail-ej1-f70.google.com [209.85.218.70]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by smtp-relay-internal-0.canonical.com (Postfix) with ESMTPS id 5F91A3F51D for ; Mon, 22 May 2023 16:13:20 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canonical.com; s=20210705; t=1684772000; bh=4rb90djqBbs5XuYtW3R9I7+5RrdmbXXkWM9Wptt0JPo=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version:Content-Type; b=kGbV8pY6g9wUtSipAX/32hBadyjG1AiedXvrjmwkF3oO7/uSu9R4x+mffgGu0Ui+7 r4iZZnCECP/IBrKFNAu9oPnDH0oZvaHTGxImB9tWQilrZ3IniZ7Bh0xyGXAZYz2DFi 0vTguQO80p9zoRpd+wQdEt1OG/nGEucPQ+B7PvnUNkMPoMYQUSgkBJJuRnEczwxeCY AxG4b2XI88C0L9xdLUziA3HWQ7eQioj9OOnw0gHxKCA2Zbb5oluBBRODkhoNPXoXGR L0GZUrexZSCDyDZkG4C3xwJrrZWzUBvuxhA7Du+lwmf3P4q2mAoOm4Q+b7tLtaklsP SJ8abN8cAAi6A== Received: by mail-ej1-f70.google.com with SMTP id a640c23a62f3a-94a341efd9aso791802866b.0 for ; Mon, 22 May 2023 09:13:20 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1684771998; x=1687363998; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=4rb90djqBbs5XuYtW3R9I7+5RrdmbXXkWM9Wptt0JPo=; b=lN0V9pl3V4j9lAilBBaSUcifKY1UJmzjpxp7GbDWBjVE19NmmJmQtiuKsVlNRhV+TB SMZ1mZgAWDZaUFyV+bSXnE4sAknXkHFEvB7ajhMHahAB6PXNS9WUYSjphuZVWs9R2Jc6 83WFGXImEYefYYfkZXnYQYxMFkfzuxRpKtY9X0LPhuyQTrJSZB2dW6PLidSWXRqBRZJl SFGqTrPhg+ohs6ZWZv8VyWP7Hofvxnq+mnBlX59FGLdcaFZ2mjyu6WznegZlwqhZvePr HeHMDlhltch0GsdF47ycOkTDpahyOWZEfPYyWg6hvWXRjs4gmXq65Ya20Ec9qhTq+a6z CTXA== X-Gm-Message-State: AC+VfDyNZqoZNLyfRXfGgJkgWRF+zSr2yXoH4wIZwOTxdIXLAIl1lP5b 12bd3RRO2JQ4rYz12JuGDrV94PZWcEK4TcWjmjJIgK9kh06a9QHqxf1lzc8KQA/AHNknr3C63/g UuNT4vpWz8tJfRIb1Zn61ttwV3WUUXNuDNFYB8X48gQ== X-Received: by 2002:a17:907:e8c:b0:965:ff38:2fbb with SMTP id ho12-20020a1709070e8c00b00965ff382fbbmr11057660ejc.1.1684771998138; Mon, 22 May 2023 09:13:18 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ6sFu9ZDMMoJ+qT7dryKzCzvkxh7vw6VbgF+1fgPmovvfOkC6jSGHbWPbUIqDC9vc4/EtEUfg== X-Received: by 2002:a17:907:e8c:b0:965:ff38:2fbb with SMTP id ho12-20020a1709070e8c00b00965ff382fbbmr11057638ejc.1.1684771997945; Mon, 22 May 2023 09:13:17 -0700 (PDT) Received: from amikhalitsyn.local (dslb-088-074-206-207.088.074.pools.vodafone-ip.de. [88.74.206.207]) by smtp.gmail.com with ESMTPSA id a7-20020a17090682c700b009658475919csm3225039ejy.188.2023.05.22.09.13.16 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 22 May 2023 09:13:17 -0700 (PDT) From: Alexander Mikhalitsyn To: pbonzini@redhat.com Cc: Alexander Mikhalitsyn , Sean Christopherson , =?UTF-8?q?St=C3=A9phane=20Graber?= , kvm@vger.kernel.org, linux-kernel@vger.kernel.org, Thomas Gleixner , Ingo Molnar , Borislav Petkov , Dave Hansen , x86@kernel.org, "H. Peter Anvin" Subject: [PATCH v2 1/2] KVM: SVM: free sev_*asid_bitmap init if SEV init fails Date: Mon, 22 May 2023 18:12:47 +0200 Message-Id: <20230522161249.800829-2-aleksandr.mikhalitsyn@canonical.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230522161249.800829-1-aleksandr.mikhalitsyn@canonical.com> References: <20230522161249.800829-1-aleksandr.mikhalitsyn@canonical.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org If misc_cg_set_capacity() fails for some reason then we have a memleak for sev_reclaim_asid_bitmap/sev_asid_bitmap. It's not a case right now, because misc_cg_set_capacity() just can't fail and check inside it is always successful. But let's fix that for code consistency. Cc: Sean Christopherson Cc: Paolo Bonzini Cc: St=C3=A9phane Graber Cc: kvm@vger.kernel.org Cc: linux-kernel@vger.kernel.org Signed-off-by: Alexander Mikhalitsyn Reported-by: Alexander Mikhalitsyn --- arch/x86/kvm/svm/sev.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/arch/x86/kvm/svm/sev.c b/arch/x86/kvm/svm/sev.c index 69ae5e1b3120..cc832a8d1bca 100644 --- a/arch/x86/kvm/svm/sev.c +++ b/arch/x86/kvm/svm/sev.c @@ -2216,8 +2216,13 @@ void __init sev_hardware_setup(void) } =20 sev_asid_count =3D max_sev_asid - min_sev_asid + 1; - if (misc_cg_set_capacity(MISC_CG_RES_SEV, sev_asid_count)) + if (misc_cg_set_capacity(MISC_CG_RES_SEV, sev_asid_count)) { + bitmap_free(sev_reclaim_asid_bitmap); + sev_reclaim_asid_bitmap =3D NULL; + bitmap_free(sev_asid_bitmap); + sev_asid_bitmap =3D NULL; goto out; + } =20 pr_info("SEV supported: %u ASIDs\n", sev_asid_count); sev_supported =3D true; --=20 2.34.1 From nobody Wed Dec 17 11:54:51 2025 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id D6CB6C7EE23 for ; Mon, 22 May 2023 16:13:36 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229806AbjEVQNf (ORCPT ); Mon, 22 May 2023 12:13:35 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:57672 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233062AbjEVQN1 (ORCPT ); Mon, 22 May 2023 12:13:27 -0400 Received: from smtp-relay-internal-1.canonical.com (smtp-relay-internal-1.canonical.com [185.125.188.123]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id BB196E9 for ; Mon, 22 May 2023 09:13:26 -0700 (PDT) Received: from mail-ed1-f69.google.com (mail-ed1-f69.google.com [209.85.208.69]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by smtp-relay-internal-1.canonical.com (Postfix) with ESMTPS id 61EFC41B53 for ; Mon, 22 May 2023 16:13:23 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canonical.com; s=20210705; t=1684772003; bh=yEoXhOv9392G4YyVtPika8TuddyFutw1yuUvDKTMDXc=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version:Content-Type; b=TP0Ncy9/9VU/db5w+O0Yol+Hl0ShJCAJoBPlyVJZ+Tfjuf92uGL9uksa0qqDnNxrM cqGWToN3b82t4+SXWtwBF4myIioUGlU/fRynAZnDRNem6J2M8GqZe8c8/Tb4fR87WV 9w5QqJEwFoqPCfdXbSnodzlAWJrQQESovwzULCpY4oU0NnSW0RFecvmIJ0ko2UM1bW VV9DxmqOQHWJVFUY83CIeisBgFMNiQ2MVSwJ2mlfTFYG+SOdmjT0Gp+uasOBoUBU15 Rc9a/gqpAXWyy6kj4dSWg4zluXNbaYGcTwvFMzp0BPXflL8ym3wvpyGL4Fl4uPNGMX UHD/q0BHUOhMQ== Received: by mail-ed1-f69.google.com with SMTP id 4fb4d7f45d1cf-512937f82b2so2416650a12.2 for ; Mon, 22 May 2023 09:13:23 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1684772001; x=1687364001; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=yEoXhOv9392G4YyVtPika8TuddyFutw1yuUvDKTMDXc=; b=PmOcmeFlt6qZA7kpc5gNbTRgWjNbgXxk2D0P/u7QkrQB3kgtUFr3iUqNuvuVZYEndn VkbLyKmJNY3de41Z4lQPdxm5XM6EsvcWEUtJX435sItTpLqCbtk9WKXpLT2YcHKFYI1N G240xu9CMOXrZOUt2fKDTB2MB0tGCI6ItFINZ/WhRdXSJ44qb7r4fLgxqaWh3eVj3WYW X9e2sb7A7W0aZ+BLRxFyUjfa3MZr78se17lgVOLcVFoQ2C9xsBdMh4l/8sCPqTv1kCAz cyAr+pn1czmwOQm9dNCE9M6F47QBBFl3lggnHEMXcQNm042OFUdKf9NwKGge88Ay2ktX jFYw== X-Gm-Message-State: AC+VfDwMqH7ajPGjlBF7QdnPdewVHvISl/eHQR2LJKXkuGf/gRbKDj94 YinJ3UBFZyaP4w2JtuHsYNGkJQJpcRm9F8XA1vf1n+Wat2f3EcW0twuaePW2vTlTkDiCNlLeK0n M6SyCnBqoDTpwaTIxF4fS/Xhz4l7mbJlHzHIs7jhB1g== X-Received: by 2002:a17:906:58c7:b0:96b:e93:3a9f with SMTP id e7-20020a17090658c700b0096b0e933a9fmr11141503ejs.20.1684772001416; Mon, 22 May 2023 09:13:21 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ6dUWTXh+XjI7wSktkwgjubPt+RAL8UbOeWuwZfD0kG6B2OVu9hYOQ/teuL04KXyyfGDkSquQ== X-Received: by 2002:a17:906:58c7:b0:96b:e93:3a9f with SMTP id e7-20020a17090658c700b0096b0e933a9fmr11141482ejs.20.1684772001173; Mon, 22 May 2023 09:13:21 -0700 (PDT) Received: from amikhalitsyn.local (dslb-088-074-206-207.088.074.pools.vodafone-ip.de. [88.74.206.207]) by smtp.gmail.com with ESMTPSA id a7-20020a17090682c700b009658475919csm3225039ejy.188.2023.05.22.09.13.19 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 22 May 2023 09:13:20 -0700 (PDT) From: Alexander Mikhalitsyn To: pbonzini@redhat.com Cc: Alexander Mikhalitsyn , Sean Christopherson , =?UTF-8?q?St=C3=A9phane=20Graber?= , kvm@vger.kernel.org, linux-kernel@vger.kernel.org, Thomas Gleixner , Ingo Molnar , Borislav Petkov , Dave Hansen , x86@kernel.org, "H. Peter Anvin" Subject: [PATCH v2 2/2] KVM: SVM: enhance info printk's in SEV init Date: Mon, 22 May 2023 18:12:48 +0200 Message-Id: <20230522161249.800829-3-aleksandr.mikhalitsyn@canonical.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230522161249.800829-1-aleksandr.mikhalitsyn@canonical.com> References: <20230522161249.800829-1-aleksandr.mikhalitsyn@canonical.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Let's print available ASID ranges for SEV/SEV-ES guests. This information can be useful for system administrator to debug if SEV/SEV-ES fails to enable. There are a few reasons. SEV: - NPT is disabled (module parameter) - CPU lacks some features (sev, decodeassists) - Maximum SEV ASID is 0 SEV-ES: - mmio_caching is disabled (module parameter) - CPU lacks sev_es feature - Minimum SEV ASID value is 1 (can be adjusted in BIOS/UEFI) Cc: Sean Christopherson Cc: Paolo Bonzini Cc: St=C3=A9phane Graber Cc: kvm@vger.kernel.org Cc: linux-kernel@vger.kernel.org Suggested-by: Sean Christopherson Signed-off-by: Alexander Mikhalitsyn --- v2: - print only the ASID ranges according to Sean's suggestion --- arch/x86/kvm/svm/sev.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/arch/x86/kvm/svm/sev.c b/arch/x86/kvm/svm/sev.c index cc832a8d1bca..fff63d1f2a34 100644 --- a/arch/x86/kvm/svm/sev.c +++ b/arch/x86/kvm/svm/sev.c @@ -2224,7 +2224,6 @@ void __init sev_hardware_setup(void) goto out; } =20 - pr_info("SEV supported: %u ASIDs\n", sev_asid_count); sev_supported =3D true; =20 /* SEV-ES support requested? */ @@ -2252,10 +2251,16 @@ void __init sev_hardware_setup(void) if (misc_cg_set_capacity(MISC_CG_RES_SEV_ES, sev_es_asid_count)) goto out; =20 - pr_info("SEV-ES supported: %u ASIDs\n", sev_es_asid_count); sev_es_supported =3D true; =20 out: + if (boot_cpu_has(X86_FEATURE_SEV)) + pr_info("SEV %s (ASIDs %u - %u)\n", + sev_supported ? "enabled" : "disabled", min_sev_asid, max_sev_asid); + if (boot_cpu_has(X86_FEATURE_SEV_ES)) + pr_info("SEV-ES %s (ASIDs %u - %u)\n", + sev_es_supported ? "enabled" : "disabled", 1, min_sev_asid - 1); + sev_enabled =3D sev_supported; sev_es_enabled =3D sev_es_supported; #endif --=20 2.34.1