From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id D4AE3C4332F for ; Fri, 15 Oct 2021 06:01:34 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id 766826115C for ; Fri, 15 Oct 2021 06:01:34 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.1 mail.kernel.org 766826115C Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=kvack.org Received: by kanga.kvack.org (Postfix) id A82606B006C; Fri, 15 Oct 2021 02:01:33 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id A326F900002; Fri, 15 Oct 2021 02:01:33 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 8F9F96B0072; Fri, 15 Oct 2021 02:01:33 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0175.hostedemail.com [216.40.44.175]) by kanga.kvack.org (Postfix) with ESMTP id 80BB36B006C for ; Fri, 15 Oct 2021 02:01:33 -0400 (EDT) Received: from smtpin13.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay01.hostedemail.com (Postfix) with ESMTP id 392861816397C for ; Fri, 15 Oct 2021 06:01:33 +0000 (UTC) X-FDA: 78697624866.13.784A648 Received: from mail-pg1-f174.google.com (mail-pg1-f174.google.com [209.85.215.174]) by imf15.hostedemail.com (Postfix) with ESMTP id D4212D000097 for ; Fri, 15 Oct 2021 06:01:31 +0000 (UTC) Received: by mail-pg1-f174.google.com with SMTP id 75so7663920pga.3 for ; Thu, 14 Oct 2021 23:01:32 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=date:from:subject:to:cc:references:in-reply-to:mime-version :message-id:content-transfer-encoding; bh=DRXHnGOtNMfw8OWo78ntmmDlXjC+sRWdxkm3O7xJKjA=; b=m7MXudFQQqL1/k+ClP+ZXqn1o6SFyJ1f66Q3Bu5Odc8OBiFPiJ13cAIC7Bb91L57Qa wg5htfRXIvWmL1XBYWjt/KapNQJ484jheOqT4laWX+5LN25duemH5efLGCCw1ezRbE2D oHMydeL853jKYzvsuglxlc6/9GhP1bSqW16TyWHFANeiap8ne6FIAs3VXM7FPdZAJDPr hU16Gs2Zstt6WT2sdSKZuMLxHFbekr7X7SOwkFRSxnKP5z+P1yr4gzJjxpUvxVIfW4aP QUYuse0SEylu3+vPw+KSZUvOf1cy/kCU1ZZUBIG6P0gbZ5pbPXMIlVRrCdBvd6rsYHuZ EXjA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:date:from:subject:to:cc:references:in-reply-to :mime-version:message-id:content-transfer-encoding; bh=DRXHnGOtNMfw8OWo78ntmmDlXjC+sRWdxkm3O7xJKjA=; b=ny/Ap+cQTrb6aCVSDQBsKFuYU9U0ES2vaFCl6FaMmdkJALgDoDEBXgvfr5e/+oWdZu EddkSOsYfQ4Bm0F0yTW1frp3pBpaVWZJANr5A+Hl+zlvLOfzRasQqOpqvR2jdLHGbsIb YLnifUoE2COtNVzcYefQRdnpFbleo8KMugZ6VUH1y1kNhNDnjVPJU2Whlhk5lGMMcvpw ZFMtJ795mr17YlTnVTgObXZewG+wyWkfJ0tJSBTu4siNrkVUjfjwYwllGeApzDbMqJoj S0hzgCEvbdZtwITp1V3EA9ZESs8mlWrNlsuxcJUUAvG8t+TW2fTP81N6TmXskmFVC9N2 SdoA== X-Gm-Message-State: AOAM531a3c0wBWh8aT1JmiDwcmWPmcy1l9NLob5hVffeTGP/jPRtUuXn hA3CKPas+wB/nMbcxyZA13o= X-Google-Smtp-Source: ABdhPJyx9VH+hAArTXbMzhj3941MCZEg4aTo2VOCQWAyZHa9YGltTOulV3JGtxxAcgJGHi5zyYTL3Q== X-Received: by 2002:a05:6a00:1487:b0:44d:c51:c88b with SMTP id v7-20020a056a00148700b0044d0c51c88bmr10003874pfu.32.1634277691871; Thu, 14 Oct 2021 23:01:31 -0700 (PDT) Received: from localhost (14-203-144-177.static.tpgi.com.au. [14.203.144.177]) by smtp.gmail.com with ESMTPSA id v6sm3998303pfv.83.2021.10.14.23.01.30 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 14 Oct 2021 23:01:31 -0700 (PDT) Date: Fri, 15 Oct 2021 16:01:26 +1000 From: Nicholas Piggin Subject: Re: [PATCH v2 02/13] powerpc: Rename 'funcaddr' to 'addr' in 'struct ppc64_opd_entry' To: Andrew Morton , Arnd Bergmann , Benjamin Herrenschmidt , Christophe Leroy , Helge Deller , Greg Kroah-Hartman , "James E.J. Bottomley" , Kees Cook , Michael Ellerman , Paul Mackerras Cc: linux-arch@vger.kernel.org, linux-ia64@vger.kernel.org, linux-kernel@vger.kernel.org, linux-mm@kvack.org, linux-parisc@vger.kernel.org, linuxppc-dev@lists.ozlabs.org References: <49f59a8bf2c4d95cfaa03bd3dd3c1569822ad6ba.1634190022.git.christophe.leroy@csgroup.eu> In-Reply-To: <49f59a8bf2c4d95cfaa03bd3dd3c1569822ad6ba.1634190022.git.christophe.leroy@csgroup.eu> MIME-Version: 1.0 Message-Id: <1634277517.7t2t049cd5.astroid@bobo.none> Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable X-Rspamd-Server: rspam06 X-Rspamd-Queue-Id: D4212D000097 X-Stat-Signature: c6fdp1hqr339dr1bfxb9cwogtkmmmu15 Authentication-Results: imf15.hostedemail.com; dkim=pass header.d=gmail.com header.s=20210112 header.b=m7MXudFQ; dmarc=pass (policy=none) header.from=gmail.com; spf=pass (imf15.hostedemail.com: domain of npiggin@gmail.com designates 209.85.215.174 as permitted sender) smtp.mailfrom=npiggin@gmail.com X-HE-Tag: 1634277691-609456 X-Bogosity: Ham, tests=bogofilter, spamicity=0.000000, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: Excerpts from Christophe Leroy's message of October 14, 2021 3:49 pm: > There are three architectures with function descriptors, try to > have common names for the address they contain in order to > refactor some functions into generic functions later. >=20 > powerpc has 'funcaddr' > ia64 has 'ip' > parisc has 'addr' >=20 > Vote for 'addr' and update 'struct ppc64_opd_entry' accordingly. It is the "address of the entry point of the function" according to=20 powerpc ELF spec, so addr seems fine. Reviewed-by: Nicholas Piggin >=20 > Reviewed-by: Kees Cook > Signed-off-by: Christophe Leroy > --- > arch/powerpc/include/asm/elf.h | 2 +- > arch/powerpc/include/asm/sections.h | 2 +- > arch/powerpc/kernel/module_64.c | 6 +++--- > 3 files changed, 5 insertions(+), 5 deletions(-) >=20 > diff --git a/arch/powerpc/include/asm/elf.h b/arch/powerpc/include/asm/el= f.h > index a4406714c060..bb0f278f9ed4 100644 > --- a/arch/powerpc/include/asm/elf.h > +++ b/arch/powerpc/include/asm/elf.h > @@ -178,7 +178,7 @@ void relocate(unsigned long final_address); > =20 > /* There's actually a third entry here, but it's unused */ > struct ppc64_opd_entry { > - unsigned long funcaddr; > + unsigned long addr; > unsigned long r2; > }; > =20 > diff --git a/arch/powerpc/include/asm/sections.h b/arch/powerpc/include/a= sm/sections.h > index 6e4af4492a14..32e7035863ac 100644 > --- a/arch/powerpc/include/asm/sections.h > +++ b/arch/powerpc/include/asm/sections.h > @@ -77,7 +77,7 @@ static inline void *dereference_function_descriptor(voi= d *ptr) > struct ppc64_opd_entry *desc =3D ptr; > void *p; > =20 > - if (!get_kernel_nofault(p, (void *)&desc->funcaddr)) > + if (!get_kernel_nofault(p, (void *)&desc->addr)) > ptr =3D p; > return ptr; > } > diff --git a/arch/powerpc/kernel/module_64.c b/arch/powerpc/kernel/module= _64.c > index 6baa676e7cb6..82908c9be627 100644 > --- a/arch/powerpc/kernel/module_64.c > +++ b/arch/powerpc/kernel/module_64.c > @@ -72,11 +72,11 @@ static func_desc_t func_desc(unsigned long addr) > } > static unsigned long func_addr(unsigned long addr) > { > - return func_desc(addr).funcaddr; > + return func_desc(addr).addr; > } > static unsigned long stub_func_addr(func_desc_t func) > { > - return func.funcaddr; > + return func.addr; > } > static unsigned int local_entry_offset(const Elf64_Sym *sym) > { > @@ -187,7 +187,7 @@ static int relacmp(const void *_x, const void *_y) > static unsigned long get_stubs_size(const Elf64_Ehdr *hdr, > const Elf64_Shdr *sechdrs) > { > - /* One extra reloc so it's always 0-funcaddr terminated */ > + /* One extra reloc so it's always 0-addr terminated */ > unsigned long relocs =3D 1; > unsigned i; > =20 > --=20 > 2.31.1 >=20 >=20 >=20