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 77158C6379F for ; Wed, 22 Feb 2023 21:15:15 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id C5B0A6B0071; Wed, 22 Feb 2023 16:15:14 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id C0B386B0072; Wed, 22 Feb 2023 16:15:14 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id AD27E6B0073; Wed, 22 Feb 2023 16:15:14 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0013.hostedemail.com [216.40.44.13]) by kanga.kvack.org (Postfix) with ESMTP id 9F5AB6B0071 for ; Wed, 22 Feb 2023 16:15:14 -0500 (EST) Received: from smtpin15.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay09.hostedemail.com (Postfix) with ESMTP id 6E37C80DBB for ; Wed, 22 Feb 2023 21:15:14 +0000 (UTC) X-FDA: 80496183348.15.4853A68 Received: from mail-vs1-f47.google.com (mail-vs1-f47.google.com [209.85.217.47]) by imf09.hostedemail.com (Postfix) with ESMTP id AC2C014000E for ; Wed, 22 Feb 2023 21:15:11 +0000 (UTC) Authentication-Results: imf09.hostedemail.com; dkim=pass header.d=google.com header.s=20210112 header.b=LGTJs4zu; dmarc=pass (policy=reject) header.from=google.com; spf=pass (imf09.hostedemail.com: domain of almasrymina@google.com designates 209.85.217.47 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=1677100511; 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=1m4zHkmfDXhrcpX0Sw9engd7Wnt/0n2RMJDfDI6SB8c=; b=yBYzW4unLMyesvOtHx/pzoGLQir2/ly/oSGM0HRr242hq5UOgG2xQ4jaaO40EIt8lXEw59 oLI8V8Hi78GUVLo3jzbkLMfc7Qdl1gFMmWP0IYI0GD2QtCwXoqkRvOMJEDaL4IMbVP8JVB TManX7s48+f9B83F8awMy5aZM8LU6io= ARC-Authentication-Results: i=1; imf09.hostedemail.com; dkim=pass header.d=google.com header.s=20210112 header.b=LGTJs4zu; dmarc=pass (policy=reject) header.from=google.com; spf=pass (imf09.hostedemail.com: domain of almasrymina@google.com designates 209.85.217.47 as permitted sender) smtp.mailfrom=almasrymina@google.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1677100511; a=rsa-sha256; cv=none; b=q4snz8uv+cA5r48Bj1zK9wAtbGR/7VGbKqmD8Fmr5u00VnLRX4AHN833aZRV0lEdmQLdKa rvc+jpdh7j34WYQG7RkWs2j36B/4OdwwSpuqN5T1dx2v9ktcIcaIiBeb1TpMS5iJH3Cogg n6xqpjHfPia8+HaYM4+sLtpNYfodHRY= Received: by mail-vs1-f47.google.com with SMTP id d20so3912665vsf.11 for ; Wed, 22 Feb 2023 13:15:11 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20210112; t=1677100511; h=cc:to:subject:message-id:date:from:in-reply-to:references :mime-version:from:to:cc:subject:date:message-id:reply-to; bh=1m4zHkmfDXhrcpX0Sw9engd7Wnt/0n2RMJDfDI6SB8c=; b=LGTJs4zuCkaFTTngo/aLavBPfYKhXkG5ilMCj6N6GxB8mCE8r59hqOtBaf6XKXl07W IrgfANABWcMOdBoXpKDrfaBM4AkIM/dZWE6VduxNLnPgBvTM5czU98uDknTpv/Ig/jeK d2kUBhLcWHKfgykxv6BFnUUKk1gPOjbFws6tf2wUJgTuaFxgIlvpe2gBjouBp/ev00fj R/G4ytpAIeH2btcUxD68nYdnG2K/48WjHgdTfp0LE323mArH688CjkxT+ewftD2OiMVH YzCNmAuXzIoYEt/IqXZcrymRwX350B3d1H6xhspcfPMdKsVomI1pKsguo1CskglCVQ+f VUcA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1677100511; 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=1m4zHkmfDXhrcpX0Sw9engd7Wnt/0n2RMJDfDI6SB8c=; b=34wfHvC4rFl/AfcxYRr1Bbzg45Cv6jquev1xrJBUZJP+yio9QDhnRGENB+5yuEOpbP i0mMxop/YB2Ocb6OXSX8ZBOxAGMLJvXs2rEFP6OB0C58hHY7DW4eU5dyGhvxM8kq8FFn eJ0k2wXYR45W1qwJviCNrnK8wloS9EgwqoDBIxeoTyQsGQj6rs0jG9OyCBDR+6Sm+I2l K2JY3UwUoUabKJzC/11DIlGISl35/Sz48d+v/PQt21HQAtfYuOsfHcqh0E1Qpa8jPHX3 DBvNUxP/zXJ7WlxdOKO2KfTBMMi4SDOsVUYhTFbF9k74eZQvR4mUd6U/5Lgbf/sOfh/0 dbgA== X-Gm-Message-State: AO0yUKW98oB4LLyi9VGTdp5GcEy4IuvmbCZ+KyQ4GjLSXxReloyn86pa 82DeDNXRjBdq0gL24sFmj9E+vThEGEVJ6zdDaLteXg== X-Google-Smtp-Source: AK7set9Cr/aHiZ7dglVSYqcXCcOMSjSmXKsbuk5gHI7Cod+yOxVd6a/hpUU+dlK3nafpLtcSaggmUp7ZSqSTIUcOpi4= X-Received: by 2002:a05:6102:23f6:b0:3c8:6949:ea4c with SMTP id p22-20020a05610223f600b003c86949ea4cmr2240794vsc.76.1677100510730; Wed, 22 Feb 2023 13:15:10 -0800 (PST) MIME-Version: 1.0 References: <20230218002819.1486479-1-jthoughton@google.com> <20230218002819.1486479-16-jthoughton@google.com> In-Reply-To: <20230218002819.1486479-16-jthoughton@google.com> From: Mina Almasry Date: Wed, 22 Feb 2023 13:14:59 -0800 Message-ID: Subject: Re: [PATCH v2 15/46] hugetlb: add make_huge_pte_with_shift To: James Houghton Cc: Mike Kravetz , Muchun Song , Peter Xu , Andrew Morton , 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 , Frank van der Linden , Jiaqi Yan , linux-mm@kvack.org, linux-kernel@vger.kernel.org Content-Type: text/plain; charset="UTF-8" X-Rspam-User: X-Rspamd-Server: rspam02 X-Rspamd-Queue-Id: AC2C014000E X-Stat-Signature: ghn1wwafg4qmahwq5ctgokrs6kfz4ia4 X-HE-Tag: 1677100511-799645 X-HE-Meta: U2FsdGVkX19/P2dC/DeCnHYEALHVNJ0RlzlwDBSjBPZTqsFKpdkAMYwsZwKolJrBotQjN87kK9ULP9j4pcDl5kWtmfUVPhYI7seMcT7+FrgEtChCbqRb6XHy795lX6Zydl5tWrf8CoajGRC8U9j0ZyIksJhvVOcd94+cmw79FWDBvWoorSwbDCy4wcH8T1A8cFqEGQe8Wtcg5eqgtEJz8TawR2G0mfyzIxAno+7P/eMWTeR6ZI1swkRdj2Y/tRvTA9BXLpxmZ8NFofIIRxx1VqOHJhokR6tvY3eA6KDG7jm9+0G9EIDTdehTKfhPljKGo/Xu1KaTkG/S3+6LLKSzntk+SL4Po2x6UL5AC+uPiFzs0F19SDEBKsOct+uCFf4VZp9JTMHeGrf07bEkBHQ7XVJjsPoB+GWkk3XQb6v4ArVYscoEOtO1u9mbOjGyfoL80z4QfWOfwf6FavFNukeu0ee4CAT1YKNck5sYRBOvhIue3AQXDmyrl8hzMm1tQMPi+h5ahwOV9Kw10ybHhm1gJztKyPlg+bMcMkcJmukBW5hpe7Nd+TcxZYgUvrbkU0kLchXki3NWyfmE/DDN5jOwidKFvRx8uYHtiRzHgB41k88rIm7nrUeSQOKxulFfH484jNkKB5EaXFlky6PFzze7k5dNKqHVF5u3C0kzZvf8poFMeiSOi/V6nSoY3aVbxpwMtSBH0w2TsEHYupazu2eWAl1C/nL1cjVrGKgbz25rdx6G2qVBoYvipGLQRStdkg6nZZpEJ0Th3ojpLcHwARkSPgBzBavJOgj2JsULaXkmDyS1bQe6vii1sJHxw6dkLp/4O/ZPWfMiw8kPGubjEf2aRa5Y6DbCk+8zqCSxJrBxnOQzlO5tt/hjvYnT5Iw35uPm3UqjasRCXbeazA/tV4qlXshbvZ1qyHB4Le1ZTfqC59bQE5sGhG4PYfiHy3gZsmwytLSa/n3NjqKFk2VDEX0 SBhtwNV4 cKJq/pNLIRTem0wy0elAkS+GLqsDalw6iBhgs/Aa+zl1QfWDO16IhaIZYyZf2IuUnF2cvn6yYhAYmga1Qzt/7030aeaZOdTYmkQ64sK83zn81Dz2r5VujM7BQxr5xo8gw6ut+FhLsZjlfp1bhp5Pda5tNEOJMlaKXIonEKWknmGM5aYJVAcVtjB+RbYei+q8zaoJc36zOaQY/TD1O0efnVRpnLhrgsamcvjqC0O2x7Sh/7HTe1suZyGNStXRwD9AKdIGXkox9bupKiZZ2MlBNeVt+IBWsDzq+IBV8J4W7o8d4P3FlU4tMyuCRdco5fGv8wftER+3mFwnsoEMdi10nZfj7KA== 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, Feb 17, 2023 at 4:28 PM James Houghton wrote: > > 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 > Reviewed-by: Mina Almasry > 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) Nit: can this be 'unsigned int shift'. Because you're actually passing it an unsigned int below and there is an implicit cast there. Yes it will never matter, I know... > { > 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 >