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=-3.9 required=3.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED autolearn=no 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 56CC7C433E0 for ; Thu, 4 Jun 2020 12:43:11 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 353B7207D8 for ; Thu, 4 Jun 2020 12:43:11 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=ellerman.id.au header.i=@ellerman.id.au header.b="Yl67+OzG" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727850AbgFDMnK (ORCPT ); Thu, 4 Jun 2020 08:43:10 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:36860 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1725926AbgFDMnJ (ORCPT ); Thu, 4 Jun 2020 08:43:09 -0400 Received: from ozlabs.org (ozlabs.org [IPv6:2401:3900:2:1::2]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 2C17EC08C5C0; Thu, 4 Jun 2020 05:43:09 -0700 (PDT) Received: from authenticated.ozlabs.org (localhost [127.0.0.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange ECDHE (P-256) server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by mail.ozlabs.org (Postfix) with ESMTPSA id 49d56M3DNLz9sSc; Thu, 4 Jun 2020 22:43:07 +1000 (AEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=ellerman.id.au; s=201909; t=1591274587; bh=c+fR+Wk8wg6/dMhQWZlcmNgpSzbn+tow0KvBgGVU/eM=; h=From:To:Cc:Subject:In-Reply-To:References:Date:From; b=Yl67+OzGPoDggkr27FQmgShUI/8MC2dI5y1gc6QuUE7I8uAOK4NEt4t6AfAgZysm5 Zj1wFT8ovE72SqiB2umXioszuoBZEy0KjB5hrqmiPGu0w4+M4OZXc5s7sjIIAyg/Nr GclqZAStzoJcUkNjpBqxjSbGn+xzY8awJKZQQEALjnc1NNrSkruvMZJBB9VHYneyEk ao1eGQTKm5kzGMokyaLbwUZlAuBj60l/2beuRrqqKrP/z8gkWuFRuxZJfCktvcbtLw A2T4jP/0u9xnwH8sNSHhvHw84RWnoN8qNuFzq6LVwUs5nyrfCoHqyn0h9sAbucnyc9 L1KxZPTfQ/keA== From: Michael Ellerman To: Stephen Rothwell , Andrew Morton Cc: Linux Next Mailing List , Linux Kernel Mailing List , PowerPC Subject: Re: linux-next: fix ups for clashes between akpm and powerpc trees In-Reply-To: <20200604184501.1ea5ba36@canb.auug.org.au> References: <20200603202655.0ad0eacc@canb.auug.org.au> <20200604165246.436f02ba@canb.auug.org.au> <20200604184501.1ea5ba36@canb.auug.org.au> Date: Thu, 04 Jun 2020 22:43:31 +1000 Message-ID: <87o8pzgfws.fsf@mpe.ellerman.id.au> MIME-Version: 1.0 Content-Type: text/plain Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Stephen Rothwell writes: > Hi all, > > On Thu, 4 Jun 2020 16:52:46 +1000 Stephen Rothwell wrote: >> >> diff --git a/arch/powerpc/mm/kasan/8xx.c b/arch/powerpc/mm/kasan/8xx.c >> index db4ef44af22f..569d98a41881 100644 >> --- a/arch/powerpc/mm/kasan/8xx.c >> +++ b/arch/powerpc/mm/kasan/8xx.c >> @@ -10,7 +10,7 @@ >> static int __init >> kasan_init_shadow_8M(unsigned long k_start, unsigned long k_end, void *block) >> { >> - pmd_t *pmd = pmd_ptr_k(k_start); >> + pmd_t *pmd = pmd_off_k(k_start); >> unsigned long k_cur, k_next; >> >> for (k_cur = k_start; k_cur != k_end; k_cur = k_next, pmd += 2, block += SZ_8M) { >> @@ -59,7 +59,7 @@ int __init kasan_init_region(void *start, size_t size) >> return ret; >> >> for (; k_cur < k_end; k_cur += PAGE_SIZE) { >> - pmd_t *pmd = pmd_ptr_k(k_cur); >> + pmd_t *pmd = pmd_off_k(k_cur); >> void *va = block + k_cur - k_start; >> pte_t pte = pfn_pte(PHYS_PFN(__pa(va)), PAGE_KERNEL); >> >> diff --git a/arch/powerpc/mm/kasan/book3s_32.c b/arch/powerpc/mm/kasan/book3s_32.c >> index 4bc491a4a1fd..a32b4640b9de 100644 >> --- a/arch/powerpc/mm/kasan/book3s_32.c >> +++ b/arch/powerpc/mm/kasan/book3s_32.c >> @@ -46,7 +46,7 @@ int __init kasan_init_region(void *start, size_t size) >> kasan_update_early_region(k_start, k_cur, __pte(0)); >> >> for (; k_cur < k_end; k_cur += PAGE_SIZE) { >> - pmd_t *pmd = pmd_ptr_k(k_cur); >> + pmd_t *pmd = pmd_off_k(k_cur); >> void *va = block + k_cur - k_start; >> pte_t pte = pfn_pte(PHYS_PFN(__pa(va)), PAGE_KERNEL); >> >> diff --git a/arch/powerpc/mm/nohash/8xx.c b/arch/powerpc/mm/nohash/8xx.c >> index 286441bbbe49..92e8929cbe3e 100644 >> --- a/arch/powerpc/mm/nohash/8xx.c >> +++ b/arch/powerpc/mm/nohash/8xx.c >> @@ -74,7 +74,7 @@ static pte_t __init *early_hugepd_alloc_kernel(hugepd_t *pmdp, unsigned long va) >> static int __ref __early_map_kernel_hugepage(unsigned long va, phys_addr_t pa, >> pgprot_t prot, int psize, bool new) >> { >> - pmd_t *pmdp = pmd_ptr_k(va); >> + pmd_t *pmdp = pmd_off_k(va); >> pte_t *ptep; >> >> if (WARN_ON(psize != MMU_PAGE_512K && psize != MMU_PAGE_8M)) >> diff --git a/arch/powerpc/mm/pgtable.c b/arch/powerpc/mm/pgtable.c >> index 45a0556089e8..1136257c3a99 100644 >> --- a/arch/powerpc/mm/pgtable.c >> +++ b/arch/powerpc/mm/pgtable.c >> @@ -264,7 +264,7 @@ int huge_ptep_set_access_flags(struct vm_area_struct *vma, >> #if defined(CONFIG_PPC_8xx) >> void set_huge_pte_at(struct mm_struct *mm, unsigned long addr, pte_t *ptep, pte_t pte) >> { >> - pmd_t *pmd = pmd_ptr(mm, addr); >> + pmd_t *pmd = pmd_off(mm, addr); >> pte_basic_t val; >> pte_basic_t *entry = &ptep->pte; >> int num = is_hugepd(*((hugepd_t *)pmd)) ? 1 : SZ_512K / SZ_4K; >> diff --git a/arch/powerpc/mm/pgtable_32.c b/arch/powerpc/mm/pgtable_32.c >> index e2d054c9575e..6eb4eab79385 100644 >> --- a/arch/powerpc/mm/pgtable_32.c >> +++ b/arch/powerpc/mm/pgtable_32.c >> @@ -40,7 +40,7 @@ notrace void __init early_ioremap_init(void) >> { >> unsigned long addr = ALIGN_DOWN(FIXADDR_START, PGDIR_SIZE); >> pte_t *ptep = (pte_t *)early_fixmap_pagetable; >> - pmd_t *pmdp = pmd_ptr_k(addr); >> + pmd_t *pmdp = pmd_off_k(addr); >> >> for (; (s32)(FIXADDR_TOP - addr) > 0; >> addr += PGDIR_SIZE, ptep += PTRS_PER_PTE, pmdp++) > > I have added the above hunks as to linux-next for tomorrow as a fix for > mm-pgtable-add-shortcuts-for-accessing-kernel-pmd-and-pte. Looks good. Thanks. cheers 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=-3.5 required=3.0 tests=DKIM_INVALID,DKIM_SIGNED, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE, SPF_PASS,URIBL_BLOCKED autolearn=no 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 AC93AC433E0 for ; Thu, 4 Jun 2020 12:45:18 +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 1BD0E2064C for ; Thu, 4 Jun 2020 12:45:18 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (2048-bit key) header.d=ellerman.id.au header.i=@ellerman.id.au header.b="Yl67+OzG" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 1BD0E2064C Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=ellerman.id.au 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 49d58p6jc6zDqpM for ; Thu, 4 Jun 2020 22:45:14 +1000 (AEST) Received: from ozlabs.org (bilbo.ozlabs.org [203.11.71.1]) (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 49d56M5sMwzDqnG for ; Thu, 4 Jun 2020 22:43:07 +1000 (AEST) Authentication-Results: lists.ozlabs.org; dmarc=none (p=none dis=none) header.from=ellerman.id.au Authentication-Results: lists.ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=ellerman.id.au header.i=@ellerman.id.au header.a=rsa-sha256 header.s=201909 header.b=Yl67+OzG; dkim-atps=neutral Received: from authenticated.ozlabs.org (localhost [127.0.0.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange ECDHE (P-256) server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by mail.ozlabs.org (Postfix) with ESMTPSA id 49d56M3DNLz9sSc; Thu, 4 Jun 2020 22:43:07 +1000 (AEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=ellerman.id.au; s=201909; t=1591274587; bh=c+fR+Wk8wg6/dMhQWZlcmNgpSzbn+tow0KvBgGVU/eM=; h=From:To:Cc:Subject:In-Reply-To:References:Date:From; b=Yl67+OzGPoDggkr27FQmgShUI/8MC2dI5y1gc6QuUE7I8uAOK4NEt4t6AfAgZysm5 Zj1wFT8ovE72SqiB2umXioszuoBZEy0KjB5hrqmiPGu0w4+M4OZXc5s7sjIIAyg/Nr GclqZAStzoJcUkNjpBqxjSbGn+xzY8awJKZQQEALjnc1NNrSkruvMZJBB9VHYneyEk ao1eGQTKm5kzGMokyaLbwUZlAuBj60l/2beuRrqqKrP/z8gkWuFRuxZJfCktvcbtLw A2T4jP/0u9xnwH8sNSHhvHw84RWnoN8qNuFzq6LVwUs5nyrfCoHqyn0h9sAbucnyc9 L1KxZPTfQ/keA== From: Michael Ellerman To: Stephen Rothwell , Andrew Morton Subject: Re: linux-next: fix ups for clashes between akpm and powerpc trees In-Reply-To: <20200604184501.1ea5ba36@canb.auug.org.au> References: <20200603202655.0ad0eacc@canb.auug.org.au> <20200604165246.436f02ba@canb.auug.org.au> <20200604184501.1ea5ba36@canb.auug.org.au> Date: Thu, 04 Jun 2020 22:43:31 +1000 Message-ID: <87o8pzgfws.fsf@mpe.ellerman.id.au> MIME-Version: 1.0 Content-Type: text/plain 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 Next Mailing List , PowerPC , Linux Kernel Mailing List Errors-To: linuxppc-dev-bounces+linuxppc-dev=archiver.kernel.org@lists.ozlabs.org Sender: "Linuxppc-dev" Stephen Rothwell writes: > Hi all, > > On Thu, 4 Jun 2020 16:52:46 +1000 Stephen Rothwell wrote: >> >> diff --git a/arch/powerpc/mm/kasan/8xx.c b/arch/powerpc/mm/kasan/8xx.c >> index db4ef44af22f..569d98a41881 100644 >> --- a/arch/powerpc/mm/kasan/8xx.c >> +++ b/arch/powerpc/mm/kasan/8xx.c >> @@ -10,7 +10,7 @@ >> static int __init >> kasan_init_shadow_8M(unsigned long k_start, unsigned long k_end, void *block) >> { >> - pmd_t *pmd = pmd_ptr_k(k_start); >> + pmd_t *pmd = pmd_off_k(k_start); >> unsigned long k_cur, k_next; >> >> for (k_cur = k_start; k_cur != k_end; k_cur = k_next, pmd += 2, block += SZ_8M) { >> @@ -59,7 +59,7 @@ int __init kasan_init_region(void *start, size_t size) >> return ret; >> >> for (; k_cur < k_end; k_cur += PAGE_SIZE) { >> - pmd_t *pmd = pmd_ptr_k(k_cur); >> + pmd_t *pmd = pmd_off_k(k_cur); >> void *va = block + k_cur - k_start; >> pte_t pte = pfn_pte(PHYS_PFN(__pa(va)), PAGE_KERNEL); >> >> diff --git a/arch/powerpc/mm/kasan/book3s_32.c b/arch/powerpc/mm/kasan/book3s_32.c >> index 4bc491a4a1fd..a32b4640b9de 100644 >> --- a/arch/powerpc/mm/kasan/book3s_32.c >> +++ b/arch/powerpc/mm/kasan/book3s_32.c >> @@ -46,7 +46,7 @@ int __init kasan_init_region(void *start, size_t size) >> kasan_update_early_region(k_start, k_cur, __pte(0)); >> >> for (; k_cur < k_end; k_cur += PAGE_SIZE) { >> - pmd_t *pmd = pmd_ptr_k(k_cur); >> + pmd_t *pmd = pmd_off_k(k_cur); >> void *va = block + k_cur - k_start; >> pte_t pte = pfn_pte(PHYS_PFN(__pa(va)), PAGE_KERNEL); >> >> diff --git a/arch/powerpc/mm/nohash/8xx.c b/arch/powerpc/mm/nohash/8xx.c >> index 286441bbbe49..92e8929cbe3e 100644 >> --- a/arch/powerpc/mm/nohash/8xx.c >> +++ b/arch/powerpc/mm/nohash/8xx.c >> @@ -74,7 +74,7 @@ static pte_t __init *early_hugepd_alloc_kernel(hugepd_t *pmdp, unsigned long va) >> static int __ref __early_map_kernel_hugepage(unsigned long va, phys_addr_t pa, >> pgprot_t prot, int psize, bool new) >> { >> - pmd_t *pmdp = pmd_ptr_k(va); >> + pmd_t *pmdp = pmd_off_k(va); >> pte_t *ptep; >> >> if (WARN_ON(psize != MMU_PAGE_512K && psize != MMU_PAGE_8M)) >> diff --git a/arch/powerpc/mm/pgtable.c b/arch/powerpc/mm/pgtable.c >> index 45a0556089e8..1136257c3a99 100644 >> --- a/arch/powerpc/mm/pgtable.c >> +++ b/arch/powerpc/mm/pgtable.c >> @@ -264,7 +264,7 @@ int huge_ptep_set_access_flags(struct vm_area_struct *vma, >> #if defined(CONFIG_PPC_8xx) >> void set_huge_pte_at(struct mm_struct *mm, unsigned long addr, pte_t *ptep, pte_t pte) >> { >> - pmd_t *pmd = pmd_ptr(mm, addr); >> + pmd_t *pmd = pmd_off(mm, addr); >> pte_basic_t val; >> pte_basic_t *entry = &ptep->pte; >> int num = is_hugepd(*((hugepd_t *)pmd)) ? 1 : SZ_512K / SZ_4K; >> diff --git a/arch/powerpc/mm/pgtable_32.c b/arch/powerpc/mm/pgtable_32.c >> index e2d054c9575e..6eb4eab79385 100644 >> --- a/arch/powerpc/mm/pgtable_32.c >> +++ b/arch/powerpc/mm/pgtable_32.c >> @@ -40,7 +40,7 @@ notrace void __init early_ioremap_init(void) >> { >> unsigned long addr = ALIGN_DOWN(FIXADDR_START, PGDIR_SIZE); >> pte_t *ptep = (pte_t *)early_fixmap_pagetable; >> - pmd_t *pmdp = pmd_ptr_k(addr); >> + pmd_t *pmdp = pmd_off_k(addr); >> >> for (; (s32)(FIXADDR_TOP - addr) > 0; >> addr += PGDIR_SIZE, ptep += PTRS_PER_PTE, pmdp++) > > I have added the above hunks as to linux-next for tomorrow as a fix for > mm-pgtable-add-shortcuts-for-accessing-kernel-pmd-and-pte. Looks good. Thanks. cheers