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 18969436352 for ; Fri, 29 May 2026 18:36:14 +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=1780079780; cv=none; b=QKi5mXbDgKd3weEJHPByFHs3FZagkq3eClmVWGY2UeISWlUGBuVVI6fqGaUpHchzwK9IpceahTrxHZRsbmItkzXZpzalOBCIwAL7tSWylyOy9d9iowPlrr1e4cBcAdfkqo7q/VkTTGjUK4rhWwHpvvtjmmUnw7zKt1DklL5biww= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1780079780; c=relaxed/simple; bh=tQ9+tE+DbULo1I89vDeIy9JMoLMUcQfgtStrqd9V650=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=LxdeeIt0xFRvudMzAJbbO8pqiJXeukc091QpW7Gc2MYvzn1N1zcYOK9CHt7NGDQdR0URoNcEj1SpjTvmj0Tl7n5+V5yMc3KdM53ScMHDVwASiuA0BNpdxHcC0Aj8A7D9csRnaQE7g5sP5IEUhk9KrmPs4N2kwX9sfT4Thot6ieE= 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=Upz+3qUr; dkim=pass (2048-bit key) header.d=redhat.com header.i=@redhat.com header.b=gI3FInmS; 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="Upz+3qUr"; dkim=pass (2048-bit key) header.d=redhat.com header.i=@redhat.com header.b="gI3FInmS" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1780079773; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=R0u/shZrwVj4PqbRgkkyXanK2+FAoAVtVPTTfQ581C8=; b=Upz+3qUru6L6HTlgRck3piMjRoIw1Kn97ZuA/DXiqVHvqYi25HarQlBQegJNL1OKH0031M pJWqmlGU/kXkGvRtJ+40Reb/yz/ZXnRigV9jfucPj62tFuKprh2Dof2B97nrs7Angi3/xR 2h1TSwMEQtuE6PIWzVqet9J+Zxv8OY0= Received: from mail-wr1-f71.google.com (mail-wr1-f71.google.com [209.85.221.71]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-47-KgOHXAk6NhucK87UpVJ59A-1; Fri, 29 May 2026 14:36:11 -0400 X-MC-Unique: KgOHXAk6NhucK87UpVJ59A-1 X-Mimecast-MFC-AGG-ID: KgOHXAk6NhucK87UpVJ59A_1780079771 Received: by mail-wr1-f71.google.com with SMTP id ffacd0b85a97d-45eef10d5ebso772040f8f.0 for ; Fri, 29 May 2026 11:36:11 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=google; t=1780079770; x=1780684570; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=R0u/shZrwVj4PqbRgkkyXanK2+FAoAVtVPTTfQ581C8=; b=gI3FInmSyyh0mZ5QbmzJOwcWEdDuLaNUuOpCUGVsiL4xWLx11BctQ0sHc4aFEDu1s8 KclzuBNatRgS/y3UnQOwGgWmjslMhI62eBrw0tl0XYQWOzCSGa8k9dsyvcYwN2yHN+GN uNE2xfmeX39T2glce1gMUELLs0DbrDkinzFtfRq0KhWELDaUA5caVmqNBcHh9NE8jf0l a+KfD0C8Ksxpfyf882jmXRH+7+cgdQyDud7XoMhnYgrRsRPjOd/nPWJALWIuykhBsfNh Tx38lru3CssFg6RCNmqaPXeZB/1awxBcQB93zmFMEo4ZP/yar9Z7sylOi/JfRt5IPLFt hg4w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1780079770; x=1780684570; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=R0u/shZrwVj4PqbRgkkyXanK2+FAoAVtVPTTfQ581C8=; b=odfN5d2Bc2Rhu5PuwEoAND3sZF8X7EvWXCd/9Izr/DReTsJO3RSQ2twoVwo3UekbO4 06/BwFghHx7pnyRbdZWhywGqlY3WIT9L1Nc8prDC4DhuSJdprlFB9OFL7Yx6ScXxF3vM /hGF0WA+Ew//hUDwG/XiEZANixUjPSi+5AXrIBiciGUDTeC3+a1vmoIVxA8YVma6TFqZ ue3U26tPSz14cUJBJeVS+rS9LfWuDLUmtuoG3/I78I7BFA135if/App0Grxbj4tqzgcc 7V+7W1WO7rJxXVm/tn43CGGlxYyG0RzbvHS33qD0rvVNHdOIDPFL1fKydMVGo3IU+tq1 Mkig== X-Gm-Message-State: AOJu0YwS5Yrn+Z4HfGTkZXRTGwkNRQi/8Z67qZal6fczrSG603LH3fyk 9tGjXT1eS26yUqjMKnoNJMIvEi9m1epELMNacMCf1+qCoKnXwF0azXtRPja77g1UWdfYxNn/Qdr /RmBMxh0dTpVSKK19LYOboHzZTCQ16ERl+YDoYzF0414DwVnyVtmB7YOnrxE88i5YR6V1sXxoal 61aOx+dw84oF3rcVw/MEOORIoJVdPdQb78Y/eG1eEMhLfuf2YquQ== X-Gm-Gg: Acq92OHVINHQ0+7DBjHgz4LoqbfbaBVPAMwLxpg9liRfIqpE9FBC3QHkt332gylizYx zlkjm1M9HHdNl3vYQWr1Rf6rdeBGdG0Zq0lLxaJ/Klt9PhxTZvff8wmBK6NbrSm6Xn2ya/UYb+d oFyE3PbKjWDLkFEwZE2fGyXIVWPh3KM9BeQe5J9rRKi+kQ/WNQkPkGcSD/Ic38eMoix0NJ8wk1M Y0A9Tfj22ohd/czoVphkPKy8ooIA1MT8OKSW6+Sru5oSA2iFrjwvtKbVUKbNL0KqII7FNCa8mzN KujJMZfWg6n6DgMylUlUAuw38hdXp6WWtHFvpsmvqZPdDsG54SQZtt1W3UVBg4AJhZYUVENeaYt QUH8avlI13+MTqxIjEaOrwVCG7Z2F8//qDQsjTj992/ooi1ppGYdh/8azZX5m5FM+h1S/OiBWNd DsaRENTkqhUWrBQxXpP+RBrESxT5q1xINUKop+Zw== X-Received: by 2002:a5d:698b:0:b0:441:1e1e:a050 with SMTP id ffacd0b85a97d-45ef6b3e21cmr1332781f8f.16.1780079770612; Fri, 29 May 2026 11:36:10 -0700 (PDT) X-Received: by 2002:a5d:698b:0:b0:441:1e1e:a050 with SMTP id ffacd0b85a97d-45ef6b3e21cmr1332738f8f.16.1780079770148; Fri, 29 May 2026 11:36:10 -0700 (PDT) Received: from [192.168.10.48] ([151.49.251.208]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-45ef34bcc30sm5367936f8f.12.2026.05.29.11.36.08 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 29 May 2026 11:36:08 -0700 (PDT) From: Paolo Bonzini To: linux-kernel@vger.kernel.org, kvm@vger.kernel.org Cc: seanjc@google.com, Tom Lendacky , Michael Roth , stable@vger.kernel.org Subject: [PATCH 08/24] KVM: SEV: Don't explicitly pass PSC buffer to snp_begin_psc() Date: Fri, 29 May 2026 20:35:33 +0200 Message-ID: <20260529183549.1104619-9-pbonzini@redhat.com> X-Mailer: git-send-email 2.54.0 In-Reply-To: <20260529183549.1104619-1-pbonzini@redhat.com> References: <20260529183549.1104619-1-pbonzini@redhat.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit From: Sean Christopherson Stop explicitly passing the PSC buffer to snp_begin_psc(): it *must* be the scratch area. This will allow fixing a variety of bugs without further complicating the code. No functional change intended. Cc: stable@vger.kernel.org Reviewed-by: Tom Lendacky Reviewed-by: Michael Roth Signed-off-by: Sean Christopherson Message-ID: <20260501202250.2115252-9-seanjc@google.com> Signed-off-by: Paolo Bonzini --- arch/x86/kvm/svm/sev.c | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/arch/x86/kvm/svm/sev.c b/arch/x86/kvm/svm/sev.c index a3e85348ace9..8577451b82b2 100644 --- a/arch/x86/kvm/svm/sev.c +++ b/arch/x86/kvm/svm/sev.c @@ -3841,7 +3841,7 @@ struct psc_buffer { struct psc_entry entries[]; } __packed; -static int snp_begin_psc(struct vcpu_svm *svm, struct psc_buffer *psc); +static int snp_begin_psc(struct vcpu_svm *svm); static void snp_complete_psc(struct vcpu_svm *svm, u64 psc_ret) { @@ -3883,7 +3883,6 @@ static void __snp_complete_one_psc(struct vcpu_svm *svm) static int snp_complete_one_psc(struct kvm_vcpu *vcpu) { struct vcpu_svm *svm = to_svm(vcpu); - struct psc_buffer *psc = svm->sev_es.ghcb_sa; if (vcpu->run->hypercall.ret) { snp_complete_psc(svm, VMGEXIT_PSC_ERROR_GENERIC); @@ -3893,11 +3892,13 @@ static int snp_complete_one_psc(struct kvm_vcpu *vcpu) __snp_complete_one_psc(svm); /* Handle the next range (if any). */ - return snp_begin_psc(svm, psc); + return snp_begin_psc(svm); } -static int snp_begin_psc(struct vcpu_svm *svm, struct psc_buffer *psc) +static int snp_begin_psc(struct vcpu_svm *svm) { + struct vcpu_sev_es_state *sev_es = &svm->sev_es; + struct psc_buffer *psc = sev_es->ghcb_sa; struct psc_entry *entries = psc->entries; struct kvm_vcpu *vcpu = &svm->vcpu; struct psc_hdr *hdr = &psc->hdr; @@ -4567,7 +4568,7 @@ int sev_handle_vmgexit(struct kvm_vcpu *vcpu) if (ret) break; - ret = snp_begin_psc(svm, svm->sev_es.ghcb_sa); + ret = snp_begin_psc(svm); break; case SVM_VMGEXIT_AP_CREATION: ret = sev_snp_ap_creation(svm); -- 2.54.0