From patchwork Thu Jul 6 15:45:16 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Baoquan He X-Patchwork-Id: 13303973 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 D94A0EB64D9 for ; Thu, 6 Jul 2023 15:48:10 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 734F68D0005; Thu, 6 Jul 2023 11:48:10 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 6E4FC8D0003; Thu, 6 Jul 2023 11:48:10 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 585F78D0005; Thu, 6 Jul 2023 11:48:10 -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 46F4D8D0003 for ; Thu, 6 Jul 2023 11:48:10 -0400 (EDT) Received: from smtpin24.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay08.hostedemail.com (Postfix) with ESMTP id 1FB0F140399 for ; Thu, 6 Jul 2023 15:48:10 +0000 (UTC) X-FDA: 80981618340.24.CA291DA Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by imf09.hostedemail.com (Postfix) with ESMTP id 7F7C714001A for ; Thu, 6 Jul 2023 15:48:03 +0000 (UTC) Authentication-Results: imf09.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=IQidm1EC; spf=pass (imf09.hostedemail.com: domain of bhe@redhat.com designates 170.10.133.124 as permitted sender) smtp.mailfrom=bhe@redhat.com; dmarc=pass (policy=none) header.from=redhat.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1688658483; 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=SboB+Gem+bQaB39EZZBPE5ZHPttNaa4nwbopj4kdit4=; b=L2ly8RMbiKgwsuf8/oM+Ft0qzbBK9H2BSwholkBjqe/2+46YMZyicU3e5Co43nIIcCcHNG CW52pWmLu9Xx9CyYHs3opEy+1zjT7ld24A58oef7sVCd+2HonJy/ebpRnADpLANeyDEqYB iUw8ReFQGci1vK11UaPWLG93FaiKQi4= ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1688658483; a=rsa-sha256; cv=none; b=PXbJKtXnKE4vxMRd4d5fGTRHykJHMhiuRdDzOHS5Wg0B7CtDev0ZIp5IhjDNk17PaxNjv/ GE1qnTqHkTqDyNSzOf/fPUrmPo8jqjZgw7CqxOA+ca0g76rVSbQmp9MjBQrqTNqENhA3wb zJWxNJxFoiFz+UNYgBPRzJQteEKaeeU= ARC-Authentication-Results: i=1; imf09.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=IQidm1EC; spf=pass (imf09.hostedemail.com: domain of bhe@redhat.com designates 170.10.133.124 as permitted sender) smtp.mailfrom=bhe@redhat.com; dmarc=pass (policy=none) header.from=redhat.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1688658482; 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=SboB+Gem+bQaB39EZZBPE5ZHPttNaa4nwbopj4kdit4=; b=IQidm1EC58/vjDq6gQE+xUk7FunNqDhtYSJvhh4A3TjvCB/QeDtpdKGtArpqCuha6UPnFz N0vGco5yBHhv5yIAWvEuiggPXz7OuCYkxfafs5vsCbfH8T8ukZUHQ0E/1E1zR3F99nR7vz xUnbwtiJWaLD3DwG8yzas8cdvgwAX2I= 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-102-Zgylzl54Oz6H0HNz3490IA-1; Thu, 06 Jul 2023 11:47:57 -0400 X-MC-Unique: Zgylzl54Oz6H0HNz3490IA-1 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.rdu2.redhat.com [10.11.54.5]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 318981044591; Thu, 6 Jul 2023 15:47:56 +0000 (UTC) Received: from MiWiFi-R3L-srv.redhat.com (ovpn-12-39.pek2.redhat.com [10.72.12.39]) by smtp.corp.redhat.com (Postfix) with ESMTP id C303DF5CF0; Thu, 6 Jul 2023 15:47:48 +0000 (UTC) From: Baoquan He To: linux-kernel@vger.kernel.org Cc: akpm@linux-foundation.org, linux-mm@kvack.org, arnd@arndb.de, hch@lst.de, christophe.leroy@csgroup.eu, rppt@kernel.org, willy@infradead.org, agordeev@linux.ibm.com, wangkefeng.wang@huawei.com, schnelle@linux.ibm.com, shorne@gmail.com, David.Laight@ACULAB.COM, deller@gmx.de, nathan@kernel.org, glaubitz@physik.fu-berlin.de, Baoquan He Subject: [PATCH v8 15/19] mm/ioremap: Consider IOREMAP space in generic ioremap Date: Thu, 6 Jul 2023 23:45:16 +0800 Message-Id: <20230706154520.11257-16-bhe@redhat.com> In-Reply-To: <20230706154520.11257-1-bhe@redhat.com> References: <20230706154520.11257-1-bhe@redhat.com> MIME-Version: 1.0 Content-type: text/plain X-Scanned-By: MIMEDefang 3.1 on 10.11.54.5 X-Rspamd-Queue-Id: 7F7C714001A X-Rspam-User: X-Rspamd-Server: rspam11 X-Stat-Signature: yoqbm5ufrpi9tk6jgq1hg8ac5zouwuj9 X-HE-Tag: 1688658483-751055 X-HE-Meta: U2FsdGVkX18vHMpwxEXTmsAX9V1BM03BQtk3oeaGNiC6WMu31QH2yEg3Uv10o9fLK2PRBtffd7EqcsSurQW4N969AjlMlG5oC7EkyWm5owTF1sCa5BqRHPHiNEz1N7XwhchjeZwkstM38lh8/HC5Iyzjwl4wKgGIWxbwFb+N/G53FWakJSv0gudpHIJOl7bZI9OA1FPTU/Xtzz/7Hz/kGDOX8TMq3QHas2yMoPyULrGi9EFgvvLvNrkJGhJWsjnSNgVtfsF/S8Oko6xwbaAP+sUZxIW062DyOfTK/JBtuRrRNqiIHoligGlO2txB9ymxayqJ6Ac0bFqWiSDy5/Ty6WdBU/eo2LWzAt31XuEx88kJ2Cra2ksPI5vVaZbv2fz5eUQ9UP7iHfHnn4WmWGnMMziic7fdAipdQcRnRETRtgRN5UDm6iWXZEJhBkF1AXJ5NuNoK75SPr4aNP18R7ygho5yxJVTWT0kdVRL8NzHlR+98YD+/HRO/moC1mq7q8q4Lh089WKSxEpOsjRINzaMfFFQKRaZEt5wwMBMJWeVAyRGOJmY7mGyTvoHrJegePYdFjanF3MPMgIHGbD+VXRz3xnKeEp4pEUKg2hcIwyAtGKuU6LmeHDL4O+jFeZ0h27GwsokuwE+EB5tsuU/8JeFSfJlYHg51kHj7zMN7KUZIoj3k9kDDSmgaCPNfxRg8StUecjZ8vJFbxR+uRWzpZd1Ptc7iQY8bkFdVuF07v4Sb7HN48FntgWGpE5qZReO/DCeQkL0+JujhAMchY2Cq1+macA+gzEVdZ40dLqMUwpVR8qferdtaycaQvci4rSIx/jvgnAwEzrh/EduRHTlHif7ndR8YwGQ67YhjlAvHFSxP7kOgh3VaSY+CtT5Kf7gpTywdLo+1qw8ScWL6sZYd4kPtduN7nMR2bjNcVxvNs1+Avesa4Q00MohImp+6hYlTUC9IZF7UXmYfXOI5wDxl8a wC5zzmyP SQYL7siwUD6UCbr1eynkrQfq6fuxs+WaJp4AtbgalxTrTEyIYfevQikgP+6wUNmWdIniv+wnnKZMY9VmNWlk/cgZqMMnq03RY0JV+M/hLZVBJDnfifWvdOCwr6SLqe+k7x0aQ0Ebx+La2W2rEuvuN2VhYSsIxULSQsH/6r71Rxp2k6ULMhzJecAdG7GVJBlzIL+CwjpaWe3TAFNBH5uxMdEOSNvYnZG+DdbBYhy2HM/eJROg= 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 --- 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); }