From patchwork Fri Jun 9 07:55:24 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Baoquan He X-Patchwork-Id: 13273365 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by smtp.lore.kernel.org (Postfix) with ESMTP id 7ABF7C7EE2F for ; Fri, 9 Jun 2023 07:57:33 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 136468E000C; Fri, 9 Jun 2023 03:57:33 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 071F08E0008; Fri, 9 Jun 2023 03:57:33 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id E2DE58E000C; Fri, 9 Jun 2023 03:57:32 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0014.hostedemail.com [216.40.44.14]) by kanga.kvack.org (Postfix) with ESMTP id CDB928E0008 for ; Fri, 9 Jun 2023 03:57:32 -0400 (EDT) Received: from smtpin22.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay01.hostedemail.com (Postfix) with ESMTP id 9EA3E1C71D0 for ; Fri, 9 Jun 2023 07:57:32 +0000 (UTC) X-FDA: 80882454744.22.E92F47B Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by imf07.hostedemail.com (Postfix) with ESMTP id ED80A4001B for ; Fri, 9 Jun 2023 07:57:30 +0000 (UTC) Authentication-Results: imf07.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=NbYybZwI; dmarc=pass (policy=none) header.from=redhat.com; spf=pass (imf07.hostedemail.com: domain of bhe@redhat.com designates 170.10.129.124 as permitted sender) smtp.mailfrom=bhe@redhat.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1686297451; h=from:from:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:dkim-signature; bh=pRjmDB/MhJX2uAhXZR6PcmrnbkF0aNZomeUUr4ZAM3o=; b=fFZvJ44nZkg69xE5sTiL0NPMsjKTJwmQLQcasobjI1qI95N59+NLVWQDtrnSybg8jX0SUL EydaDmywofsSO9g5KOeCpV5a/3amoofAFwzVNFDPhKVFTKtMEKv9li88p8wCdkLkdv6eE2 QTzL9qQ+wTv1ZgwH/cpdpctAKP1pfyI= ARC-Authentication-Results: i=1; imf07.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=NbYybZwI; dmarc=pass (policy=none) header.from=redhat.com; spf=pass (imf07.hostedemail.com: domain of bhe@redhat.com designates 170.10.129.124 as permitted sender) smtp.mailfrom=bhe@redhat.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1686297451; a=rsa-sha256; cv=none; b=qpng7FpfFiyrPPf6q9krU/ZpRH2LE5BSD8o+f7GvxzDwKO6iPgE7VoIRtbkCdQOTBSxwZE s63d7SYjBmy+0gFYLU9GKUEwx2Oz3aygMyWt/JcdhUNfhwawVgKARK9AeY7M/w0zpu0GwQ EoPeLoYoVb2kSTXCHnBLdTDVhXy8CMo= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1686297450; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=pRjmDB/MhJX2uAhXZR6PcmrnbkF0aNZomeUUr4ZAM3o=; b=NbYybZwIRGDTXpSOOkx43P9kYFStKP4GX8VkOzz5GENzdshU6uSMGJkuHDUePN75BbvDgv JGs3Pzy6sHdKeyxSzH0UbN5xvum+UgynBxVA5jwwKYJ6xK9EWPIbvg8myIG0DSAEck4+4p wftgOGfAQxwXd2UqyDw36v6h8/if0fE= Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-437-Rqd3XGSRMJmpF0VEV5s9pg-1; Fri, 09 Jun 2023 03:57:24 -0400 X-MC-Unique: Rqd3XGSRMJmpF0VEV5s9pg-1 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.rdu2.redhat.com [10.11.54.4]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id AEC4280120A; Fri, 9 Jun 2023 07:57:23 +0000 (UTC) Received: from MiWiFi-R3L-srv.redhat.com (ovpn-12-92.pek2.redhat.com [10.72.12.92]) by smtp.corp.redhat.com (Postfix) with ESMTP id 244B620268C6; Fri, 9 Jun 2023 07:57:17 +0000 (UTC) From: Baoquan He To: linux-kernel@vger.kernel.org Cc: linux-arch@vger.kernel.org, linux-mm@kvack.org, arnd@arndb.de, christophe.leroy@csgroup.eu, hch@lst.de, rppt@kernel.org, willy@infradead.org, agordeev@linux.ibm.com, wangkefeng.wang@huawei.com, schnelle@linux.ibm.com, David.Laight@ACULAB.COM, shorne@gmail.com, deller@gmx.de, Baoquan He Subject: [PATCH v6 15/19] mm/ioremap: Consider IOREMAP space in generic ioremap Date: Fri, 9 Jun 2023 15:55:24 +0800 Message-Id: <20230609075528.9390-16-bhe@redhat.com> In-Reply-To: <20230609075528.9390-1-bhe@redhat.com> References: <20230609075528.9390-1-bhe@redhat.com> MIME-Version: 1.0 Content-type: text/plain X-Scanned-By: MIMEDefang 3.1 on 10.11.54.4 X-Rspam-User: X-Rspamd-Server: rspam12 X-Rspamd-Queue-Id: ED80A4001B X-Stat-Signature: p4r544qcw8hn1jc8r6tpf4skg8thdwtq X-HE-Tag: 1686297450-211697 X-HE-Meta: U2FsdGVkX1/3NVnlOxVzy9YKOXef+XVriqABbcmDzyJ+MP4vWSxCykoMoK2Jv+YAuva5n8ruhGTq94/mK7spO2jALMqRLpj0m0XgF8eSNU0u0ERFrKRtyh03z4BSpTCvSoFnkz9pkuFE89XwB1Acdf/cxnG7gqbKGD3xe/4P/rxJ+8HZEoI6J1d+9WgGpWs92aHAJhhACqwe15kWz0nUllnAaw/MeE384O7CNBoVh732LoyVCY7nq62wLwaJHkOFjd94rEgsshmjzsVWBou7MGV2bieOs59RnwBZfMdjb1azrMNhy962WNSebMp5wO8eRBMph1Xszok68uSPBR6/OSuE8zQBejqSCfkZ6ji+URwSJeAVevk1dH11GKZKaFub/GZs7YYSrhNFd6G6MpQbw3T106JnuCiyXIsw2Y1tSJ7QWZyoXZl9wZFZReNL1cTYPMZ/9jK+9S5zB6H/sU9QPe8nRYaW7Tfw6ZEQSa7wCRq5nknI+ymxNty++Oreupcvx96zPtbBevy0Bmtf5GAmD6K1ghvhhShn+hx1x0U+ilwC850E+hS2M2zo3vM6yT78ydMZ8A8iNXd+N1O/6iLLwaTjnwSEHAY2Ns3yr1IMmGeGLieoXwBV6Eze57PSxdoyjkrh8kRJ9dzWHSFXrX4Z7ZmeuMekbmu14HgwbTrhJqrmp50ITHWRHk2vlwBGowwMlSJwtL/QkmXq4CxYfizH8zwYBfbxegFv+DwA+2/IG0QliVSQ7hY6wIHCXiVboGbI6YzmMX9XE5pGzmqA3fZdX19rdUq1WNpwTKyz3Kt+XQKB5FfJoMcxtj6oLq/JoOq92G/hzbRLqw160alNkW5SpLXNK7jzt9s0OYmHgRZaV0T+Fi/xkPzn5vfxYNbwXD/C0cPMDpI/Pvzm3d83jFL7EN01xUlKCBpR70PYH2GcyYWxVLIG0DMCJP29GEMdKUO+YoWMLGKepLiuaeqcQ03 sphGfWtB 7yIaNqodaq7jYWoi4o4ExaS8YkIiTrQrkyI5Lpw8g2LLE36MHbhhuX12rj26aJVVdmBXSp8xrpHd/NLyuxG+QLeom8vBMaGmSUrmKhBdOyXB6jIM1z1NxSaA9bzaPwCSr6znnzduxFAccm3ZT31ODf0LhUv14Urwhgv6eekpptfK7ZgPxu4hL/3XoCQtUsiqIvSXYjwO+nruwwpUf5QosjJgUSq0EGY1uvv55CEUyo+MI8YY= 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: From: Christophe Leroy Architectures like powerpc have a dedicated space for IOREMAP mappings. If so, use it in generic_ioremap_prot(). Signed-off-by: Christophe Leroy Signed-off-by: Baoquan He Reviewed-by: Christoph Hellwig --- v5->v6: Add definition of IOREMAP_START|END in mm/ioremap.c so that we can call __get_vm_area_caller() for all ARCH-es - Christoph mm/ioremap.c | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/mm/ioremap.c b/mm/ioremap.c index 86b82ec27d2b..68d9895144ad 100644 --- a/mm/ioremap.c +++ b/mm/ioremap.c @@ -11,6 +11,15 @@ #include #include +/* + * Ioremap often, but not always uses the generic vmalloc area. E.g on + * Power ARCH, it could have different ioremap space. + */ +#ifndef IOREMAP_START +#define IOREMAP_START VMALLOC_START +#define IOREMAP_END VMALLOC_END +#endif + void __iomem *generic_ioremap_prot(phys_addr_t phys_addr, size_t size, pgprot_t prot) { @@ -35,8 +44,8 @@ void __iomem *generic_ioremap_prot(phys_addr_t phys_addr, size_t size, if (!ioremap_allowed(phys_addr, size, pgprot_val(prot))) return NULL; - area = get_vm_area_caller(size, VM_IOREMAP, - __builtin_return_address(0)); + area = __get_vm_area_caller(size, VM_IOREMAP, IOREMAP_START, + IOREMAP_END, __builtin_return_address(0)); if (!area) return NULL; vaddr = (unsigned long)area->addr; @@ -66,7 +75,7 @@ void generic_iounmap(volatile void __iomem *addr) if (!iounmap_allowed(vaddr)) return; - if (is_vmalloc_addr(vaddr)) + if (is_ioremap_addr(vaddr)) vunmap(vaddr); }