From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-yb1-f202.google.com (mail-yb1-f202.google.com [209.85.219.202]) (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 2477B20DF7 for ; Thu, 28 Mar 2024 02:48:31 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.219.202 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1711594113; cv=none; b=rJzYA9aCfg1ZMuXlMQaZJmgs2KtkNV8BpFvIgqWBD4/GoQueLzkwu0r/QRlsUGhkP9gqTeXibNqdKR93Vj9ItClUB0tBe7Ml54KbyTibbOHQWBzmhOH46sbgzMnDcfSVRUoVR/9vonwNFAlAW0qGcNrqA+ExzBcNJNRMx3y3uCc= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1711594113; c=relaxed/simple; bh=5eGGDSk4BD3UY2fAfn703dVtF9ub3OwUFQVO9EkJFY8=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=S1J/BR8IN4/ljWwhFQ3dNcPA1m4lni1Ub+yVynFqt4GZNf8joyk1xHRU5cCfDe5DNTuS/N2JrYNzCCG3998imVMtbGJUlkFtvYDpZ8kEMgb7YMm5kG7zslHyDh8mnVNtCT5n5WJ/bSJX5F8dNsDt5FxYAjendGzg2M+9K3ECXwo= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com; spf=pass smtp.mailfrom=flex--ackerleytng.bounces.google.com; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b=14JQ7/Dj; arc=none smtp.client-ip=209.85.219.202 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--ackerleytng.bounces.google.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b="14JQ7/Dj" Received: by mail-yb1-f202.google.com with SMTP id 3f1490d57ef6-dcbee93a3e1so728983276.3 for ; Wed, 27 Mar 2024 19:48:31 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1711594111; x=1712198911; darn=vger.kernel.org; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:from:to:cc:subject:date:message-id:reply-to; bh=9X/k4Ur7ktRAsFVEZTgADbEiXncvofPy+APEnCk0Uuc=; b=14JQ7/DjxpcIpqUPcpkmm6lMZhr4UkwbX/x7BaUlaHUJEBi0y2C2z+x+MCSdYG3UIi bZfRthj5MtMXl7eOAd2r5kXnN6bx+dtN8fJMBag+lfr80xlY51sWpuQ5LEu1OjHNOlov BBwW/hICZYjFQDDivmf3+uYOvP6aPNltYHZgvKKsGqWOXSqC3yBjH7QELecDNnMqn1Ya 0WTvoygudERs5neAdqJRKrKJ3KD8zUvBGJbuPndfK5yCfIdPM1NcHMsp5W2F9HfJMg69 ac4+EXNu9V4jPHUENiUbFpFdNrJisQhFzXyjsIPKkobIQ29l/721Orj4PnsWX1yNMsWI 9O6w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1711594111; x=1712198911; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=9X/k4Ur7ktRAsFVEZTgADbEiXncvofPy+APEnCk0Uuc=; b=TIjFPVK/UTigruPpdbPfzjlAdA8J4qATAfiwF+1UX6wPAGxsH/AgDFqgSdNtMX/x1S Tpl3ClH7VbfR4BY3nN28LnCCyVA52LnoUTH7J0tQO+zkTf4c9gZQWtAvBsOWw7NsoN4B hNZxhrA3KI0BX/Vh+d7Al1TewiHlPkYi/yKas6ueONThgEsFB7LWLUYBifz5zegrBjYt pHJT0upMoQURHGpLWVZIRVtFe5nEQRz1EyV7OTgUYKsyI1fLpAZzlVcTE4WBWZWoKzj1 rr95A4Xoewzjc3e0Ijcs5DqEBE+B5m9DRcMwL27n/SKA71/A4Ks6wpv9uS6AZupqro8a 3ozQ== X-Forwarded-Encrypted: i=1; AJvYcCV+Z2sEtnO3hXU+u+LcJ1YCra3FcEGwfxjZ4AliFZ8+KCJD97kg3YIJB9bUfWOslbJ5hN1Op2cJ0qzC6ez487C3gzmQ3EWWg8mZwd4k X-Gm-Message-State: AOJu0YzaXGL7AubuukKQfhhQUfQw2PM0XVQqZv+qnPFbP4FQxhE+YR3/ 8V4+ynuRsuVQk+1gedsbos9ATfkLzRLrwnhxvWsZ479y5fvclKGx05K36aNMAydV2ZfTy1VFs3x Ri02jvOpoYEmpq/5/uMTIUg== X-Google-Smtp-Source: AGHT+IHCBcXGdwnKOw373UKcOQTGGrOXXtILBB7knODDR6g2De9IJeAdRjNIMJCvIjU14tTQdEZAyXnNc8ki3rX1vA== X-Received: from ctop-sg.c.googlers.com ([fda3:e722:ac3:cc00:4f:4b78:c0a8:1223]) (user=ackerleytng job=sendgmr) by 2002:a05:6902:260b:b0:dc8:27e6:cde1 with SMTP id dw11-20020a056902260b00b00dc827e6cde1mr124693ybb.5.1711594111169; Wed, 27 Mar 2024 19:48:31 -0700 (PDT) Date: Thu, 28 Mar 2024 02:48:27 +0000 In-Reply-To: <20240314232637.2538648-3-seanjc@google.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: Mime-Version: 1.0 References: <20240314232637.2538648-1-seanjc@google.com> <20240314232637.2538648-3-seanjc@google.com> Message-ID: Subject: Re: [PATCH 02/18] KVM: sefltests: Add kvm_util_types.h to hold common types, e.g. vm_vaddr_t From: Ackerley Tng To: Sean Christopherson , Marc Zyngier , Oliver Upton , Paolo Bonzini , Christian Borntraeger , Janosch Frank , Claudio Imbrenda , Anup Patel , Paul Walmsley , Palmer Dabbelt , Albert Ou 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-Type: text/plain; charset="UTF-8" Sean Christopherson writes: > Move the base types unique to KVM selftests out of kvm_util.h and into a > new header, kvm_util_types.h. This will allow kvm_util_arch.h, i.e. core > arch headers, to reference common types, e.g. vm_vaddr_t and vm_paddr_t. > > No functional change intended. > > Signed-off-by: Sean Christopherson > --- > .../testing/selftests/kvm/include/kvm_util.h | 16 +-------------- > .../selftests/kvm/include/kvm_util_types.h | 20 +++++++++++++++++++ > 2 files changed, 21 insertions(+), 15 deletions(-) > create mode 100644 tools/testing/selftests/kvm/include/kvm_util_types.h > > diff --git a/tools/testing/selftests/kvm/include/kvm_util.h b/tools/testing/selftests/kvm/include/kvm_util.h > index 95baee5142a7..acdcddf78e3f 100644 > --- a/tools/testing/selftests/kvm/include/kvm_util.h > +++ b/tools/testing/selftests/kvm/include/kvm_util.h > @@ -21,28 +21,14 @@ > #include > > #include "kvm_util_arch.h" > +#include "kvm_util_types.h" > #include "sparsebit.h" > > -/* > - * Provide a version of static_assert() that is guaranteed to have an optional > - * message param. If _ISOC11_SOURCE is defined, glibc (/usr/include/assert.h) > - * #undefs and #defines static_assert() as a direct alias to _Static_assert(), > - * i.e. effectively makes the message mandatory. Many KVM selftests #define > - * _GNU_SOURCE for various reasons, and _GNU_SOURCE implies _ISOC11_SOURCE. As > - * a result, static_assert() behavior is non-deterministic and may or may not > - * require a message depending on #include order. > - */ > -#define __kvm_static_assert(expr, msg, ...) _Static_assert(expr, msg) > -#define kvm_static_assert(expr, ...) __kvm_static_assert(expr, ##__VA_ARGS__, #expr) > - > #define KVM_DEV_PATH "/dev/kvm" > #define KVM_MAX_VCPUS 512 > > #define NSEC_PER_SEC 1000000000L > > -typedef uint64_t vm_paddr_t; /* Virtual Machine (Guest) physical address */ > -typedef uint64_t vm_vaddr_t; /* Virtual Machine (Guest) virtual address */ > - > struct userspace_mem_region { > struct kvm_userspace_memory_region2 region; > struct sparsebit *unused_phy_pages; > diff --git a/tools/testing/selftests/kvm/include/kvm_util_types.h b/tools/testing/selftests/kvm/include/kvm_util_types.h > new file mode 100644 > index 000000000000..764491366eb9 > --- /dev/null > +++ b/tools/testing/selftests/kvm/include/kvm_util_types.h > @@ -0,0 +1,20 @@ > +/* SPDX-License-Identifier: GPL-2.0-only */ > +#ifndef SELFTEST_KVM_UTIL_TYPES_H > +#define SELFTEST_KVM_UTIL_TYPES_H > + > +/* > + * Provide a version of static_assert() that is guaranteed to have an optional > + * message param. If _ISOC11_SOURCE is defined, glibc (/usr/include/assert.h) > + * #undefs and #defines static_assert() as a direct alias to _Static_assert(), > + * i.e. effectively makes the message mandatory. Many KVM selftests #define > + * _GNU_SOURCE for various reasons, and _GNU_SOURCE implies _ISOC11_SOURCE. As > + * a result, static_assert() behavior is non-deterministic and may or may not > + * require a message depending on #include order. > + */ > +#define __kvm_static_assert(expr, msg, ...) _Static_assert(expr, msg) > +#define kvm_static_assert(expr, ...) __kvm_static_assert(expr, ##__VA_ARGS__, #expr) > + > +typedef uint64_t vm_paddr_t; /* Virtual Machine (Guest) physical address */ > +typedef uint64_t vm_vaddr_t; /* Virtual Machine (Guest) virtual address */ > + > +#endif /* SELFTEST_KVM_UTIL_TYPES_H */ > -- > 2.44.0.291.gc1ea87d7ee-goog Reviewed-by: Ackerley Tng