From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-pj1-f74.google.com (mail-pj1-f74.google.com [209.85.216.74]) (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 3873F319871 for ; Sat, 21 Feb 2026 01:24:33 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.216.74 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1771637074; cv=none; b=row0dtKHTiJhfz/yZAR7Pp6hKNQjpdBmcRZEHea+IJh+3FJgkc16c+mClHZhdAKSA7dZlCN6+iIHGX3q82SDfgR+WbseD/8d8EAK9kvz0yNf/MKZBLZIrE6qPsml0lIs1fMSKGnIDMAEYiKk9SYODs5RjqYZEU+JltqEUpjXrTU= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1771637074; c=relaxed/simple; bh=dyyolq6QYL1vx+owLx0Z7PhVaQxT9oCUBf55Xme4PXo=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=I3xcpS9/lkdlrkjkbNMAIuNzfrh/82yeaMI1fkBWK3Dss8UjiFjxaEhE1yNCPTx8bA3yQ20qtAlNFceOuon2YedkuWP6jSviVv6Noz+kMvFnWhjSxDFko7pV7gQwBhSq6Z2B11cOBBNdhBR53Gj0cMUYsOo3UQpJP9omaMhEtC4= 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=ZsTFeu9c; arc=none smtp.client-ip=209.85.216.74 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="ZsTFeu9c" Received: by mail-pj1-f74.google.com with SMTP id 98e67ed59e1d1-354c72d23dfso16590808a91.2 for ; Fri, 20 Feb 2026 17:24:33 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1771637072; x=1772241872; darn=vger.kernel.org; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:from:to:cc:subject:date:message-id:reply-to; bh=P7vmKD3Um12JS7qpp2L+ZgiUNaYnAvcQIOGCUjb5bcA=; b=ZsTFeu9cjwf+xjqFsvnpXksCrNIUw17qdqG11hYvI88cvjycrUnftzlIdlpBWtr4BC QgewIo9FCvl19h3GJfZr/gK5a1ZVhUfH551khgR+xmhCWo9AXi/iKRwDJX5BmXFI8dwO kCsccSf3Gcn86zD7IxzyUereY+pNTSh4qnb4Oc0gn4ugF9Tpl2WinDTcrk44phiWDJSA Axs8gQySzFJGvL3DNcy3hEJhMS/nSxuwqnGC408euttvMqaqtUVShID1QLo20NPl9U+I Pn8PVlhh9RlK9zSYPT687dWd58RApXGWl8RflA8YTnqntbBY+CmbmeZPQVeqO9k3vNJE O+2g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1771637072; x=1772241872; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=P7vmKD3Um12JS7qpp2L+ZgiUNaYnAvcQIOGCUjb5bcA=; b=vZnhqiYfxks2bdtBUMHazSDdSAKYE6jRROrRGgZ9Ssvy75sZvGBaaE23GuGhZ48RmH hhZTFh7R5/JS6EEBVAs365ApDnSdJGWJYAG5sQEJM0cjH9P6sY9uGq1dr+ylEd7L7FgM Wx7qSPhXVEJ8gXEJvZUvyuS4NYh8Rd4axx2My8rkszz8imIyQ3rs4IHx7uM9zu5MY/71 4MQZm/qGQ31UbjYqNGcfVwqfqleapJzqX3ynNvQrIMviftviPemHvlUDA57dWt+ICTj5 k5kJXhf++UmaGQZPUaFnUWL4PUOMoZDp0DzibeH75pYaITtybF/fJ9L8szxx1mnatgX5 4f9A== X-Forwarded-Encrypted: i=1; AJvYcCWUToCLBGkVBr+PJobhWPwOLfdFIORiiPHRJKgrYP+LxgMoK4Syj2Uki5OP6Ogwfll6OCOTC+7ekGuSqtc=@vger.kernel.org X-Gm-Message-State: AOJu0YxSwLaZij5vk7p7ATkRU2umDmMDbt1duPEfwdEanDajzoUvP0Fo LE8G0HqAcrIHn012PIUHYFHxHFTWAnifqy0JxMYcnqumrw6eib94gxI7Q/3pD5oE/PDe81nQ+Ts bB5bmqQ== X-Received: from pjbnh21.prod.google.com ([2002:a17:90b:3655:b0:354:e874:cf5c]) (user=seanjc job=prod-delivery.src-stubby-dispatcher) by 2002:a17:90b:2d43:b0:354:a780:6667 with SMTP id 98e67ed59e1d1-358ae7e9168mr1361436a91.3.1771637072461; Fri, 20 Feb 2026 17:24:32 -0800 (PST) Date: Fri, 20 Feb 2026 17:24:30 -0800 In-Reply-To: <20260206190851.860662-25-yosry.ahmed@linux.dev> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: Mime-Version: 1.0 References: <20260206190851.860662-1-yosry.ahmed@linux.dev> <20260206190851.860662-25-yosry.ahmed@linux.dev> Message-ID: Subject: Re: [PATCH v5 24/26] KVM: nSVM: Restrict mapping VMCB12 on nested VMRUN From: Sean Christopherson To: Yosry Ahmed Cc: Paolo Bonzini , kvm@vger.kernel.org, linux-kernel@vger.kernel.org Content-Type: text/plain; charset="us-ascii" On Fri, Feb 06, 2026, Yosry Ahmed wrote: > diff --git a/arch/x86/kvm/svm/nested.c b/arch/x86/kvm/svm/nested.c > index b1f3e9df2cd5..0a7bb01f5404 100644 > --- a/arch/x86/kvm/svm/nested.c > +++ b/arch/x86/kvm/svm/nested.c > @@ -1102,26 +1102,56 @@ static void __nested_svm_vmexit(struct vcpu_svm *svm, struct vmcb *vmcb12) > kvm_queue_exception(vcpu, DB_VECTOR); > } > > -static void nested_svm_vmrun_error_vmexit(struct kvm_vcpu *vcpu, struct vmcb *vmcb12) > +static void nested_svm_vmrun_error_vmexit(struct kvm_vcpu *vcpu, u64 vmcb12_gpa) > { > struct vcpu_svm *svm = to_svm(vcpu); > + struct kvm_host_map map; > + struct vmcb *vmcb12; > + int r; > > WARN_ON_ONCE(svm->vmcb == svm->nested.vmcb02.ptr); > > leave_guest_mode(vcpu); > > + r = kvm_vcpu_map(vcpu, gpa_to_gfn(vmcb12_gpa), &map); > + if (r) { Drop the 'r' since KVM doesn't do anything with it, i.e. if (kvm_vcpu_map(...)) { kvm_make_request(KVM_REQ_TRIPLE_FAULT, vcpu); return; } (I can do this when applying). > + kvm_make_request(KVM_REQ_TRIPLE_FAULT, vcpu); > + return; > + }