From patchwork Wed Dec 13 21:11:40 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Evan Green X-Patchwork-Id: 82094 Return-Path: X-Original-To: patchwork@sourceware.org Delivered-To: patchwork@sourceware.org Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 9823D384DEE1 for ; Wed, 13 Dec 2023 21:12:57 +0000 (GMT) X-Original-To: libc-alpha@sourceware.org Delivered-To: libc-alpha@sourceware.org Received: from mail-oo1-xc31.google.com (mail-oo1-xc31.google.com [IPv6:2607:f8b0:4864:20::c31]) by sourceware.org (Postfix) with ESMTPS id 4C869385DC11 for ; Wed, 13 Dec 2023 21:12:07 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 4C869385DC11 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 4C869385DC11 Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=2607:f8b0:4864:20::c31 ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1702501929; cv=none; b=s658/Qh4YwD9FahZd7HHzJojxVqboVZEatES5Z2kt1P1W8P8r4614ks7e1TcpMiWMxCeirq+tWMUfyBRNmrSDWqi75Xreg1N5jFdHmQzEP55kayi7ZlZfL/IQ5T5wrUK/3ujRC4D4uu+KQq88kIS21Xeoou9NudXjF1wUDpbRPA= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1702501929; c=relaxed/simple; bh=OmmaHEABqlfURONSAAIufLVjUUd2psZiBVxAsCEj8dk=; h=DKIM-Signature:From:To:Subject:Date:Message-Id:MIME-Version; b=P57SI2nRbVfl9XvhEN+V+Yt+tbUyTY6EtndC+MSy/Yi9ALlWTXcY6y7FfpTcz0gUyyQvbbQH2Yp60Rw30Unu4pJK8xkQWGTq+el31eyUYmQ9zKBM0cMTk95NwuGhdqhgLg49nEf7KgPHCYGJ3LTWmS3oDkhJmLjjj6BB/RR4ePQ= ARC-Authentication-Results: i=1; server2.sourceware.org Received: by mail-oo1-xc31.google.com with SMTP id 006d021491bc7-58d1b767b2bso4746096eaf.2 for ; Wed, 13 Dec 2023 13:12:07 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=rivosinc-com.20230601.gappssmtp.com; s=20230601; t=1702501925; x=1703106725; 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=IKe4xa9VzbKEWsnhQ0HsyHNmoz/T30Gb29Jw2h1jDMk=; b=j2YgTOc52alQxPPzA0fktjT7Sx2CrWx85E730w8/wbPhOUZT6uTkNE25PshdbO3SJz gNm1yLhKN1b5syzQWy7PDKPKQbYQFK6XRXMTI9+HZo4+t3mivCR+/FrvKitejcf6oZ99 KkD8IzLy7dLA8I6338GeJFKpi7JQywTxfSL2nNve7ezPg20q9A8KHqnSPebwkzzK5+UT 12KU4+8OaHt5RbEE08HU7CNPaGchJtUixgPmC7D/WnK8DvHd/8t49vk95SHazlR1eK+v KskpyS1nm/ePEjFIiBvAlBtg5mobZljSgD2MTYVw5FlykdZH0rSh9GyKwqcbxItk1NkQ ObfA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1702501925; x=1703106725; 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=IKe4xa9VzbKEWsnhQ0HsyHNmoz/T30Gb29Jw2h1jDMk=; b=lVoW90QeB2DYB0FFlzCVqPrp8SYwTs2+ZxAHgAwU9Qvah5ljjriRkpoUWFns9oS+2c 70jH0XugcbGxy8AihVpiBKP5K3vBwG/vxvmmx7iRXOgEoaReUc+mYcYWYfaiKAmohQ0k ntgHL06/L90c5L/X9Ay5z9Ni8ovGc+G3KXYksclhIv1EjfBjSPMPi/zmh4SNqPbzQ83C hy3rYNxV+ySePz6Xm5UZalvrxDnJy3nArjnx0wArkddb0j5Wiug4W4Cb1Rq9385WeOfV 5wQVqTbpLJDackMeRPMhQqK/mhcD5v5a7rYRdmhukMLlg6J3mPq6HpDkTEJ848/2aCnF oFnA== X-Gm-Message-State: AOJu0YweX2ZBwIkQGYPOqjSZAx1SW5JMlUwo2d8yWbqwXFmeTNL5m0lr GoY2km2deWXQhaMlAnJWuSVZhvLXBJMac2ZK6p4= X-Google-Smtp-Source: AGHT+IHgFaXQ6IIBIjlKB4887KgC6QOsrxXBSSvDJOrS+Hn28DO2B+ttYhg1rAu11DGPpLNOPkCUiQ== X-Received: by 2002:a05:6820:826:b0:581:e089:9e5c with SMTP id bg38-20020a056820082600b00581e0899e5cmr7771847oob.6.1702501925657; Wed, 13 Dec 2023 13:12:05 -0800 (PST) Received: from evan.ba.rivosinc.com ([64.71.180.162]) by smtp.gmail.com with ESMTPSA id c15-20020a4a380f000000b0058d1de21893sm3223109ooa.24.2023.12.13.13.12.04 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 13 Dec 2023 13:12:05 -0800 (PST) From: Evan Green To: libc-alpha@sourceware.org Cc: vineetg@rivosinc.com, slewis@rivosinc.com, palmer@rivosinc.com, Florian Weimer , Evan Green Subject: [PATCH v10 5/7] riscv: Enable multi-arg ifunc resolvers Date: Wed, 13 Dec 2023 13:11:40 -0800 Message-Id: <20231213211142.1543025-6-evan@rivosinc.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20231213211142.1543025-1-evan@rivosinc.com> References: <20231213211142.1543025-1-evan@rivosinc.com> MIME-Version: 1.0 X-Spam-Status: No, score=-11.9 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 X-BeenThere: libc-alpha@sourceware.org X-Mailman-Version: 2.1.30 Precedence: list List-Id: Libc-alpha mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: libc-alpha-bounces+patchwork=sourceware.org@sourceware.org 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 v9) 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 5794614488..b45fad72b3 100644 --- a/include/libc-symbols.h +++ b/include/libc-symbols.h @@ -665,9 +665,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; \ @@ -675,13 +675,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 @@ -692,18 +692,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..7bff591d1e --- /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) 2023 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)