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 mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id AB21DC433EF for ; Thu, 4 Nov 2021 08:35:11 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id 50DED61213 for ; Thu, 4 Nov 2021 08:35:11 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.1 mail.kernel.org 50DED61213 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=linuxfoundation.org Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=kvack.org Received: by kanga.kvack.org (Postfix) id E09E3940009; Thu, 4 Nov 2021 04:35:10 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id DBA3B940008; Thu, 4 Nov 2021 04:35:10 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id CA936940009; Thu, 4 Nov 2021 04:35:10 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0177.hostedemail.com [216.40.44.177]) by kanga.kvack.org (Postfix) with ESMTP id BC32B940008 for ; Thu, 4 Nov 2021 04:35:10 -0400 (EDT) Received: from smtpin28.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay03.hostedemail.com (Postfix) with ESMTP id 5C6838249980 for ; Thu, 4 Nov 2021 08:35:10 +0000 (UTC) X-FDA: 78770587980.28.3BBC3F3 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by imf27.hostedemail.com (Postfix) with ESMTP id BCD9A70000A8 for ; Thu, 4 Nov 2021 08:35:09 +0000 (UTC) Received: by mail.kernel.org (Postfix) with ESMTPSA id 3EF7961216; Thu, 4 Nov 2021 08:35:08 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1636014908; bh=McY9gQ8BqcMk7vs9Z3yJmIcYKviY8ebHfiIPLxeEYfg=; h=Subject:To:Cc:From:Date:In-Reply-To:From; b=L2hIUVZJC5ixiAN4OCUcLRhkNCWwGRCwv5ZsXPbX0UpJkgBT2HwOuX+Yqla3g61dm KhM1aP0lHGRwM7wo7C3IWrIUPTQjVy+DIzARDcFt7LyWvMfe2tvxaqCPOo/uXCZWj/ 6uz6VABI2LcN4iXF5cAdroklb+0OlCvodXhIgDbU= Subject: Patch "mm/zsmalloc: Prepare to variable MAX_PHYSMEM_BITS" has been added to the 4.14-stable tree To: arnd@arndb.de,benh@kernel.crashing.org,bp@suse.de,f.fainelli@gmail.com,gregkh@linuxfoundation.org,hpa@zytor.com,kirill.shutemov@linux.intel.com,linux-arm-kernel@lists.infradead.org,linux-mips@linux-mips.org,linux-mm@kvack.org,linux-snps-arc@lists.infradead.org,linux@armlinux.org.uk,linuxppc-dev@lists.ozlabs.org,luto@amacapital.net,minchan@kernel.org,mingo@kernel.org,mingo@redhat.com,mpe@ellerman.id.au,ngupta@vflare.org,paulus@samba.org,peterz@infradead.org,ralf@linux-mips.org,rppt@linux.ibm.com,sashal@kernel.org,sergey.senozhatsky.work@gmail.com,stefan@agner.ch,tglx@linutronix.de,torvalds@linux-foundation.org,tsbogend@alpha.franken.de,vgupta@synopsys.com,x86@kernel.org Cc: From: Date: Thu, 04 Nov 2021 09:34:58 +0100 In-Reply-To: <20211103205704.374734-2-f.fainelli@gmail.com> Message-ID: <163601489811148@kroah.com> MIME-Version: 1.0 Content-Type: text/plain; charset=ANSI_X3.4-1968 X-stable: commit X-Patchwork-Hint: ignore X-Rspamd-Server: rspam03 X-Rspamd-Queue-Id: BCD9A70000A8 X-Stat-Signature: bkkzg1fasw9mwfqc33xctc7ewsmpebrh Authentication-Results: imf27.hostedemail.com; dkim=fail ("body hash did not verify") header.d=linuxfoundation.org header.s=korg header.b=L2hIUVZJ; dmarc=pass (policy=none) header.from=linuxfoundation.org; spf=pass (imf27.hostedemail.com: domain of gregkh@linuxfoundation.org designates 198.145.29.99 as permitted sender) smtp.mailfrom=gregkh@linuxfoundation.org X-HE-Tag: 1636014909-453033 Content-Transfer-Encoding: quoted-printable 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 is a note to let you know that I've just added the patch titled mm/zsmalloc: Prepare to variable MAX_PHYSMEM_BITS to the 4.14-stable tree which can be found at: http://www.kernel.org/git/?p=3Dlinux/kernel/git/stable/stable-queue.g= it;a=3Dsummary The filename of the patch is: mm-zsmalloc-prepare-to-variable-max_physmem_bits.patch and it can be found in the queue-4.14 subdirectory. If you, or anyone else, feels it should not be added to the stable tree, please let know about it. >From foo@baz Thu Nov 4 09:33:05 AM CET 2021 From: Florian Fainelli Date: Wed, 3 Nov 2021 13:57:03 -0700 Subject: mm/zsmalloc: Prepare to variable MAX_PHYSMEM_BITS To: linux-kernel@vger.kernel.org Cc: stable@vger.kernel.org, Greg Kroah-Hartman , Sasha Levin , "Kirill A. Shutemov" , Nitin Gupta , Minchan Kim , Andy Lutomirski , Borislav Petkov , Linus Torvalds , Peter Zijlstra = , Sergey Senozhatsky , Thomas Gleixner , linux-mm@kvack.org, Ingo Mol= nar , Florian Fainelli , Vineet G= upta , Russell King , Ralf Ba= echle , Benjamin Herrenschmidt , Paul Mackerras , Michael Ellerman , Ingo Molnar , "H. Peter Anvin" ,= x86@kernel.org (maintainer:X86 ARCHITECTURE (32-BIT AND 64-BIT)), Arnd B= ergmann , Stefan Agner , Thomas Bogendoerfer , Mike Rapoport <= rppt@linux.ibm.com>, linux-snps-arc@lists.infradead.org (open list:SYNOPS= YS ARC ARCHITECTURE), linux-arm-kernel@lists.infradead.org (moderated lis= t:ARM PORT), linux-mips@linux-mips.org (open list:MIPS), linuxppc-dev@lis= ts.ozlabs.org (open list:LINUX FOR POWERPC (32-BIT AND 64-BIT)), linux-ar= ch@vger.kernel.org (open list:GENERIC INCLUDE/ASM HEADER FILES) Message-ID: <20211103205704.374734-2-f.fainelli@gmail.com> From: "Kirill A. Shutemov" commit 02390b87a9459937cdb299e6b34ff33992512ec7 upstream With boot-time switching between paging mode we will have variable MAX_PHYSMEM_BITS. Let's use the maximum variable possible for CONFIG_X86_5LEVEL=3Dy configuration to define zsmalloc data structures. The patch introduces MAX_POSSIBLE_PHYSMEM_BITS to cover such case. It also suits well to handle PAE special case. Signed-off-by: Kirill A. Shutemov Reviewed-by: Nitin Gupta Acked-by: Minchan Kim Cc: Andy Lutomirski Cc: Borislav Petkov Cc: Linus Torvalds Cc: Peter Zijlstra Cc: Sergey Senozhatsky Cc: Thomas Gleixner Cc: linux-mm@kvack.org Link: http://lkml.kernel.org/r/20180214111656.88514-3-kirill.shutemov@lin= ux.intel.com Signed-off-by: Ingo Molnar Signed-off-by: Florian Fainelli Signed-off-by: Greg Kroah-Hartman --- arch/x86/include/asm/pgtable-3level_types.h | 1 + arch/x86/include/asm/pgtable_64_types.h | 2 ++ mm/zsmalloc.c | 13 +++++++------ 3 files changed, 10 insertions(+), 6 deletions(-) --- a/arch/x86/include/asm/pgtable-3level_types.h +++ b/arch/x86/include/asm/pgtable-3level_types.h @@ -44,5 +44,6 @@ typedef union { */ #define PTRS_PER_PTE 512 =20 +#define MAX_POSSIBLE_PHYSMEM_BITS 36 =20 #endif /* _ASM_X86_PGTABLE_3LEVEL_DEFS_H */ --- a/arch/x86/include/asm/pgtable_64_types.h +++ b/arch/x86/include/asm/pgtable_64_types.h @@ -40,6 +40,8 @@ typedef struct { pteval_t pte; } pte_t; #define P4D_SIZE (_AC(1, UL) << P4D_SHIFT) #define P4D_MASK (~(P4D_SIZE - 1)) =20 +#define MAX_POSSIBLE_PHYSMEM_BITS 52 + #else /* CONFIG_X86_5LEVEL */ =20 /* --- a/mm/zsmalloc.c +++ b/mm/zsmalloc.c @@ -83,18 +83,19 @@ * This is made more complicated by various memory models and PAE. */ =20 -#ifndef MAX_PHYSMEM_BITS -#ifdef CONFIG_HIGHMEM64G -#define MAX_PHYSMEM_BITS 36 -#else /* !CONFIG_HIGHMEM64G */ +#ifndef MAX_POSSIBLE_PHYSMEM_BITS +#ifdef MAX_PHYSMEM_BITS +#define MAX_POSSIBLE_PHYSMEM_BITS MAX_PHYSMEM_BITS +#else /* * If this definition of MAX_PHYSMEM_BITS is used, OBJ_INDEX_BITS will j= ust * be PAGE_SHIFT */ -#define MAX_PHYSMEM_BITS BITS_PER_LONG +#define MAX_POSSIBLE_PHYSMEM_BITS BITS_PER_LONG #endif #endif -#define _PFN_BITS (MAX_PHYSMEM_BITS - PAGE_SHIFT) + +#define _PFN_BITS (MAX_POSSIBLE_PHYSMEM_BITS - PAGE_SHIFT) =20 /* * Memory for allocating for handle keeps object position by Patches currently in stable-queue which might be from f.fainelli@gmail.co= m are queue-4.14/mm-zsmalloc-prepare-to-variable-max_physmem_bits.patch queue-4.14/arch-pgtable-define-max_possible_physmem_bits-where-needed.pat= ch