From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-yw1-f202.google.com (mail-yw1-f202.google.com [209.85.128.202]) (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 4FD64175549 for ; Fri, 26 Jul 2024 23:53:21 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.128.202 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1722038002; cv=none; b=Mf80monCeTESEzb/jXvXbmdIVChhczy3OM00Mbd8E14icTus2d/Gfg+n1TR4kq7xBAzTRrb/k0J9E0Wy+gUKBuaJCytrSV8SS9EeyiiCFKCqlFx27yK5mbuvzgRtdGFV+/OlpVQF1mA+85W1j7fbt1fTah7SjEP7RizF8Edj8po= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1722038002; c=relaxed/simple; bh=btA5HWQO+KsQDU5pHR0Xwi+Zt3luZJSHGiywErewvig=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=fJeDGQwq/tGin9feu2wXN1uIHGu0WCs67P3erHgfDuaWssp3FDedlk+GDSJIyN5g1vdPQJQeLM+VLNTSoeVFcdId9jFIG+6ZqviBeTk0I8l2rdrdi+VccNO89n7EPHivYdCtX54uz+0Y4e7c7Pcj8Ct+BeKdIdXMRzHeLDfWVwQ= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com; spf=pass smtp.mailfrom=flex--seanjc.bounces.google.com; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b=0RRc+rpG; arc=none smtp.client-ip=209.85.128.202 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=flex--seanjc.bounces.google.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b="0RRc+rpG" Received: by mail-yw1-f202.google.com with SMTP id 00721157ae682-664fc7c4e51so5586897b3.3 for ; Fri, 26 Jul 2024 16:53:21 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1722038000; x=1722642800; darn=lists.linux.dev; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:reply-to:from:to:cc:subject:date:message-id:reply-to; bh=khS3+Cji6+1mvvdZyBUq0wqzq89EmN0cfXvMph1EjiU=; b=0RRc+rpGxkhtDFzGUXXA1pGmNdSm6lwdHEty8cKaM6cs66MzIZkIiSg3s4imWMNgz/ BEYLEh8zDyIGgwNes/tWCEpK+e05TOyZjEjgkkXNFZplO5ZwDIwLZDAMrBtkOL97R/C4 5CTPuDMnjPAdcj3uLvWTutKwtWN9WjkuUuBOYDRsIxND5Xud80fnHuMioYRYBKyClZES 1WUzZly3p5MOYtNHgdh4cgQNwvrjb1Px6+NNef/pKH0l9SGHwUE2J2YImz1UDib0qIoE sBetmeCRX5Kbrrg3fg1rjuk4Z49Lz9sSiL1/KfsEYgZyLUBOlP442UrQI2pEGlZlpBgC ETIw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1722038000; x=1722642800; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:reply-to:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=khS3+Cji6+1mvvdZyBUq0wqzq89EmN0cfXvMph1EjiU=; b=eFfUOMPt25e7O7WWb4obu3tGXjA+4sjEgwO/mSmePVjqGdmt07Kacn9YER1g88TT27 mVUP7My6e+7VQ17IpMH83tbA4yRQHg4If+2ek2JeVJ8BMX+28wV1UsT9dPJjKpqeT8jc Q29TaCmqb5f89aYpcQjhpLB9CTw1VabZPoHojCUtNIrlrzKYtb/G1HUlZ95mnib8aTbu VNSBYyaaNv1c3a++8WObwe4iQ256Lwn2SXiFqCtEQ1CP2mXk6W+vzuYuVF6EiTD70/kN h1qM/ZT8ZHhyamTDWFGZ6PZ4jn03xBMt5L7jTFBuKV61tXbhf2vEiFHeFgsTD4vg96di 7eiw== X-Forwarded-Encrypted: i=1; AJvYcCVGY5NkzRySS3oRE7//+tyPtMaSLoyJL+b9dlMfVxOvrBhOwku7jYIJMFJ/BKg7y3fz2YLyLqG2kyq663H2crHRPauGDu9a X-Gm-Message-State: AOJu0YyWidsYpXqJIwWnwOFXmcUHSocfCDDguX45lm1A5qCs4oeOzrKW Sqsso3+PSMm8i4yq7CVyhruw3VC7ySb0lFlgM5YNYoy+hiA4k7sGEH/+icn3z7dRC2PmEJiHTF4 gcQ== X-Google-Smtp-Source: AGHT+IHn8ljNba0QNoBWKfaXu8Wx8VTGIoZ1RPeW8pDsltrF/Hl6Iy7/rU4VvDeHaG7eZvfgbbZBLlqPjFc= X-Received: from zagreus.c.googlers.com ([fda3:e722:ac3:cc00:7f:e700:c0a8:5c37]) (user=seanjc job=sendgmr) by 2002:a05:690c:806:b0:64a:8aec:617c with SMTP id 00721157ae682-679fffd3e35mr362617b3.0.1722038000511; Fri, 26 Jul 2024 16:53:20 -0700 (PDT) Reply-To: Sean Christopherson Date: Fri, 26 Jul 2024 16:51:30 -0700 In-Reply-To: <20240726235234.228822-1-seanjc@google.com> Precedence: bulk X-Mailing-List: kvmarm@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: Mime-Version: 1.0 References: <20240726235234.228822-1-seanjc@google.com> X-Mailer: git-send-email 2.46.0.rc1.232.g9752f9e123-goog Message-ID: <20240726235234.228822-22-seanjc@google.com> Subject: [PATCH v12 21/84] KVM: nVMX: Rely on kvm_vcpu_unmap() to track validity of eVMCS mapping From: Sean Christopherson To: Paolo Bonzini , Marc Zyngier , Oliver Upton , Tianrui Zhao , Bibo Mao , Huacai Chen , Michael Ellerman , Anup Patel , Paul Walmsley , Palmer Dabbelt , Albert Ou , Christian Borntraeger , Janosch Frank , Claudio Imbrenda , Sean Christopherson Cc: kvm@vger.kernel.org, linux-arm-kernel@lists.infradead.org, kvmarm@lists.linux.dev, loongarch@lists.linux.dev, linux-mips@vger.kernel.org, linuxppc-dev@lists.ozlabs.org, kvm-riscv@lists.infradead.org, linux-riscv@lists.infradead.org, linux-kernel@vger.kernel.org, David Matlack , David Stevens Content-Type: text/plain; charset="UTF-8" Remove the explicit evmptr12 validity check when deciding whether or not to unmap the eVMCS pointer, and instead rely on kvm_vcpu_unmap() to play nice with a NULL map->hva, i.e. to do nothing if the map is invalid. Note, vmx->nested.hv_evmcs_map is zero-allocated along with the rest of vcpu_vmx, i.e. the map starts out invalid/NULL. Signed-off-by: Sean Christopherson --- arch/x86/kvm/vmx/nested.c | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/arch/x86/kvm/vmx/nested.c b/arch/x86/kvm/vmx/nested.c index 2392a7ef254d..a34b49ea64b5 100644 --- a/arch/x86/kvm/vmx/nested.c +++ b/arch/x86/kvm/vmx/nested.c @@ -231,11 +231,8 @@ static inline void nested_release_evmcs(struct kvm_vcpu *vcpu) struct kvm_vcpu_hv *hv_vcpu = to_hv_vcpu(vcpu); struct vcpu_vmx *vmx = to_vmx(vcpu); - if (nested_vmx_is_evmptr12_valid(vmx)) { - kvm_vcpu_unmap(vcpu, &vmx->nested.hv_evmcs_map, true); - vmx->nested.hv_evmcs = NULL; - } - + kvm_vcpu_unmap(vcpu, &vmx->nested.hv_evmcs_map, true); + vmx->nested.hv_evmcs = NULL; vmx->nested.hv_evmcs_vmptr = EVMPTR_INVALID; if (hv_vcpu) { -- 2.46.0.rc1.232.g9752f9e123-goog