From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-wm1-f50.google.com (mail-wm1-f50.google.com [209.85.128.50]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 5F9B0156968 for ; Tue, 7 Jan 2025 12:41:54 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.128.50 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1736253718; cv=none; b=armW1Amy+t1EqaG0j786KNV7qnJIoGAsrLfiOh43F8AxkznS82L/pJMrk9yxT2cCu6E6HmLrl42PbNmVFzZrsbekAQIfkZGH9DLnkLJok8foGZPX5alHb8Uy4b7w1Ukpglu1acEzesXECx2Y5d/mG4rI1icbDiPOlrJqGDW4V9E= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1736253718; c=relaxed/simple; bh=VaPSil/xFUZKZBdrr/UMv3gfLn36VxEgu6ey8vlPX8Q=; h=Message-ID:Date:MIME-Version:Subject:To:Cc:References:From: In-Reply-To:Content-Type; b=sui+ut5d4VMazjeWGSj+unllzJq/ulHLn/7SFAR1ONc98Hqaw7NadA891akJ5aZlMdpfjNntwlXtTGC3m/0YUcBlNE7ocjNZYN5sSGGF4uG7b+I9zK0QJuuo5lu667u2+cXz2315V69gniBKqEIgTvA8D56IXHuMsB0Dg/rFo5c= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=suse.com; spf=pass smtp.mailfrom=suse.com; dkim=pass (2048-bit key) header.d=suse.com header.i=@suse.com header.b=B8zGD0lw; arc=none smtp.client-ip=209.85.128.50 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=suse.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=suse.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=suse.com header.i=@suse.com header.b="B8zGD0lw" Received: by mail-wm1-f50.google.com with SMTP id 5b1f17b1804b1-4368a293339so122397025e9.3 for ; Tue, 07 Jan 2025 04:41:54 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.com; s=google; t=1736253713; x=1736858513; darn=vger.kernel.org; h=content-transfer-encoding:in-reply-to:content-language:from :references:cc:to:subject:user-agent:mime-version:date:message-id :from:to:cc:subject:date:message-id:reply-to; bh=DtLfX1vfHpElmPmkOd6B6Z2Dl4xWa+S6C0xYlZKfN7c=; b=B8zGD0lwMVjNPBFqjYRkZ4K5eRTU42oCEwRENiCJYvYvpwbsQK5LdptHAEVuV4EKrR Vj77wm9IR3apKZbsx54OCr9rVyi2brfnO5zqiKusG9J1oaAXgFVKk0WGwsZUH+n1hT2m 7T4+wL4LI+/WCXydoIPZtlA/4hyfrrLB1bkohW27X5LsYQhBGY+7QxvTbQ50mqK1QmM5 F11oAA+TkKv/RQeri9JYdQTUx9wOtn5sbu/fiykrCBK+kFJUMoUp9iPf1PbD/vzASsuV 6Ns2Vy4Vg32ZTGIyU1lJQve1tWn7CZOT4SBmA/muXg8BbzWNftOC0ldDLr+gRlrzppjB RrSw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1736253713; x=1736858513; h=content-transfer-encoding:in-reply-to:content-language:from :references:cc:to:subject:user-agent:mime-version:date:message-id :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=DtLfX1vfHpElmPmkOd6B6Z2Dl4xWa+S6C0xYlZKfN7c=; b=OamRcVBv4rmNA5UAi5OMKO/PKbEg/TAwgdkounUlqxYPh7sZQQns4E8mVStEBwoUGj qek+6jb503JBDD83fPjs+WsBl42d3M78TMSmFRDfQdPDLouiyP4DnlklxUknzxdkvYQr rP9IgMTCcmvTxyibpgkY7qkjQMN3mwUzsMjZGdBNZkVERJQ/+mAAyoxdBfwWz6OSmR/w wIJX7SXJJv1cV2jQkaS0s3nVqrgj6Ty+cNZ6m8XddOqbcVdjbKhFJUJ/u4R6ZVbCc/w7 Wpus65acJxMfDQ4PQ1MEXGgrdrIWtes3TSSSYPxevU+CwAmX1jb6loBeXRYxPrn/cPhL bH2A== X-Forwarded-Encrypted: i=1; AJvYcCUTGQFi2znZ3zcoBBW3KD5KNqnnBzC5+W7caiSqEjedur1LPa/LOp7JDNCuw1gsXy0Gg/9H/4a5QjCI2dI=@vger.kernel.org X-Gm-Message-State: AOJu0YzhMmWbm41SsG9PFU7YZYDnVFnvq/w8JBNAnc1Vk5k26quCKznu friNBoiUdelXY6znPnJm6z8cmX7Xf3+uFZ3ht7U9Z3Fvh8wOcqhc1odnTV6uxuCnHe0Vq5wIn+k 8 X-Gm-Gg: ASbGnculfeZ1wy/ehduz1M5F9ejcmwF5IyWxdym6mhWquRYxzfYpoHAK/iKk2WramTA +iZLlECd3k+B8mxNArMimw2cJkizYuYJbEABXmsS4uwGTzh6uwti7Bh6NQiVsEs4mxFNdfArY1b cPitdxAlE/p5tHeCi+GLCBn8a/kGIzfMUX+cvIn8t1Fvg5CgLwjKxbmCmig5R7mXDGvq00iStBA kpcpTS57dknZK8MPkYl1ByzriVoq99p+1QLpwSMlTFkKIoF+Aa2RVO5zBS2NQ== X-Google-Smtp-Source: AGHT+IEKVFWofdmR779GCffISYCKUDYqpt0f5REtBvJSH6t3eLDJHz6L2x61Od8gTltEX7suLqOfbQ== X-Received: by 2002:a05:600c:310a:b0:434:fddf:5bfa with SMTP id 5b1f17b1804b1-4366854bfc0mr481439425e9.2.1736253712740; Tue, 07 Jan 2025 04:41:52 -0800 (PST) Received: from [192.168.0.20] ([212.21.133.249]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-43656b00cf6sm638967985e9.10.2025.01.07.04.41.51 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Tue, 07 Jan 2025 04:41:52 -0800 (PST) Message-ID: <7f8d0beb-cc02-467d-ae2a-10e22571e5cf@suse.com> Date: Tue, 7 Jan 2025 14:41:51 +0200 Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Subject: Re: [PATCH v2 00/25] TDX vCPU/VM creation To: Tony Lindgren , "Edgecombe, Rick P" Cc: "pbonzini@redhat.com" , "seanjc@google.com" , "Huang, Kai" , "Li, Xiaoyao" , "isaku.yamahata@gmail.com" , "linux-kernel@vger.kernel.org" , "kvm@vger.kernel.org" , "Zhao, Yan Y" , "Chatre, Reinette" References: <20241030190039.77971-1-rick.p.edgecombe@intel.com> <94e37a815632447d4d16df0a85f3ec2e346fca49.camel@intel.com> From: Nikolay Borisov Content-Language: en-US In-Reply-To: Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 8bit On 7.01.25 г. 9:37 ч., Tony Lindgren wrote: > On Sat, Jan 04, 2025 at 01:43:56AM +0000, Edgecombe, Rick P wrote: >> On Mon, 2024-12-23 at 17:25 +0100, Paolo Bonzini wrote: >>> 22: missing review comment from v1 >>> >>>> +     /* TDX only supports x2APIC, which requires an in-kernel local APIC. */ >>>> +     if (!vcpu->arch.apic) >>>> +             return -EINVAL; >>> >>> nit: Use kvm_apic_present() >> >> Oops, nice catch. > > Sorry this fell through. I made a patch for this earlier but missed it > while rebasing to a later dev branch and never sent it. > > Below is a rebased version against the current KVM CoCo queue to fold > in if still needed. Sounds like this might be already dealt with in > Paolo's upcoming CoCo queue branch though. > > Regards, > > Tony > > 8< -------------------- > From aac264e9923c15522baf9ae765b1d58165c24523 Mon Sep 17 00:00:00 2001 > From: Tony Lindgren > Date: Mon, 2 Sep 2024 13:52:20 +0300 > Subject: [PATCH 1/1] KVM/TDX: Use kvm_apic_present() in tdx_vcpu_create() > > Use kvm_apic_present() in tdx_vcpu_create(). We need to now export > apic_hw_disabled for kvm-intel to use it. > > Suggested-by: Nikolay Borisov > Signed-off-by: Tony Lindgren > --- > arch/x86/kvm/lapic.c | 2 ++ > arch/x86/kvm/vmx/tdx.c | 3 ++- > 2 files changed, 4 insertions(+), 1 deletion(-) > > diff --git a/arch/x86/kvm/lapic.c b/arch/x86/kvm/lapic.c > index fcf3a8907196..2b83092eace2 100644 > --- a/arch/x86/kvm/lapic.c > +++ b/arch/x86/kvm/lapic.c > @@ -139,6 +139,8 @@ __read_mostly DEFINE_STATIC_KEY_FALSE(kvm_has_noapic_vcpu); > EXPORT_SYMBOL_GPL(kvm_has_noapic_vcpu); > > __read_mostly DEFINE_STATIC_KEY_DEFERRED_FALSE(apic_hw_disabled, HZ); > +EXPORT_SYMBOL_GPL(apic_hw_disabled); Is it really required to expose this symbol? apic_hw_disabled is defined as static inline in the header? > +> __read_mostly DEFINE_STATIC_KEY_DEFERRED_FALSE(apic_sw_disabled, HZ); > > static inline int apic_enabled(struct kvm_lapic *apic) > diff --git a/arch/x86/kvm/vmx/tdx.c b/arch/x86/kvm/vmx/tdx.c > index d0dc3200fa37..6c68567d964d 100644 > --- a/arch/x86/kvm/vmx/tdx.c > +++ b/arch/x86/kvm/vmx/tdx.c > @@ -8,6 +8,7 @@ > #include "capabilities.h" > #include "mmu.h" > #include "x86_ops.h" > +#include "lapic.h" > #include "tdx.h" > #include "vmx.h" > #include "mmu/spte.h" > @@ -674,7 +675,7 @@ int tdx_vcpu_create(struct kvm_vcpu *vcpu) > return -EIO; > > /* TDX only supports x2APIC, which requires an in-kernel local APIC. */ > - if (!vcpu->arch.apic) > + if (!kvm_apic_present(vcpu)) > return -EINVAL; > > fpstate_set_confidential(&vcpu->arch.guest_fpu);