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 2C8BAC433DF for ; Thu, 4 Jun 2020 18:04:40 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 0E7A6206E6 for ; Thu, 4 Jun 2020 18:04:40 +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" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1730353AbgFDSEj (ORCPT ); Thu, 4 Jun 2020 14:04:39 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:58616 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1730055AbgFDSEi (ORCPT ); Thu, 4 Jun 2020 14:04:38 -0400 Received: from mail-pj1-x1043.google.com (mail-pj1-x1043.google.com [IPv6:2607:f8b0:4864:20::1043]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id AC4FFC08C5C0; Thu, 4 Jun 2020 11:04:38 -0700 (PDT) Received: by mail-pj1-x1043.google.com with SMTP id i12so1459338pju.3; 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=ZO4dpcHEnIjkKcUbjU2nmfDxY9HZlgShCvO97sc+kiyRIYwuk1bUXeZuJ5OWEQWXZy 5ykHqAy1hybGVzhOww11K/GJ2PNy4SZuOqkExf9SNqKYOKHfjM+mCBJaAXBQTvPF6tbw iZ/LpeiPQcwy5pjKuZSbHObFAIXszEm2UNuH/u3eW6Oldzpn2Yv6Vvtjgh8MbriEzD/i G1/DLNgXw9no3Mq9151YffOMs4l93HW2/3/pU+vI0NOYMQmxRHWWRlYVxfW1upjMFd+w JvcQ+vIwfmBDUnDf+Bh6YvUF0yXHIAo7Bw8D1J0HfC8Ci9hjHp9CxA/6Y64hYEpmlP9S 2M4A== X-Gm-Message-State: AOAM5304uf/Ia+RFMuykORUSF+A7owShfhmZzaxHyE69tPyQk7j9zc1z ODvzC4GkQtYQsx7veRvO3Fw= 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) Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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 > 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 6F026C433DF for ; Thu, 4 Jun 2020 18:07:04 +0000 (UTC) Received: from lists.ozlabs.org (lists.ozlabs.org [203.11.71.2]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id E0A5120772 for ; Thu, 4 Jun 2020 18:07:03 +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 E0A5120772 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=linuxppc-dev-bounces+linuxppc-dev=archiver.kernel.org@lists.ozlabs.org Received: from bilbo.ozlabs.org (lists.ozlabs.org [IPv6:2401:3900:2:1::3]) by lists.ozlabs.org (Postfix) with ESMTP id 49dDJ54gydzDqhN for ; Fri, 5 Jun 2020 04:07:01 +1000 (AEST) Authentication-Results: lists.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=gmail.com (client-ip=2607:f8b0:4864:20::641; helo=mail-pl1-x641.google.com; envelope-from=groeck7@gmail.com; receiver=) Authentication-Results: lists.ozlabs.org; dmarc=none (p=none dis=none) header.from=roeck-us.net Authentication-Results: lists.ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20161025 header.b=fMbfz5xt; dkim-atps=neutral Received: from mail-pl1-x641.google.com (mail-pl1-x641.google.com [IPv6:2607:f8b0:4864:20::641]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by lists.ozlabs.org (Postfix) with ESMTPS id 49dDFP64S0zDqkB for ; Fri, 5 Jun 2020 04:04:41 +1000 (AEST) Received: by mail-pl1-x641.google.com with SMTP id m7so2510683plt.5 for ; Thu, 04 Jun 2020 11:04:41 -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=fcg4Vq+kX821AW7/hfpr8UJmZssPxauZe2xqLuIrWoU2wP/1oXH6t3rtVLo1n5sQM/ MZM1T0/T/8mSu6Qp1Hd7g2A/dIWPPU0HkfD86QT94OglYKSJzw1XQMoGWdaCmkcdp+jA q0em5wHGVjjtr7Wf7hHyBOxtkcE9usf/XY/xI74htLZAnySDj9IqiRsgfkTnQbeBMrmN /70fkhFyP9X1LFIUGNMISyv4lCL9b5RWXLEJntqEdnawD7OTJoG/W5ZEDzUc1KXnV2Tl f9p7ONhXi7Xt/C7J9XF6LZLaJNFWSyzWAPUaXQVSJxtFuPtVhttMOBKnDMl76hWiTXkq 26mg== X-Gm-Message-State: AOAM530Rb2dG5v46BAVBSDcute5Y5L/5lcY00cjaoajeZnHinds0WXAe ozo3Ajt3XhE58RPg9ACWcTY= 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 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-BeenThere: linuxppc-dev@lists.ozlabs.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Linux on PowerPC Developers Mail List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: linux-arch@vger.kernel.org, Stephen Rothwell , jroedel@suse.de, linux-mm@kvack.org, peterz@infradead.org, linuxppc-dev@lists.ozlabs.org, linux-kernel@vger.kernel.org, Steven Rostedt , Abdul Haleem , linux-next@vger.kernel.org, Satheesh Rajendran , Andy Lutomirski , Andrew Morton , manvanth@linux.vnet.ibm.com, hch@lst.de Errors-To: linuxppc-dev-bounces+linuxppc-dev=archiver.kernel.org@lists.ozlabs.org Sender: "Linuxppc-dev" 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 >