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=-5.3 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_SANE_1 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 F15E2C32753 for ; Wed, 14 Aug 2019 09:31:38 +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 C4F23204EC for ; Wed, 14 Aug 2019 09:31:38 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="kBVw589M" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org C4F23204EC Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=arm.com 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=4X482ZN5mRmL3jXOxdnOPraeZ6abH9iazby6+ca66YI=; b=kBVw589MWKQYtE QArXh2NfctAClOY0CkMV+qnWQhGWbYJug6pr91TL0F1QaB5prfI5PWXsuU+M2FLEDyhR1AEHfEI4M SbFWWVlHyKMpPXR7lKR+OdRNUExQmhGt98GKQ07iUwXQGErY37OFyLRkjnpUT3KMGjeVVYiBe+ZpF 6JDR7thSiHw1domFUpVRoD1HuCia1TkeMD+S1VWK4dwhKmqa5CGfaUV8KgLiUB5IU/bnQVo2E8zKh FlIkck+G+vYOY/+cAVrdc6NaysiABt6F+gC9AvY2x9GzyfIrwYyBko4qIt7X4XiE4vSB8isrLQvWi lqwKUsH8/C05zGa5eIXw==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.92 #3 (Red Hat Linux)) id 1hxpd4-0006E7-Ea; Wed, 14 Aug 2019 09:31:38 +0000 Received: from foss.arm.com ([217.140.110.172]) by bombadil.infradead.org with esmtp (Exim 4.92 #3 (Red Hat Linux)) id 1hxpbr-0005Ei-EC for linux-arm-kernel@lists.infradead.org; Wed, 14 Aug 2019 09:30:24 +0000 Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.121.207.14]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id AE48E344; Wed, 14 Aug 2019 02:30:22 -0700 (PDT) Received: from arrakis.emea.arm.com (arrakis.cambridge.arm.com [10.1.196.78]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPSA id AC6AA3F694; Wed, 14 Aug 2019 02:30:21 -0700 (PDT) Date: Wed, 14 Aug 2019 10:30:19 +0100 From: Catalin Marinas To: Will Deacon Subject: Re: [PATCH 3/8] arm64: memory: Rewrite default page_to_virt()/virt_to_page() Message-ID: <20190814093019.GC50688@arrakis.emea.arm.com> References: <20190813170149.26037-1-will@kernel.org> <20190813170149.26037-4-will@kernel.org> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <20190813170149.26037-4-will@kernel.org> User-Agent: Mutt/1.10.1 (2018-07-13) X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20190814_023023_754545_5B794A61 X-CRM114-Status: GOOD ( 10.60 ) 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: Mark Rutland , Steve Capper , Andrey Konovalov , Geert Uytterhoeven , Qian Cai , linux-arm-kernel@lists.infradead.org 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 Tue, Aug 13, 2019 at 06:01:44PM +0100, Will Deacon wrote: > diff --git a/arch/arm64/include/asm/memory.h b/arch/arm64/include/asm/memory.h > index 47b4dc73b8bf..77074b3a1025 100644 > --- a/arch/arm64/include/asm/memory.h > +++ b/arch/arm64/include/asm/memory.h > @@ -313,19 +313,18 @@ static inline void *phys_to_virt(phys_addr_t x) > #if !defined(CONFIG_SPARSEMEM_VMEMMAP) || defined(CONFIG_DEBUG_VIRTUAL) > #define virt_to_page(kaddr) pfn_to_page(__pa(kaddr) >> PAGE_SHIFT) > #else > -#define __virt_to_pgoff(kaddr) (((u64)(kaddr) - PAGE_OFFSET) / PAGE_SIZE * sizeof(struct page)) > -#define __page_to_voff(kaddr) (((u64)(kaddr) - VMEMMAP_START) * PAGE_SIZE / sizeof(struct page)) > - > -#define page_to_virt(page) ({ \ > - unsigned long __addr = \ > - ((__page_to_voff(page)) + PAGE_OFFSET); \ > - const void *__addr_tag = \ > - __tag_set((void *)__addr, page_kasan_tag(page)); \ > - ((void *)__addr_tag); \ > +#define page_to_virt(x) ({ \ > + __typeof__(x) __page = x; \ Why not struct page * directly here? Either way: Reviewed-by: Catalin Marinas _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel