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 7209D256C84 for ; Wed, 25 Feb 2026 01:21:06 +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=1771982467; cv=none; b=ZZ2SOlMqPECZ40dck/Hk7rPej4/ylP3KF8WVM2HC/39S/FC4iz4JI7U7DleTw+6KRyOP12EaWopCayn7/b9+fINxyusmmO3iIPr1370fcgz4LpKg64eQ+JhKYf4ZIPy/ag455x81VKKxnc7SrcucoTnEvC3GgtLl1Ibr/Rv21Lk= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1771982467; c=relaxed/simple; bh=7lRp2eCkoo+DRHWUNEDaUBTQXTHdWU47sEkYGqsesug=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=I96ol5D5DESaec3+Jj5FXZ85yE3KsSqgcXE1S+Dhr4j1ILNmO7dPu1ceLdE/KzdTaFLIHlnSuexKByL7l+UVK2btFTvBr7iurneweU0DiAcKp5qbhQ8gXjCS9nhGyk0gyxqkz+15SFSwavVNYqZebdnVC0ZLdn1WeB3OaG/HYIU= 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=t7HwgQyb; 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="t7HwgQyb" Received: by mail-pj1-f74.google.com with SMTP id 98e67ed59e1d1-3568090851aso39448817a91.1 for ; Tue, 24 Feb 2026 17:21:06 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1771982464; x=1772587264; 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=gV7BZ60qmf3JAsxc6wDH0RQvnfJYSY1NcM7wseiHg1Y=; b=t7HwgQybqbbZUi30gFfENo1IvEUYBHKRNSWdodWfVKUDcAjRnPpqUKGyWoVAF53xDV i/tlYY+Z3bbE5sJQCfA2tOHRJJQ3ORd3NIUFhXHqrDVR/31dYplwHkzAWAPxnPe4qpnr g3sIEo+e5ICEsCxAeLZOIRXoYwM8s39Vya5zgW5THDZUZs5voTCkcr6AyVZmLTzkyDDa q01JqmMTaCNh2i2tNaLGe0rpLIlbC4/ygIwy6pMd+nDeL9miw2YMRdKKqlE+U4VRkU6W wy5PPXHD7g6HhSMSD4IFApFfQGbzhAjn3kej138uJ3WtRRIKu1MtvY4k3c+BGcS0JARQ OIdQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1771982464; x=1772587264; 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=gV7BZ60qmf3JAsxc6wDH0RQvnfJYSY1NcM7wseiHg1Y=; b=bDV1+JdLTKq2AgatVrdu23H+3NyG27dfDMAICrrdEy+GEB6wr/hAaqDAF9G4SQ6VF6 wFE/fgha3vMbtGjJPpsu7vW9AMGycD4S308DOYiqcIEPD6moJ5paMIJHvn6J2l9F2s1Z zNdFhuH3YuoGlerXkVEwZRLghsSxppZdtqFCEshESJTM4r9XuC8nh9V0SKBGZkXytnRi YjWtS1+9YWkSjLP5xw6ZltOxoPv+KvEZBWvypXlONQV4gcK3sGYqN1XbOhK7lD1dkl7u /mmzOqOf/obchHAGTfyYMUViEp7P5iA8KK94Pp66Y1LqKzoU0ZUPCU9CerVTF0v1lYi1 dq5g== X-Forwarded-Encrypted: i=1; AJvYcCXZUruDcNdm/q7Rkk/JH8cAG0OcqsxZHbTXv3s52cjWVlHajdPu5fqR3MDAa92Wagc1mTN6OiFh018P/KI=@vger.kernel.org X-Gm-Message-State: AOJu0Yy1uPMItcC1i8D+1qJf2hFHk25brfR3dVctYL63FEvHrd36zXln R+s4gFKa4OUEIG5alMmg70CCw56goHHZKpYsjSoiz/u9P89crsSV/3RxbrIFGQj1V0/QB5mo9P/ 6gUqwNA== X-Received: from pjal2.prod.google.com ([2002:a17:90a:1502:b0:34a:bebf:c162]) (user=seanjc job=prod-delivery.src-stubby-dispatcher) by 2002:a17:90b:5285:b0:354:c629:efaf with SMTP id 98e67ed59e1d1-3590f26515dmr508907a91.35.1771982463612; Tue, 24 Feb 2026 17:21:03 -0800 (PST) Reply-To: Sean Christopherson Date: Tue, 24 Feb 2026 17:20:41 -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-7-seanjc@google.com> Subject: [PATCH 06/14] KVM: x86: Move MMIO write tracing into vcpu_mmio_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" Move the invocation of MMIO write tracepoint into vcpu_mmio_write() and drop its largely-useless wrapper to cull pointless code and to make the code symmetrical with respect to vcpu_mmio_read(). No functional change intended. Signed-off-by: Sean Christopherson --- arch/x86/kvm/x86.c | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/arch/x86/kvm/x86.c b/arch/x86/kvm/x86.c index 5fde5bb010e7..7abd6f93c386 100644 --- a/arch/x86/kvm/x86.c +++ b/arch/x86/kvm/x86.c @@ -7769,11 +7769,14 @@ static void kvm_init_msr_lists(void) } static int vcpu_mmio_write(struct kvm_vcpu *vcpu, gpa_t addr, int len, - const void *v) + void *__v) { + const void *v = __v; int handled = 0; int n; + trace_kvm_mmio(KVM_TRACE_MMIO_WRITE, len, addr, __v); + do { n = min(len, 8); if (!(lapic_in_kernel(vcpu) && @@ -8131,12 +8134,6 @@ static int write_emulate(struct kvm_vcpu *vcpu, gpa_t gpa, return emulator_write_phys(vcpu, gpa, val, bytes); } -static int write_mmio(struct kvm_vcpu *vcpu, gpa_t gpa, int bytes, void *val) -{ - trace_kvm_mmio(KVM_TRACE_MMIO_WRITE, bytes, gpa, val); - return vcpu_mmio_write(vcpu, gpa, bytes, val); -} - static const struct read_write_emulator_ops read_emultor = { .read_write_emulate = read_emulate, .read_write_mmio = vcpu_mmio_read, @@ -8144,7 +8141,7 @@ static const struct read_write_emulator_ops read_emultor = { static const struct read_write_emulator_ops write_emultor = { .read_write_emulate = write_emulate, - .read_write_mmio = write_mmio, + .read_write_mmio = vcpu_mmio_write, .write = true, }; -- 2.53.0.414.gf7e9f6c205-goog