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 A8ACEC05027 for ; Sat, 18 Feb 2023 00:29:15 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id E1EB428000B; Fri, 17 Feb 2023 19:29:00 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id D82A6280002; Fri, 17 Feb 2023 19:29:00 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id C20F028000B; Fri, 17 Feb 2023 19:29:00 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0011.hostedemail.com [216.40.44.11]) by kanga.kvack.org (Postfix) with ESMTP id B140D280002 for ; Fri, 17 Feb 2023 19:29:00 -0500 (EST) Received: from smtpin18.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay04.hostedemail.com (Postfix) with ESMTP id 7CC2B1A073D for ; Sat, 18 Feb 2023 00:29:00 +0000 (UTC) X-FDA: 80478527640.18.7DA4A73 Received: from mail-vk1-f202.google.com (mail-vk1-f202.google.com [209.85.221.202]) by imf16.hostedemail.com (Postfix) with ESMTP id B5B2318000B for ; Sat, 18 Feb 2023 00:28:58 +0000 (UTC) Authentication-Results: imf16.hostedemail.com; dkim=pass header.d=google.com header.s=20210112 header.b=a3A4PV5p; spf=pass (imf16.hostedemail.com: domain of 3yRvwYwoKCOYRbPWcOPbWVOWWOTM.KWUTQVcf-UUSdIKS.WZO@flex--jthoughton.bounces.google.com designates 209.85.221.202 as permitted sender) smtp.mailfrom=3yRvwYwoKCOYRbPWcOPbWVOWWOTM.KWUTQVcf-UUSdIKS.WZO@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=1676680138; 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=xG9DbE8VOder+S14FjxoH+IwzXAdpZM7a0a5kZcYva0=; b=VtlfQjMp3chVLlBacBTkvpKaV//Qn2mB8Z2CP/aVHB+M/FwIcLJK/tdVnothaRIWaET9hU Qlvo6fHxVhhU0TkOeUMjRFTDBUocGkcGstH3mgi8ekKN6RtjbAmWjkUxkvWiOjKU23tgKP /65skshbLRhbQ+tD07qdIat9pU0Yfdk= ARC-Authentication-Results: i=1; imf16.hostedemail.com; dkim=pass header.d=google.com header.s=20210112 header.b=a3A4PV5p; spf=pass (imf16.hostedemail.com: domain of 3yRvwYwoKCOYRbPWcOPbWVOWWOTM.KWUTQVcf-UUSdIKS.WZO@flex--jthoughton.bounces.google.com designates 209.85.221.202 as permitted sender) smtp.mailfrom=3yRvwYwoKCOYRbPWcOPbWVOWWOTM.KWUTQVcf-UUSdIKS.WZO@flex--jthoughton.bounces.google.com; dmarc=pass (policy=reject) header.from=google.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1676680138; a=rsa-sha256; cv=none; b=4/LJJjlDt5ZiFnIsfFF0dl8VXkE8uO5c6QD2T/+ajQNh1lauNbOp7tRcU6/ti3OFqSg39v 25BGmTTDxaVD2WRl3CzAvR4WFKjScnqSIIOAdaDSTn3kJgww0jZFgWle2KyN2SeZhglsCi rX7ve/niM4L3P6YSmPeNdPJORV9GlD0= Received: by mail-vk1-f202.google.com with SMTP id n21-20020ac5cd55000000b00388997b8d31so732971vkm.3 for ; Fri, 17 Feb 2023 16:28:58 -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=xG9DbE8VOder+S14FjxoH+IwzXAdpZM7a0a5kZcYva0=; b=a3A4PV5p5qh9WhQPMBGPxG18XU5syYapjVA8cJrIQKg9SlfzzX0meZ5KSEbjCS76/h KkgUk1GyrdDSRmNwgJs67ciqNHmVAv5DJmhTpojLF0Uyhx6Rxq0nYHhEXa500KqHdLSY 8OPHt1vFrno7tMNUTlD5OZynE2nE9LC7G2tsTG/pmDJw36wEBjXLJkf3kjpEqyBFrFHU onGHC9FIBifpRYHynXz9NhBphtMbFvKNAw8XziHocmnSczkwT0klgF5M5m56ALq64vUA bsFoi/I6FyoSWC8X++RYI9nsaIKHXsGED5l665XewLFlFoDtjmgAh+mOcZ6rWrr94rxB 1OVA== 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=xG9DbE8VOder+S14FjxoH+IwzXAdpZM7a0a5kZcYva0=; b=RVJ+ZZi9ovDwyKKYQ8Ra1wVfLAOikLlXti3A8dTA6+YMjxZPiskn1ubUs4A0mTUEhO JvjC1bmChPIB9c/0tDpGbNhwg1upbTlRx7lTRy8bQ1R4jN1W9csJ2MqIWrc2S7Y/cjup tvDhoYTdlvlgPCEIfoxkDwXSoNNSS6BVFFlE8IfQ3KVjPT8fDCY1fmr7UQKQ26SJahn3 sRptprf0U2IlOLiD5ZoQ1rj7Pw93ugLK1FzBNZR866wcG1wqw45zHQa7Tb51ZwdT/BH8 0D0GEBe0FgKy1GTC2nBj+lEXNKeg/bidTAYabv+SbmYCHQfkoAW2EM000mJ35/UBW/n/ CY5w== X-Gm-Message-State: AO0yUKV6VTdrThF66liVtO8zfcAGrxsR/3W2k0i2y1NyqgCdnh1D47js H2xnEhzDINhCHKLmjEq8TMWyWQNLn78G2EPO X-Google-Smtp-Source: AK7set90mnEVzNzEwK6fPTTkXMb5MvuuAdnXyAlauMlVrzIA9ZFHAX7xiVkHYeaXZEfkvh8rxB+tXWDlCgeheDym X-Received: from jthoughton.c.googlers.com ([fda3:e722:ac3:cc00:14:4d90:c0a8:2a4f]) (user=jthoughton job=sendgmr) by 2002:ab0:53d9:0:b0:68d:6360:77b with SMTP id l25-20020ab053d9000000b0068d6360077bmr26282uaa.1.1676680137978; Fri, 17 Feb 2023 16:28:57 -0800 (PST) Date: Sat, 18 Feb 2023 00:27:48 +0000 In-Reply-To: <20230218002819.1486479-1-jthoughton@google.com> Mime-Version: 1.0 References: <20230218002819.1486479-1-jthoughton@google.com> X-Mailer: git-send-email 2.39.2.637.g21b0678d19-goog Message-ID: <20230218002819.1486479-16-jthoughton@google.com> Subject: [PATCH v2 15/46] hugetlb: add make_huge_pte_with_shift From: James Houghton To: Mike Kravetz , Muchun Song , Peter Xu , Andrew Morton 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 , Frank van der Linden , Jiaqi Yan , linux-mm@kvack.org, linux-kernel@vger.kernel.org, James Houghton Content-Type: text/plain; charset="UTF-8" X-Rspam-User: X-Rspamd-Server: rspam04 X-Rspamd-Queue-Id: B5B2318000B X-Stat-Signature: j4mrtd1gkibqdththj1jqtan746wbazr X-HE-Tag: 1676680138-791488 X-HE-Meta: U2FsdGVkX19aEUmx9q50WUUp5JlOScSgW8aqAt+tUDLrayBpgveAfAxVRZ52S1/DsVhrW5TA88t+Uqx5u8PvH+4/iWgi8bv1ua7SpEC1Tewv1Fxqd5cf7D4h8BFAqVm/KTCsKNFsw4Ug0fUBXP4iT7Rgn5YfrmkWktMX7FZ6DcLokGl5AgBoqgxrYcC6M2ShKQjKGjJaFviHZpsJp7bECnSu6bZe4gWCcNEd1dnhUT7BFAhwwt6Ty0Y+7kUQRlEtMrplhZngPJTKOMBf1rt04O7z/kCkESFO0cOsI0H8p5NoaD5/eB3PB24AhggyzZP5DUxu5AIFvE/mzlxdQ1wMcxnFe+ztM3wSNF3G+Xqgg7GVylD3E8Zl8CjEfBPZG3WBfqzsEnQjQX0Lm6+evnCmWw7bCDIYJUUmdWlY1kKP5Yock69LOP2+OpEk+pz80wqIyJ6gMzrgSHT4wLSPgvW4xKh/9XPLfONHkPKaiWAh9COingWbkSCgU5nwmGfOU7VsaX5dHeY3KcZgRs0Dv2WCa6S3zrY7DbIeuUzqp8ha9+VRrI5EPCQeglyDRuuWP2PZmqGj6KH7gZCMQm8EnEtuRVviyp/WTj5heyBRy92x6gFOXEqOh8wBv9YX5urwiFwn9wKPPzvQxoGVUCMZucuXftHBhqDYEC79cPipuTTFaqaOuEP4d9V1gKRqNsY2RPfTO9AFimLN/jpTrZ9ws8ccQ91P7kqQ/KkL1QVRCE4Wcnry4+62ktVPf7TRtQbejTFPonrUz3jCwD5mf1DEAz36k5Evq3PPXZFDrd/vpkj5hgDoDUihpE7r8EoEGSr7QmNAVhgPXNg0ivzg73tuf+lDKaz0V4dcZp5WJ+hLy8WqGVaKl2O/aQoaaVZuTesnTskCbpgVQ6sgmMludcOFs2DYSEIIjhY+HS9rT6YGD4ff7cmkposgbPhFar9sTbbpoaxLYMXcCsZRKtsmxHMbEia IVNDe8iQ 6/09WVSGeO6PohjBvHYzS36P60mE4OfNN0yHjK80GnOQNwwxXpVdl+gYwLbeofcEDrChCsRotW7gHNpPJmNZtzxh7nmOEn8D4knN/zFS64/cHwy64P4NP8rlkCDrxRXMi2vtcxX0FaP9BF7BIDDsCy0MLNYjIfZHFejZ0N0KWR70Q6jNDyXm9M6v02iF/+GQnBOqyaWnCIPAVyLRXUT6MD4SG2sgEsWeud3cRstdDNuVI9i8jRzm0eWCcNfwr9i6vCZruDpSunpZY8elWt95gUaCWO8vYDfhCyvp4plw4AfYhtUkK9fWNpSMjf43DlQ9YRPajF06dXaUHlZLFUKwNGgf6dwTo+crJiGBXH91s5KRszEAMHz5QVR7XEWvpSJbiF7fQjvc0M6+zX56P1ZaIMRWcc4/h4KOS0uFxSWslZvnqdI4kKk2XejD3a/zIszdq3XUh0/02BhMuI4sWXb3XsL0SFKjk7pt/V+ULCJK2mPvGgYuV6PvOSg9k2XGjKkN2lHksonCdAEGPDCnH76S+khVWUmR0XcOdh14MZE1zjygUO+qbVgC4AhfR+2mZR3Ruy4f26ds11945RDo3HhHL87LGPdT4ZK3oTEulSjzhRrSwLMcZ5pcNR9B9YsCh8tBykcXftB9gfnsPWvh0SgbmrVEneOXoDncOyKNERc46SDOfLuMlFr54SCikJZ4hLrBZ2jgUAZN29CSfsx7r32osWr/PBp9O7ipKeXGF 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: This allows us to make huge PTEs at shifts other than the hstate shift, which will be necessary for high-granularity mappings. Acked-by: Mike Kravetz Signed-off-by: James Houghton diff --git a/mm/hugetlb.c b/mm/hugetlb.c index f74183acc521..ed1d806020de 100644 --- a/mm/hugetlb.c +++ b/mm/hugetlb.c @@ -5110,11 +5110,11 @@ const struct vm_operations_struct hugetlb_vm_ops = { .pagesize = hugetlb_vm_op_pagesize, }; -static pte_t make_huge_pte(struct vm_area_struct *vma, struct page *page, - int writable) +static pte_t make_huge_pte_with_shift(struct vm_area_struct *vma, + struct page *page, int writable, + int shift) { pte_t entry; - unsigned int shift = huge_page_shift(hstate_vma(vma)); if (writable) { entry = huge_pte_mkwrite(huge_pte_mkdirty(mk_pte(page, @@ -5128,6 +5128,14 @@ static pte_t make_huge_pte(struct vm_area_struct *vma, struct page *page, return entry; } +static pte_t make_huge_pte(struct vm_area_struct *vma, struct page *page, + int writable) +{ + unsigned int shift = huge_page_shift(hstate_vma(vma)); + + return make_huge_pte_with_shift(vma, page, writable, shift); +} + static void set_huge_ptep_writable(struct vm_area_struct *vma, unsigned long address, pte_t *ptep) { -- 2.39.2.637.g21b0678d19-goog