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 F203EC25B75 for ; Fri, 24 May 2024 00:54:01 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 7097C6B007B; Thu, 23 May 2024 20:54:01 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 6B98F6B0083; Thu, 23 May 2024 20:54:01 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 559B66B0085; Thu, 23 May 2024 20:54:01 -0400 (EDT) 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 3844E6B007B for ; Thu, 23 May 2024 20:54:01 -0400 (EDT) Received: from smtpin09.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay01.hostedemail.com (Postfix) with ESMTP id B7BB81C0794 for ; Fri, 24 May 2024 00:54:00 +0000 (UTC) X-FDA: 82151467440.09.85E51BE Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by imf12.hostedemail.com (Postfix) with ESMTP id BDC5F4000C for ; Fri, 24 May 2024 00:53:57 +0000 (UTC) Authentication-Results: imf12.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=M5GIG0IB; spf=pass (imf12.hostedemail.com: domain of peterx@redhat.com designates 170.10.129.124 as permitted sender) smtp.mailfrom=peterx@redhat.com; dmarc=pass (policy=none) header.from=redhat.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1716512037; 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=4bXsqkd30FAf+6qBmC705wVMq3rXSqyst/TAidoHN74=; b=Hv3xqBvq50nWTXmyQg5SE0EwYtMl9j1dofjdmdaIzEH0R/6aWWclG8i37hVYY+ahvMTgD5 9FoED8/waqIKEw9OwGALkdADQ7orE8kYfwiPFLQnckGV9SPVpMb37bYtIc7xF32BrLxO2S eIQqqhrVJ1TjiyYcKVwR2dzdrgHti3A= ARC-Authentication-Results: i=1; imf12.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=M5GIG0IB; spf=pass (imf12.hostedemail.com: domain of peterx@redhat.com designates 170.10.129.124 as permitted sender) smtp.mailfrom=peterx@redhat.com; dmarc=pass (policy=none) header.from=redhat.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1716512037; a=rsa-sha256; cv=none; b=lUl2Dv4GP88DuP4JIqkGVuwnmt0x+Py16MlDmTAHpvjOYmwYqzaCFpEKD6NC8xjoIu6JB3 svqOQuUyQs8X5J+0wU6v4u+SUYTh8faN8cwlaVemBC7ROkF+x/9w3Hrd1xr5Zm2DlrOpzo DGK2EubP2WZMk2LKon5nHs5TGFDwjXQ= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1716512037; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=4bXsqkd30FAf+6qBmC705wVMq3rXSqyst/TAidoHN74=; b=M5GIG0IB82Fw1XEZL43/6wwLxsDDzlEqJ9sWiQfBpDlmLkR76LohmGFr3e+TgooUG2Lv6l dnjbjAHxs3BrQahRB+DdEiJYjriPSZTlmwW/AmLhICpxlgO8WSudVW8HRCMjXy2lxe8Gw4 ES0tf92MdgLGeIHkJRhGdn87bYVHO6w= Received: from mail-qv1-f70.google.com (mail-qv1-f70.google.com [209.85.219.70]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-647-Gp5mvzlCOmuM1_7diZy6Dw-1; Thu, 23 May 2024 20:53:55 -0400 X-MC-Unique: Gp5mvzlCOmuM1_7diZy6Dw-1 Received: by mail-qv1-f70.google.com with SMTP id 6a1803df08f44-6ab9836827eso1911916d6.1 for ; Thu, 23 May 2024 17:53:55 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1716512035; x=1717116835; h=in-reply-to:content-disposition:mime-version:references:message-id :subject:cc:to:from:date:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=4bXsqkd30FAf+6qBmC705wVMq3rXSqyst/TAidoHN74=; b=f/1vZIukFMS8W/VFJkp5cYZgA9PNRXIA5Iim5UjgtaTtTTnPBREHsrR6CT0okd1R2d WjSplAZch+wXHi4ehCjCp0UHKffujonZl3a4iYMVX1YLplHQARiogEt3C4h5jL5jtkBM GfA8zH81pqeXPvdymCRph4aDmQ2yuexe1OnJlO2y0d3t+Pls3jm37kUZYLyDpbnrD4M5 kURCM90/hDQ6Nj5Bek7FXqauZjepWbNrgqM5WycS9ed5WDWF1OOXb4CZMX2xc9NgMoFm 2NL/tnYzcRvpppsZbmab4WjQ00bG3yico2bpav+7r3UL2BVofVz19POIvPjslIFt9Z4S yoSA== X-Gm-Message-State: AOJu0YyW1fwQyN5h73f10+Qte+vQJLw8LLHWL2nEKpGFnHmkv7HA4l2Q PKao6Q8L0g7XaO0a3C0lkd+WQxIuCF/k03OZpdnz20OopNhbNmmHdvVesEBMnKhq+2cOy6b64sW gQoUBAsRjUs0KuYDioN7l/shEbcG64nNrIHqd+kgrdOF9kMHW X-Received: by 2002:a05:6214:c2e:b0:6a3:3ea4:7156 with SMTP id 6a1803df08f44-6abbbcc044fmr7203856d6.1.1716512034864; Thu, 23 May 2024 17:53:54 -0700 (PDT) X-Google-Smtp-Source: AGHT+IGAR7s5N9/YYw7UFaVUWvL696U4+4Y6JhWUXYWMH4Lg/8zPuLfIrzHk6ojc+TjPP6pa9eibvQ== X-Received: by 2002:a05:6214:c2e:b0:6a3:3ea4:7156 with SMTP id 6a1803df08f44-6abbbcc044fmr7203636d6.1.1716512034081; Thu, 23 May 2024 17:53:54 -0700 (PDT) Received: from x1n (pool-99-254-121-117.cpe.net.cable.rogers.com. [99.254.121.117]) by smtp.gmail.com with ESMTPSA id 6a1803df08f44-6ac162ef94fsm2001796d6.82.2024.05.23.17.53.52 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 23 May 2024 17:53:53 -0700 (PDT) Date: Thu, 23 May 2024 20:53:51 -0400 From: Peter Xu To: Dave Hansen Cc: linux-mm@kvack.org, linux-kernel@vger.kernel.org, Thomas Gleixner , Jason Gunthorpe , Andrew Morton , Al Viro , Dave Hansen , Andy Lutomirski , Matthew Wilcox , Dan Williams , "Kirill A . Shutemov" , Mike Rapoport , Ingo Molnar , Michal Hocko , Alex Williamson , Peter Zijlstra , Suren Baghdasaryan , Borislav Petkov , x86@kernel.org Subject: Re: [PATCH RFC 2/2] mm/x86/pat: Do proper PAT bit shift for large mappings Message-ID: References: <20240523223745.395337-1-peterx@redhat.com> <20240523223745.395337-3-peterx@redhat.com> MIME-Version: 1.0 In-Reply-To: X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset=utf-8 Content-Disposition: inline X-Stat-Signature: p4jtpwa8ufaw7tf7rfo1xnehr3h8k4mn X-Rspamd-Queue-Id: BDC5F4000C X-Rspam-User: X-Rspamd-Server: rspam10 X-HE-Tag: 1716512037-743010 X-HE-Meta: U2FsdGVkX18IXEqZ5R2EedlyjLxyrYMWbQ34rZdeARKJp/w40ba+hVO1CiVFMG2hteGBMD/dp3R7DHse/O+FFaVe+4CsW65gm9H5g3l8GSXdrAJ/W/o5ISuOVP6FkwYRGHzhX0+CCV5v0wlc9d5wy6AMw/licA+gQ3UyuWTwfOQNQTBR4hFzJoiegQzSxPaWMW+cQuPQHoC0QmU+UqcvJP41o6qtGQ2zGPnYJFMODbSVSGx7Y0Ks2aHeG5auxGCo5T7y9T7tZFpG5xMvrfZ+xEyk1cCuB4U8DI/gKwtbU4X9p48wMGiPJrNaLeaHfJ3lNWL1ckF9LRStb12d+XG9Rqr2SOxatd09RdifGk0Aw9DRAYDVtnvrOhom8KnSfuUd4dZk6sYAVWIR9dk8vRd+AGB62vg6ItqgGIAU2B7AqoLt+MLQNU4ELw3rmbzu293TfQjwFJx/WOp71ePcdTIR6p/rTfCjsEYkDBVeZHYdx7HYU/UKzKim0KxTwek/ENVH0+TUXA2RTBDlgtIpY2wJGlbuv5I094Z0ZOT8zMMdj24HHGzog4I3YoVJrQvj86ikrvdUk5q7rAOQYA1vaUbki8JOAFTRu/HzCwE8abaXr6+4mTPDdOjdCxBxC1jQou4Kx4RF9HdFzut8bszOLZaI+4vRK348jBj88zTG0bRf/nxiJLbxnciTSsIMZXh4JWhw7bmrsJh4+I0aZjwIEMY0aZvHgt2SooYDElyIO1E4joIp/YzwX85kzZH3gH+EQyG2S/mVk86K+LAnMRw1mYXPUq8eWKup1tylP+Osly77qb4RO3diZrigEbqnIEwZFU5lllJk75hTKq3EXsVJUYyJLd186VT604674g9pd2ndiWlFqVlNiNIMR0DZfO9P2p4NE4+pfAVa+F+KHABAWPB1kCJq0T2lkQsbdsfU4NNzry4PA5Jr3Cdna59XKzEQUTcO0bpZgWxeMfnWYqvTrrP w8x5ZUG/ f6onHxl8oAsAr8hW0B9soFp9ntkehJNaKFe8ZrEeBEtgis+E5qq3xzVvW8WeTtJoYcxg1h0CG8ssRNOVXuCls1XpWUx9C9kZ42WiP0BnS0LwZplPHiViRCN++BzyIdDeTwDNAScgulDf80mEyJos1d6hbIqd4sFevTBj2mStRmp+P0Q2xDzHogekbxqifG9DThZCxQgVuxm1AFc+NMUGeGltyGhgbe9h81sxg0v9FgG/W0QV54DPiYbE/4SzVd/GzHfvJghUhH1gBL7SFMV0RTx8pCOTt4GuLYy//w5oH7l0yGYRxPLZSn8CbhAVpcSIYX8fV0cSDVdiNm1oQVHsMIgU/fNZIMJ7WEKNjtHaR7U2TYuiJmZD5x4GyoPcSZJn2ZmzwWEjWLw87Fvby3WqA6JZaVFZ1OPHeQZS9Z/6uJN/r7Isb3FtyfOGdYPXcwzVrQuYkqTlHlE1jwi6YfgDacTVTJCKHKp9McPGojU6IfIjrtNMu2kImO+8qdgryV+JsF4Jtoi/LTN1yGoOLspWb0UxLA7wWT8f97IaoV4GnN0ak0ZfvPkpG7wL7mqIiBKXA7367l3bvj3rtIAZCxOwrT9CI+WqQNhTjuV3xJKil4zMbw+I= 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: List-Subscribe: List-Unsubscribe: On Thu, May 23, 2024 at 07:07:06PM -0400, Peter Xu wrote: > On Thu, May 23, 2024 at 03:48:22PM -0700, Dave Hansen wrote: > > On 5/23/24 15:37, Peter Xu wrote: > > > diff --git a/mm/huge_memory.c b/mm/huge_memory.c > > > index 317de2afd371..c4a2356b1a54 100644 > > > --- a/mm/huge_memory.c > > > +++ b/mm/huge_memory.c > > > @@ -1135,7 +1135,7 @@ static void insert_pfn_pmd(struct vm_area_struct *vma, unsigned long addr, > > > goto out_unlock; > > > } > > > > > > - entry = pmd_mkhuge(pfn_t_pmd(pfn, prot)); > > > + entry = pmd_mkhuge(pfn_t_pmd(pfn, pgprot_4k_2_large(prot))); > > > if (pfn_t_devmap(pfn)) > > > entry = pmd_mkdevmap(entry); > > > if (write) { > > > > Does this even compile on non-x86 architectures? > > Probably not.. I think I can define a pgprot_to_large() globally, pointing > that to pgprot_4k_2_large() on x86 and make the fallback to be noop. And > if there's a new version I'll guarantee to run over my cross compilers. > > Any comments on the idea itself? Do we have a problem, or maybe I > overlooked something? I also attached one new version of patch 2 that should pass the cross builds. Please reviewers feel free to look at this one instead. From x86 perspective they should be the same thing. Thanks, ===8<=== >From 1cce12c872cb01aaa8686d8f5c7cd6b266ca4e38 Mon Sep 17 00:00:00 2001 From: Peter Xu Date: Thu, 23 May 2024 18:19:35 -0400 Subject: [PATCH rfcv1.1] mm/x86/pat: Do proper PAT bit shift for large mappings For large mappings, the pgtable PAT is set on bit 12 (_PAGE_PAT_LARGE) rather than bit 9 (_PAGE_PAT), while bit 9 is used as PAE hint. Do proper shifting when inject large pfn pgtable mappings to make cache mode alright. Cc: Alex Williamson Cc: Jason Gunthorpe Cc: Al Viro Cc: Dave Hansen Cc: Andy Lutomirski Cc: Peter Zijlstra Cc: Thomas Gleixner Cc: Ingo Molnar Cc: Borislav Petkov Cc: Kirill A. Shutemov Cc: x86@kernel.org Signed-off-by: Peter Xu --- arch/x86/include/asm/pgtable_types.h | 1 + include/linux/pgtable.h | 4 ++++ mm/huge_memory.c | 4 ++-- 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/arch/x86/include/asm/pgtable_types.h b/arch/x86/include/asm/pgtable_types.h index b78644962626..f9edb2bb1512 100644 --- a/arch/x86/include/asm/pgtable_types.h +++ b/arch/x86/include/asm/pgtable_types.h @@ -512,6 +512,7 @@ static inline pgprot_t pgprot_large_2_4k(pgprot_t pgprot) return __pgprot(protval_large_2_4k(pgprot_val(pgprot))); } +#define pgprot_to_large(pgprot) pgprot_4k_2_large(pgprot) typedef struct page *pgtable_t; diff --git a/include/linux/pgtable.h b/include/linux/pgtable.h index 18019f037bae..54487d2b3e40 100644 --- a/include/linux/pgtable.h +++ b/include/linux/pgtable.h @@ -1956,4 +1956,8 @@ pgprot_t vm_get_page_prot(unsigned long vm_flags) \ } \ EXPORT_SYMBOL(vm_get_page_prot); +#ifndef pgprot_to_large +#define pgprot_to_large(pgprot) pgprot +#endif + #endif /* _LINUX_PGTABLE_H */ diff --git a/mm/huge_memory.c b/mm/huge_memory.c index 317de2afd371..4c134a60fb64 100644 --- a/mm/huge_memory.c +++ b/mm/huge_memory.c @@ -1135,7 +1135,7 @@ static void insert_pfn_pmd(struct vm_area_struct *vma, unsigned long addr, goto out_unlock; } - entry = pmd_mkhuge(pfn_t_pmd(pfn, prot)); + entry = pmd_mkhuge(pfn_t_pmd(pfn, pgprot_to_large(prot))); if (pfn_t_devmap(pfn)) entry = pmd_mkdevmap(entry); if (write) { @@ -1233,7 +1233,7 @@ static void insert_pfn_pud(struct vm_area_struct *vma, unsigned long addr, goto out_unlock; } - entry = pud_mkhuge(pfn_t_pud(pfn, prot)); + entry = pud_mkhuge(pfn_t_pud(pfn, pgprot_to_large(prot))); if (pfn_t_devmap(pfn)) entry = pud_mkdevmap(entry); if (write) { -- 2.45.0 -- Peter Xu