From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-pg1-f201.google.com (mail-pg1-f201.google.com [209.85.215.201]) (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 D3B6A257431 for ; Wed, 25 Feb 2026 01:21:00 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.215.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1771982462; cv=none; b=Yeq2sYt+sAq7I8IgWxMoHtFqGZn0jZpLnIWg+h40d7fJ2i46q6w1Z+VcJ0oGQsClU9WVHIjrvGhrTmR3CaRSdr9nyWz1wabA/tXtTaToppKVICb8a/czV9Pi48/4NVxELjzZKrobjKMJDRPWi6f2leGMFDV/R9yfKq/tQ1JdfbY= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1771982462; c=relaxed/simple; bh=5WioRAn/exL/M/dDLMs+BGBP7zMGvVlgJ+hWWegWOB8=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=lbFD4jW5mSd1XJZmeiSEZguUlCXf2z5//4wtUC5fOJuG71ZwkJElsVBxVEjpZ6FgxW+7xlxZBZYaZnVCuGR1KMDMmcIheXvGoRUy82MsLlugsbij26TzxOTb3AcN01JB0CRI/xIwHXDL0ZY3kdmhT/74wQIf2VufDQxbBkxJ/pg= 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=md6QiK/0; arc=none smtp.client-ip=209.85.215.201 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="md6QiK/0" Received: by mail-pg1-f201.google.com with SMTP id 41be03b00d2f7-c6e18f1cb86so25185631a12.0 for ; Tue, 24 Feb 2026 17:21:00 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1771982460; x=1772587260; darn=vger.kernel.org; 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=dv3TZbd1nBU/AEQJbeAhZb6gpTw6vQIp0AVXQNpKYls=; b=md6QiK/0BuVkI1hqEPStqXIqHSYp4VhzieptPk+8zWvamoimyR/caDCl3rbe25EPV+ Q4hqe/lkdD0svXec9h0QUbspkYjoqHfjVbjVuG6cJ1EXSiCq1KKBDSCHiF1vrgd4mymY ik6p5CEL/T+AdIs6J9fji0KRXU95Rsou1xZDodQDclANnK0PG2eDt1bT0vtXwQQZkU3P zsxHxHRRD3JVYl8AiZjwS9okXpi6UFWEyu3sAX/CxKXHpedljNcjjm+I0FoXVbPdchIb oYVezqLrlhxyAHMAeD2MRu3eyDalwBWhf91S+APbQqA6OLuLnWxRDxHlqkgsbm/k+HHg zufw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1771982460; x=1772587260; 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=dv3TZbd1nBU/AEQJbeAhZb6gpTw6vQIp0AVXQNpKYls=; b=X01qEtLtdd4DnvqJCGEXuDqVuekHRVVzOpDpjrxE7chr+T699WUBN9QgpM+O1sRFbN KjSn09YJcxEDNOZhaTBB3kRuzo4fuXWazr8Ok95DAI+gC46XPVWP089Uke17FrvuUOCh b3mqRJUQk8AiYk7a8LCR3BrmiI4S7aHppqM0X42B//O/ziLpu8OY7h22mo0eqhOjMhtm omXvdUWTyB3ZuKCdA/XiEzndnPTyq8xrdMwavMCTEM3+fjUiM76V6mNgQEINo/AsD7e7 yKWFVapmC17uXCx4q2Eak2m23C7xN1f9BkB1NDcvUn2vNHEYZ1MS5s4tyyrEFQKzoynx WhdQ== X-Forwarded-Encrypted: i=1; AJvYcCX4SE3/vxzhdSjUy0hvm/s+irnDJEN41KCJe1skZNMvxzeXU475bvaJOjEjHyQljE3RdiwahSd/WgWBbdM=@vger.kernel.org X-Gm-Message-State: AOJu0Yz/fdU6CTbRJ5bovbfoPkncwH9d27ONyJXQM8NpId8Eqj6Lid+l 0286q165mN/lSAT9ecluSh9dRqedPRknzCzNeqhjBj7xdrJUMhnHMpACrfvPQ87ioV6HuopppND OMXVIzw== X-Received: from pgbbq17.prod.google.com ([2002:a05:6a02:451:b0:c6e:288a:3ab9]) (user=seanjc job=prod-delivery.src-stubby-dispatcher) by 2002:a05:6a21:496:b0:394:f4fd:b751 with SMTP id adf61e73a8af0-39545fc60c5mr11022872637.51.1771982460005; Tue, 24 Feb 2026 17:21:00 -0800 (PST) Reply-To: Sean Christopherson Date: Tue, 24 Feb 2026 17:20:39 -0800 In-Reply-To: <20260225012049.920665-1-seanjc@google.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: Mime-Version: 1.0 References: <20260225012049.920665-1-seanjc@google.com> X-Mailer: git-send-email 2.53.0.414.gf7e9f6c205-goog Message-ID: <20260225012049.920665-5-seanjc@google.com> Subject: [PATCH 04/14] KVM: x86: Use local MMIO fragment variable to clean up emulator_read_write() From: Sean Christopherson To: Sean Christopherson , Paolo Bonzini , Kiryl Shutsemau Cc: kvm@vger.kernel.org, x86@kernel.org, linux-coco@lists.linux.dev, linux-kernel@vger.kernel.org, Yashu Zhang , Rick Edgecombe , Binbin Wu , Xiaoyao Li , Tom Lendacky , Michael Roth Content-Type: text/plain; charset="UTF-8" Grab the MMIO fragment used by emulator_read_write() to initiate an exit to userspace in a local variable to make the code easier to read. No functional change intended. Signed-off-by: Sean Christopherson --- arch/x86/kvm/x86.c | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/arch/x86/kvm/x86.c b/arch/x86/kvm/x86.c index a74ae3a81076..7cbd6f7d8578 100644 --- a/arch/x86/kvm/x86.c +++ b/arch/x86/kvm/x86.c @@ -8231,7 +8231,7 @@ static int emulator_read_write(struct x86_emulate_ctxt *ctxt, const struct read_write_emulator_ops *ops) { struct kvm_vcpu *vcpu = emul_to_vcpu(ctxt); - gpa_t gpa; + struct kvm_mmio_fragment *frag; int rc; if (WARN_ON_ONCE((bytes > 8u || !ops->write) && object_is_on_stack(val))) @@ -8287,17 +8287,16 @@ static int emulator_read_write(struct x86_emulate_ctxt *ctxt, if (!vcpu->mmio_nr_fragments) return X86EMUL_CONTINUE; - gpa = vcpu->mmio_fragments[0].gpa; - vcpu->mmio_needed = 1; vcpu->mmio_cur_fragment = 0; - vcpu->run->mmio.len = min(8u, vcpu->mmio_fragments[0].len); + frag = &vcpu->mmio_fragments[0]; + vcpu->run->mmio.len = min(8u, frag->len); vcpu->run->mmio.is_write = vcpu->mmio_is_write = ops->write; vcpu->run->exit_reason = KVM_EXIT_MMIO; - vcpu->run->mmio.phys_addr = gpa; + vcpu->run->mmio.phys_addr = frag->gpa; - return ops->read_write_exit_mmio(vcpu, gpa, val, bytes); + return ops->read_write_exit_mmio(vcpu, frag->gpa, val, bytes); } static int emulator_read_emulated(struct x86_emulate_ctxt *ctxt, -- 2.53.0.414.gf7e9f6c205-goog