Message ID | 20230105101844.1893104-15-jthoughton@google.com (mailing list archive) |
---|---|
State | New |
Headers | show
Return-Path: <owner-linux-mm@kvack.org> 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 60CF5C3DA7A for <linux-mm@archiver.kernel.org>; Thu, 5 Jan 2023 10:26:47 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id F0A418E0005; Thu, 5 Jan 2023 05:26:46 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id EBA338E0002; Thu, 5 Jan 2023 05:26:46 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id D83C98E0005; Thu, 5 Jan 2023 05:26:46 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0015.hostedemail.com [216.40.44.15]) by kanga.kvack.org (Postfix) with ESMTP id C22AB8E0002 for <linux-mm@kvack.org>; Thu, 5 Jan 2023 05:26:46 -0500 (EST) Received: from smtpin11.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay08.hostedemail.com (Postfix) with ESMTP id 93838140B83 for <linux-mm@kvack.org>; Thu, 5 Jan 2023 10:26:46 +0000 (UTC) X-FDA: 80320366812.11.DB469F6 Received: from mail-oa1-f73.google.com (mail-oa1-f73.google.com [209.85.160.73]) by imf08.hostedemail.com (Postfix) with ESMTP id 07C3616000B for <linux-mm@kvack.org>; Thu, 5 Jan 2023 10:26:44 +0000 (UTC) Authentication-Results: imf08.hostedemail.com; dkim=pass header.d=google.com header.s=20210112 header.b=b1RVVWEc; spf=pass (imf08.hostedemail.com: domain of 3I6S2YwoKCGoRbPWcOPbWVOWWOTM.KWUTQVcf-UUSdIKS.WZO@flex--jthoughton.bounces.google.com designates 209.85.160.73 as permitted sender) smtp.mailfrom=3I6S2YwoKCGoRbPWcOPbWVOWWOTM.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=1672914405; 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=TZkjgoDFSdPqMdf6PVi66Nkhma8WC4z5Ws9uGEsRfvU=; b=LlAn+3/r5iquwLJbbm53jYjikvk5fvUzclbUEtycormekgPhYMhRPkGhmqEd5zqSofPluz rmWnxSj9vfKYeJ41AWyzFayd2Ni5gS5DD3D8LO+80h3Z40mPW5zaOCZl8uOXc+nX8IvJfV +QFIJLHLfYyWZ6M4UiwZHfKvyTyOZao= ARC-Authentication-Results: i=1; imf08.hostedemail.com; dkim=pass header.d=google.com header.s=20210112 header.b=b1RVVWEc; spf=pass (imf08.hostedemail.com: domain of 3I6S2YwoKCGoRbPWcOPbWVOWWOTM.KWUTQVcf-UUSdIKS.WZO@flex--jthoughton.bounces.google.com designates 209.85.160.73 as permitted sender) smtp.mailfrom=3I6S2YwoKCGoRbPWcOPbWVOWWOTM.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=1672914405; a=rsa-sha256; cv=none; b=3qQsX5owXiz6S/5PDnAl4QmH5u93o3wbZF6BMDDkHWo9Y4VY4XcE/qPo0ZN/FdARwAHRj7 vTQPMQpdEkAZJROCdnJVktenXSpIYHZ+xJExBiWgUYrL7TOk5iPYP6mQ9BnLY52Nr2J3/f RVkCPm0m4NhKrprzPbUc6z+/I9734AE= Received: by mail-oa1-f73.google.com with SMTP id 586e51a60fabf-14fdcb3381fso11696265fac.0 for <linux-mm@kvack.org>; Thu, 05 Jan 2023 02:26:44 -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=TZkjgoDFSdPqMdf6PVi66Nkhma8WC4z5Ws9uGEsRfvU=; b=b1RVVWEcn7xCiOOjSjy13xNZs7I3m2tPgL+vaICF4A006PbkCzbik5RH+bvlc5t1Qx smy7s9lD0NeMHyXR/guX74nirJ4mhSP/b5OsHYtrukajSYuo8SN51XOlUZveqfcIBxTi pCfvLZWOwBGymc/6OMx4GvgiaEZ8gEeK8Ch/w/fxFKNdFChMKGauZEpNnT4CrnGxewHT oGPT+PC4YdlyU5cZzBSC43pYPeJidbn+PHc6Uj+0smcgsOefwqWpVuhCtBoBfzEfEMFV upTK7E8QZhz98epzC3+PkHQg4sEDxGGdEgPVD9h872OYNbYRLMjyEnUxFS/EyfSg2GYD aEIQ== 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=TZkjgoDFSdPqMdf6PVi66Nkhma8WC4z5Ws9uGEsRfvU=; b=H5JdTyH8yxHNKgfQ1TMl9MxGI3t5SeRf7UZA6EwTj9+rUUbFPccLzR39D1bcaguoui /TgUGwUotrL1GaHuyF1NLk6loUfggKHXDxxVZSE9bcG1xIyY3EVqayxtIJdOWCJkafmk 0XU3BbbzEcbzL6i5Lce0h5rK7DaEjmp/UDsG21i1qESE+YrInnDzXsvoMqcy8zl4Uxid Imi0o/gxb9jmzI3Li8yUBX3G/MWFxWROA0OoRQ5aX6XXKc1ySCx94VIVIhcisFkPbTt2 oGCNKOTYtWvfs5ZEsr32u+xG5irSonDUNFnYJ3Wi2Nw1VqFainUxBgtrXz1Uhp2uF7cI BY2w== X-Gm-Message-State: AFqh2krSZty02+TLbkEKrTeDtpk0/4Q7UXda/k2wI3OLWJNe62uP2e1y 981+/cSOVMF7tSGcXONMeBwsQaaNlIUwWoaW X-Google-Smtp-Source: AMrXdXvdfTkOB9SHQm3CQqLDUm9d4RcxTmzh/cSUAY1Ri2gZNPJRC9o4+adxaYDY9ZV7J44JX0JcbEjpnhe2Rp/q X-Received: from jthoughton.c.googlers.com ([fda3:e722:ac3:cc00:14:4d90:c0a8:2a4f]) (user=jthoughton job=sendgmr) by 2002:a25:f41:0:b0:6f9:bd92:e428 with SMTP id 62-20020a250f41000000b006f9bd92e428mr4815135ybp.28.1672913955309; Thu, 05 Jan 2023 02:19:15 -0800 (PST) Date: Thu, 5 Jan 2023 10:18:12 +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-15-jthoughton@google.com> Subject: [PATCH 14/46] hugetlb: add make_huge_pte_with_shift From: James Houghton <jthoughton@google.com> To: Mike Kravetz <mike.kravetz@oracle.com>, Muchun Song <songmuchun@bytedance.com>, Peter Xu <peterx@redhat.com> Cc: David Hildenbrand <david@redhat.com>, David Rientjes <rientjes@google.com>, Axel Rasmussen <axelrasmussen@google.com>, Mina Almasry <almasrymina@google.com>, "Zach O'Keefe" <zokeefe@google.com>, Manish Mishra <manish.mishra@nutanix.com>, Naoya Horiguchi <naoya.horiguchi@nec.com>, "Dr . David Alan Gilbert" <dgilbert@redhat.com>, "Matthew Wilcox (Oracle)" <willy@infradead.org>, Vlastimil Babka <vbabka@suse.cz>, Baolin Wang <baolin.wang@linux.alibaba.com>, Miaohe Lin <linmiaohe@huawei.com>, Yang Shi <shy828301@gmail.com>, Andrew Morton <akpm@linux-foundation.org>, linux-mm@kvack.org, linux-kernel@vger.kernel.org, James Houghton <jthoughton@google.com> Content-Type: text/plain; charset="UTF-8" X-Rspam-User: X-Rspamd-Server: rspam04 X-Rspamd-Queue-Id: 07C3616000B X-Stat-Signature: t6sekef3b6ogxxs6mdidheyei5jwidjf X-HE-Tag: 1672914404-342540 X-HE-Meta: U2FsdGVkX1+R+9BNL9qJKKnv9BBmTVUP6N1/GOL/3+gg/TtvVpbou+CzGU9YeZ0zKe1olyG/r0ng27EpdNro1lIQSVwmOXJvF1NBx8vve+yizwuq3DO2llKmRL+hu1IhuKH5hC9Vrt2u9wz1yCtc28rKb3elJbm+QZ9wPp+4/rf3L2y7MwRw8Oz/8lZ2d61bpKifxgLodyvCJEDC6Fk38U2nVC0Y6R9t9NW92y4BiVEY21h4WGq1filS+9E2zkmL1q6TVmoBYR/5X5Cz30gjFInb/l8j+zlvgESj1igEOr9//4QaRtBn7NJRTtJ8IkPE9e74nOctark7jCRbFvMO63cghpvI0s9TGrRB4hSnYK4S05mpwfFP6mhYiVq4Cgb9A9z73VMhBqETH+AogX3H893SLFsLrXfTOq2PAMQicy4F3/w4Gi797unhxF2Xm0HpZVLc4aXro8J+anXqEiuAXycmGWDbFSm5KV7tYE5whCs4Dj2JVmyGEC9T/T2Up/98iv+1iQCkmZFuE0AX9ihRQ98foqlar7hJ0VWmQVa7nrcyNKad+YvLc711j2SzONozIMWFjK21Gn6Fd6Qrda2YF7MRawNKVfLmvlY9PW1L5KW4mqvZgabiAICyseIPWCOhnGJ9chCw4xqFkjXpyDcoV5JuCQjsSpNsjVjjB1kUR3b6JXsySfeEXFr/xBOWqPg0cplDkcyf30E6FOU5cqZHvKY2FApVEhK485CWL3T/rhFSeBGoFJKtBT58f/RuS0IIihawfnrYWreHJSEaIqtKc0VPMenPb+qIblDRl3Lm1U+RiP5Be4ORwQ75mIxlK1ZoWgtVf+ykniN7Xb23zhPPj9pPBzl1ii6eGYAXpzDJQmiV0FTnFXCyZ6sz7jac8tST1NcZdngDGJNT+vcUyZfV5Hd/5M0l8xnFwks5wRUuqVknsne7ftIOSFd6l5kp5/1lsTi3taUUsmUQTMDYZsq jRkjd4T9 nu/NVpk2UZMS3+LhDznVUYnIy7D0yv/NlZo3jjVQsP+zM6JEtVSk6XBN36MbmlPg1jwUwC9mJmqk6flrEf5Oasot8oAd8jKSnhVftZ7Il4hr0r+BLYlpCREB8kkzE9Z9XgYaWrAYhBXLCZqyvcgDB2voKMlejGaiQhU7jYPt1juR/uwe7MsxCii4ZMvNrE1FdPgZIP+Uk9VXuOtCh7V6MMGLqsoUCZwzdhpw/7nGT92b68Pq3iT6e6CkiBDxkAy6Csx5cSkdjfYd6VLEvBmQwZlK+Dak+sJJd2T5j7phpyLMddIYQ+VFoSY/9mr4sD9Gw23yk2ukw8ygTff11/5cwpwOZAXEK8dZ9T6J84s47NJ0ofHcmGrXk0VYcv22D8Jx4B8dvdw/SiWzf8xlNEbQ15FKZ6Ai2p0MtFiHu5vbWfTprEerR+Nm5BrOBT6gH7hVlDvBK 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: <linux-mm.kvack.org> |
Series |
Based on latest mm-unstable (85b44c25cd1e).
|
expand
|
diff --git a/mm/hugetlb.c b/mm/hugetlb.c index aa8e59cbca69..3a75833d7aba 100644 --- a/mm/hugetlb.c +++ b/mm/hugetlb.c @@ -5028,11 +5028,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, @@ -5046,6 +5046,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) {