From nobody Mon Feb 9 01:30:01 2026 Received: from mail-pl1-f201.google.com (mail-pl1-f201.google.com [209.85.214.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 1BED8137C35 for ; Sat, 11 Jan 2025 00:50:58 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.201 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1736556660; cv=none; b=tZM0yD1ozwoXmOKuw9cHV/A4926/riAk0tFwtGHPAhFAOZ3dAnFJvx21giJBlDqb6CU7CwXCN0VafpAVQbbwrFGBIwakwQ5wJ1giLNATMqvNyYgvtl8D2NWYcAP9JuAAP6Jgi8iDeGz768xr1ygWU9NNhourrt8Ya4wi2v6jgwI= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1736556660; c=relaxed/simple; bh=cdYoQmC1gHgaq22PDsiZGCRoGD7RLzRK9PeAtDWgW1s=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=YtcnrQMRavAUt6h2X/S6asd8RIcj+4gqjAX7Kv82SSMvQJNg4EmdKPWZptEI2P5mFpnKeQC3hSa3CIlB9DfnQ6JDGENxnkJDrCQjuG/Ksh5b1IKeRg4InXKG6DXMdXMcKLnZbdeglvQGcNxBwes4m6UonrjSFD/qMeEJtjo0ADo= 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=M/2tOqie; arc=none smtp.client-ip=209.85.214.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="M/2tOqie" Received: by mail-pl1-f201.google.com with SMTP id d9443c01a7336-2167141e00eso44277235ad.2 for ; Fri, 10 Jan 2025 16:50:58 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1736556658; x=1737161458; 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=FOB7JN0OSt2j8FiVppNC5qzgljC2YrzarOO3DmltLC8=; b=M/2tOqieyewvDcvF/7h4VIbprC04HVlZpZVS0Y42BX3wB//yocBD1i7/97sKnHrPHb K0mGlsoXLiTRvSo1sxwTvtBI2IA/aNbUkO/uACjnZXaEhqTDKy9hltRE9M3k1Dh14n0+ /6ThSEPYp28+cKFKtV71pm6ZTXRKRRkXDWH0T0LuhoOCrUAmQ4BclU1fT3nmwGUmeqB8 B+EgatRx4mr14R/LETzRfGYfcvtnThGRs+2zaRGYZGecrst3PE8fp59CVqGZnXl/ICj9 SSqY0GOFwZ50SD7chkkLCOoD2XBVB9ZBRGbdNNOPYt+triymYk0gSXfE00FBF8qVxel7 jEnA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1736556658; x=1737161458; 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=FOB7JN0OSt2j8FiVppNC5qzgljC2YrzarOO3DmltLC8=; b=aTcoVf+YIr1s6PQB5eS1fUqOsrpKFEFJyXGhE3KLyXygmfMT7pd/mbklhhczTXBFhe I+rmJ5cxzLpBbGHIGdlTXPF+QY4XMVWW64BywE17J0DcdZFujqE4sLxthHNqJjHIHY9u ZBVQxlihOW64lKPQgpgEVjjEQY1MjlEDUP1heeP5mr5J6hMQ/4N89eQYdKD3ovEj2Pvh 1r6CWR8nAkwb0puxguw3Q8oL4tKRyBoqd5YmswbM701ZcT5OmSJVt0+XM4nU1g51paKV R3/5dm4x/WwAdn58S8ji9YYW6tzjKNdbsb/rL1I67ZrZ029PUgTAthLydGKVroRhnzSf RYHw== X-Forwarded-Encrypted: i=1; AJvYcCXk8WKdf8cppT0o59Isarv9zd4noG632XqgwgIiyMKkGaWYXTlOJyEnS9tB9Vas1/QyzYC+TLTMx6oxAVE=@vger.kernel.org X-Gm-Message-State: AOJu0YzAJ9suYQKCuL1juK42o4Nix1OH6EQFw7iuwmXOG9DI5alMfBwZ k50xay4edIASACna1WJTYM2ERGNAiZPv/rHwCi+P1I61PSxm8F8y/5L1PUDKG4U0CXhPhnJuwEy XSg== X-Google-Smtp-Source: AGHT+IHw+facaWQOVSZ1pCK120eQYAoo8aTdmYyBocQEoqyBkRp7UviUm/cm4T86jySXDaDXKVoax9zRB1k= X-Received: from pgqb5.prod.google.com ([2002:a65:41c5:0:b0:9a1:7139:ff84]) (user=seanjc job=prod-delivery.src-stubby-dispatcher) by 2002:a05:6a21:339b:b0:1e0:bf98:42dc with SMTP id adf61e73a8af0-1e88d0bfa04mr21140343637.28.1736556658420; Fri, 10 Jan 2025 16:50:58 -0800 (PST) Reply-To: Sean Christopherson Date: Fri, 10 Jan 2025 16:50:44 -0800 In-Reply-To: <20250111005049.1247555-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: <20250111005049.1247555-1-seanjc@google.com> X-Mailer: git-send-email 2.47.1.613.gc27f4b7a9f-goog Message-ID: <20250111005049.1247555-5-seanjc@google.com> Subject: [PATCH v2 4/9] KVM: selftests: Macrofy vm_get_stat() to auto-generate stat name string From: Sean Christopherson To: Marc Zyngier , Oliver Upton , Anup Patel , Paul Walmsley , Palmer Dabbelt , Albert Ou , Christian Borntraeger , Janosch Frank , Claudio Imbrenda , Sean Christopherson , Paolo Bonzini Cc: linux-arm-kernel@lists.infradead.org, kvmarm@lists.linux.dev, kvm@vger.kernel.org, kvm-riscv@lists.infradead.org, linux-riscv@lists.infradead.org, linux-kernel@vger.kernel.org Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Turn vm_get_stat() into a macro that generates a string for the stat name, as opposed to taking a string. This will allow hardening stat usage in the future to generate errors on unknown stats at compile time. No functional change intended. Signed-off-by: Sean Christopherson --- tools/testing/selftests/kvm/include/kvm_util.h | 14 +++++++------- .../kvm/x86/dirty_log_page_splitting_test.c | 6 +++--- .../testing/selftests/kvm/x86/nx_huge_pages_test.c | 4 ++-- 3 files changed, 12 insertions(+), 12 deletions(-) diff --git a/tools/testing/selftests/kvm/include/kvm_util.h b/tools/testing= /selftests/kvm/include/kvm_util.h index 4c4e5a847f67..044c2231431e 100644 --- a/tools/testing/selftests/kvm/include/kvm_util.h +++ b/tools/testing/selftests/kvm/include/kvm_util.h @@ -534,13 +534,13 @@ void read_stat_data(int stats_fd, struct kvm_stats_he= ader *header, void __vm_get_stat(struct kvm_vm *vm, const char *stat_name, uint64_t *dat= a, size_t max_elements); =20 -static inline uint64_t vm_get_stat(struct kvm_vm *vm, const char *stat_nam= e) -{ - uint64_t data; - - __vm_get_stat(vm, stat_name, &data, 1); - return data; -} +#define vm_get_stat(vm, stat) \ +({ \ + uint64_t data; \ + \ + __vm_get_stat(vm, #stat, &data, 1); \ + data; \ +}) =20 void vm_create_irqchip(struct kvm_vm *vm); =20 diff --git a/tools/testing/selftests/kvm/x86/dirty_log_page_splitting_test.= c b/tools/testing/selftests/kvm/x86/dirty_log_page_splitting_test.c index 2929c067c207..b0d2b04a7ff2 100644 --- a/tools/testing/selftests/kvm/x86/dirty_log_page_splitting_test.c +++ b/tools/testing/selftests/kvm/x86/dirty_log_page_splitting_test.c @@ -41,9 +41,9 @@ struct kvm_page_stats { =20 static void get_page_stats(struct kvm_vm *vm, struct kvm_page_stats *stats= , const char *stage) { - stats->pages_4k =3D vm_get_stat(vm, "pages_4k"); - stats->pages_2m =3D vm_get_stat(vm, "pages_2m"); - stats->pages_1g =3D vm_get_stat(vm, "pages_1g"); + stats->pages_4k =3D vm_get_stat(vm, pages_4k); + stats->pages_2m =3D vm_get_stat(vm, pages_2m); + stats->pages_1g =3D vm_get_stat(vm, pages_1g); stats->hugepages =3D stats->pages_2m + stats->pages_1g; =20 pr_debug("\nPage stats after %s: 4K: %ld 2M: %ld 1G: %ld huge: %ld\n", diff --git a/tools/testing/selftests/kvm/x86/nx_huge_pages_test.c b/tools/t= esting/selftests/kvm/x86/nx_huge_pages_test.c index e7efb2b35f8b..c0d84827f736 100644 --- a/tools/testing/selftests/kvm/x86/nx_huge_pages_test.c +++ b/tools/testing/selftests/kvm/x86/nx_huge_pages_test.c @@ -73,7 +73,7 @@ static void check_2m_page_count(struct kvm_vm *vm, int ex= pected_pages_2m) { int actual_pages_2m; =20 - actual_pages_2m =3D vm_get_stat(vm, "pages_2m"); + actual_pages_2m =3D vm_get_stat(vm, pages_2m); =20 TEST_ASSERT(actual_pages_2m =3D=3D expected_pages_2m, "Unexpected 2m page count. Expected %d, got %d", @@ -84,7 +84,7 @@ static void check_split_count(struct kvm_vm *vm, int expe= cted_splits) { int actual_splits; =20 - actual_splits =3D vm_get_stat(vm, "nx_lpage_splits"); + actual_splits =3D vm_get_stat(vm, nx_lpage_splits); =20 TEST_ASSERT(actual_splits =3D=3D expected_splits, "Unexpected NX huge page split count. Expected %d, got %d", --=20 2.47.1.613.gc27f4b7a9f-goog