From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-il1-x130.google.com (mail-il1-x130.google.com [IPv6:2607:f8b0:4864:20::130]) by sourceware.org (Postfix) with ESMTPS id 66994385E02F for ; Wed, 14 Feb 2024 14:32:56 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 66994385E02F Authentication-Results: sourceware.org; dmarc=none (p=none dis=none) header.from=rivosinc.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=rivosinc.com ARC-Filter: OpenARC Filter v1.0.0 sourceware.org 66994385E02F Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=2607:f8b0:4864:20::130 ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1707921179; cv=none; b=VQ18miTpw5GxVVuwrpdIx1c9R3YCOxdJ3C8apO715uJepIs3vm7VPX28RI6uP0ipeGSiLa6+rujAb4JrnQJMkgFfAVd90S/CBvfLDQlGahozURRpR+g51ns5SvXrgOADpY+LAfnb5LxYEIUqF7c6v//Xbvzn/na0Uoaqhp0BCss= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1707921179; c=relaxed/simple; bh=UnKyy1ukjSKYqVd90v+CtuJef8i2fEiXmdUVIwiOHko=; h=DKIM-Signature:From:To:Subject:Date:Message-Id:MIME-Version; b=bLqVs8VMfw6XpgKHMt8GCgtRi+p0eq61Yg92yRB+NdWyN1vdoiC8H+NfVvmc7wLX8RbiI6GHFUVZW9P02hmsPJ8C/AFzmZ1XLbbzoSROmKYh0qnhBrew28aZ5Vvih9dUNslM36k2I4sMD5saTyMtV8CF7Gu6WJBdc6KtqgUnsEI= ARC-Authentication-Results: i=1; server2.sourceware.org Received: by mail-il1-x130.google.com with SMTP id e9e14a558f8ab-363d85fda93so18267305ab.1 for ; Wed, 14 Feb 2024 06:32:56 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=rivosinc-com.20230601.gappssmtp.com; s=20230601; t=1707921175; x=1708525975; darn=sourceware.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=gojGF3ao4MuuQ17fKclkOOLHiBX3fJLJqwJjkB2z6QU=; b=FeAjgLvjKwKvVfN1xElTz2mVqK1K/hiLPfxJ2Lwwkzh0vL/yZPW1mFt0Li48Iv+5YB 4kjjEofZLqKKlSOLihTRi2sVjFnU5h4gxA471l0D7yJ7jqNRws2v3ciomZcbHHkg3mmR C2YOlA6VuiqOqiK8SeCM9YCCk1j5UvM0z9Cwvm+k1ydr0rwrC10MRItjMcirZxKipysL b0FPX8VuRILgAarxD5L5FdzTb3eX5jb1uCTKZ4T3HUEPWEq/ZSqhPGjb7jIvc55pZeUl EnGALzRI6MQFas7RO2TF0ISqunhA2ljJmvMplLsu92gfGtgsDMZekdhT0a8DWsZN3+u9 73ww== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1707921175; x=1708525975; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=gojGF3ao4MuuQ17fKclkOOLHiBX3fJLJqwJjkB2z6QU=; b=i81ozNzrfScCJk1SHrEZpIp9YDW4wE8GpIfZnUWITvFh/uNnfPBYl2WurhQslc184K iC9JbVMDJA/J4DwLWKlOg+8BcfjdmXzipNU2MhZ0D387PS8t4H86cZAJp/h9q7vfHRwK dB1UXSwkKf1OhZLy7oQsCxHtBXhsQvRtWFMAOHqdWhCNv4dkDixfW6uFbNewAC3FC/oU x02yRY8/tsFOswzkc/Uvtiq84a1cnasKuEoyHF6f2kT7p/8lVmUPDD5bZUNsFR13KuOq wJDrVsGv1JY6w4nfoO8KoVElj3EHUVWfZnIiTEXZ2YJvrnuau9fRocLeysXsKAAL6UpE 8WWA== X-Gm-Message-State: AOJu0YxA1soOUQ+uwDt0I7pD9KYDvfllwVtF0HBSZBIM+LW2ak0w02n1 jYUsvxRCZ/iof/eD+HI/IrKLaOmGBU916iHPiOVFvzPemMKoJ3Ori/S2ObIF94l5aljHei5gsnH 2 X-Google-Smtp-Source: AGHT+IHUKd89IcbC3jb4yQSGSQI10Ij2heD3Enz0uDgkS/1ns4zHRDo9MlWEGp8RAGcCm6lJg/6g0A== X-Received: by 2002:a05:6e02:80e:b0:363:bc58:1ebd with SMTP id u14-20020a056e02080e00b00363bc581ebdmr3089326ilm.10.1707921175058; Wed, 14 Feb 2024 06:32:55 -0800 (PST) X-Forwarded-Encrypted: i=1; AJvYcCWAe7tG2kjKtOLj/vhaEo0I6gP+MsqR+45IHA91kTTDzNbM317Lio0yykSiiA48BWDJu9HVtFZCSV6B/14R20OiTOFtLZn+Sg1HcXPNE5D0RmCp9by9iuhqk4OVQEaXkQ8CajXcaEISOFnPyFPPiZ25lMLy8sRQydAeyuDGXJel Received: from evan.ba.rivosinc.com ([64.71.180.162]) by smtp.gmail.com with ESMTPSA id k21-20020a635a55000000b005dc98d9114bsm1140255pgm.43.2024.02.14.06.32.54 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 14 Feb 2024 06:32:54 -0800 (PST) From: Evan Green To: libc-alpha@sourceware.org Cc: vineetg@rivosinc.com, Florian Weimer , slewis@rivosinc.com, palmer@rivosinc.com, Evan Green Subject: [PATCH v12 5/7] riscv: Enable multi-arg ifunc resolvers Date: Wed, 14 Feb 2024 06:31:56 -0800 Message-Id: <20240214143159.2951158-6-evan@rivosinc.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20240214143159.2951158-1-evan@rivosinc.com> References: <20240214143159.2951158-1-evan@rivosinc.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-11.7 required=5.0 tests=BAYES_00,DKIM_SIGNED,DKIM_VALID,GIT_PATCH_0,KAM_SHORT,RCVD_IN_DNSWL_NONE,SPF_HELO_NONE,SPF_PASS,TXREP,T_SCC_BODY_TEXT_LINE,URIBL_BLACK autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org List-Id: RISC-V is apparently the first architecture to pass more than one argument to ifunc resolvers. The helper macros in libc-symbols.h, __ifunc_resolver(), __ifunc(), and __ifunc_hidden(), are incompatible with this. These macros have an "arg" (non-final) parameter that represents the parameter signature of the ifunc resolver. The result is an inability to pass the required comma through in a single preprocessor argument. Rearrange the __ifunc_resolver() macro to be variadic, and pass the types as those variable parameters. Move the guts of __ifunc() and __ifunc_hidden() into new macros, __ifunc_args(), and __ifunc_args_hidden(), that pass the variable arguments down through to __ifunc_resolver(). Then redefine __ifunc() and __ifunc_hidden(), which are used in a bunch of places, to simply shuffle the arguments down into __ifunc_args[_hidden]. Finally, define a riscv-ifunc.h header, which provides convenience macros to those looking to write ifunc selectors that use both arguments. Signed-off-by: Evan Green --- (no changes since v11) Changes in v11: - Update copyright year (Adhemerval) Changes in v9: - Fix a couple of typos causing powerpc not to build (build-many-glibcs) Changes in v6: - Introduced riscv-ifunc.h for multi-arg ifunc selectors. --- include/libc-symbols.h | 28 +++++++++++++++++----------- sysdeps/riscv/riscv-ifunc.h | 27 +++++++++++++++++++++++++++ 2 files changed, 44 insertions(+), 11 deletions(-) create mode 100644 sysdeps/riscv/riscv-ifunc.h diff --git a/include/libc-symbols.h b/include/libc-symbols.h index e21bb599b3..4367aa6740 100644 --- a/include/libc-symbols.h +++ b/include/libc-symbols.h @@ -667,9 +667,9 @@ for linking") #endif /* Helper / base macros for indirect function symbols. */ -#define __ifunc_resolver(type_name, name, expr, arg, init, classifier) \ +#define __ifunc_resolver(type_name, name, expr, init, classifier, ...) \ classifier inhibit_stack_protector \ - __typeof (type_name) *name##_ifunc (arg) \ + __typeof (type_name) *name##_ifunc (__VA_ARGS__) \ { \ init (); \ __typeof (type_name) *res = expr; \ @@ -677,13 +677,13 @@ for linking") } #ifdef HAVE_GCC_IFUNC -# define __ifunc(type_name, name, expr, arg, init) \ +# define __ifunc_args(type_name, name, expr, init, ...) \ extern __typeof (type_name) name __attribute__ \ ((ifunc (#name "_ifunc"))); \ - __ifunc_resolver (type_name, name, expr, arg, init, static) + __ifunc_resolver (type_name, name, expr, init, static, __VA_ARGS__) -# define __ifunc_hidden(type_name, name, expr, arg, init) \ - __ifunc (type_name, name, expr, arg, init) +# define __ifunc_args_hidden(type_name, name, expr, init, ...) \ + __ifunc_args (type_name, name, expr, init, __VA_ARGS__) #else /* Gcc does not support __attribute__ ((ifunc (...))). Use the old behaviour as fallback. But keep in mind that the debug information for the ifunc @@ -694,18 +694,24 @@ for linking") different signatures. (Gcc support is disabled at least on a ppc64le Ubuntu 14.04 system.) */ -# define __ifunc(type_name, name, expr, arg, init) \ +# define __ifunc_args(type_name, name, expr, init, ...) \ extern __typeof (type_name) name; \ - __typeof (type_name) *name##_ifunc (arg) __asm__ (#name); \ - __ifunc_resolver (type_name, name, expr, arg, init,) \ + __typeof (type_name) *name##_ifunc (__VA_ARGS__) __asm__ (#name); \ + __ifunc_resolver (type_name, name, expr, init, , __VA_ARGS__) \ __asm__ (".type " #name ", %gnu_indirect_function"); -# define __ifunc_hidden(type_name, name, expr, arg, init) \ +# define __ifunc_args_hidden(type_name, name, expr, init, ...) \ extern __typeof (type_name) __libc_##name; \ - __ifunc (type_name, __libc_##name, expr, arg, init) \ + __ifunc (type_name, __libc_##name, expr, __VA_ARGS__, init) \ strong_alias (__libc_##name, name); #endif /* !HAVE_GCC_IFUNC */ +#define __ifunc(type_name, name, expr, arg, init) \ + __ifunc_args (type_name, name, expr, init, arg) + +#define __ifunc_hidden(type_name, name, expr, arg, init) \ + __ifunc_args_hidden (type_name, name, expr, init, arg) + /* The following macros are used for indirect function symbols in libc.so. First of all, you need to have the function prototyped somewhere, say in foo.h: diff --git a/sysdeps/riscv/riscv-ifunc.h b/sysdeps/riscv/riscv-ifunc.h new file mode 100644 index 0000000000..c77ab51548 --- /dev/null +++ b/sysdeps/riscv/riscv-ifunc.h @@ -0,0 +1,27 @@ +/* Common definition for ifunc resolvers. Linux/RISC-V version. + This file is part of the GNU C Library. + Copyright (C) 2024 Free Software Foundation, Inc. + + The GNU C Library is free software; you can redistribute it and/or + modify it under the terms of the GNU Lesser General Public + License as published by the Free Software Foundation; either + version 2.1 of the License, or (at your option) any later version. + + The GNU C Library is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Lesser General Public License for more details. + + You should have received a copy of the GNU Lesser General Public + License along with the GNU C Library; if not, see + . */ + +#include +#include +#include + +#define INIT_ARCH() + +#define riscv_libc_ifunc(name, expr) \ + __ifunc_args (name, name, expr(hwcap, hwprobe), INIT_ARCH, \ + uint64_t hwcap, __riscv_hwprobe_t hwprobe) -- 2.34.1