From mboxrd@z Thu Jan 1 00:00:00 1970 From: joel@joelfernandes.org (Joel Fernandes) Date: Fri, 12 Oct 2018 09:34:33 -0700 Subject: [PATCH v2 1/2] treewide: remove unused address argument from pte_alloc functions In-Reply-To: <594fc952-5e87-3162-b2f9-963479d16eb3@kot-begemot.co.uk> References: <20181012013756.11285-1-joel@joelfernandes.org> <594fc952-5e87-3162-b2f9-963479d16eb3@kot-begemot.co.uk> Message-ID: <20181012163433.GA223066@joelaf.mtv.corp.google.com> To: linux-riscv@lists.infradead.org List-Id: linux-riscv.lists.infradead.org On Fri, Oct 12, 2018 at 02:56:19PM +0100, Anton Ivanov wrote: > > On 10/12/18 2:37 AM, Joel Fernandes (Google) wrote: > > This series speeds up mremap(2) syscall by copying page tables at the > > PMD level even for non-THP systems. There is concern that the extra > > 'address' argument that mremap passes to pte_alloc may do something > > subtle architecture related in the future, that makes the scheme not > > work. Also we find that there is no point in passing the 'address' to > > pte_alloc since its unused. > > > > This patch therefore removes this argument tree-wide resulting in a nice > > negative diff as well. Also ensuring along the way that the architecture > > does not do anything funky with 'address' argument that goes unnoticed. > > > > Build and boot tested on x86-64. Build tested on arm64. > > > > The changes were obtained by applying the following Coccinelle script. > > The pte_fragment_alloc was manually fixed up since it was only 2 > > occurences and could not be easily generalized (and thanks Julia for > > answering all my silly and not-silly Coccinelle questions!). > > > > // Options: --include-headers --no-includes > > // Note: I split the 'identifier fn' line, so if you are manually > > // running it, please unsplit it so it runs for you. > > > > virtual patch > > > > @pte_alloc_func_def depends on patch exists@ > > identifier E2; > > identifier fn =~ > > "^(__pte_alloc|pte_alloc_one|pte_alloc|__pte_alloc_kernel|pte_alloc_one_kernel)$"; > > type T2; > > @@ > > > > fn(... > > - , T2 E2 > > ) > > { ... } > > > > @pte_alloc_func_proto depends on patch exists@ > > identifier E1, E2, E4; > > type T1, T2, T3, T4; > > identifier fn =~ > > "^(__pte_alloc|pte_alloc_one|pte_alloc|__pte_alloc_kernel|pte_alloc_one_kernel)$"; > > @@ > > > > ( > > - T3 fn(T1 E1, T2 E2); > > + T3 fn(T1 E1); > > | > > - T3 fn(T1 E1, T2 E2, T4 E4); > > + T3 fn(T1 E1, T2 E2); > > ) > > > > @pte_alloc_func_call depends on patch exists@ > > expression E2; > > identifier fn =~ > > "^(__pte_alloc|pte_alloc_one|pte_alloc|__pte_alloc_kernel|pte_alloc_one_kernel)$"; > > @@ > > > > fn(... > > -, E2 > > ) > > > > @pte_alloc_macro depends on patch exists@ > > identifier fn =~ > > "^(__pte_alloc|pte_alloc_one|pte_alloc|__pte_alloc_kernel|pte_alloc_one_kernel)$"; > > identifier a, b, c; > > expression e; > > position p; > > @@ > > > > ( > > - #define fn(a, b, c)@p e > > + #define fn(a, b) e > > | > > - #define fn(a, b)@p e > > + #define fn(a) e > > ) > > > > Suggested-by: Kirill A. Shutemov > > Cc: Michal Hocko > > Cc: Julia Lawall > > Cc: elfring at users.sourceforge.net > > Signed-off-by: Joel Fernandes (Google) > > --- > > arch/alpha/include/asm/pgalloc.h | 6 +++--- > > arch/arc/include/asm/pgalloc.h | 5 ++--- > > arch/arm/include/asm/pgalloc.h | 4 ++-- > > arch/arm64/include/asm/pgalloc.h | 4 ++-- > > arch/hexagon/include/asm/pgalloc.h | 6 ++---- > > arch/ia64/include/asm/pgalloc.h | 5 ++--- > > arch/m68k/include/asm/mcf_pgalloc.h | 8 ++------ > > arch/m68k/include/asm/motorola_pgalloc.h | 4 ++-- > > arch/m68k/include/asm/sun3_pgalloc.h | 6 ++---- > > arch/microblaze/include/asm/pgalloc.h | 19 ++----------------- > > arch/microblaze/mm/pgtable.c | 3 +-- > > arch/mips/include/asm/pgalloc.h | 6 ++---- > > arch/nds32/include/asm/pgalloc.h | 5 ++--- > > arch/nios2/include/asm/pgalloc.h | 6 ++---- > > arch/openrisc/include/asm/pgalloc.h | 5 ++--- > > arch/openrisc/mm/ioremap.c | 3 +-- > > arch/parisc/include/asm/pgalloc.h | 4 ++-- > > arch/powerpc/include/asm/book3s/32/pgalloc.h | 4 ++-- > > arch/powerpc/include/asm/book3s/64/pgalloc.h | 12 +++++------- > > arch/powerpc/include/asm/nohash/32/pgalloc.h | 4 ++-- > > arch/powerpc/include/asm/nohash/64/pgalloc.h | 6 ++---- > > arch/powerpc/mm/pgtable-book3s64.c | 2 +- > > arch/powerpc/mm/pgtable_32.c | 4 ++-- > > arch/riscv/include/asm/pgalloc.h | 6 ++---- > > arch/s390/include/asm/pgalloc.h | 4 ++-- > > arch/sh/include/asm/pgalloc.h | 6 ++---- > > arch/sparc/include/asm/pgalloc_32.h | 5 ++--- > > arch/sparc/include/asm/pgalloc_64.h | 6 ++---- > > arch/sparc/mm/init_64.c | 6 ++---- > > arch/sparc/mm/srmmu.c | 4 ++-- > > arch/um/kernel/mem.c | 4 ++-- > > There is a declaration of pte_alloc_one in arch/um/include/asm/pgalloc.h > > This patch missed it. Ah, true. Thanks. Couldn't test every arch obviously. The reason this was missed is the script could not find matches with prototypes without named parameters: extern pgtable_t pte_alloc_one(struct mm_struct *, unsigned long); I wrote something like this as below but it failed to compile, Julia any suggestions on how to express this? @pte_alloc_func_proto depends on patch exists@ type T1, T2, T3, T4; identifier fn =~ "^(__pte_alloc|pte_alloc_one|pte_alloc|__pte_alloc_kernel|pte_alloc_one_kernel)$"; @@ ( - T3 fn(T1, T2); + T3 fn(T1); | - T3 fn(T1, T2, T4); + T3 fn(T1, T2); ) thanks, - Joel 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 X-Spam-Level: X-Spam-Status: No, score=-7.0 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_PASS,URIBL_BLOCKED,USER_AGENT_MUTT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id EC9E4C6783C for ; Fri, 12 Oct 2018 16:34:56 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id B37602086A for ; Fri, 12 Oct 2018 16:34:56 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="qdknSj7h"; dkim=fail reason="signature verification failed" (1024-bit key) header.d=joelfernandes.org header.i=@joelfernandes.org header.b="YyM56XCq" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org B37602086A Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=joelfernandes.org Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-riscv-bounces+infradead-linux-riscv=archiver.kernel.org@lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:Cc:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:In-Reply-To:MIME-Version:References: Message-ID:Subject:To:From:Date:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=kzAOR4JiyDzUs5H0ilJ3U5L8qqbkeSUL3M1qwAPitS8=; b=qdknSj7hPr7kA3 uEz2Bx3HEpRORJXViH4N4gsPpbY0PjIEdTxJZgP5dW3tqNqivCQgrfxCgA6eKLgUvLMRvWFg4kW75 H0EzJFmfTRSZs4MR5bMtJnYhVRVfFMdFzwQULq2wx7n0R4DKY0Aw9k6nVPfA1Yec6Dpcf3zBVFrEN t1GDiWkPED4hvjcdoeP0i/KGw1Sp9K9z/PFjNunp+OjtS6ngjw6C7906giRCGNv4GYD0iV4sYd2RJ sYibpB20KeDvChRn6SoBguNaUDrKrecL0LEwNqZlQzTjYXX0ZvFyOe5aCVIMS4aMagJlR4Zc49qQg lXZhB2RJGDiflSjEDbug==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.90_1 #2 (Red Hat Linux)) id 1gB0Or-0005yF-Lv; Fri, 12 Oct 2018 16:34:53 +0000 Received: from mail-pf1-x441.google.com ([2607:f8b0:4864:20::441]) by bombadil.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) id 1gB0Om-0005w1-BU for linux-riscv@lists.infradead.org; Fri, 12 Oct 2018 16:34:50 +0000 Received: by mail-pf1-x441.google.com with SMTP id p24-v6so6452291pff.10 for ; Fri, 12 Oct 2018 09:34:37 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=joelfernandes.org; s=google; h=date:from:to:cc:subject:message-id:references:mime-version :content-disposition:in-reply-to:user-agent; bh=GeJJXCqJMCDTI+MXwHMrbk77W318YMmfXGKRapf9/Sk=; b=YyM56XCqSfyaUBYDgdLpuQEKq1ABQCtIjAm3mexn7sHI103AKL5IRtu1yDgRXWcUmR +5dV4+N0dIsXdoQdM+bIK2ixBQF6EMK+bJUmgO404S133rpaNqZgC3hsYM6bPD/0A+T8 ZZ1OQ9M/ZdWJax92mEDJBrHQFwC2/LW1LA+LY= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:from:to:cc:subject:message-id:references :mime-version:content-disposition:in-reply-to:user-agent; bh=GeJJXCqJMCDTI+MXwHMrbk77W318YMmfXGKRapf9/Sk=; b=qQNik/7DMcXscgBr3gcfULCUk3UWTrDhDclX2MyzNkjOhKZyo93I0lnOyoDvN01FG2 lHWRx/hi6B97V4B2+/DmiONumkiSy78PI1eyAzoTP5FKkV2NrURD2ULTSD0bDeDqGmU9 ex2tvOi949PTZMk62O9oncEMt0qgB7b/HuybRursHXU0WlQqYtMPhi2t1aq1XKW0KuEd rfNsSkb8uNSARivdQJ8nf2sQj/Ume87W58vYLa/h5y41Je6TCeyr/78rrDh4AkwxQV2Z 2/9x6aYhVXjcPxtNBR9Dss/km8kPwaQg4rfhI4m70dyORpIuVSLBZrtWPjm8wSkxm4ij 3t2Q== X-Gm-Message-State: ABuFfohhc1GaQYaFM9VUTji4O9HeVMuyNnIlScyNmjYo4F+PH2E9U/Sg 4UkB7aQrH2mWiz+tDM5MI80SXg== X-Google-Smtp-Source: ACcGV60O5IRpWWZ7ZD+hGXAxlNIP90i6xDrWPRRFvZcxuenG86m+xkw+7WT83DyNZ2L6qLNSI0RNkQ== X-Received: by 2002:aa7:80cd:: with SMTP id a13-v6mr6747047pfn.86.1539362076258; Fri, 12 Oct 2018 09:34:36 -0700 (PDT) Received: from localhost ([2620:0:1000:1601:3aef:314f:b9ea:889f]) by smtp.gmail.com with ESMTPSA id l71-v6sm2751559pgd.31.2018.10.12.09.34.34 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Fri, 12 Oct 2018 09:34:34 -0700 (PDT) Date: Fri, 12 Oct 2018 09:34:33 -0700 From: Joel Fernandes To: Anton Ivanov Subject: Re: [PATCH v2 1/2] treewide: remove unused address argument from pte_alloc functions Message-ID: <20181012163433.GA223066@joelaf.mtv.corp.google.com> References: <20181012013756.11285-1-joel@joelfernandes.org> <594fc952-5e87-3162-b2f9-963479d16eb3@kot-begemot.co.uk> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <594fc952-5e87-3162-b2f9-963479d16eb3@kot-begemot.co.uk> User-Agent: Mutt/1.10.1 (2018-07-13) X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20181012_093448_400580_9E176858 X-CRM114-Status: GOOD ( 23.77 ) X-BeenThere: linux-riscv@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: linux-mips@linux-mips.org, Rich Felker , linux-ia64@vger.kernel.org, linux-sh@vger.kernel.org, Peter Zijlstra , Catalin Marinas , Dave Hansen , Will Deacon , Michal Hocko , linux-mm@kvack.org, lokeshgidra@google.com, sparclinux@vger.kernel.org, linux-riscv@lists.infradead.org, elfring@users.sourceforge.net, Jonas Bonn , linux-s390@vger.kernel.org, dancol@google.com, Yoshinori Sato , Max Filippov , linux-hexagon@vger.kernel.org, Helge Deller , "maintainer:X86 ARCHITECTURE 32-BIT AND 64-BIT" , hughd@google.com, "James E.J. Bottomley" , kasan-dev@googlegroups.com, kvmarm@lists.cs.columbia.edu, Ingo Molnar , Geert Uytterhoeven , Andrey Ryabinin , linux-snps-arc@lists.infradead.org, kernel-team@android.com, Sam Creasey , linux-xtensa@linux-xtensa.org, Jeff Dike , linux-alpha@vger.kernel.org, linux-um@lists.infradead.org, Stefan Kristiansson , Julia Lawall , linux-m68k@lists.linux-m68k.org, openrisc@lists.librecores.org, Borislav Petkov , Andy Lutomirski , Ley Foon Tan , kirill@shutemov.name, Stafford Horne , Guan Xuetao , linux-arm-kernel@lists.infradead.org, Chris Zankel , Tony Luck , linux-parisc@vger.kernel.org, pantin@google.com, linux-kernel@vger.kernel.org, Fenghua Yu , minchan@kernel.org, Thomas Gleixner , Richard Weinberger , nios2-dev@lists.rocketboards.org, akpm@linux-foundation.org, linuxppc-dev@lists.ozlabs.org, "David S. Miller" Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "linux-riscv" Errors-To: linux-riscv-bounces+infradead-linux-riscv=archiver.kernel.org@lists.infradead.org Message-ID: <20181012163433.yzEt4MMuIVQDudsRiTV3_vS9mSPjOQ21DjdbVJvRJbo@z> On Fri, Oct 12, 2018 at 02:56:19PM +0100, Anton Ivanov wrote: > > On 10/12/18 2:37 AM, Joel Fernandes (Google) wrote: > > This series speeds up mremap(2) syscall by copying page tables at the > > PMD level even for non-THP systems. There is concern that the extra > > 'address' argument that mremap passes to pte_alloc may do something > > subtle architecture related in the future, that makes the scheme not > > work. Also we find that there is no point in passing the 'address' to > > pte_alloc since its unused. > > > > This patch therefore removes this argument tree-wide resulting in a nice > > negative diff as well. Also ensuring along the way that the architecture > > does not do anything funky with 'address' argument that goes unnoticed. > > > > Build and boot tested on x86-64. Build tested on arm64. > > > > The changes were obtained by applying the following Coccinelle script. > > The pte_fragment_alloc was manually fixed up since it was only 2 > > occurences and could not be easily generalized (and thanks Julia for > > answering all my silly and not-silly Coccinelle questions!). > > > > // Options: --include-headers --no-includes > > // Note: I split the 'identifier fn' line, so if you are manually > > // running it, please unsplit it so it runs for you. > > > > virtual patch > > > > @pte_alloc_func_def depends on patch exists@ > > identifier E2; > > identifier fn =~ > > "^(__pte_alloc|pte_alloc_one|pte_alloc|__pte_alloc_kernel|pte_alloc_one_kernel)$"; > > type T2; > > @@ > > > > fn(... > > - , T2 E2 > > ) > > { ... } > > > > @pte_alloc_func_proto depends on patch exists@ > > identifier E1, E2, E4; > > type T1, T2, T3, T4; > > identifier fn =~ > > "^(__pte_alloc|pte_alloc_one|pte_alloc|__pte_alloc_kernel|pte_alloc_one_kernel)$"; > > @@ > > > > ( > > - T3 fn(T1 E1, T2 E2); > > + T3 fn(T1 E1); > > | > > - T3 fn(T1 E1, T2 E2, T4 E4); > > + T3 fn(T1 E1, T2 E2); > > ) > > > > @pte_alloc_func_call depends on patch exists@ > > expression E2; > > identifier fn =~ > > "^(__pte_alloc|pte_alloc_one|pte_alloc|__pte_alloc_kernel|pte_alloc_one_kernel)$"; > > @@ > > > > fn(... > > -, E2 > > ) > > > > @pte_alloc_macro depends on patch exists@ > > identifier fn =~ > > "^(__pte_alloc|pte_alloc_one|pte_alloc|__pte_alloc_kernel|pte_alloc_one_kernel)$"; > > identifier a, b, c; > > expression e; > > position p; > > @@ > > > > ( > > - #define fn(a, b, c)@p e > > + #define fn(a, b) e > > | > > - #define fn(a, b)@p e > > + #define fn(a) e > > ) > > > > Suggested-by: Kirill A. Shutemov > > Cc: Michal Hocko > > Cc: Julia Lawall > > Cc: elfring@users.sourceforge.net > > Signed-off-by: Joel Fernandes (Google) > > --- > > arch/alpha/include/asm/pgalloc.h | 6 +++--- > > arch/arc/include/asm/pgalloc.h | 5 ++--- > > arch/arm/include/asm/pgalloc.h | 4 ++-- > > arch/arm64/include/asm/pgalloc.h | 4 ++-- > > arch/hexagon/include/asm/pgalloc.h | 6 ++---- > > arch/ia64/include/asm/pgalloc.h | 5 ++--- > > arch/m68k/include/asm/mcf_pgalloc.h | 8 ++------ > > arch/m68k/include/asm/motorola_pgalloc.h | 4 ++-- > > arch/m68k/include/asm/sun3_pgalloc.h | 6 ++---- > > arch/microblaze/include/asm/pgalloc.h | 19 ++----------------- > > arch/microblaze/mm/pgtable.c | 3 +-- > > arch/mips/include/asm/pgalloc.h | 6 ++---- > > arch/nds32/include/asm/pgalloc.h | 5 ++--- > > arch/nios2/include/asm/pgalloc.h | 6 ++---- > > arch/openrisc/include/asm/pgalloc.h | 5 ++--- > > arch/openrisc/mm/ioremap.c | 3 +-- > > arch/parisc/include/asm/pgalloc.h | 4 ++-- > > arch/powerpc/include/asm/book3s/32/pgalloc.h | 4 ++-- > > arch/powerpc/include/asm/book3s/64/pgalloc.h | 12 +++++------- > > arch/powerpc/include/asm/nohash/32/pgalloc.h | 4 ++-- > > arch/powerpc/include/asm/nohash/64/pgalloc.h | 6 ++---- > > arch/powerpc/mm/pgtable-book3s64.c | 2 +- > > arch/powerpc/mm/pgtable_32.c | 4 ++-- > > arch/riscv/include/asm/pgalloc.h | 6 ++---- > > arch/s390/include/asm/pgalloc.h | 4 ++-- > > arch/sh/include/asm/pgalloc.h | 6 ++---- > > arch/sparc/include/asm/pgalloc_32.h | 5 ++--- > > arch/sparc/include/asm/pgalloc_64.h | 6 ++---- > > arch/sparc/mm/init_64.c | 6 ++---- > > arch/sparc/mm/srmmu.c | 4 ++-- > > arch/um/kernel/mem.c | 4 ++-- > > There is a declaration of pte_alloc_one in arch/um/include/asm/pgalloc.h > > This patch missed it. Ah, true. Thanks. Couldn't test every arch obviously. The reason this was missed is the script could not find matches with prototypes without named parameters: extern pgtable_t pte_alloc_one(struct mm_struct *, unsigned long); I wrote something like this as below but it failed to compile, Julia any suggestions on how to express this? @pte_alloc_func_proto depends on patch exists@ type T1, T2, T3, T4; identifier fn =~ "^(__pte_alloc|pte_alloc_one|pte_alloc|__pte_alloc_kernel|pte_alloc_one_kernel)$"; @@ ( - T3 fn(T1, T2); + T3 fn(T1); | - T3 fn(T1, T2, T4); + T3 fn(T1, T2); ) thanks, - Joel _______________________________________________ linux-riscv mailing list linux-riscv@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-riscv