From patchwork Fri Jan 15 19:04:45 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Axel Rasmussen X-Patchwork-Id: 12023883 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=-26.3 required=3.0 tests=BAYES_00,DKIMWL_WL_MED, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_CR_TRAILER,INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS, USER_AGENT_GIT,USER_IN_DEF_DKIM_WL 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 D7171C4332D for ; Fri, 15 Jan 2021 19:07:09 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id BB30A23A5E for ; Fri, 15 Jan 2021 19:07:09 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1731073AbhAOTG3 (ORCPT ); Fri, 15 Jan 2021 14:06:29 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:39494 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726541AbhAOTG3 (ORCPT ); Fri, 15 Jan 2021 14:06:29 -0500 Received: from mail-pf1-x449.google.com (mail-pf1-x449.google.com [IPv6:2607:f8b0:4864:20::449]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 94D2DC061798 for ; Fri, 15 Jan 2021 11:05:13 -0800 (PST) Received: by mail-pf1-x449.google.com with SMTP id w135so6559870pff.1 for ; Fri, 15 Jan 2021 11:05:13 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20161025; h=sender:date:in-reply-to:message-id:mime-version:references:subject :from:to:cc; bh=oTwVnpEB+dNbI2/GJPfCxLuQafCc92ohApdmsU/sVV8=; b=nlsMKU20U2BV9LxuWLugi1r7yb8At2zSQB6VuiiB674F3TvGF/jFaeK/gXr98wOBf8 DdmgxI6HH+WuNSCVtekTz/CHwiSlRHhlV/0ia8221JkbnLFG1tq9w8B5OoGgxQX3TcMZ xrwodHSn6xSWAH332RuxmbA3CegqsFW85nwI3n2AHPCw9igXLO8K1Bmfidh0p8pGJRh6 s6iuAQ0dmem9IW7DmfQVNvGyg8Cv9eE5+6f4Ah6kfM934NwFgM9FkgHxZRR5eNNEh1/U ClxGIyYV+bUnrxixoc3KJb9C1O+U0zlWlaIGeaAark1bVHNVL1axAYQMrMzUlZuCqc6K sdTQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:date:in-reply-to:message-id:mime-version :references:subject:from:to:cc; bh=oTwVnpEB+dNbI2/GJPfCxLuQafCc92ohApdmsU/sVV8=; b=EqYIhvOztzm/sN6UrwOW2+/zPA/5OzHK9ukC9a81DFh9puVhQOKEMFggcCTEe0wgMZ 7Mw1bJvKx5c0I68pjc/o25SieeSYwx4el8RAF+WOWsvzvU6F9msSWMJ3Iq0vs+fjB20J gV8e4gxg55KNXduBHTwyNueLwhxx/XL6fSxb2Q66pFSO2PJufohtiQ2z5Zo2S8N2SBAd b20HWgedhuxtlu8kWNacKPYZw8tQMb8jgJnhtd2JuuPIgKdR8+r/BEorQs93wfWNcQo0 ABX0BxWb0eTB9bA6XZMPKXBIM0O+Q4x7ffYuT0bHg+6Djv8R6ieiRuKpk7xe9IQQ8ZK7 S+3A== X-Gm-Message-State: AOAM533JpdBjS6vmj1x1/r1wPInyNhfZn9ZVNXN2/UNALMhR673rWL4J 2+KMvnou1sc96Nc7fu9ub12elsYy5JVmRHfTN8cp X-Google-Smtp-Source: ABdhPJwd8+2UJUUzuwu53gsQBgAE9tIOtgs7VV6+lAZOwahwvki/HHrFvFrhMis67XqTrhSDJ+ZhcC8+H8iOaZ42//2W Sender: "axelrasmussen via sendgmr" X-Received: from ajr0.svl.corp.google.com ([2620:15c:2cd:203:f693:9fff:feef:c8f8]) (user=axelrasmussen job=sendgmr) by 2002:a17:902:684f:b029:de:3124:d4ee with SMTP id f15-20020a170902684fb02900de3124d4eemr14219044pln.13.1610737513037; Fri, 15 Jan 2021 11:05:13 -0800 (PST) Date: Fri, 15 Jan 2021 11:04:45 -0800 In-Reply-To: <20210115190451.3135416-1-axelrasmussen@google.com> Message-Id: <20210115190451.3135416-4-axelrasmussen@google.com> Mime-Version: 1.0 References: <20210115190451.3135416-1-axelrasmussen@google.com> X-Mailer: git-send-email 2.30.0.284.gd98b1dd5eaa7-goog Subject: [PATCH 3/9] mm/hugetlb: Move flush_hugetlb_tlb_range() into hugetlb.h From: Axel Rasmussen To: Alexander Viro , Alexey Dobriyan , Andrea Arcangeli , Andrew Morton , Anshuman Khandual , Catalin Marinas , Chinwen Chang , Huang Ying , Ingo Molnar , Jann Horn , Jerome Glisse , Lokesh Gidra , "Matthew Wilcox (Oracle)" , Michael Ellerman , " =?utf-8?q?Michal_Koutn=C3=BD?= " , Michel Lespinasse , Mike Kravetz , Mike Rapoport , Nicholas Piggin , Peter Xu , Shaohua Li , Shawn Anastasio , Steven Rostedt , Steven Price , Vlastimil Babka Cc: linux-kernel@vger.kernel.org, linux-fsdevel@vger.kernel.org, linux-mm@kvack.org, Adam Ruprecht , Axel Rasmussen , Cannon Matthews , "Dr . David Alan Gilbert" , David Rientjes , Oliver Upton Precedence: bulk List-ID: X-Mailing-List: linux-fsdevel@vger.kernel.org From: Peter Xu Prepare for it to be called outside of mm/hugetlb.c. Signed-off-by: Peter Xu Signed-off-by: Axel Rasmussen --- include/linux/hugetlb.h | 8 ++++++++ mm/hugetlb.c | 8 -------- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/include/linux/hugetlb.h b/include/linux/hugetlb.h index 4959e94e78b1..4c8e3447ae6a 100644 --- a/include/linux/hugetlb.h +++ b/include/linux/hugetlb.h @@ -959,4 +959,12 @@ static inline bool want_pmd_share(struct vm_area_struct *vma) #endif } +#ifndef __HAVE_ARCH_FLUSH_HUGETLB_TLB_RANGE +/* + * ARCHes with special requirements for evicting HUGETLB backing TLB entries can + * implement this. + */ +#define flush_hugetlb_tlb_range(vma, addr, end) flush_tlb_range(vma, addr, end) +#endif + #endif /* _LINUX_HUGETLB_H */ diff --git a/mm/hugetlb.c b/mm/hugetlb.c index 1ad91d94cbe2..61d6346ed009 100644 --- a/mm/hugetlb.c +++ b/mm/hugetlb.c @@ -4924,14 +4924,6 @@ long follow_hugetlb_page(struct mm_struct *mm, struct vm_area_struct *vma, return i ? i : err; } -#ifndef __HAVE_ARCH_FLUSH_HUGETLB_TLB_RANGE -/* - * ARCHes with special requirements for evicting HUGETLB backing TLB entries can - * implement this. - */ -#define flush_hugetlb_tlb_range(vma, addr, end) flush_tlb_range(vma, addr, end) -#endif - unsigned long hugetlb_change_protection(struct vm_area_struct *vma, unsigned long address, unsigned long end, pgprot_t newprot) {