From patchwork Fri Oct 21 16:36:18 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Houghton X-Patchwork-Id: 13015071 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 kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by smtp.lore.kernel.org (Postfix) with ESMTP id E0752FA373D for ; Fri, 21 Oct 2022 16:37:18 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 85D1A8E0005; Fri, 21 Oct 2022 12:37:18 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 7999E8E0001; Fri, 21 Oct 2022 12:37:18 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 5C31F8E0005; Fri, 21 Oct 2022 12:37:18 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0014.hostedemail.com [216.40.44.14]) by kanga.kvack.org (Postfix) with ESMTP id 469528E0001 for ; Fri, 21 Oct 2022 12:37:18 -0400 (EDT) Received: from smtpin15.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay06.hostedemail.com (Postfix) with ESMTP id 0E595AAD57 for ; Fri, 21 Oct 2022 16:37:18 +0000 (UTC) X-FDA: 80045511756.15.EF66B1C Received: from mail-yb1-f201.google.com (mail-yb1-f201.google.com [209.85.219.201]) by imf26.hostedemail.com (Postfix) with ESMTP id AEAD7140036 for ; Fri, 21 Oct 2022 16:37:17 +0000 (UTC) Received: by mail-yb1-f201.google.com with SMTP id y6-20020a25b9c6000000b006c1c6161716so3754927ybj.8 for ; Fri, 21 Oct 2022 09:37:17 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20210112; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:from:to:cc:subject:date:message-id:reply-to; bh=esgdcnz6KGc3B9V+LZ2N8Ds4/nBZJJcBbCbHMbBwHjk=; b=pIJH5olO/I2dA/fnJ38RNDUNag1jCBRbSJReNXDuFWFG47O9hxJi0FrZmqRDXnMQI/ /1xVDVB5mv31fhcLpuKcwsVOmx47jsNdpgEmx1ogSlHkiRq2gQSCkBfkeXDdnWNMRdDn WgoWwu2YOgG4/TAj7KoF7BJ0B/PakCZecR5Fz7AxDD2HusQ0sKx0GmA+SDCOGrHBGHKJ 9+3IXcRAfLkNOoszDtrPaH07o7iDaKBcPTzeRh8Cc75lTqqKCgJ+kxoLRkdDPkZ1rJBO w37Zjh0EOVT4NqJ7iFe9EVTQT2dlpacbUdy+60R4swoG2PQ3BsajOoLaJnerCKU7XJt3 wX9g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=esgdcnz6KGc3B9V+LZ2N8Ds4/nBZJJcBbCbHMbBwHjk=; b=CJyadUbD1p9CbWtgz6OmZlRMalPUSqQZXW9cqipm13gJjr80InvOiKAvbDBILEp0YN /0WcZDMbes4zjc8kfEv0cZ0qbCDlCgI5ycUew12wsTyU/41ZyFmEnL6EbV1Pa4+a+UKP aRBBT8pzmiC0x+gu6vEvZcicKqSC7OPILC542pXEMtFUb69DTTgnbx53I0jQV3f9UNzJ q4POa0jAtflDLSdQdhm6ySO0dI/ZQG7ku49SSIcMnAg7aaRNTucHHh8dB59rRTc5vdj4 coMv26QExTIBJo88ZvugxJD9FdXyQDhKuQZIUvKEbewIStNRu1pfz8KkqXbJPhRUXhMl 0YEg== X-Gm-Message-State: ACrzQf2Pt54dxzBIl3rsJkBOO3mqDpk9GdFlSzMURLIe9Jy4OowN48fk Fpz0Ss0webPohhOmPQM70DXPRT516jYWO/mB X-Google-Smtp-Source: AMsMyM5MFGoqy8wia1mdc/lLpWSr3NMH5TcxOdBPl8JHYJ3m/WiGfOvhhzuYtwCQ7+h6B+nksqPI0zssr+I/zZcM X-Received: from jthoughton.c.googlers.com ([fda3:e722:ac3:cc00:14:4d90:c0a8:2a4f]) (user=jthoughton job=sendgmr) by 2002:a25:3cc4:0:b0:6af:c67e:909e with SMTP id j187-20020a253cc4000000b006afc67e909emr17009872yba.266.1666370236967; Fri, 21 Oct 2022 09:37:16 -0700 (PDT) Date: Fri, 21 Oct 2022 16:36:18 +0000 In-Reply-To: <20221021163703.3218176-1-jthoughton@google.com> Mime-Version: 1.0 References: <20221021163703.3218176-1-jthoughton@google.com> X-Mailer: git-send-email 2.38.0.135.g90850a2211-goog Message-ID: <20221021163703.3218176-3-jthoughton@google.com> Subject: [RFC PATCH v2 02/47] hugetlb: remove mk_huge_pte; it is unused From: James Houghton To: Mike Kravetz , Muchun Song , Peter Xu Cc: David Hildenbrand , David Rientjes , Axel Rasmussen , Mina Almasry , "Zach O'Keefe" , Manish Mishra , Naoya Horiguchi , "Dr . David Alan Gilbert" , "Matthew Wilcox (Oracle)" , Vlastimil Babka , Baolin Wang , Miaohe Lin , Yang Shi , Andrew Morton , linux-mm@kvack.org, linux-kernel@vger.kernel.org, James Houghton ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1666370237; a=rsa-sha256; cv=none; b=fLkHiW110y30Mc5eDWHlgrRVmRUz9YwAUsJaYOvxg52dZJuOLgdzi4QukaQTAAYnSl5RmS xmgISKbg3O4BEeGhxtgIZQozm+/6Axd//2TsrlF1oV/xNteQjPJ7Bx3P3VfleewQWZ0s8/ 2CVNgjS3JfBM7Wzjzcbf+qLnAfmES5s= ARC-Authentication-Results: i=1; imf26.hostedemail.com; dkim=pass header.d=google.com header.s=20210112 header.b=pIJH5olO; spf=pass (imf26.hostedemail.com: domain of 3vMpSYwoKCL0mwkrxjkwrqjrrjoh.frpolqx0-ppnydfn.ruj@flex--jthoughton.bounces.google.com designates 209.85.219.201 as permitted sender) smtp.mailfrom=3vMpSYwoKCL0mwkrxjkwrqjrrjoh.frpolqx0-ppnydfn.ruj@flex--jthoughton.bounces.google.com; dmarc=pass (policy=reject) header.from=google.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1666370237; h=from:from:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type:content-transfer-encoding: in-reply-to:in-reply-to:references:references:dkim-signature; bh=esgdcnz6KGc3B9V+LZ2N8Ds4/nBZJJcBbCbHMbBwHjk=; b=ru+4QRiz6wG7AwSbEvwuZXHV/fBURLx052O4QfGDM9AkoCQr+MBkRso4+TbYKIiVazeomN YAXlYofMtoqCJQC25/I9Y01c9zQmlmuGw4suPhf4yw/2Q8ZNmFzzUZlFNCZdot/iVGA5Mg Kbe0nuPFFudXxxh7ekF+RogxUQBgtcU= X-Stat-Signature: gdrt3bcdhpmpdknqj3g8r78nrycdkqod X-Rspamd-Queue-Id: AEAD7140036 X-Rspam-User: X-Rspamd-Server: rspam03 Authentication-Results: imf26.hostedemail.com; dkim=pass header.d=google.com header.s=20210112 header.b=pIJH5olO; spf=pass (imf26.hostedemail.com: domain of 3vMpSYwoKCL0mwkrxjkwrqjrrjoh.frpolqx0-ppnydfn.ruj@flex--jthoughton.bounces.google.com designates 209.85.219.201 as permitted sender) smtp.mailfrom=3vMpSYwoKCL0mwkrxjkwrqjrrjoh.frpolqx0-ppnydfn.ruj@flex--jthoughton.bounces.google.com; dmarc=pass (policy=reject) header.from=google.com X-HE-Tag: 1666370237-144536 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: mk_huge_pte is unused and not necessary. pte_mkhuge is the appropriate function to call to create a HugeTLB PTE (see Documentation/mm/arch_pgtable_helpers.rst). It is being removed now to avoid complicating the implementation of HugeTLB high-granularity mapping. Signed-off-by: James Houghton Acked-by: Peter Xu Acked-by: Mina Almasry Reviewed-by: Mike Kravetz --- arch/s390/include/asm/hugetlb.h | 5 ----- include/asm-generic/hugetlb.h | 5 ----- mm/debug_vm_pgtable.c | 2 +- mm/hugetlb.c | 7 +++---- 4 files changed, 4 insertions(+), 15 deletions(-) diff --git a/arch/s390/include/asm/hugetlb.h b/arch/s390/include/asm/hugetlb.h index ccdbccfde148..c34893719715 100644 --- a/arch/s390/include/asm/hugetlb.h +++ b/arch/s390/include/asm/hugetlb.h @@ -77,11 +77,6 @@ static inline void huge_ptep_set_wrprotect(struct mm_struct *mm, set_huge_pte_at(mm, addr, ptep, pte_wrprotect(pte)); } -static inline pte_t mk_huge_pte(struct page *page, pgprot_t pgprot) -{ - return mk_pte(page, pgprot); -} - static inline int huge_pte_none(pte_t pte) { return pte_none(pte); diff --git a/include/asm-generic/hugetlb.h b/include/asm-generic/hugetlb.h index a57d667addd2..aab9e46fa628 100644 --- a/include/asm-generic/hugetlb.h +++ b/include/asm-generic/hugetlb.h @@ -5,11 +5,6 @@ #include #include -static inline pte_t mk_huge_pte(struct page *page, pgprot_t pgprot) -{ - return mk_pte(page, pgprot); -} - static inline unsigned long huge_pte_write(pte_t pte) { return pte_write(pte); diff --git a/mm/debug_vm_pgtable.c b/mm/debug_vm_pgtable.c index 2b61fde8c38c..10573a283a12 100644 --- a/mm/debug_vm_pgtable.c +++ b/mm/debug_vm_pgtable.c @@ -929,7 +929,7 @@ static void __init hugetlb_basic_tests(struct pgtable_debug_args *args) * as it was previously derived from a real kernel symbol. */ page = pfn_to_page(args->fixed_pmd_pfn); - pte = mk_huge_pte(page, args->page_prot); + pte = mk_pte(page, args->page_prot); WARN_ON(!huge_pte_dirty(huge_pte_mkdirty(pte))); WARN_ON(!huge_pte_write(huge_pte_mkwrite(huge_pte_wrprotect(pte)))); diff --git a/mm/hugetlb.c b/mm/hugetlb.c index 650761cdd2f6..20a111b532aa 100644 --- a/mm/hugetlb.c +++ b/mm/hugetlb.c @@ -4728,11 +4728,10 @@ static pte_t make_huge_pte(struct vm_area_struct *vma, struct page *page, unsigned int shift = huge_page_shift(hstate_vma(vma)); if (writable) { - entry = huge_pte_mkwrite(huge_pte_mkdirty(mk_huge_pte(page, - vma->vm_page_prot))); + entry = huge_pte_mkwrite(huge_pte_mkdirty(mk_pte(page, + vma->vm_page_prot))); } else { - entry = huge_pte_wrprotect(mk_huge_pte(page, - vma->vm_page_prot)); + entry = huge_pte_wrprotect(mk_pte(page, vma->vm_page_prot)); } entry = pte_mkyoung(entry); entry = arch_make_huge_pte(entry, shift, vma->vm_flags);