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.5 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 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 44017C4724C for ; Wed, 6 May 2020 06:11:23 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 25824206E6 for ; Wed, 6 May 2020 06:11:23 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (2048-bit key) header.d=infradead.org header.i=@infradead.org header.b="oP1hjP2O" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726863AbgEFGLW (ORCPT ); Wed, 6 May 2020 02:11:22 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:56986 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-FAIL-OK-FAIL) by vger.kernel.org with ESMTP id S1725782AbgEFGLW (ORCPT ); Wed, 6 May 2020 02:11:22 -0400 Received: from bombadil.infradead.org (bombadil.infradead.org [IPv6:2607:7c80:54:e::133]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id A7E3AC061A0F; Tue, 5 May 2020 23:11:22 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=bombadil.20170209; h=In-Reply-To:Content-Type:MIME-Version :References:Message-ID:Subject:Cc:To:From:Date:Sender:Reply-To: Content-Transfer-Encoding:Content-ID:Content-Description; bh=P11S868Du0HesvmsqxCwWCcyLr9HALCMySezlQJYbk0=; b=oP1hjP2OSgsVM0gfohwmDa6TcJ pe2nyvwO4gyPy3EogWVPUyLuJPjNyzmhpbMc6GD0yzBaUgwBJpYMZIawh2cAn7pSWJAwKcIy+N0iG 9KkDB6HJKLdpOkO/nyh4dRaVF84SQb2vNPPhyCMtxFB0WAak2bb8S8mhB4zF3CH0ftvBkjXoHBk1j lXn9GQGt6AGvGJ41Jsb/VXUqUImhdk8jGfzPUaJrKaKm9H3m2LOW5RvK+roHmF5va7Rs/3C0Fi/Yg iNoAGMMEenG3ML28zKZZs3mCsUTgT0wAnSwGRhowW6de9Ed1X2TZvrXtds/aJBumQp91Nu+3irWcY Z2xba3Cw==; Received: from hch by bombadil.infradead.org with local (Exim 4.92.3 #3 (Red Hat Linux)) id 1jWDGz-0003zA-SZ; Wed, 06 May 2020 06:11:13 +0000 Date: Tue, 5 May 2020 23:11:13 -0700 From: Christoph Hellwig To: ira.weiny@intel.com Cc: linux-kernel@vger.kernel.org, Andrew Morton , Christian Koenig , Huang Rui , Thomas Bogendoerfer , "James E.J. Bottomley" , Helge Deller , Benjamin Herrenschmidt , Paul Mackerras , "David S. Miller" , Thomas Gleixner , Ingo Molnar , Borislav Petkov , x86@kernel.org, "H. Peter Anvin" , Dave Hansen , Andy Lutomirski , Peter Zijlstra , Chris Zankel , Max Filippov , Dan Williams , linux-snps-arc@lists.infradead.org, linux-arm-kernel@lists.infradead.org, linux-csky@vger.kernel.org, linux-mips@vger.kernel.org, linux-parisc@vger.kernel.org, linuxppc-dev@lists.ozlabs.org, sparclinux@vger.kernel.org, linux-xtensa@linux-xtensa.org, dri-devel@lists.freedesktop.org Subject: Re: [PATCH V2 05/11] {x86,powerpc,microblaze}/kmap: Move preempt disable Message-ID: <20200506061113.GA5192@infradead.org> References: <20200504010912.982044-1-ira.weiny@intel.com> <20200504010912.982044-6-ira.weiny@intel.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20200504010912.982044-6-ira.weiny@intel.com> X-SRS-Rewrite: SMTP reverse-path rewritten from by bombadil.infradead.org. See http://www.infradead.org/rpr.html Sender: linux-csky-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-csky@vger.kernel.org On Sun, May 03, 2020 at 06:09:06PM -0700, ira.weiny@intel.com wrote: > From: Ira Weiny > > During this kmap() conversion series we must maintain bisect-ability. > To do this, kmap_atomic_prot() in x86, powerpc, and microblaze need to > remain functional. > > Create a temporary inline version of kmap_atomic_prot within these > architectures so we can rework their kmap_atomic() calls and then lift > kmap_atomic_prot() to the core. > > Signed-off-by: Ira Weiny > > --- > Changes from V1: > New patch > --- > arch/microblaze/include/asm/highmem.h | 11 ++++++++++- > arch/microblaze/mm/highmem.c | 10 ++-------- > arch/powerpc/include/asm/highmem.h | 11 ++++++++++- > arch/powerpc/mm/highmem.c | 9 ++------- > arch/x86/include/asm/highmem.h | 11 ++++++++++- > arch/x86/mm/highmem_32.c | 10 ++-------- > 6 files changed, 36 insertions(+), 26 deletions(-) > > diff --git a/arch/microblaze/include/asm/highmem.h b/arch/microblaze/include/asm/highmem.h > index 0c94046f2d58..ec9954b091e1 100644 > --- a/arch/microblaze/include/asm/highmem.h > +++ b/arch/microblaze/include/asm/highmem.h > @@ -51,7 +51,16 @@ extern pte_t *pkmap_page_table; > #define PKMAP_NR(virt) ((virt - PKMAP_BASE) >> PAGE_SHIFT) > #define PKMAP_ADDR(nr) (PKMAP_BASE + ((nr) << PAGE_SHIFT)) > > -extern void *kmap_atomic_prot(struct page *page, pgprot_t prot); > +extern void *kmap_atomic_high_prot(struct page *page, pgprot_t prot); > +void *kmap_atomic_prot(struct page *page, pgprot_t prot) Shouldn't this be marked inline? The rest looks fine: Reviewed-by: Christoph Hellwig 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=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED 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 B266BC4725B for ; Wed, 6 May 2020 06:11:26 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (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 89A5F206E6 for ; Wed, 6 May 2020 06:11:26 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="N3HqaE+v" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 89A5F206E6 Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=infradead.org Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-snps-arc-bounces+linux-snps-arc=archiver.kernel.org@lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:Cc:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:In-Reply-To:MIME-Version:References: Message-ID:Subject:To:From:Date:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=YTISyzvWeT7pDdOWPs4QTmXe0d0Mt+P+jnqHJJb0KNM=; b=N3HqaE+v1FQlin NRq+d5iqjrauYCtjYXpUWcFuIktIf52CGguki000jNQEtbzn6JOMsiBlIIqbfVEk3i+TA/bj+qvQe mYiDkxfsBUC2WQlIdUSTeXBSJLjyWuivZZ+ZTxDYiZ1yg/MMN1pIdH/g9WYHLFqTvFntoCWtvYOKM 4P6HTmmD5Onl5ZP2wAlcXHx4oj4v7GqfN/eKALB96r0rslcYTGIitU2hlpjv/+F4h4qQvNAzhLrKN ePy6FAsj2OI0L+p5Iz/C7qt6JxgUKRCylzn/x+G4kbVfB9Rt6nrpB81dWerS+GNhutr9tl6/6NeNN Cw7iVqBBtPrxpfcjGzHg==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1jWDH7-0003zk-9S; Wed, 06 May 2020 06:11:21 +0000 Received: from hch by bombadil.infradead.org with local (Exim 4.92.3 #3 (Red Hat Linux)) id 1jWDGz-0003zA-SZ; Wed, 06 May 2020 06:11:13 +0000 Date: Tue, 5 May 2020 23:11:13 -0700 From: Christoph Hellwig To: ira.weiny@intel.com Subject: Re: [PATCH V2 05/11] {x86,powerpc,microblaze}/kmap: Move preempt disable Message-ID: <20200506061113.GA5192@infradead.org> References: <20200504010912.982044-1-ira.weiny@intel.com> <20200504010912.982044-6-ira.weiny@intel.com> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <20200504010912.982044-6-ira.weiny@intel.com> X-BeenThere: linux-snps-arc@lists.infradead.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Linux on Synopsys ARC Processors List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Peter Zijlstra , Benjamin Herrenschmidt , Dave Hansen , dri-devel@lists.freedesktop.org, linux-mips@vger.kernel.org, "James E.J. Bottomley" , Max Filippov , Huang Rui , Paul Mackerras , "H. Peter Anvin" , sparclinux@vger.kernel.org, Dan Williams , Helge Deller , x86@kernel.org, linux-csky@vger.kernel.org, Ingo Molnar , linux-snps-arc@lists.infradead.org, linux-xtensa@linux-xtensa.org, Borislav Petkov , Andy Lutomirski , Thomas Gleixner , linux-arm-kernel@lists.infradead.org, Chris Zankel , Thomas Bogendoerfer , linux-parisc@vger.kernel.org, linux-kernel@vger.kernel.org, Christian Koenig , Andrew Morton , linuxppc-dev@lists.ozlabs.org, "David S. Miller" Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "linux-snps-arc" Errors-To: linux-snps-arc-bounces+linux-snps-arc=archiver.kernel.org@lists.infradead.org On Sun, May 03, 2020 at 06:09:06PM -0700, ira.weiny@intel.com wrote: > From: Ira Weiny > > During this kmap() conversion series we must maintain bisect-ability. > To do this, kmap_atomic_prot() in x86, powerpc, and microblaze need to > remain functional. > > Create a temporary inline version of kmap_atomic_prot within these > architectures so we can rework their kmap_atomic() calls and then lift > kmap_atomic_prot() to the core. > > Signed-off-by: Ira Weiny > > --- > Changes from V1: > New patch > --- > arch/microblaze/include/asm/highmem.h | 11 ++++++++++- > arch/microblaze/mm/highmem.c | 10 ++-------- > arch/powerpc/include/asm/highmem.h | 11 ++++++++++- > arch/powerpc/mm/highmem.c | 9 ++------- > arch/x86/include/asm/highmem.h | 11 ++++++++++- > arch/x86/mm/highmem_32.c | 10 ++-------- > 6 files changed, 36 insertions(+), 26 deletions(-) > > diff --git a/arch/microblaze/include/asm/highmem.h b/arch/microblaze/include/asm/highmem.h > index 0c94046f2d58..ec9954b091e1 100644 > --- a/arch/microblaze/include/asm/highmem.h > +++ b/arch/microblaze/include/asm/highmem.h > @@ -51,7 +51,16 @@ extern pte_t *pkmap_page_table; > #define PKMAP_NR(virt) ((virt - PKMAP_BASE) >> PAGE_SHIFT) > #define PKMAP_ADDR(nr) (PKMAP_BASE + ((nr) << PAGE_SHIFT)) > > -extern void *kmap_atomic_prot(struct page *page, pgprot_t prot); > +extern void *kmap_atomic_high_prot(struct page *page, pgprot_t prot); > +void *kmap_atomic_prot(struct page *page, pgprot_t prot) Shouldn't this be marked inline? The rest looks fine: Reviewed-by: Christoph Hellwig _______________________________________________ linux-snps-arc mailing list linux-snps-arc@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-snps-arc 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.5 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 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 0575CC28CBC for ; Wed, 6 May 2020 06:14:55 +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 AA05620714 for ; Wed, 6 May 2020 06:14:54 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (2048-bit key) header.d=infradead.org header.i=@infradead.org header.b="oP1hjP2O" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org AA05620714 Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=infradead.org 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 49H5sl6vcNzDqml for ; Wed, 6 May 2020 16:14:51 +1000 (AEST) Authentication-Results: lists.ozlabs.org; spf=none (no SPF record) smtp.mailfrom=bombadil.srs.infradead.org (client-ip=2607:7c80:54:e::133; helo=bombadil.infradead.org; envelope-from=batv+6d584a7a2daf23bdd0a2+6100+infradead.org+hch@bombadil.srs.infradead.org; receiver=) Authentication-Results: lists.ozlabs.org; dmarc=none (p=none dis=none) header.from=infradead.org Received: from bombadil.infradead.org (bombadil.infradead.org [IPv6:2607:7c80:54:e::133]) (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 49H5pW310kzDqRv for ; Wed, 6 May 2020 16:12:02 +1000 (AEST) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=bombadil.20170209; h=In-Reply-To:Content-Type:MIME-Version :References:Message-ID:Subject:Cc:To:From:Date:Sender:Reply-To: Content-Transfer-Encoding:Content-ID:Content-Description; bh=P11S868Du0HesvmsqxCwWCcyLr9HALCMySezlQJYbk0=; b=oP1hjP2OSgsVM0gfohwmDa6TcJ pe2nyvwO4gyPy3EogWVPUyLuJPjNyzmhpbMc6GD0yzBaUgwBJpYMZIawh2cAn7pSWJAwKcIy+N0iG 9KkDB6HJKLdpOkO/nyh4dRaVF84SQb2vNPPhyCMtxFB0WAak2bb8S8mhB4zF3CH0ftvBkjXoHBk1j lXn9GQGt6AGvGJ41Jsb/VXUqUImhdk8jGfzPUaJrKaKm9H3m2LOW5RvK+roHmF5va7Rs/3C0Fi/Yg iNoAGMMEenG3ML28zKZZs3mCsUTgT0wAnSwGRhowW6de9Ed1X2TZvrXtds/aJBumQp91Nu+3irWcY Z2xba3Cw==; Received: from hch by bombadil.infradead.org with local (Exim 4.92.3 #3 (Red Hat Linux)) id 1jWDGz-0003zA-SZ; Wed, 06 May 2020 06:11:13 +0000 Date: Tue, 5 May 2020 23:11:13 -0700 From: Christoph Hellwig To: ira.weiny@intel.com Subject: Re: [PATCH V2 05/11] {x86,powerpc,microblaze}/kmap: Move preempt disable Message-ID: <20200506061113.GA5192@infradead.org> References: <20200504010912.982044-1-ira.weiny@intel.com> <20200504010912.982044-6-ira.weiny@intel.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20200504010912.982044-6-ira.weiny@intel.com> X-SRS-Rewrite: SMTP reverse-path rewritten from by bombadil.infradead.org. See http://www.infradead.org/rpr.html 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: Peter Zijlstra , Dave Hansen , dri-devel@lists.freedesktop.org, linux-mips@vger.kernel.org, "James E.J. Bottomley" , Max Filippov , Huang Rui , Paul Mackerras , "H. Peter Anvin" , sparclinux@vger.kernel.org, Dan Williams , Helge Deller , x86@kernel.org, linux-csky@vger.kernel.org, Ingo Molnar , linux-snps-arc@lists.infradead.org, linux-xtensa@linux-xtensa.org, Borislav Petkov , Andy Lutomirski , Thomas Gleixner , linux-arm-kernel@lists.infradead.org, Chris Zankel , Thomas Bogendoerfer , linux-parisc@vger.kernel.org, linux-kernel@vger.kernel.org, Christian Koenig , Andrew Morton , linuxppc-dev@lists.ozlabs.org, "David S. Miller" Errors-To: linuxppc-dev-bounces+linuxppc-dev=archiver.kernel.org@lists.ozlabs.org Sender: "Linuxppc-dev" On Sun, May 03, 2020 at 06:09:06PM -0700, ira.weiny@intel.com wrote: > From: Ira Weiny > > During this kmap() conversion series we must maintain bisect-ability. > To do this, kmap_atomic_prot() in x86, powerpc, and microblaze need to > remain functional. > > Create a temporary inline version of kmap_atomic_prot within these > architectures so we can rework their kmap_atomic() calls and then lift > kmap_atomic_prot() to the core. > > Signed-off-by: Ira Weiny > > --- > Changes from V1: > New patch > --- > arch/microblaze/include/asm/highmem.h | 11 ++++++++++- > arch/microblaze/mm/highmem.c | 10 ++-------- > arch/powerpc/include/asm/highmem.h | 11 ++++++++++- > arch/powerpc/mm/highmem.c | 9 ++------- > arch/x86/include/asm/highmem.h | 11 ++++++++++- > arch/x86/mm/highmem_32.c | 10 ++-------- > 6 files changed, 36 insertions(+), 26 deletions(-) > > diff --git a/arch/microblaze/include/asm/highmem.h b/arch/microblaze/include/asm/highmem.h > index 0c94046f2d58..ec9954b091e1 100644 > --- a/arch/microblaze/include/asm/highmem.h > +++ b/arch/microblaze/include/asm/highmem.h > @@ -51,7 +51,16 @@ extern pte_t *pkmap_page_table; > #define PKMAP_NR(virt) ((virt - PKMAP_BASE) >> PAGE_SHIFT) > #define PKMAP_ADDR(nr) (PKMAP_BASE + ((nr) << PAGE_SHIFT)) > > -extern void *kmap_atomic_prot(struct page *page, pgprot_t prot); > +extern void *kmap_atomic_high_prot(struct page *page, pgprot_t prot); > +void *kmap_atomic_prot(struct page *page, pgprot_t prot) Shouldn't this be marked inline? The rest looks fine: Reviewed-by: Christoph Hellwig From mboxrd@z Thu Jan 1 00:00:00 1970 From: Christoph Hellwig Date: Wed, 06 May 2020 06:11:13 +0000 Subject: Re: [PATCH V2 05/11] {x86,powerpc,microblaze}/kmap: Move preempt disable Message-Id: <20200506061113.GA5192@infradead.org> List-Id: References: <20200504010912.982044-1-ira.weiny@intel.com> <20200504010912.982044-6-ira.weiny@intel.com> In-Reply-To: <20200504010912.982044-6-ira.weiny@intel.com> MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit To: ira.weiny@intel.com Cc: Peter Zijlstra , Benjamin Herrenschmidt , Dave Hansen , dri-devel@lists.freedesktop.org, linux-mips@vger.kernel.org, "James E.J. Bottomley" , Max Filippov , Huang Rui , Paul Mackerras , "H. Peter Anvin" , sparclinux@vger.kernel.org, Dan Williams , Helge Deller , x86@kernel.org, linux-csky@vger.kernel.org, Ingo Molnar , linux-snps-arc@lists.infradead.org, linux-xtensa@linux-xtensa.org, Borislav Petkov , Andy Lutomirski , Thomas Gleixner , linux-arm-kernel@lists.infradead.org, Chris Zankel , Thomas Bogendoerfer , linux-parisc@vger.kernel.org, linux-kernel@vger.kernel.org, Christian Koenig , Andrew Morton , linuxppc-dev@lists.ozlabs.org, "David S. Miller" On Sun, May 03, 2020 at 06:09:06PM -0700, ira.weiny@intel.com wrote: > From: Ira Weiny > > During this kmap() conversion series we must maintain bisect-ability. > To do this, kmap_atomic_prot() in x86, powerpc, and microblaze need to > remain functional. > > Create a temporary inline version of kmap_atomic_prot within these > architectures so we can rework their kmap_atomic() calls and then lift > kmap_atomic_prot() to the core. > > Signed-off-by: Ira Weiny > > --- > Changes from V1: > New patch > --- > arch/microblaze/include/asm/highmem.h | 11 ++++++++++- > arch/microblaze/mm/highmem.c | 10 ++-------- > arch/powerpc/include/asm/highmem.h | 11 ++++++++++- > arch/powerpc/mm/highmem.c | 9 ++------- > arch/x86/include/asm/highmem.h | 11 ++++++++++- > arch/x86/mm/highmem_32.c | 10 ++-------- > 6 files changed, 36 insertions(+), 26 deletions(-) > > diff --git a/arch/microblaze/include/asm/highmem.h b/arch/microblaze/include/asm/highmem.h > index 0c94046f2d58..ec9954b091e1 100644 > --- a/arch/microblaze/include/asm/highmem.h > +++ b/arch/microblaze/include/asm/highmem.h > @@ -51,7 +51,16 @@ extern pte_t *pkmap_page_table; > #define PKMAP_NR(virt) ((virt - PKMAP_BASE) >> PAGE_SHIFT) > #define PKMAP_ADDR(nr) (PKMAP_BASE + ((nr) << PAGE_SHIFT)) > > -extern void *kmap_atomic_prot(struct page *page, pgprot_t prot); > +extern void *kmap_atomic_high_prot(struct page *page, pgprot_t prot); > +void *kmap_atomic_prot(struct page *page, pgprot_t prot) Shouldn't this be marked inline? The rest looks fine: Reviewed-by: Christoph Hellwig 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=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED 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 637ABC28CBC for ; Wed, 6 May 2020 06:11:22 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (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 3A56D206E6 for ; Wed, 6 May 2020 06:11:22 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="mY5QFmdD" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 3A56D206E6 Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=infradead.org Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-arm-kernel-bounces+infradead-linux-arm-kernel=archiver.kernel.org@lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:Cc:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:In-Reply-To:MIME-Version:References: Message-ID:Subject:To:From:Date:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=EWd8bODoKGYRqkr9P72IqPUYDMHEhu2WnWGi+KeY0vk=; b=mY5QFmdDFDpquB GpiZBA2sL+l+f4CHKaJPusztkyxGJW33kv3sJeU90h67NLMKVDUIOZ295T120eN8VuDKF/wkqXOlz BFxx9ZJ39lRPcPVLwHpg09oHySnsCAD9kiu8LZ86dA/fAv8IgqwAJ1mopxZq0vr0Kjl017Ai+uQ4J C2LWGSSNXDrh/LaAgbodiKvtFJ8U+7LiGNKKmtFsr2z41VC4Fkura49bANgmuThwKEgJjvjWe1YMW RoYqS0mWrLp7hLwIZC1yMWriIEW1v6wqZUMAFnXwgXAjcZwZAWHTNuc875UuNPiDC+D1CUkhPlC1F lJ452I1VYWZ1BxgVQQGQ==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1jWDH7-0003zw-OW; Wed, 06 May 2020 06:11:21 +0000 Received: from hch by bombadil.infradead.org with local (Exim 4.92.3 #3 (Red Hat Linux)) id 1jWDGz-0003zA-SZ; Wed, 06 May 2020 06:11:13 +0000 Date: Tue, 5 May 2020 23:11:13 -0700 From: Christoph Hellwig To: ira.weiny@intel.com Subject: Re: [PATCH V2 05/11] {x86,powerpc,microblaze}/kmap: Move preempt disable Message-ID: <20200506061113.GA5192@infradead.org> References: <20200504010912.982044-1-ira.weiny@intel.com> <20200504010912.982044-6-ira.weiny@intel.com> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <20200504010912.982044-6-ira.weiny@intel.com> X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Peter Zijlstra , Benjamin Herrenschmidt , Dave Hansen , dri-devel@lists.freedesktop.org, linux-mips@vger.kernel.org, "James E.J. Bottomley" , Max Filippov , Huang Rui , Paul Mackerras , "H. Peter Anvin" , sparclinux@vger.kernel.org, Dan Williams , Helge Deller , x86@kernel.org, linux-csky@vger.kernel.org, Ingo Molnar , linux-snps-arc@lists.infradead.org, linux-xtensa@linux-xtensa.org, Borislav Petkov , Andy Lutomirski , Thomas Gleixner , linux-arm-kernel@lists.infradead.org, Chris Zankel , Thomas Bogendoerfer , linux-parisc@vger.kernel.org, linux-kernel@vger.kernel.org, Christian Koenig , Andrew Morton , linuxppc-dev@lists.ozlabs.org, "David S. Miller" Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+infradead-linux-arm-kernel=archiver.kernel.org@lists.infradead.org On Sun, May 03, 2020 at 06:09:06PM -0700, ira.weiny@intel.com wrote: > From: Ira Weiny > > During this kmap() conversion series we must maintain bisect-ability. > To do this, kmap_atomic_prot() in x86, powerpc, and microblaze need to > remain functional. > > Create a temporary inline version of kmap_atomic_prot within these > architectures so we can rework their kmap_atomic() calls and then lift > kmap_atomic_prot() to the core. > > Signed-off-by: Ira Weiny > > --- > Changes from V1: > New patch > --- > arch/microblaze/include/asm/highmem.h | 11 ++++++++++- > arch/microblaze/mm/highmem.c | 10 ++-------- > arch/powerpc/include/asm/highmem.h | 11 ++++++++++- > arch/powerpc/mm/highmem.c | 9 ++------- > arch/x86/include/asm/highmem.h | 11 ++++++++++- > arch/x86/mm/highmem_32.c | 10 ++-------- > 6 files changed, 36 insertions(+), 26 deletions(-) > > diff --git a/arch/microblaze/include/asm/highmem.h b/arch/microblaze/include/asm/highmem.h > index 0c94046f2d58..ec9954b091e1 100644 > --- a/arch/microblaze/include/asm/highmem.h > +++ b/arch/microblaze/include/asm/highmem.h > @@ -51,7 +51,16 @@ extern pte_t *pkmap_page_table; > #define PKMAP_NR(virt) ((virt - PKMAP_BASE) >> PAGE_SHIFT) > #define PKMAP_ADDR(nr) (PKMAP_BASE + ((nr) << PAGE_SHIFT)) > > -extern void *kmap_atomic_prot(struct page *page, pgprot_t prot); > +extern void *kmap_atomic_high_prot(struct page *page, pgprot_t prot); > +void *kmap_atomic_prot(struct page *page, pgprot_t prot) Shouldn't this be marked inline? The rest looks fine: Reviewed-by: Christoph Hellwig _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel