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 8D4B6C433F5 for ; Thu, 14 Oct 2021 21:45:25 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id 460FB61041 for ; Thu, 14 Oct 2021 21:45:25 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.1 mail.kernel.org 460FB61041 Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=axtens.net Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=kvack.org Received: by kanga.kvack.org (Postfix) id B9F3B6B006C; Thu, 14 Oct 2021 17:45:24 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id B4E186B0071; Thu, 14 Oct 2021 17:45:24 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id A3D4D900002; Thu, 14 Oct 2021 17:45:24 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0105.hostedemail.com [216.40.44.105]) by kanga.kvack.org (Postfix) with ESMTP id 955116B006C for ; Thu, 14 Oct 2021 17:45:24 -0400 (EDT) Received: from smtpin24.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay03.hostedemail.com (Postfix) with ESMTP id 55F0F8249980 for ; Thu, 14 Oct 2021 21:45:24 +0000 (UTC) X-FDA: 78696374568.24.9BBB38F Received: from mail-pg1-f182.google.com (mail-pg1-f182.google.com [209.85.215.182]) by imf03.hostedemail.com (Postfix) with ESMTP id 4B36230000AA for ; Thu, 14 Oct 2021 21:45:23 +0000 (UTC) Received: by mail-pg1-f182.google.com with SMTP id d23so6719375pgh.8 for ; Thu, 14 Oct 2021 14:45:23 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=axtens.net; s=google; h=from:to:cc:subject:in-reply-to:references:date:message-id :mime-version; bh=4GrPc7FGyCnCD/UjuDxp/izjM7wkRrx7pBgnvNh8AfA=; b=XqUQLpCs2S/h/ceVWU2JHhlb+0n6xx80AR84zM1fbTXyJpTTdz7naNXuSISe0OmVPh NjZ/D/TD0ZH2RQIVG7s4CPqlOO1tq69oTkrFSh1I9LXUEVLqPBgSqyhAGps/jJj4ZA4P vglf7c8/7+vfhlwsZ4SeyOpGpkDyS0m7q2pnE= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:in-reply-to:references:date :message-id:mime-version; bh=4GrPc7FGyCnCD/UjuDxp/izjM7wkRrx7pBgnvNh8AfA=; b=yNBffSLyfEHUVticswSnxeE/Hh2wdXzu8yYsP5a98fVm2Sufy3m+y/RNiYE4C0hmFo B6by2Yi/3ayqFwBUcP3JxMtOlb/sPkBGfAHw5CIbwlQAgN656QijclCIzxQeOTMlTVe8 5ZgNuPlYZW55TC44W48Eo0O1QhxsEkyyVKuz9e5arqZcFLRPDHOJhL33MXhvL6q+2Lgx daOvi8Oq8mLbbPg5fxFV0sOTO7guRQotmOH9a3Orq+Dw6Y1E69FqhMdhJgFEh5jQS7Mt MbFD1pnVF6saRy6F//N10OrvrM+oWulILXVfKF8S97l/YPS37I/E8J3W2d3lRxyyC1b6 nYwA== X-Gm-Message-State: AOAM532Yifk1jIpakpU7Abk9kRprBkBOd5ALCpb/kZl/Qd1pC4m4IlEc mhjWXQ0FZhTYYCyZOsYEkWt7E07F0Ew= X-Google-Smtp-Source: ABdhPJxS8/zOn3bSDjYQg+GZqWOsdaDA+H+My597hv01n1JtKvTgaMjIuZ//mrufBDPiNL/OIH5zxA== X-Received: by 2002:a63:dc42:: with SMTP id f2mr6272407pgj.152.1634247922841; Thu, 14 Oct 2021 14:45:22 -0700 (PDT) Received: from localhost ([2001:4479:e300:600:4901:2fb9:ed97:3a3e]) by smtp.gmail.com with ESMTPSA id s62sm3366448pgc.5.2021.10.14.14.45.21 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 14 Oct 2021 14:45:22 -0700 (PDT) From: Daniel Axtens To: Christophe Leroy , Benjamin Herrenschmidt , Paul Mackerras , Michael Ellerman , Andrew Morton , "James E.J. Bottomley" , Helge Deller , Arnd Bergmann , Kees Cook , Greg Kroah-Hartman Cc: linux-arch@vger.kernel.org, linux-ia64@vger.kernel.org, linux-parisc@vger.kernel.org, linux-kernel@vger.kernel.org, linux-mm@kvack.org, linuxppc-dev@lists.ozlabs.org Subject: Re: [PATCH v2 02/13] powerpc: Rename 'funcaddr' to 'addr' in 'struct ppc64_opd_entry' In-Reply-To: <49f59a8bf2c4d95cfaa03bd3dd3c1569822ad6ba.1634190022.git.christophe.leroy@csgroup.eu> References: <49f59a8bf2c4d95cfaa03bd3dd3c1569822ad6ba.1634190022.git.christophe.leroy@csgroup.eu> Date: Fri, 15 Oct 2021 08:45:19 +1100 Message-ID: <877def46xc.fsf@dja-thinkpad.axtens.net> MIME-Version: 1.0 Content-Type: text/plain X-Rspamd-Server: rspam03 X-Rspamd-Queue-Id: 4B36230000AA X-Stat-Signature: 84wjd66wmbnsgar7qsk7tcy1szikd1ir Authentication-Results: imf03.hostedemail.com; dkim=pass header.d=axtens.net header.s=google header.b=XqUQLpCs; spf=pass (imf03.hostedemail.com: domain of dja@axtens.net designates 209.85.215.182 as permitted sender) smtp.mailfrom=dja@axtens.net; dmarc=none X-HE-Tag: 1634247923-109519 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: Christophe Leroy writes: > 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. > > powerpc has 'funcaddr' > ia64 has 'ip' > parisc has 'addr' > > Vote for 'addr' and update 'struct ppc64_opd_entry' accordingly. I would have picked 'funcaddr', but at least 'addr' is better than 'ip'! And I agree that consistency, and then making things generic is worthwhile. I grepped the latest powerpc/next for uses of 'funcaddr'. There were 5, your patch changes all 5. The series passes build tests and this patch has no checkpatch or other style concerns. On that basis: Reviewed-by: Daniel Axtens Kind regards, Daniel > 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(-) > > diff --git a/arch/powerpc/include/asm/elf.h b/arch/powerpc/include/asm/elf.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); > > /* There's actually a third entry here, but it's unused */ > struct ppc64_opd_entry { > - unsigned long funcaddr; > + unsigned long addr; > unsigned long r2; > }; > > diff --git a/arch/powerpc/include/asm/sections.h b/arch/powerpc/include/asm/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(void *ptr) > struct ppc64_opd_entry *desc = ptr; > void *p; > > - if (!get_kernel_nofault(p, (void *)&desc->funcaddr)) > + if (!get_kernel_nofault(p, (void *)&desc->addr)) > ptr = 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 = 1; > unsigned i; > > -- > 2.31.1