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 6E015C61DA4 for ; Wed, 22 Feb 2023 22:54:21 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 0C7266B0075; Wed, 22 Feb 2023 17:54:21 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 050606B0078; Wed, 22 Feb 2023 17:54:20 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id E0CB66B007B; Wed, 22 Feb 2023 17:54:20 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0010.hostedemail.com [216.40.44.10]) by kanga.kvack.org (Postfix) with ESMTP id CD0FD6B0075 for ; Wed, 22 Feb 2023 17:54:20 -0500 (EST) Received: from smtpin09.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay03.hostedemail.com (Postfix) with ESMTP id 9A390A0C75 for ; Wed, 22 Feb 2023 22:54:20 +0000 (UTC) X-FDA: 80496433080.09.F90681C Received: from mail-vs1-f54.google.com (mail-vs1-f54.google.com [209.85.217.54]) by imf02.hostedemail.com (Postfix) with ESMTP id E10C580004 for ; Wed, 22 Feb 2023 22:54:18 +0000 (UTC) Authentication-Results: imf02.hostedemail.com; dkim=pass header.d=google.com header.s=20210112 header.b=C4u1m+qj; dmarc=pass (policy=reject) header.from=google.com; spf=pass (imf02.hostedemail.com: domain of jthoughton@google.com designates 209.85.217.54 as permitted sender) smtp.mailfrom=jthoughton@google.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1677106458; 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=vwXFOqgMuy52mReBM7YJtW0wWXswYMcjcxrkPg4Wbpk=; b=LItYmC5dtwuWN9TmygbTcu3flu9L96lJJ2RCBK78AOnZ4Mk6qXYA/g8WGbdu0eNBT+YkTs /sHMH7eZzjkYvDagfIpWCWT+k/EQUz1p3wgOqPFWzCeP+/WL998WZFNpPVxnFJ+C5EvG7Q y1pJqapOLzKClqMuIwfyreVxzQij78s= ARC-Authentication-Results: i=1; imf02.hostedemail.com; dkim=pass header.d=google.com header.s=20210112 header.b=C4u1m+qj; dmarc=pass (policy=reject) header.from=google.com; spf=pass (imf02.hostedemail.com: domain of jthoughton@google.com designates 209.85.217.54 as permitted sender) smtp.mailfrom=jthoughton@google.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1677106458; a=rsa-sha256; cv=none; b=e+kg0doocNbB9v6wWA+1SSpJ3ls3mVw2A4b1JczcqX4t668LFj6ta83TwKTPlpkIU62uxp N97pGsNsMJH9A36FbDx5cglfQ6Fy12Zu49AXSyZ4UZdOh227wfO2Rr5PX/cuwA7OJehAm6 mvukofHUQJZ27yoewI8yn6ajm09IquM= Received: by mail-vs1-f54.google.com with SMTP id f13so7819527vsg.6 for ; Wed, 22 Feb 2023 14:54:18 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20210112; t=1677106458; h=cc:to:subject:message-id:date:from:in-reply-to:references :mime-version:from:to:cc:subject:date:message-id:reply-to; bh=vwXFOqgMuy52mReBM7YJtW0wWXswYMcjcxrkPg4Wbpk=; b=C4u1m+qj59yTXcFhECr+gLA8EE3O3Y42cUVexpZHT2IK/W9JYY+qiTKdFl70rnDcPc 8AEX1VXCVpnKRyQIaGQsEbxUPn9aa0bRoCVyrQEEEy5s53/MfVT4hiIggvzQclHrmBOB eMsjTVOv6nynaOFNalhqbHEfCXA+58L5VfCIzErJ/0Hag9SCfG/No3lrSna2RZXuc7Ks rkZA93dqgkUMZBFWkP2elM3P+cUkve2qeUgdbhjneXL3FLxkU3w7As4INVYIfWYGD1WV 3nLn/EEbSDb0f3hlM4V4unI1tqTHwLN07lS1kZVzyxNhMD2Pcvb3kfRv+gmNQ5nEcMw9 EBzg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1677106458; 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=vwXFOqgMuy52mReBM7YJtW0wWXswYMcjcxrkPg4Wbpk=; b=ULu/p8YrLvo5NLYBe6OjnqWrBWTo5TTdvlVzKUavayrWXJiwLZfqpBDfsTueHwV0yw lod9PHKnWyvkFczIgUhgi+BzoO5YHzi43SxA0H3S1AjOE6PfezujpCFUyCWReIRIGsJ4 Xor39Sq63Z3w76w4U6zH86GoTlnY0EUirPERuVMDJZX5j+nl7tltYXH2yxy5YsXy2wK1 FU8pmh+Tk/jgDncIxaZ9oSsPS2zOeQOpfm6ZIIYOUgaqdxTxinzu0fZzU9rLfIvRyhSU +HkJcsEc7OEt1ULeL2cKpTWArq/qyOKmHHTITmMRO4xkDokQ2B/EYenFqhSu0+JXnwCT dknA== X-Gm-Message-State: AO0yUKXZHhqcfeLF3i5Lfrp/tS1yaj3Dy/w/N3ojY1uaz2oGgF7xsL7V G49IjORc0OW3dTinqAs9A7rh65EX6fKCRRxnCQoFxw== X-Google-Smtp-Source: AK7set8/28U69HPGUVsZOSqq2mG7uy8Ii3ibCWRXbJfiC/xiMdhOy1uOz48V38C7m+VeqUXgLFLiGCesuq9On+Q0RGk= X-Received: by 2002:a05:6122:1692:b0:401:42f3:fe4d with SMTP id 18-20020a056122169200b0040142f3fe4dmr1971940vkl.42.1677106457981; Wed, 22 Feb 2023 14:54:17 -0800 (PST) MIME-Version: 1.0 References: <20230218002819.1486479-1-jthoughton@google.com> <20230218002819.1486479-16-jthoughton@google.com> In-Reply-To: From: James Houghton Date: Wed, 22 Feb 2023 14:53:42 -0800 Message-ID: Subject: Re: [PATCH v2 15/46] hugetlb: add make_huge_pte_with_shift To: Mina Almasry 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-Rspamd-Queue-Id: E10C580004 X-Rspamd-Server: rspam09 X-Rspam-User: X-Stat-Signature: 3petewn5j9a7r6oqgdwmhr1u77birj6d X-HE-Tag: 1677106458-987638 X-HE-Meta: U2FsdGVkX1+FtVtj298vSmYxytsXRY8IzLD86YjUhiIa7o0EDblh9goOmM2keFa1JCtopcdR5d5pfLiPqUeFx09NiIEkf8JjERPBo2c/8bQ8/bSrcvOpnt7SwVH67xIyuMeNHxboxm/vXaOne0jDDsSLqKFonZGsp5QgacNQpBplWAoBr6nK3cIizdFaGoJUesmyoEbGOLvGIQ+zRuMdtJAoSAiTdl+sEN+Nfis4CdgrFKwTfHchcByAn/Rl522C4icPLaLY+OGXGZWUlc6+02WxLQRFvtjMZ3tpxZOGWJy6loY6bx/+dIDx2hFwMZhwPMFKjNgH4z8bYY0gKTqEawVPV59uwsA0QM8l7//lGpZJtx2WSvaiohVNnU2vX6khpwR6K1X6ZkDljYBfzjT35v2+5+Jv3YNZUnnuwDSE2CmeezdrxHshH7sp5RodgxkkTvXB9JAimUjjLUobvJsfKmD7zDthjN5+E0ZAwpEa1b559TTaTVDPrc5WCAFGvl+wsnxXX06OMq5CDV9Th9ByCsFmUjraq6X5A4zGOW+nqbq6ikErki6Hp0gUE5XAqu20QYvl39YwnOYYGyvRUroDZ23dkdc0iD0lLSC6oMreS1uMoNEobFl/7GCfT5EOQ//B9GEumBOGyX0LuSqaWz1KBaFPdnBUHrQTRptQDqH0UxsLlq8V9fITYVnNsqlJ6XbzLvEY8wdZGNgeuE53HhgzIzmcTtmLTRNMI/PDTPEFz/qjEBNf//pCoEnVOd1cGLfFsJrXHjr+fZE3QQNZHulXM1ovp7zjYipaoeGyqS9mOtse3ME1q2fIHcraLEYyz/8HlS4RfdUfPHP80I4g+eH8I8wcQyxh80ExFs/YFxoEvjjMHcDJKKhmTyy5+I9POMhbAvLLYGAmJRW7szX8H7oT5sSeIBxa2vGQ1Pyjvo0F7eXMU3JRnBR8LHFim5F48RxJSU8xTbxQyy0NRJqfPjA rnO+PThM LQxOKcd4ebd7aWgy8Qfdc/T/WzHGjxk7ofvoSgI3cjE3cUlA9ATRhiCnBiYgcOvZuDj3wCO5hv/TkeUxK+duojzANUrIEbgLHTBnA1huq2wqbJzhtB0PNDvBhts5pJo/69y2VrfBteJbTpZ9JCPu/XlpzwdViqO+gnPg9ScYeUvu5LIuScsk1kpRtFba/vFDtoJMOmAsUAwn29Hvt75mE0MFZHeGgk4F6YKhbjg/bVWnprojucTCoC+0Dos+e1o0HJfwi30ZBVYzU30SesMBcCHfI9w6AloSHwSXbimoJ0xqAdbSvGR+2A6QNnK8+Ob/nBMW72VjiL51o5N+TcT7iq7gBqg== 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 Wed, Feb 22, 2023 at 1:15 PM Mina Almasry wrote: > > 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 Thank you :) > > > 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... Yes I think it should be unsigned int. Thanks for the catch. > > > { > > 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 > >