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 kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by smtp.lore.kernel.org (Postfix) with ESMTP id 01948C4708D for ; Wed, 7 Dec 2022 23:14:04 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 7E1BC8E0003; Wed, 7 Dec 2022 18:14:04 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 7923B8E0001; Wed, 7 Dec 2022 18:14:04 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 65A918E0003; Wed, 7 Dec 2022 18:14:04 -0500 (EST) 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 570498E0001 for ; Wed, 7 Dec 2022 18:14:04 -0500 (EST) Received: from smtpin17.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay08.hostedemail.com (Postfix) with ESMTP id 1B58E140643 for ; Wed, 7 Dec 2022 23:14:04 +0000 (UTC) X-FDA: 80217065208.17.BC332D5 Received: from mail-vs1-f53.google.com (mail-vs1-f53.google.com [209.85.217.53]) by imf08.hostedemail.com (Postfix) with ESMTP id 911A0160004 for ; Wed, 7 Dec 2022 23:14:02 +0000 (UTC) Authentication-Results: imf08.hostedemail.com; dkim=pass header.d=google.com header.s=20210112 header.b=JfQA+TEz; dmarc=pass (policy=reject) header.from=google.com; spf=pass (imf08.hostedemail.com: domain of almasrymina@google.com designates 209.85.217.53 as permitted sender) smtp.mailfrom=almasrymina@google.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1670454842; 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=X3AMraPxTEMML2QwIVTCEcNgf8lB6EELFHw2faoFhz0=; b=S7Zj2niZX0EIkPJhZJyB+bp0+Yp/rTAuV55PK3FCq5OyHdbaKlNYSDB2XM9nWQB6KB62e7 WUq8O3hJ51hsFN5fHXlLhGI3tY/AtebgRngxfEimn8gkHGEl/tIzIEmbCXHKP9wg0FtCo3 JuVgMbeb6ucau5lO2NMarsHGvFwL6Po= ARC-Authentication-Results: i=1; imf08.hostedemail.com; dkim=pass header.d=google.com header.s=20210112 header.b=JfQA+TEz; dmarc=pass (policy=reject) header.from=google.com; spf=pass (imf08.hostedemail.com: domain of almasrymina@google.com designates 209.85.217.53 as permitted sender) smtp.mailfrom=almasrymina@google.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1670454842; a=rsa-sha256; cv=none; b=3tVWfxlxaPTn65qJNw4XCL3vfXRsVTe2SP/FHRt1u5W5UbAoh6LgmhF/ljgBes+mmfCw1n 1zRaKGm8WDE4LpwTWk3NqXsM/VqH85DpgyOChV+4nZrXCuANcHB50xh7m6R3bqUXw66Fy0 HLhuDTVxbNaOlWf4qWenM0Jjqln0Nsw= Received: by mail-vs1-f53.google.com with SMTP id 125so18717269vsi.9 for ; Wed, 07 Dec 2022 15:14:02 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20210112; h=cc:to:subject:message-id:date:from:in-reply-to:references :mime-version:from:to:cc:subject:date:message-id:reply-to; bh=X3AMraPxTEMML2QwIVTCEcNgf8lB6EELFHw2faoFhz0=; b=JfQA+TEzoiHOj0cgo8aRIAdrr1vXuO7gCmCpgnRv/LqryVKtMxM90wYWRCOfJhdBYZ vCFZZJjUUfImOp2oVS38W4AtJgY8i3PYAdRjHPf4iZdZFgThJdMTtiB08NgGKxaueAc2 IsBDgCy5EDpc0XdhQ+PCu9RAqOne071/FE0LZrMZ3C2wVxYiDQzpHuzDOptoRNPYtlRO 8SDzgWTqIltwPCk/SuX83NmJUhXGOeUd4715cFXy/BMAmNdQD9Vf40zz95vvFFt3fUlQ 0bOtcK5H4t0A2wKKF89etmINGB3nugcdbfYC7rI/nefgy6CXbjY/YlFMyRKom/r3pVCq v1yA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=cc:to:subject:message-id:date:from:in-reply-to:references :mime-version:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=X3AMraPxTEMML2QwIVTCEcNgf8lB6EELFHw2faoFhz0=; b=E2hZvILhlRAT3H/owDOZJZDTG+i86yvjH+hxTcZoY1sdhBnKvCJyZpKy38r8QFkTFn v4ENMqFLVODi/WnMnpQqu5235gSO3taxntMDWkaTtpOCMMYrM6zjES3lD2B++MsInmHA n727QZYUwJDtgWsuHl/X1xAqTdBd8KPynqzh1VQypTrKvXT9i8xdiea9GJAyvPCz8tEo WlTH4ZMpmpHo1s21aQV+rwFB/m4ySp9S29JyrJ991ddSti575ESFeOMXdDT8/lxquLoN QeC2Px9IbRwjByxZqUQ3PX4sz03J+9UoHKXGNj+nPJlnhD2ozJlpBx7qTHvIar0q52x8 5Tvg== X-Gm-Message-State: ANoB5pmSbBxCAmXtaQqZdU+KExyRJ+OJBgoEUSl5TpCMKz4x0YBsro5P htOUFTOPGh3VNYR0Di5iT9XCrZZIDdMfAjvilY0Efg== X-Google-Smtp-Source: AA0mqf5hc2cyG+r40eIgDTUY2j584KDq0fVV2uUzVoIpSZ9CKcMf4xVlyU03mDhKWsozpDgxpp+aZJFN1i8V0OV6qAs= X-Received: by 2002:a05:6102:cd1:b0:3aa:1bff:a8a5 with SMTP id g17-20020a0561020cd100b003aa1bffa8a5mr52101595vst.67.1670454841616; Wed, 07 Dec 2022 15:14:01 -0800 (PST) MIME-Version: 1.0 References: <20221021163703.3218176-1-jthoughton@google.com> <20221021163703.3218176-3-jthoughton@google.com> In-Reply-To: <20221021163703.3218176-3-jthoughton@google.com> From: Mina Almasry Date: Wed, 7 Dec 2022 15:13:50 -0800 Message-ID: Subject: Re: [RFC PATCH v2 02/47] hugetlb: remove mk_huge_pte; it is unused To: James Houghton Cc: Mike Kravetz , Muchun Song , Peter Xu , David Hildenbrand , David Rientjes , Axel Rasmussen , "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 Content-Type: text/plain; charset="UTF-8" X-Rspamd-Queue-Id: 911A0160004 X-Rspamd-Server: rspam09 X-Rspam-User: X-Stat-Signature: g9xy386s7bgz5ybpy8hanynioxxxsoq9 X-HE-Tag: 1670454842-796131 X-HE-Meta: U2FsdGVkX18f+03O08y1lNH7l/gpS+tiC6LBwxNr25Sac5K4IoyJw9mgXISpX3Z0oorcJOQaDzoUxbtVCFyNFelU3EC81qi8PL/72aGZGG9ecxygEA2HRD9l+BEUghRjpOqgJ+ryTVbQSRF9UiHvlpm29vGrG8Ae0qrWkv0UL//SPee6Eya+n6UIgfeEhoGalIMjX1IBkvp4Axi26QiewhGHp9bVuvvETLQqLFEmjNFqK4dys85ZIXug4fwKvi/g4J7ixsaUtPHsVGLZVvif8MpUsoY5sS/sPT5qVX26O+Ac1SF57m6UpunvPV9BopqakoGPnxToP+R64jib/4QAuOIUd/+dkcvMIY0LhTLTccZJftaCmxPkv9uiYED2csHzMWtRstPcmW2TvXuaa6avQFcl4Nqyi1kpbRJFZTRCEb4EoGZW/LeU9mYV4dwWyiXPa4f8nKbWDpPHAqoYIlpzmWHuZemXLKIcP8CL2Y7Vk85BU08uZRVfo/jZlcdXMiLHSgOksCwqO0ic6Zj6IdQLMosTAbW27Z1A88NEWPwQ37oUuCbE50OUbshIkd4v7/D2fro1nqSbxzISDSH4QtDLRwf44Oudnj8Lo1y4VBzWicGIYqqhHRS0CnhzLaZIC2hX/f0W+7RxdYk/sZOYpRuvvfv5IdpYqAaUX6X9JNr10kxfiONcU2rGPeOsbqmhmkqSsTEon5yg076sD6XB0bWsETJysTi+QR7GdoxzJUPVFSv3uIPQzYKbY2R2gfWLJGFYqvIpbcoqNZoK+/WG4kBvxxHhjh9uGLZhAvcy2ir9Oed72CpB+Jd3F6XjnDd89ThNfHiNSwXLH2gzW3dIrJLaTj0i2zV60In37tOW5+4BetIdFtiOkZs9zN/BTD7lIRtSF3Mf7Rfa9ia8cpUU2UAaMF3d/r2n2Yh8BoIoNiDESq5n4fjcwkF4YJ/Smi0jfESDXu5VTaFVBKTMJs2ry4l /ddexfmO ROFQ8xV8aI8I+OKInmORO3Bqfza8GnNPv2cHff9OteXHDMLx91cXvRaX+c9naKsVa9MPB 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: On Fri, Oct 21, 2022 at 9:37 AM James Houghton wrote: > > 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: Mina Almasry > --- > 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); > -- > 2.38.0.135.g90850a2211-goog >