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 DC243C54E76 for ; Thu, 5 Jan 2023 10:18:57 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 6848A900002; Thu, 5 Jan 2023 05:18:57 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 5E65B8E0001; Thu, 5 Jan 2023 05:18:57 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 46145900002; Thu, 5 Jan 2023 05:18:57 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0012.hostedemail.com [216.40.44.12]) by kanga.kvack.org (Postfix) with ESMTP id 3656F8E0001 for ; Thu, 5 Jan 2023 05:18:57 -0500 (EST) Received: from smtpin22.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay02.hostedemail.com (Postfix) with ESMTP id F17A4120D03 for ; Thu, 5 Jan 2023 10:18:56 +0000 (UTC) X-FDA: 80320347072.22.D3B9143 Received: from mail-yb1-f202.google.com (mail-yb1-f202.google.com [209.85.219.202]) by imf30.hostedemail.com (Postfix) with ESMTP id 651BB8000E for ; Thu, 5 Jan 2023 10:18:55 +0000 (UTC) Authentication-Results: imf30.hostedemail.com; dkim=pass header.d=google.com header.s=20210112 header.b=OvRCq1K7; spf=pass (imf30.hostedemail.com: domain of 3DqS2YwoKCFU6G4BH34GBA3BB381.zB985AHK-997Ixz7.BE3@flex--jthoughton.bounces.google.com designates 209.85.219.202 as permitted sender) smtp.mailfrom=3DqS2YwoKCFU6G4BH34GBA3BB381.zB985AHK-997Ixz7.BE3@flex--jthoughton.bounces.google.com; dmarc=pass (policy=reject) header.from=google.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1672913935; a=rsa-sha256; cv=none; b=8r75amKttunJ4Di/PNMwfxjhTR+osaNoySQw4ph2rObYViq7CKLrxeEglX+3KMBOhWO6TT 81fbXX4tifB20oDirX5uKtZvWwjxz/DwCKSxbeyf57ICRo8MqcaLevW0rZQUm+eHFq759j /U9/wjL1OgbFP22IhLboQa6BFeIPqy0= ARC-Authentication-Results: i=1; imf30.hostedemail.com; dkim=pass header.d=google.com header.s=20210112 header.b=OvRCq1K7; spf=pass (imf30.hostedemail.com: domain of 3DqS2YwoKCFU6G4BH34GBA3BB381.zB985AHK-997Ixz7.BE3@flex--jthoughton.bounces.google.com designates 209.85.219.202 as permitted sender) smtp.mailfrom=3DqS2YwoKCFU6G4BH34GBA3BB381.zB985AHK-997Ixz7.BE3@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=1672913935; 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=0YYyrn/i5J+Hdl7Oce+Vi3RxVXkQH55IR2Pj2f6MRss=; b=JDhaOY8Od6xPoBcv2wr83HCk8Or3IG73sLOvkUdEOzjcB0GKwrSW88xFaDiwzauF+0kdz+ 7Fqb5DcT8huCBg9kR5A1LUmB9qO7NvkYawRHzOoCRrzjtpMNxlmlatk3sWwEwMu+kWKm/w 6zmcN+t/5bnVK8qYukZcXb9zM8aKIMM= Received: by mail-yb1-f202.google.com with SMTP id k18-20020a25e812000000b0077cc9ab9dd9so27181764ybd.8 for ; Thu, 05 Jan 2023 02:18:55 -0800 (PST) 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=0YYyrn/i5J+Hdl7Oce+Vi3RxVXkQH55IR2Pj2f6MRss=; b=OvRCq1K7vBr4jC60kQ8Em8RrEuL5pvhvHnKcAsgERc3uS+w79rqkAY+8zuKClMXYP1 9Ko8z21BLtt7+dY9dy1V18U882pGXu/OE6i+Xr0iQPnYIyNgznMU4MIYAU10i4V8msYi vF8PBI3bFXNBLc45eUtC+jumcHqn1CRhScBqxVt0/BNc1x40y+nrTfMPbTVNaD7phI6p n1O1IlZLttIwzPlRgdc/hc2CmAd1C15Vy/o6AJ8g8UFwO7fkbcWUnHCUscKvp68diaN9 zV3S/Vot4voCzs8e2T5wk56DNUb4ssJaLwx9z6hGPfl2a20zFaxom/8VdWD8sa1qWbzF 3Vuw== 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=0YYyrn/i5J+Hdl7Oce+Vi3RxVXkQH55IR2Pj2f6MRss=; b=WYvnK0U9YnexCdNoe8VfpPkPvXsxTS9enKHbwSOm9d7n3iiQ/Nh2oOW0LH0xCHjqzs yAYxL8nE1he/eYUZFZUndlswrOs/n3AQvtJH57yBa5SW1MsCO0xo4s6K7xY2u1Ar2Fwo 7YKv5p83zWH5IUN8LxZpoKaWoajx7CKsjrSlUi1R+jTq4OzXmPkiz8NqxjomCBNrjC1q JM2k1LuvWTdJhNqI50xnL9htZTAYi3+3pzciqAIU6Q54R8yVrPnaGZdRO+cEDSDrCbdS 8KwL9USqkDzPsWqBE/eNHJKgjUW7zGqnCJUAjrAzYQvYjgip85rINLd+7i4bjSke9UD6 2hdA== X-Gm-Message-State: AFqh2kqkKsCUVGz1gzsWXcTmNBTj3p3v/LbrN6Tge8W4TILMc3oHVzhS 3onMdCOmHbiTs7xV2Kav0rcExgTo9BbO/Eta X-Google-Smtp-Source: AMrXdXtC8k5di86WReSiaGhD69tMGn+bIeELhRcjp6aIf2STjTrG//8SeY01j3sLTLnAywMSOT6aefEO4rMpcD9u X-Received: from jthoughton.c.googlers.com ([fda3:e722:ac3:cc00:14:4d90:c0a8:2a4f]) (user=jthoughton job=sendgmr) by 2002:a25:5056:0:b0:7b6:2b8f:f2c0 with SMTP id e83-20020a255056000000b007b62b8ff2c0mr25297ybb.46.1672913934575; Thu, 05 Jan 2023 02:18:54 -0800 (PST) Date: Thu, 5 Jan 2023 10:18:00 +0000 In-Reply-To: <20230105101844.1893104-1-jthoughton@google.com> Mime-Version: 1.0 References: <20230105101844.1893104-1-jthoughton@google.com> X-Mailer: git-send-email 2.39.0.314.g84b9a713c41-goog Message-ID: <20230105101844.1893104-3-jthoughton@google.com> Subject: [PATCH 02/46] 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 Content-Type: text/plain; charset="UTF-8" X-Rspam-User: X-Rspamd-Queue-Id: 651BB8000E X-Rspamd-Server: rspam01 X-Stat-Signature: dj8dfu43u8pwxafz7z5ii981ri1rdhxf X-HE-Tag: 1672913935-473609 X-HE-Meta: U2FsdGVkX1+nJRy5POMh8nca7cvFd5qKHyBY7iA017GE2Jw4VwhWksqe8yXwl1uAFB9DM2gNQGU/0dtAOQaj0sKrXGtFK6UUo/OYlw9yERLkGaptN+a1eY5z7nVedpxoyF4YVa+tp71nxTh25VN+J1X9rm/EmLEGvCRr3yQ2ssAuIlR1YneqObYyMAB9CTXr/AR5sXebt6j1VRCcT1m1b/ViKvAjOP1WX8R8GcB0gqXxsEpEpshbton60Vpal3YBdWZLHAQYUJ/UMhLY9mknHck9qLkx+Y1F7P/jq57iyKnLONpRoAVFIvs/k5VfiYLviWiA+HLtjFvZrJP0XBW2lVJ7/AIFw68AOLKl5h+BpLA1JhzGTZ9gCxcHPt7tnm6eyQeRmSTQrLVqGNr300/z2wkeWZop8uIdXLBu8icdXYnD281nfqGW6Oj4R4vFhgCd6S4plrKDcv9sf0HdgTy6ToRT8Wg7Q3pLF3eO1FOuTG6S+Asp/zOKLXkR+UxDtj4c2hzCbfJoJ72Xt1TapmkXSg+OfPAlflYi40PRV1bYJ94yPSkpHHq4ZDSfAsW+lxQ3iXtyOOVj4a9jHPFO9CDW3uEfmyLT2TseQ/3F/H6uSXH7S7dkWDcIPkGwkQ3slLQk0+HsnSzwFyAILBNPw8SQegGmsAGioSNCyO+ujMceqzqDFGHeDDz8mgmsESyqX+tcNHENOp7vylnucacA33gsVv/yp8mbaaFuMz9nBj75/N1fzKY5ePDfYUIG/3SfAscx8tMdH+pNdYE0NaMIQuO60y24dnnvoVeZjtQAklwmN598wIo1jU04r32b7rt5Evc1wuUKfRvHqcCD4dXFPDLviv4MKoPizKb+YLR/Fy6ywUtBOepXV8cXZw700LYBXDH1p8PjqjJTcu+p+bxPCyitwYqRzGt05FOvGrgtZZ4TzQzZgq5yW2x7vjQ/aIiUtpkdJrE3UBBRgA7OSZ85IaS xCBWM9t1 pdxteQuG+WetHqXDfVhv+tc8H+2ogcp8Po11nX/qmIK74OcKaDzBSHzM/XDznlf9ceF6Iim9AmqFwSlcMRnLLxQkXByVzL+p9oqFw/t/tNnC6cxS0HWwclghBXKa9eZZWCQYGClxzzvmj22WaxMkdjD7ZNZCbTyttNITflu9tGE31Mp+1xiRW9tjIBoZ3QwiG4Mr34U3LMiOa7Yw96qNp8x9JxPB2izmJqzT9VL3q8f8rFOJgPFBk4kv0Z3Xe3nAP02bftcH2aVxEFUF86271DNepgMNVRjcmpHjO6vcue2D3jmq4TwJUNXwB3oyH0xcO5BX28iVILyqXXfEO+0p1TyF0OCGGJgvSFRk0NfFSpEZHk55zLJaFlb3OmuMnySxVFthDhb3t71rMv9uxu9xjrCCNK/rLGuPogKivaMgmY6KlblJyK3G+hbDyEBmzzySaQPG/ 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. Acked-by: Peter Xu Acked-by: Mina Almasry Reviewed-by: Mike Kravetz Signed-off-by: James Houghton --- 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 d7f6335d3999..be2e763e956f 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 c631ade3f1d2..643cce3493cc 100644 --- a/mm/debug_vm_pgtable.c +++ b/mm/debug_vm_pgtable.c @@ -900,7 +900,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 b061e31c1fb8..7e9793b602ac 100644 --- a/mm/hugetlb.c +++ b/mm/hugetlb.c @@ -4870,11 +4870,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.39.0.314.g84b9a713c41-goog