From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id B53AC27B343 for ; Fri, 6 Mar 2026 11:32:00 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=170.10.129.124 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1772796723; cv=none; b=Y88b08TDLJuZsEuNxGvYcsNFPFUWe+QQd1t1JUSUFGtEa8Kej/u+pbrXFPeUH5n5XVKePSQ4XAqf2MOrh3+sno+W+fuzN9MbLZjkLf+9Ub/b2yQuYExLawY/ydzN6j4thwsahh+wnaYuEnQhh8YPugE07rov+XwDhV5cQAUOViE= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1772796723; c=relaxed/simple; bh=IB/8T4bcRwqJW7qkPjt1Y/B1VUTQBSkGgXvL5lCG8i4=; h=Message-ID:Date:MIME-Version:Subject:To:Cc:References:From: In-Reply-To:Content-Type; b=nfAWBvA6ZS0MvlZuCuiUmb3GNE+IlklW/dtQzyVuqXQ/L7zkh625sDsvRjjMlwb8AWO4e6A73vWG1sOFNMbKLA27GO7yAbc7XU6mIdgS+0+kKT1KaoOeNlPNjfxn8+3qiHrjaiwuFA8NwUAvSGIfto3W1MyzpgbyNmYE+aX1ucs= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=redhat.com; spf=pass smtp.mailfrom=redhat.com; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b=ezl9wJNm; dkim=pass (2048-bit key) header.d=redhat.com header.i=@redhat.com header.b=j7B0l3EV; arc=none smtp.client-ip=170.10.129.124 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=redhat.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=redhat.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="ezl9wJNm"; dkim=pass (2048-bit key) header.d=redhat.com header.i=@redhat.com header.b="j7B0l3EV" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1772796719; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=+mE/NjsbASrzJEKUSNMD1TI5Q2DNpk7Rf/uNUvjO5uY=; b=ezl9wJNmFKkChWpkRTq3CrmaCtRJFrff/wTLZUtnmT+Tandod9FjX+WM+EF5OlS7mNKI3M TkOvpeVwN7Ba1RSHbFxcUNRsZoM8LO6pk8GlqU39ZpVGQge3o2w60gFNs/+96NUSkOqMe5 9Pe/H5VYM3czI4ruuV2htHf1OqEJpHo= Received: from mail-wm1-f72.google.com (mail-wm1-f72.google.com [209.85.128.72]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-657-2fGuJVfWN4GpR83InwcN-g-1; Fri, 06 Mar 2026 06:31:58 -0500 X-MC-Unique: 2fGuJVfWN4GpR83InwcN-g-1 X-Mimecast-MFC-AGG-ID: 2fGuJVfWN4GpR83InwcN-g_1772796717 Received: by mail-wm1-f72.google.com with SMTP id 5b1f17b1804b1-4836abfc742so72332595e9.0 for ; Fri, 06 Mar 2026 03:31:58 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=google; t=1772796717; x=1773401517; 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=+mE/NjsbASrzJEKUSNMD1TI5Q2DNpk7Rf/uNUvjO5uY=; b=j7B0l3EVCXEsFgrKbyPBhcYNY0iRy0nm6R44f8XiwMxxWOFtDd44Eb4AR9AG4KqWQ7 8tuk/sRsoknW3nRnuVj8yazaXigIjS4Bbc2BK/NV5ypM6Yt8gpHx9X3XW1MvfyJtwfOj HQIOCFbhWlz5Pr6vFQyreqCDw06ogfMhBcDuFyuNoG65hUXYJUgcD73w+0VzjNPhcYib fLFhk6MPY5ielzdpZQbAwOAAeW55VGFZgdlXs8ZwojQeyF4rhxRY3X/eNOPqyv6CCQwt B5fCNz3Suk4w57CWF0R6GS1sLegPm2gy33MLrhUB7NgSOKcBuM4YcciNEBrxYUnmY5iA ONQA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1772796717; x=1773401517; h=content-transfer-encoding:in-reply-to:content-language:from :references:cc:to:subject:user-agent:mime-version:date:message-id :x-gm-gg:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=+mE/NjsbASrzJEKUSNMD1TI5Q2DNpk7Rf/uNUvjO5uY=; b=xQXEP8I5T4xCTHXfaXgse9HF1VG36WA7UUJBM8RGagWMmdi+5hJrp8l5RRL3/Gvpu6 zI+u5l3ju9xDVmkv/yu50cbKWZnNyuglnSiukq3Kai3YwCrDfWMQky8WT3f0h2pfWcOV Uk5pkeER/mU0OUjAE5Q0AyZKUHQTiNMJ/XTopTRSWfFfwFBvSFMaMdp6fUq2RDDGf3Io d3VnTLs9wkKp5f7/9T9uWGPhPyEPc53eOQF5qJmsvOld3BC+C0/EYgmXn28dDH8YVDlX ZhFDYN6JBINBXWRC7a+Le2GOWpnyZ0YUVy8ktDmtLvuOoR1tVfwOCsRc8OSKBT8g+lNF 3Cbg== X-Forwarded-Encrypted: i=1; AJvYcCXgRPRV8vO/VaNIJCtt6QeqTosTUCwSJEsiSVmHNfpXuwNNgzZFkEO71CGyUhHNQk4jAMvfHSnaTtxIpPY=@vger.kernel.org X-Gm-Message-State: AOJu0YxvtO9a1b2LkEDOYQJfWUbTUlGJWUtqpcjfikn7pJrqqU7CFnbo AP/dQ2k1gsAGXzihdPFTHRc3nbBRZ7i5/ma8DIgkLa0P1OamgWGE6suLXoEVbmgiNYxgNf5q7YI jomwFEvUprVkd8js3v8GI9QtIPg6Thv16QcP0ZVMsI9cU9l5yBGeqZ9efUcxwebliQQ== X-Gm-Gg: ATEYQzwURb0vi/rIOI5u0t60dGxCp3Z3PXJJ9oJPg3I3RFgJ+ZFxjaoJZ5T71oDeins rp9VvpRFgfHWtPqMCucobcUeYefDK5Y5wW+yS42kj27vNaDKZJyENlsnICTTMgyt77zrumxib+8 CpKOZOgoMT4nM4Oxqrs/Ew3cqkowuOphJXq74NMDEfOosVQjJXw814H3tenA1wgCHLvK4lvqZ00 XcBF1phD3Hu1HmlYJRFEGmgETZnkZb9RnUYGQcrzjiZXTILmbvlKTtBFT8u9UgkBSucKxDGMK7x 10hzC0c42jdj3PtP5CHj63viecrL8skSSrkiADeY38y/kwfx9JdutXSfXcYDF86vuIS16DNpHiP CTs5c47BEIFxf5T4fNS0a9SSWpM0u90LKBG86p2UK6MOXESTj0WlYf5fGfwkIBiZ6e05zmWs3LE iUdmkyAxwBHEPX1q/SslTIlt1EoNM= X-Received: by 2002:a05:600c:a12:b0:483:badb:618f with SMTP id 5b1f17b1804b1-48526966b07mr26161275e9.25.1772796717311; Fri, 06 Mar 2026 03:31:57 -0800 (PST) X-Received: by 2002:a05:600c:a12:b0:483:badb:618f with SMTP id 5b1f17b1804b1-48526966b07mr26160755e9.25.1772796716824; Fri, 06 Mar 2026 03:31:56 -0800 (PST) Received: from [192.168.10.81] ([151.95.144.138]) by smtp.googlemail.com with ESMTPSA id ffacd0b85a97d-439dad8d840sm4118705f8f.8.2026.03.06.03.31.55 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Fri, 06 Mar 2026 03:31:56 -0800 (PST) Message-ID: Date: Fri, 6 Mar 2026 12:31:54 +0100 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 4/7] KVM: SVM: Populate FRED event data on event injection To: Shivansh Dhiman , seanjc@google.com, linux-kernel@vger.kernel.org, kvm@vger.kernel.org Cc: tglx@linutronix.de, mingo@redhat.com, bp@alien8.de, dave.hansen@linux.intel.com, x86@kernel.org, hpa@zytor.com, xin@zytor.com, nikunj.dadhania@amd.com, santosh.shukla@amd.com References: <20260129063653.3553076-1-shivansh.dhiman@amd.com> <20260129063653.3553076-5-shivansh.dhiman@amd.com> From: Paolo Bonzini Content-Language: en-US In-Reply-To: <20260129063653.3553076-5-shivansh.dhiman@amd.com> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit On 1/29/26 07:36, Shivansh Dhiman wrote: > From: Neeraj Upadhyay > > Set injected-event data (in EVENTINJDATA) when injecting an event, > use EXITINTDATA for populating the injected-event data during > reinjection. > > Unlike IDT using some extra CPU register as part of an event > context, e.g., %cr2 for #PF, FRED saves a complete event context > in its stack frame, e.g., FRED saves the faulting linear address > of a #PF into the event data field defined in its stack frame. > > Populate the EVENTINJDATA during event injection. The event data > will be pushed into a FRED stack frame for VM entries that inject > an event using FRED event delivery. > > Signed-off-by: Neeraj Upadhyay > Co-developed-by: Shivansh Dhiman > Signed-off-by: Shivansh Dhiman > --- > arch/x86/kvm/svm/svm.c | 22 ++++++++++++++++++---- > 1 file changed, 18 insertions(+), 4 deletions(-) > > diff --git a/arch/x86/kvm/svm/svm.c b/arch/x86/kvm/svm/svm.c > index ddd8941af6f0..693b46d715b4 100644 > --- a/arch/x86/kvm/svm/svm.c > +++ b/arch/x86/kvm/svm/svm.c > @@ -374,6 +374,10 @@ static void svm_inject_exception(struct kvm_vcpu *vcpu) > | SVM_EVTINJ_VALID > | (ex->has_error_code ? SVM_EVTINJ_VALID_ERR : 0) > | SVM_EVTINJ_TYPE_EXEPT; > + > + if (is_fred_enabled(vcpu)) > + svm->vmcb->control.event_inj_data = ex->event_data; > + > svm->vmcb->control.event_inj_err = ex->error_code; > } > > @@ -4066,7 +4070,7 @@ static void svm_complete_soft_interrupt(struct kvm_vcpu *vcpu, u8 vector, > kvm_rip_write(vcpu, svm->soft_int_old_rip); > } > > -static void svm_complete_interrupts(struct kvm_vcpu *vcpu) > +static void svm_complete_interrupts(struct kvm_vcpu *vcpu, bool reinject_on_vmexit) > { > struct vcpu_svm *svm = to_svm(vcpu); > u8 vector; > @@ -4111,6 +4115,7 @@ static void svm_complete_interrupts(struct kvm_vcpu *vcpu) > break; > case SVM_EXITINTINFO_TYPE_EXEPT: { > u32 error_code = 0; > + u64 event_data = 0; > > /* > * Never re-inject a #VC exception. > @@ -4121,9 +4126,18 @@ static void svm_complete_interrupts(struct kvm_vcpu *vcpu) > if (exitintinfo & SVM_EXITINTINFO_VALID_ERR) > error_code = svm->vmcb->control.exit_int_info_err; > > + /* > + * FRED requires an additional field to pass injected-event > + * data to the guest. > + */ > + if (is_fred_enabled(vcpu) && (vector == PF_VECTOR || vector == DB_VECTOR)) > + event_data = reinject_on_vmexit ? > + svm->vmcb->control.exit_int_data : > + svm->vmcb->control.event_inj_data; The new argument is not needed, just... > @@ -4146,7 +4160,7 @@ static void svm_cancel_injection(struct kvm_vcpu *vcpu) > control->exit_int_info = control->event_inj; > control->exit_int_info_err = control->event_inj_err; ... move event_inj into exit_int here, similar to the other fields: control->exit_int_data = control->event_inj_data; Paolo > control->event_inj = 0; > - svm_complete_interrupts(vcpu); > + svm_complete_interrupts(vcpu, false); > } > > static int svm_vcpu_pre_run(struct kvm_vcpu *vcpu) > @@ -4382,7 +4396,7 @@ static __no_kcsan fastpath_t svm_vcpu_run(struct kvm_vcpu *vcpu, u64 run_flags) > > trace_kvm_exit(vcpu, KVM_ISA_SVM); > > - svm_complete_interrupts(vcpu); > + svm_complete_interrupts(vcpu, true); > > return svm_exit_handlers_fastpath(vcpu); > }