From nobody Mon Apr 6 09:43:47 2026 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 9C9D1C6FA82 for ; Thu, 8 Sep 2022 23:26:49 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230187AbiIHX0r (ORCPT ); Thu, 8 Sep 2022 19:26:47 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:43958 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230089AbiIHX0U (ORCPT ); Thu, 8 Sep 2022 19:26:20 -0400 Received: from mga03.intel.com (mga03.intel.com [134.134.136.65]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 65635E7FA3; Thu, 8 Sep 2022 16:26:09 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1662679569; x=1694215569; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=61DGXVR3NwOa0FQhJYw9VD35jgPmusPgu+hMaBxRsLA=; b=TzY+onBAXD1/ZwOf5jOtTpEWRYzUkxfzTrqsgi2GDVFpm6EFEWUH2iR1 HkdQiQLlZVa+vOCBdhvntlE8XHD7/q72KkaA7DwKuEVU+uyZljSjs2uOj NZh00u9aq5FQ+iPX8shNBPUOW0Ww9mSP9GWzpGgeEryJeLWRgR2cyUqC1 vEmUmylPGH0OhDTuvcAc4cPSTCzMxcbjx6JhDlyqLYG2LF4FaKiEpRF7t 15648UiwFDgf2OayPKVvj0o2ThSL8sFVgosquGRRt3sZkeB/5eAVA5Yj2 g78zRQXun2ZkF3OIEf5S/TRKdYO8wnjYBOlnlhLEMGcxbwggseNoRir7F w==; X-IronPort-AV: E=McAfee;i="6500,9779,10464"; a="298686997" X-IronPort-AV: E=Sophos;i="5.93,300,1654585200"; d="scan'208";a="298686997" Received: from orsmga007.jf.intel.com ([10.7.209.58]) by orsmga103.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 08 Sep 2022 16:26:08 -0700 X-IronPort-AV: E=Sophos;i="5.93,300,1654585200"; d="scan'208";a="610863191" Received: from ls.sc.intel.com (HELO localhost) ([143.183.96.54]) by orsmga007-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 08 Sep 2022 16:26:07 -0700 From: isaku.yamahata@intel.com To: linux-kernel@vger.kernel.org, kvm@vger.kernel.org, Paolo Bonzini , Sean Christopherson , Marc Zyngier , Will Deacon , Yuan Yao Cc: isaku.yamahata@intel.com, isaku.yamahata@gmail.com, Kai Huang , Chao Gao , Atish Patra , Shaokun Zhang , Qi Liu , John Garry , Daniel Lezcano , Huang Ying , Huacai Chen Subject: [PATCH v4 09/26] KVM: Do processor compatibility check on resume Date: Thu, 8 Sep 2022 16:25:25 -0700 Message-Id: <1c302387e21e689f103bf954f355cf49f73d1e82.1662679124.git.isaku.yamahata@intel.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" From: Isaku Yamahata So far the processor compatibility check is not done on resume. It should be done. The resume is called for resuming from S3/S4. CPUs can be replaced or the kernel can resume from S4 on a different machine. So compatibility check is desirable. Signed-off-by: Isaku Yamahata --- virt/kvm/kvm_main.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/virt/kvm/kvm_main.c b/virt/kvm/kvm_main.c index 0ac00c711384..fc55447c4dba 100644 --- a/virt/kvm/kvm_main.c +++ b/virt/kvm/kvm_main.c @@ -5715,6 +5715,13 @@ static int kvm_suspend(void) =20 static void kvm_resume(void) { + if (kvm_arch_check_processor_compat()) + /* + * No warning here because kvm_arch_check_processor_compat() + * would have warned with more information. + */ + return; /* FIXME: disable KVM */ + if (kvm_usage_count) { lockdep_assert_not_held(&kvm_count_lock); hardware_enable_nolock((void *)__func__); --=20 2.25.1