From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-pl1-f202.google.com (mail-pl1-f202.google.com [209.85.214.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 11081221D92 for ; Thu, 26 Jun 2025 05:48:35 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.202 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1750916917; cv=none; b=hlOc1R8g6eeIyS4R1sDE+Nh6j1TzQ8T9SEdkqA4xK4FqM8ePn78eGelmjd5ue0MsSadFqap+e7H6hSDSw5AA9bmfAhOZF6bYTKbn8qh05LnZYUh/cjIsH71Jqw/KbruCL+YtqXCge1cnuIg2JnqiGhOKk+d1tnPatoHAQDrXIQ8= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1750916917; c=relaxed/simple; bh=I2DV6rRx2Cjv+IUAW0F5JSmoyWJANossHcJsAVjMTU8=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=LunYG2MdjqDPwVuezscmHyzltHPfjUXbmDkE13LOnvVZwasQRe1vhxjiArQRghIYxs6ioIVCvD6zWBag2hU3MZIAN+ZR6J1NmP1zMYLUtXlhxIzgeI49nBxbYaR8vg7T9QUqgHXhuOI2LhFehMfJrVqU3+V0UpWy5k/g3ONsns4= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com; spf=pass smtp.mailfrom=flex--irogers.bounces.google.com; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b=WVb5VnCv; arc=none smtp.client-ip=209.85.214.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--irogers.bounces.google.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b="WVb5VnCv" Received: by mail-pl1-f202.google.com with SMTP id d9443c01a7336-234b133b428so4593795ad.3 for ; Wed, 25 Jun 2025 22:48:35 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1750916915; x=1751521715; 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=No7VYJnrsaMBClQyRTA21U4NQdkCFvGbDpgoUA5SP00=; b=WVb5VnCvREVkiQCpG7w21OmHZdDFpF5K2Goe006se2Kfad2K7x2IrqEFTMvhpa6+Cu SjUafPDIO+K/GAJDqN7E9W5E+M8JEBd30ufj4XTGeezubNjLyaG8k9BxSkWapXbVCzy6 jy50rzu4qsrzs+o/sIAZyWqvmszrN0uxyPYgxe1m8CLaOFtdTsEz1nsiq9/MMKzw+DIB MTTEIV8HB5LQmh0Lbo3GEE85iiSuT9XNnJqdWDhh9sj7I9E05dwdVP/Z0jXiss4/rBw8 CDs1/r/ZMD8gLCjEl/c6rdXBBne9HJHOfjDlhFBfvZW10aqdB1polgEsIGcrEAVTRkmu U/8g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1750916915; x=1751521715; 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=No7VYJnrsaMBClQyRTA21U4NQdkCFvGbDpgoUA5SP00=; b=JR4/7yoKvQEqgjRwXkyFRf/V9rmd1ydsJzflVPqY5F2HOdjO5trpDEiG2+8TG4VhFl s7wm4DFu9iAffRQcjtVzQaSAP5058CQa/vBppRKYYSWlKNuM49o7Ip2AzKwEN8WRSsAt Dx0tYgOiD9fxquEqaBLRrlwTCckwU0JZheo9USBloLNnjKfIRPyn45Qkg7WKooAgsQJC 8ZI3wiyJijsVNIeOf8cgDBEONaGAkx7EHGMmnT4qqb1qvCCYNAYmqPH7KDkfCtCxhLo1 kR37XYQJ94jBbMVEDFkDop9+5FFrHHyHMxZ3+Juu2eR4BRcLjg5OJA33sFQU8qbLc1WW t3TQ== X-Forwarded-Encrypted: i=1; AJvYcCWzCHvKWtmysS0lIl6gpQ+lBRPkGsZPvnI6y0YGR6DRiRy3QMxQYcIu0a8x1/sIxn2IN9tNmnni8S7id4zkyJfB@vger.kernel.org X-Gm-Message-State: AOJu0Ywgv7uQ0zgMZS/BNq3qiHcTjdxXsxjHOFlsXxd8sGdZPXPf8EAC LewGHERt2asqCY1igZoSm91ry0fEqz94Yxr4wmnxwjw9pq7rc80VUqhx+Hyjah91DjoOfdLuSNG gThtk9OASzw== X-Google-Smtp-Source: AGHT+IEsY38vIXEEuF4IRkd5xvRhTuGPG8ULpVkQr9FeQ29MCI+w1O99arFqY6BeYv2pTQt//M6Fxu4UQHw5 X-Received: from plof2.prod.google.com ([2002:a17:902:8602:b0:234:d477:3b7a]) (user=irogers job=prod-delivery.src-stubby-dispatcher) by 2002:a17:903:2f92:b0:234:88f5:c0d1 with SMTP id d9443c01a7336-238c86ee242mr41530295ad.10.1750916915313; Wed, 25 Jun 2025 22:48:35 -0700 (PDT) Date: Wed, 25 Jun 2025 22:48:25 -0700 In-Reply-To: <20250626054826.433453-1-irogers@google.com> Precedence: bulk X-Mailing-List: linux-perf-users@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: Mime-Version: 1.0 References: <20250626054826.433453-1-irogers@google.com> X-Mailer: git-send-email 2.50.0.727.gbf7dc18ff4-goog Message-ID: <20250626054826.433453-3-irogers@google.com> Subject: [PATCH v3 2/3] tools headers: Update the linux/unaligned.h copy with the kernel sources From: Ian Rogers To: Eric Biggers , Yuzhuo Jing , Andy Lutomirski , Thomas Gleixner , Vincenzo Frascino , Arnaldo Carvalho de Melo , Al Viro , Christophe Leroy , "Jason A. Donenfeld" , linux-kernel@vger.kernel.org, linux-perf-users@vger.kernel.org Cc: Ian Rogers Content-Type: text/plain; charset="UTF-8" To pick up the changes in: fe9b2b7b3583 vdso: Switch get/put unaligned from packed struct to memcpy As the code is dependent on __unqual_scalar_typeof, update the tools version of compiler_types.h to include this. Signed-off-by: Ian Rogers --- tools/include/linux/compiler_types.h | 22 ++++++++++++++++ tools/include/vdso/unaligned.h | 39 +++++++++++++++++++++++----- 2 files changed, 55 insertions(+), 6 deletions(-) diff --git a/tools/include/linux/compiler_types.h b/tools/include/linux/compiler_types.h index d09f9dc172a4..890982283a5e 100644 --- a/tools/include/linux/compiler_types.h +++ b/tools/include/linux/compiler_types.h @@ -40,4 +40,26 @@ #define asm_goto_output(x...) asm goto(x) #endif +/* + * __unqual_scalar_typeof(x) - Declare an unqualified scalar type, leaving + * non-scalar types unchanged. + */ +/* + * Prefer C11 _Generic for better compile-times and simpler code. Note: 'char' + * is not type-compatible with 'signed char', and we define a separate case. + */ +#define __scalar_type_to_expr_cases(type) \ + unsigned type: (unsigned type)0, \ + signed type: (signed type)0 + +#define __unqual_scalar_typeof(x) typeof( \ + _Generic((x), \ + char: (char)0, \ + __scalar_type_to_expr_cases(char), \ + __scalar_type_to_expr_cases(short), \ + __scalar_type_to_expr_cases(int), \ + __scalar_type_to_expr_cases(long), \ + __scalar_type_to_expr_cases(long long), \ + default: (x))) + #endif /* __LINUX_COMPILER_TYPES_H */ diff --git a/tools/include/vdso/unaligned.h b/tools/include/vdso/unaligned.h index ff0c06b6513e..0ccbcc9aa493 100644 --- a/tools/include/vdso/unaligned.h +++ b/tools/include/vdso/unaligned.h @@ -2,14 +2,41 @@ #ifndef __VDSO_UNALIGNED_H #define __VDSO_UNALIGNED_H -#define __get_unaligned_t(type, ptr) ({ \ - const struct { type x; } __packed * __get_pptr = (typeof(__get_pptr))(ptr); \ - __get_pptr->x; \ +#include + +/** + * __get_unaligned_t - read an unaligned value from memory. + * @type: the type to load from the pointer. + * @ptr: the pointer to load from. + * + * Use memcpy to affect an unaligned type sized load avoiding undefined behavior + * from approaches like type punning that require -fno-strict-aliasing in order + * to be correct. As type may be const, use __unqual_scalar_typeof to map to a + * non-const type - you can't memcpy into a const type. The void* cast silences + * ubsan warnings. + */ +#define __get_unaligned_t(type, ptr) ({ \ + type __get_unaligned_ctrl_type __always_unused; \ + __unqual_scalar_typeof(__get_unaligned_ctrl_type) __get_unaligned_val; \ + __builtin_memcpy(&__get_unaligned_val, (void *)(ptr), \ + sizeof(__get_unaligned_val)); \ + __get_unaligned_val; \ }) -#define __put_unaligned_t(type, val, ptr) do { \ - struct { type x; } __packed * __put_pptr = (typeof(__put_pptr))(ptr); \ - __put_pptr->x = (val); \ +/** + * __put_unaligned_t - write an unaligned value to memory. + * @type: the type of the value to store. + * @val: the value to store. + * @ptr: the pointer to store to. + * + * Use memcpy to affect an unaligned type sized store avoiding undefined + * behavior from approaches like type punning that require -fno-strict-aliasing + * in order to be correct. The void* cast silences ubsan warnings. + */ +#define __put_unaligned_t(type, val, ptr) do { \ + type __put_unaligned_val = (val); \ + __builtin_memcpy((void *)(ptr), &__put_unaligned_val, \ + sizeof(__put_unaligned_val)); \ } while (0) #endif /* __VDSO_UNALIGNED_H */ -- 2.50.0.727.gbf7dc18ff4-goog