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=-16.6 required=3.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED,DKIM_INVALID,DKIM_SIGNED,HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_CR_TRAILER,INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS, USER_AGENT_GIT 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 5126AC433E0 for ; Mon, 1 Mar 2021 23:11:26 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id DA9AE60230 for ; Mon, 1 Mar 2021 23:11:25 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org DA9AE60230 Authentication-Results: mail.kernel.org; dmarc=fail (p=reject dis=none) header.from=google.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=owner-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix) id 7432D8D00B6; Mon, 1 Mar 2021 18:11:25 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 6FC9C8D0063; Mon, 1 Mar 2021 18:11:25 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 5E2BE8D00B6; Mon, 1 Mar 2021 18:11:25 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0151.hostedemail.com [216.40.44.151]) by kanga.kvack.org (Postfix) with ESMTP id 492398D0063 for ; Mon, 1 Mar 2021 18:11:25 -0500 (EST) Received: from smtpin29.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay05.hostedemail.com (Postfix) with ESMTP id E80C2181AF5D3 for ; Mon, 1 Mar 2021 23:11:24 +0000 (UTC) X-FDA: 77872853688.29.6EFEDF7 Received: from mail-yb1-f201.google.com (mail-yb1-f201.google.com [209.85.219.201]) by imf15.hostedemail.com (Postfix) with ESMTP id B85A1A0A6599 for ; Mon, 1 Mar 2021 22:27:40 +0000 (UTC) Received: by mail-yb1-f201.google.com with SMTP id l10so20665701ybt.6 for ; Mon, 01 Mar 2021 14:27:41 -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=LVgsG8gD6gGqXZonzM2R/jvJn0i4FAd6qzlSE0T5SJc=; b=ACYumy8b14lsyGbOvFKzGG5Y1wfhBC2GbamxaDapA11dEVWua31sqbA+qM0DHLmqiT x/Gw2T/EPJoBp4DHXeBCDXYZQy0q1t3bu9VW6OFMM+c5YLz1Xx5YTX9AUKbMn9micn+E X/nv5Umeq9Pq+B31APauVxQsEXiMEUZiX5OXMd9g+jbhwftHy8/z0zwTHMfwSYrmYqbm IUO+Kkuqbq8g5xAfgJcyDIGgXg3ak6JiOGNhbbDtGR4OIGdZc7ZYlL+02SOef69mjbRQ 4JDklK1VhDpHv8H/9mRCkZ3CTfRcOXE7cf/nZVQNqM2phfEHHDk7yLPB+Pk+MvOKYra+ UPAg== 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=LVgsG8gD6gGqXZonzM2R/jvJn0i4FAd6qzlSE0T5SJc=; b=a7X3Ebk8hg3bEIv4S0RUQjeThoHZ4xTxl4yEQEGB0o3fUyn1/3lCYCaHIecMtfOTyk uZsOAUpN2x+KARMFJJvGEqlMk+mVEvUYquyLUw7H0us4v+wna6yAUlrKhlo2uzMK4YYp LHAhX/+mhjlvT0MxQzgAu7XiFqh1alvsQ+0YI7hVRbhBPOBUKg1mI1y4SxWuTY8+2nuJ qc+TCo7Lnjrzy/ICrCWUnvllMEaPZzIUeDBTAh7csSlCzX13nAvT0iOePcBLtxPHQst5 Smc7vzCmaHhyqtUPyMaQey//q7mYDqBkUf/Nyxdfrx8tr4ew2pB+4g0RwIs9ciyeJiCU LcpA== X-Gm-Message-State: AOAM530qz/mGjp/iex2i50QV4PIVtjFrXxnGw2mihymPBsuGnMWycbNc eeXBNgyH390rztQ/xfYudapaJVkU7rDBedb0KnuK X-Google-Smtp-Source: ABdhPJztw1LshhAXlAwAwKjzozX7J61l0ZDSJy+U6psKHMErMJlxEOJp4+vxqvBRZ2CM0NvocrdecZV5HG16m3yEjgiA X-Received: from ajr0.svl.corp.google.com ([2620:15c:2cd:203:1998:8165:ca50:ab8d]) (user=axelrasmussen job=sendgmr) by 2002:a25:5344:: with SMTP id h65mr26014172ybb.191.1614637661368; Mon, 01 Mar 2021 14:27:41 -0800 (PST) Date: Mon, 1 Mar 2021 14:27:25 -0800 In-Reply-To: <20210301222728.176417-1-axelrasmussen@google.com> Message-Id: <20210301222728.176417-4-axelrasmussen@google.com> Mime-Version: 1.0 References: <20210301222728.176417-1-axelrasmussen@google.com> X-Mailer: git-send-email 2.30.1.766.gb4fecdf3b7-goog Subject: [PATCH v9 3/6] userfaultfd: hugetlbfs: only compile UFFD helpers if config enabled 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=20Koutn=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 , Mina Almasry , Oliver Upton Content-Type: text/plain; charset="UTF-8" X-Stat-Signature: 699yhihr4sufwgkxekmhzytsqhkn4yxr X-Rspamd-Server: rspam05 X-Rspamd-Queue-Id: B85A1A0A6599 Received-SPF: none (flex--axelrasmussen.bounces.google.com>: No applicable sender policy available) receiver=imf15; identity=mailfrom; envelope-from="<3XWo9YA0KCDAMjQXdMeYgeeQZSaaSXQ.OaYXUZgj-YYWhMOW.adS@flex--axelrasmussen.bounces.google.com>"; helo=mail-yb1-f201.google.com; client-ip=209.85.219.201 X-HE-DKIM-Result: pass/pass X-HE-Tag: 1614637660-879205 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: For background, mm/userfaultfd.c provides a general mcopy_atomic implementation. But some types of memory (i.e., hugetlb and shmem) need a slightly different implementation, so they provide their own helpers for this. In other words, userfaultfd is the only caller of these functions. This patch achieves two things: 1. Don't spend time compiling code which will end up never being referenced anyway (a small build time optimization). 2. In patches later in this series, we extend the signature of these helpers with UFFD-specific state (a mode enumeration). Once this happens, we *have to* either not compile the helpers, or unconditionally define the UFFD-only state (which seems messier to me). This includes the declarations in the headers, as otherwise they'd yield warnings about implicitly defining the type of those arguments. Reviewed-by: Mike Kravetz Reviewed-by: Peter Xu Signed-off-by: Axel Rasmussen --- include/linux/hugetlb.h | 4 ++++ mm/hugetlb.c | 2 ++ 2 files changed, 6 insertions(+) diff --git a/include/linux/hugetlb.h b/include/linux/hugetlb.h index c0b10f0c7f23..7b86bf809d7a 100644 --- a/include/linux/hugetlb.h +++ b/include/linux/hugetlb.h @@ -134,11 +134,13 @@ void hugetlb_show_meminfo(void); unsigned long hugetlb_total_pages(void); vm_fault_t hugetlb_fault(struct mm_struct *mm, struct vm_area_struct *vma, unsigned long address, unsigned int flags); +#ifdef CONFIG_USERFAULTFD int hugetlb_mcopy_atomic_pte(struct mm_struct *dst_mm, pte_t *dst_pte, struct vm_area_struct *dst_vma, unsigned long dst_addr, unsigned long src_addr, struct page **pagep); +#endif /* CONFIG_USERFAULTFD */ bool hugetlb_reserve_pages(struct inode *inode, long from, long to, struct vm_area_struct *vma, vm_flags_t vm_flags); @@ -310,6 +312,7 @@ static inline void hugetlb_free_pgd_range(struct mmu_gather *tlb, BUG(); } +#ifdef CONFIG_USERFAULTFD static inline int hugetlb_mcopy_atomic_pte(struct mm_struct *dst_mm, pte_t *dst_pte, struct vm_area_struct *dst_vma, @@ -320,6 +323,7 @@ static inline int hugetlb_mcopy_atomic_pte(struct mm_struct *dst_mm, BUG(); return 0; } +#endif /* CONFIG_USERFAULTFD */ static inline pte_t *huge_pte_offset(struct mm_struct *mm, unsigned long addr, unsigned long sz) diff --git a/mm/hugetlb.c b/mm/hugetlb.c index 61fd15185f0a..4422dab8db9a 100644 --- a/mm/hugetlb.c +++ b/mm/hugetlb.c @@ -4618,6 +4618,7 @@ vm_fault_t hugetlb_fault(struct mm_struct *mm, struct vm_area_struct *vma, return ret; } +#ifdef CONFIG_USERFAULTFD /* * Used by userfaultfd UFFDIO_COPY. Based on mcopy_atomic_pte with * modifications for huge pages. @@ -4748,6 +4749,7 @@ int hugetlb_mcopy_atomic_pte(struct mm_struct *dst_mm, put_page(page); goto out; } +#endif /* CONFIG_USERFAULTFD */ static void record_subpages_vmas(struct page *page, struct vm_area_struct *vma, int refs, struct page **pages, -- 2.30.1.766.gb4fecdf3b7-goog