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=-8.1 required=3.0 tests=DKIM_INVALID,DKIM_SIGNED, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_SANE_1 autolearn=unavailable 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 99906C433E1 for ; Thu, 4 Jun 2020 18:05:12 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id 642ED20738 for ; Thu, 4 Jun 2020 18:05:12 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="fMbfz5xt" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 642ED20738 Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=roeck-us.net Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=owner-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix) id F1B1480007; Thu, 4 Jun 2020 14:05:11 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id EF2968E0006; Thu, 4 Jun 2020 14:05:11 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id E2DDD80007; Thu, 4 Jun 2020 14:05:11 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0122.hostedemail.com [216.40.44.122]) by kanga.kvack.org (Postfix) with ESMTP id C912C8E0006 for ; Thu, 4 Jun 2020 14:05:11 -0400 (EDT) Received: from smtpin11.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay01.hostedemail.com (Postfix) with ESMTP id 88225181B0492 for ; Thu, 4 Jun 2020 18:05:11 +0000 (UTC) X-FDA: 76892306022.11.pigs46_58040a426d99 Received: from filter.hostedemail.com (10.5.16.251.rfc1918.com [10.5.16.251]) by smtpin11.hostedemail.com (Postfix) with ESMTP id 9DDE01819FF7B for ; Thu, 4 Jun 2020 18:04:39 +0000 (UTC) X-HE-Tag: pigs46_58040a426d99 X-Filterd-Recvd-Size: 6854 Received: from mail-pj1-f65.google.com (mail-pj1-f65.google.com [209.85.216.65]) by imf01.hostedemail.com (Postfix) with ESMTP for ; Thu, 4 Jun 2020 18:04:38 +0000 (UTC) Received: by mail-pj1-f65.google.com with SMTP id d6so1540647pjs.3 for ; Thu, 04 Jun 2020 11:04:38 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:date:from:to:cc:subject:message-id:references:mime-version :content-disposition:in-reply-to:user-agent; bh=rD8xuTgnZ6MvQvEnMb+rcASld4ronehkugR1bak9iF4=; b=fMbfz5xtWwcFx1lkzWMOzCVDlzqu2GYk/fZ0yKlBIL/eJw7AQlXPM2ornec0YYgVg7 UYGQJ4ce7zktK+/93Nyb3PS/m2PGda6kaaZjjKvMBFSQC+5ryhUsnt7DThlQNA+R0LYy XCOeVDZckgIwHBWGyTdygX0wfKPfra4o7dlq1L9ooD+CeRgcbkE7Twjb7pCQfjzeXoLG DzwVK0l56ba8mx/b0odQND6lKJArXIcdxw8cT5vRrUzCKY2EeI60IrU3p/lzvHw2cDjL z61/A872SA93qHPX+YEF1qSZkUOOlTvrcJT4nP7tq+k2Mbmg+QKA2emmCuXl+HTOtxOF iTWg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:date:from:to:cc:subject:message-id :references:mime-version:content-disposition:in-reply-to:user-agent; bh=rD8xuTgnZ6MvQvEnMb+rcASld4ronehkugR1bak9iF4=; b=gfFYz+j6JLr3wuq7+Ps4VsLBVm2YQWWw8TmRzEBSVLz06Ts7dq6qiBH1pnIKzqb7h2 hs0n3fxPqTNBAu4/N2wMygXKW7cmUphEbvqQKA8Lmx6ceSESjEKvUSJYNDWVWBQCum4o 7AqF2cBRuQsp2LmjI2bt57W5n9lpzjpwWPP85oOttE5JeZVWouHQJrEkdY9mnizVvkdc a9HmdYo2uBXO/Jh42ZAZdtF6bgznbAUyCAX9HEpMHI8tM7LzSJ7cqzE59W1DmnsgQ5m9 Wrp0pCD4GNYN4S0jbHP50pcuw033mZXKNqXe7b4MWIi9qbUjrZ+pjONhRgZD9vqQQlYH Km2g== X-Gm-Message-State: AOAM530ZNxH6BmpMmlsYaBYdA0GGoHOUCwQCdlGp19mNgLbrxsXaJQH8 lFeLMNt9h6QHjttDvkEsMxs= X-Google-Smtp-Source: ABdhPJz0+8tBh768mrEJ585mQCjvZcm0WkxiKChW8xM5bO8f66+aggOYu3pZxcjJ7Ue5X/xjt/lBfg== X-Received: by 2002:a17:90a:b013:: with SMTP id x19mr7609215pjq.229.1591293878091; Thu, 04 Jun 2020 11:04:38 -0700 (PDT) Received: from localhost ([2600:1700:e321:62f0:329c:23ff:fee3:9d7c]) by smtp.gmail.com with ESMTPSA id g9sm3932309pfm.151.2020.06.04.11.04.36 (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Thu, 04 Jun 2020 11:04:37 -0700 (PDT) Date: Thu, 4 Jun 2020 11:04:35 -0700 From: Guenter Roeck To: Joerg Roedel Cc: Andrew Morton , peterz@infradead.org, jroedel@suse.de, Andy Lutomirski , Abdul Haleem , Satheesh Rajendran , Stephen Rothwell , manvanth@linux.vnet.ibm.com, linux-next@vger.kernel.org, Steven Rostedt , linuxppc-dev@lists.ozlabs.org, hch@lst.de, linux-arch@vger.kernel.org, linux-kernel@vger.kernel.org, linux-mm@kvack.org Subject: Re: [PATCH] mm: Fix pud_alloc_track() Message-ID: <20200604180435.GA219656@roeck-us.net> References: <20200604074446.23944-1-joro@8bytes.org> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20200604074446.23944-1-joro@8bytes.org> User-Agent: Mutt/1.9.4 (2018-02-28) X-Rspamd-Queue-Id: 9DDE01819FF7B X-Spamd-Result: default: False [0.00 / 100.00] X-Rspamd-Server: rspam04 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 Thu, Jun 04, 2020 at 09:44:46AM +0200, Joerg Roedel wrote: > From: Joerg Roedel > > The pud_alloc_track() needs to do different checks based on whether > __ARCH_HAS_5LEVEL_HACK is defined, like it already does in > pud_alloc(). Otherwise it causes boot failures on PowerPC. > > Provide the correct implementations for both possible settings of > __ARCH_HAS_5LEVEL_HACK to fix the boot problems. > > Reported-by: Abdul Haleem > Tested-by: Abdul Haleem > Tested-by: Satheesh Rajendran > Fixes: d8626138009b ("mm: add functions to track page directory modifications") > Signed-off-by: Joerg Roedel Tested-by: Guenter Roeck > --- > include/asm-generic/5level-fixup.h | 5 +++++ > include/linux/mm.h | 26 +++++++++++++------------- > 2 files changed, 18 insertions(+), 13 deletions(-) > > diff --git a/include/asm-generic/5level-fixup.h b/include/asm-generic/5level-fixup.h > index 58046ddc08d0..afbab31fbd7e 100644 > --- a/include/asm-generic/5level-fixup.h > +++ b/include/asm-generic/5level-fixup.h > @@ -17,6 +17,11 @@ > ((unlikely(pgd_none(*(p4d))) && __pud_alloc(mm, p4d, address)) ? \ > NULL : pud_offset(p4d, address)) > > +#define pud_alloc_track(mm, p4d, address, mask) \ > + ((unlikely(pgd_none(*(p4d))) && \ > + (__pud_alloc(mm, p4d, address) || ({*(mask)|=PGTBL_P4D_MODIFIED;0;})))? \ > + NULL : pud_offset(p4d, address)) > + > #define p4d_alloc(mm, pgd, address) (pgd) > #define p4d_alloc_track(mm, pgd, address, mask) (pgd) > #define p4d_offset(pgd, start) (pgd) > diff --git a/include/linux/mm.h b/include/linux/mm.h > index 66e0977f970a..ad3b31c5bcc3 100644 > --- a/include/linux/mm.h > +++ b/include/linux/mm.h > @@ -2088,35 +2088,35 @@ static inline pud_t *pud_alloc(struct mm_struct *mm, p4d_t *p4d, > NULL : pud_offset(p4d, address); > } > > -static inline p4d_t *p4d_alloc_track(struct mm_struct *mm, pgd_t *pgd, > +static inline pud_t *pud_alloc_track(struct mm_struct *mm, p4d_t *p4d, > unsigned long address, > pgtbl_mod_mask *mod_mask) > - > { > - if (unlikely(pgd_none(*pgd))) { > - if (__p4d_alloc(mm, pgd, address)) > + if (unlikely(p4d_none(*p4d))) { > + if (__pud_alloc(mm, p4d, address)) > return NULL; > - *mod_mask |= PGTBL_PGD_MODIFIED; > + *mod_mask |= PGTBL_P4D_MODIFIED; > } > > - return p4d_offset(pgd, address); > + return pud_offset(p4d, address); > } > > -#endif /* !__ARCH_HAS_5LEVEL_HACK */ > - > -static inline pud_t *pud_alloc_track(struct mm_struct *mm, p4d_t *p4d, > +static inline p4d_t *p4d_alloc_track(struct mm_struct *mm, pgd_t *pgd, > unsigned long address, > pgtbl_mod_mask *mod_mask) > + > { > - if (unlikely(p4d_none(*p4d))) { > - if (__pud_alloc(mm, p4d, address)) > + if (unlikely(pgd_none(*pgd))) { > + if (__p4d_alloc(mm, pgd, address)) > return NULL; > - *mod_mask |= PGTBL_P4D_MODIFIED; > + *mod_mask |= PGTBL_PGD_MODIFIED; > } > > - return pud_offset(p4d, address); > + return p4d_offset(pgd, address); > } > > +#endif /* !__ARCH_HAS_5LEVEL_HACK */ > + > static inline pmd_t *pmd_alloc(struct mm_struct *mm, pud_t *pud, unsigned long address) > { > return (unlikely(pud_none(*pud)) && __pmd_alloc(mm, pud, address))? > -- > 2.26.2 >