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 X-Spam-Level: X-Spam-Status: No, score=-6.8 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 0D70CC47255 for ; Mon, 11 May 2020 14:16:38 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id E3F75206B7 for ; Mon, 11 May 2020 14:16:37 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1730472AbgEKOQh (ORCPT ); Mon, 11 May 2020 10:16:37 -0400 Received: from mx0a-001b2d01.pphosted.com ([148.163.156.1]:6610 "EHLO mx0a-001b2d01.pphosted.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1730158AbgEKOQg (ORCPT ); Mon, 11 May 2020 10:16:36 -0400 Received: from pps.filterd (m0098399.ppops.net [127.0.0.1]) by mx0a-001b2d01.pphosted.com (8.16.0.42/8.16.0.42) with SMTP id 04BDXD0a161500; Mon, 11 May 2020 10:15:47 -0400 Received: from ppma03ams.nl.ibm.com (62.31.33a9.ip4.static.sl-reverse.com [169.51.49.98]) by mx0a-001b2d01.pphosted.com with ESMTP id 30wrvrxy12-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Mon, 11 May 2020 10:15:47 -0400 Received: from pps.filterd (ppma03ams.nl.ibm.com [127.0.0.1]) by ppma03ams.nl.ibm.com (8.16.0.27/8.16.0.27) with SMTP id 04BEB2Gc003182; Mon, 11 May 2020 14:15:44 GMT Received: from b06cxnps3075.portsmouth.uk.ibm.com (d06relay10.portsmouth.uk.ibm.com [9.149.109.195]) by ppma03ams.nl.ibm.com with ESMTP id 30wm55mhcy-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Mon, 11 May 2020 14:15:44 +0000 Received: from d06av24.portsmouth.uk.ibm.com (mk.ibm.com [9.149.105.60]) by b06cxnps3075.portsmouth.uk.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id 04BEFg6J62193780 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Mon, 11 May 2020 14:15:42 GMT Received: from d06av24.portsmouth.uk.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id E49024204B; Mon, 11 May 2020 14:15:41 +0000 (GMT) Received: from d06av24.portsmouth.uk.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id C160C42045; Mon, 11 May 2020 14:15:38 +0000 (GMT) Received: from linux.ibm.com (unknown [9.148.203.187]) by d06av24.portsmouth.uk.ibm.com (Postfix) with ESMTPS; Mon, 11 May 2020 14:15:38 +0000 (GMT) Date: Mon, 11 May 2020 17:15:36 +0300 From: Mike Rapoport To: Marek Szyprowski , Andrew Morton Cc: Mike Rapoport , Rich Felker , linux-ia64@vger.kernel.org, Geert Uytterhoeven , linux-sh@vger.kernel.org, Benjamin Herrenschmidt , linux-mm@kvack.org, Paul Mackerras , linux-hexagon@vger.kernel.org, Will Deacon , kvmarm@lists.cs.columbia.edu, Jonas Bonn , linux-arch@vger.kernel.org, Brian Cain , Marc Zyngier , Russell King , Ley Foon Tan , Catalin Marinas , uclinux-h8-devel@lists.sourceforge.jp, Fenghua Yu , Arnd Bergmann , kvm-ppc@vger.kernel.org, Stefan Kristiansson , openrisc@lists.librecores.org, Stafford Horne , Guan Xuetao , linux-arm-kernel@lists.infradead.org, Christophe Leroy , Tony Luck , Yoshinori Sato , linux-kernel@vger.kernel.org, Michael Ellerman , nios2-dev@lists.rocketboards.org, linuxppc-dev@lists.ozlabs.org, =?utf-8?Q?=C5=81ukasz?= Stelmach , Bartlomiej Zolnierkiewicz Subject: Re: [PATCH v4 02/14] arm: add support for folded p4d page tables Message-ID: <20200511141536.GB983798@linux.ibm.com> References: <20200414153455.21744-1-rppt@kernel.org> <20200414153455.21744-3-rppt@kernel.org> <39ba8a04-d6b5-649d-c289-0c8b27cb66c5@samsung.com> <20200507161155.GE683243@linux.ibm.com> <98229ab1-fbf8-0a89-c5d6-270c828799e7@samsung.com> <20200508174232.GA759899@linux.ibm.com> <665dade8-727a-3318-6779-3998080da18f@samsung.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <665dade8-727a-3318-6779-3998080da18f@samsung.com> X-TM-AS-GCONF: 00 X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10434:6.0.216,18.0.676 definitions=2020-05-11_05:2020-05-11,2020-05-11 signatures=0 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 malwarescore=0 spamscore=0 lowpriorityscore=0 mlxscore=0 priorityscore=1501 phishscore=0 bulkscore=0 mlxlogscore=999 clxscore=1015 impostorscore=0 suspectscore=1 adultscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2003020000 definitions=main-2005110112 Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Hi Marek, On Mon, May 11, 2020 at 08:36:41AM +0200, Marek Szyprowski wrote: > Hi Mike, > > On 08.05.2020 19:42, Mike Rapoport wrote: > > On Fri, May 08, 2020 at 08:53:27AM +0200, Marek Szyprowski wrote: > >> On 07.05.2020 18:11, Mike Rapoport wrote: > >>> On Thu, May 07, 2020 at 02:16:56PM +0200, Marek Szyprowski wrote: > >>>> On 14.04.2020 17:34, Mike Rapoport wrote: > >>>>> From: Mike Rapoport > >>>>> > >>>>> Implement primitives necessary for the 4th level folding, add walks of p4d > >>>>> level where appropriate, and remove __ARCH_USE_5LEVEL_HACK. > >>>>> > >>>>> Signed-off-by: Mike Rapoport > > Can you please try the patch below: > > > > diff --git a/arch/arm/mm/init.c b/arch/arm/mm/init.c > > index 963b5284d284..f86b3d17928e 100644 > > --- a/arch/arm/mm/init.c > > +++ b/arch/arm/mm/init.c > > @@ -571,7 +571,7 @@ static inline void section_update(unsigned long addr, pmdval_t mask, > > { > > pmd_t *pmd; > > > > - pmd = pmd_off_k(addr); > > + pmd = pmd_offset(pud_offset(p4d_offset(pgd_offset(mm, addr), addr), addr), addr); > > > > #ifdef CONFIG_ARM_LPAE > > pmd[0] = __pmd((pmd_val(pmd[0]) & mask) | prot); > This fixes kexec issue! Thanks! > > > Feel free to add: > > Reported-by: Marek Szyprowski > Fixes: 218f1c390557 ("arm: add support for folded p4d page tables") > Tested-by: Marek Szyprowski Thanks for testing! The patch is still in mmotm tree, so I don't think "Fixes" apply. Andrew, would you like me to send the fix as a formal patch or will pick it up as a fixup? > Best regards > -- > Marek Szyprowski, PhD > Samsung R&D Institute Poland > -- Sincerely yours, Mike.