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 Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by smtp.lore.kernel.org (Postfix) with ESMTP id EDE3AC48BF8 for ; Thu, 22 Feb 2024 11:51:37 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id DA3076B0089; Thu, 22 Feb 2024 06:51:16 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id CA4EE6B008A; Thu, 22 Feb 2024 06:51:16 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id AA7DD6B008C; Thu, 22 Feb 2024 06:51:16 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0015.hostedemail.com [216.40.44.15]) by kanga.kvack.org (Postfix) with ESMTP id 903F66B0089 for ; Thu, 22 Feb 2024 06:51:16 -0500 (EST) Received: from smtpin21.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay06.hostedemail.com (Postfix) with ESMTP id 68A87A11E3 for ; Thu, 22 Feb 2024 11:51:16 +0000 (UTC) X-FDA: 81819274152.21.FECBA8B Received: from mail-wr1-f47.google.com (mail-wr1-f47.google.com [209.85.221.47]) by imf12.hostedemail.com (Postfix) with ESMTP id 9366F40011 for ; Thu, 22 Feb 2024 11:51:14 +0000 (UTC) Authentication-Results: imf12.hostedemail.com; dkim=pass header.d=ionos.com header.s=google header.b=YurKPvH9; spf=pass (imf12.hostedemail.com: domain of max.kellermann@ionos.com designates 209.85.221.47 as permitted sender) smtp.mailfrom=max.kellermann@ionos.com; dmarc=pass (policy=quarantine) header.from=ionos.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1708602674; 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-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:dkim-signature; bh=+Ry2UB7dcYeDT9zlEEyR0ChQEn3iuoF+FIIQJnSpSl4=; b=NWAOCSBdLu4xkGyRyQVqMgeOMNhLGSxtLcaINJAFuiL1wUxTtLFf7it5MdziJAtYtceGSV jczOOZKyR5XU6ZQk0tNlZKF1nD+82NayK3sPRmVir4v9n/xcDJ9EAjr681rlGU9AwoKHcy 9wE3c4MriTkUaq4V2qHJxcZeZZnJB9g= ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1708602674; a=rsa-sha256; cv=none; b=HFkmigJoZtzsziz+Jt9W+0Hlx8bWRthZibR7TSz4OJ+K3pmsfSS3r+HtrqzAcp2hS93YTV 7OqtBDOB+adb0xhNdAPmqcTla9HKabPPWqtSNGdd6LQEv0y5w1KsjuEdlJgx1F+ZyOShnF 408kIxDz+2gEdil20IHs+Nxm/P1jL+w= ARC-Authentication-Results: i=1; imf12.hostedemail.com; dkim=pass header.d=ionos.com header.s=google header.b=YurKPvH9; spf=pass (imf12.hostedemail.com: domain of max.kellermann@ionos.com designates 209.85.221.47 as permitted sender) smtp.mailfrom=max.kellermann@ionos.com; dmarc=pass (policy=quarantine) header.from=ionos.com Received: by mail-wr1-f47.google.com with SMTP id ffacd0b85a97d-33d18931a94so1383259f8f.1 for ; Thu, 22 Feb 2024 03:51:14 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ionos.com; s=google; t=1708602673; x=1709207473; darn=kvack.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=+Ry2UB7dcYeDT9zlEEyR0ChQEn3iuoF+FIIQJnSpSl4=; b=YurKPvH9CIoVZ13a523SrFsJjC0KoqhbPHu2yPfRt3b/DPLDtBBrnQyN5VOEHpA0v3 Wemv82/LY3oOXbViY88ZuCvUUN847Z/VBJBYHJhOzgIdS54N8J3bXYaxYcsXdJavjXeF AOuhQliKCxdpQqo/sahsdKOibtrjGU3c7VA9Lr6uvNGAbKwU+0qEG/P4o5yjnjmBtACo sWfSLY1/VHMxaUHUFIHEM2rJHBfMaVKrUYyNjq0fs7mjbA8v7XIX2CZMgGfeuSWxkAfx 0dWuFdVuUXChJyZY5T4hfBkVTN+JLkuxd0rZGBKlhF0ZlZJ5ZYMhjflE8qWXRn+CT9Zk wHIA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1708602673; x=1709207473; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=+Ry2UB7dcYeDT9zlEEyR0ChQEn3iuoF+FIIQJnSpSl4=; b=FFNvOEKYdfL0kuWNU5sTSViYvm48oe6hShzGNjHMTZMxTbSEsEXnCXmGSa3zzcj2as f+RJVxagbi1Ajgk9Qpy6YT/WBBIQWOFjRfvcztE6b9li4bRlSfv16GSEtyG5OzwZqYF+ 0vdztZtuzX6bhd72b3nA7XvGt8rFcEP5jU7TJT0+Vq7Ndpvnj/btAxlT5PKwYdbdmrCY OE0XrCv6S/kIQE081PoofQZBUOj+MmQnOZ+dmPyiFOfe8hNRId9bXMEmto52GAODVq7r JT6Vl2w8QUeMLQ7pdNnd6B+Hy7HNg+f/F+4IPxiPOR6VPJSGrjUj7LmCQweoDzWgB/X4 79SQ== X-Forwarded-Encrypted: i=1; AJvYcCXjGx6bH1cCBNShheGuDVzifvNJqfy0KNghaZrYMPROCuQnYUIcWco6CFgwnOW54fjGrNbD62jFLxyP+TGvjdq+afw= X-Gm-Message-State: AOJu0Yw7iIfHznr5NgeIpnEO9cTSDqQ2B+diJCysVCxmj6todMsroPL6 eUoZvoioaigabtjblOn6MSXtnK5eSwckWOxPiwrDb0jgFvZAtA5DxUdfIGAxPP4= X-Google-Smtp-Source: AGHT+IHkn7Kv2cDL9TKEn0TXsN6T76wIe9NTlaJgmzsTsJCs2KhPmArE67c6S0bklL8r6dKwaNFpGw== X-Received: by 2002:a5d:5962:0:b0:33d:3a0e:9168 with SMTP id e34-20020a5d5962000000b0033d3a0e9168mr9439866wri.3.1708602673418; Thu, 22 Feb 2024 03:51:13 -0800 (PST) Received: from raven.intern.cm-ag (p200300dc6f010900023064fffe740809.dip0.t-ipconnect.de. [2003:dc:6f01:900:230:64ff:fe74:809]) by smtp.gmail.com with ESMTPSA id co18-20020a0560000a1200b0033d4c3b0beesm15044920wrb.19.2024.02.22.03.51.12 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 22 Feb 2024 03:51:12 -0800 (PST) From: Max Kellermann To: akpm@linux-foundation.org, linux-mm@kvack.org, linux-kernel@vger.kernel.org Cc: willy@infradead.org, Max Kellermann Subject: [PATCH v2 12/14] linux/mm.h: move is_vmalloc_addr() to mm/vmalloc_addr.h Date: Thu, 22 Feb 2024 12:50:53 +0100 Message-Id: <20240222115055.1172877-13-max.kellermann@ionos.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20240222115055.1172877-1-max.kellermann@ionos.com> References: <20240222115055.1172877-1-max.kellermann@ionos.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: 9366F40011 X-Rspam-User: X-Rspamd-Server: rspam11 X-Stat-Signature: f8szcw6e13847tiqewrh7o4j6qn9kf5w X-HE-Tag: 1708602674-467455 X-HE-Meta: U2FsdGVkX1+H6MaGhA44aPiLfkuPsHzB00xxHwaEe4yaJOaxuZELnUkMENsUPhhqLLTtZMpsJhz09acKc6WjDYnaL1AAly7O7OJSTx4KIixW+3QdUGvloCMyt7qr+ShVv00qi82ddvYsDCZKGIlwfmkxgOYMBolPstWTtKtkJdRQr6K6CDUnW8e/RHQBPJx+SesMunudQekAdDW6hwKG/yP+uFK184glGz3Zs9O+tefGyYng4nrG5rWh9Tj5JSmZbteX3b/sWcDJWDSRSnMxFlnJBnU9MvtA5m52TRvOQGnBANEv4yG2fxkepy+PtbjHFNPYXae4QMTpNtXhEC/RhVTQkcT1VWWbMlGdLphK2TIdxsSZXQ1167N9t8tXh+bEnJNfbv8ZYNWZBPkpTjumRUwXcr6E2lQU7/Z+nbXeLJzVZ8GfTAUu7Sv59msIdpYYtVwOpFC6XS3NYeLuHhCiIo+e1+XA/6+QF1Ole4RAoCmKghB/4yUD/x29JNyixBlRqPP5yjhIoD8scsbQSFiu4uM3Au87FoYbTM8bZuIKNCCnGy1KASN9GkxrGdKF6LOPDIefDjBVsjnvej0AP2opRCY5xo/3/EZQDvCyCk+gaVq8w4EZNS3XHuu9AhyOpZLZGfIQnb8maukhEC9eJlrnkh7QoUFU9giLL9EMdEFVmsZGyBWlOFrizwmPSTvD3pTXYwwSisf/mS42EnWV3DjscTcShL+Rl6mfcgZRixEokHi2nexITsluHi/v2HFjgFyYYJIaT8wzA+inpi/FzxW2NjwCj5Bl9qTvbPAiUTgLHI88sOf5b8UP4IKBVmYi0Ec+WeYL/+6BDgTCBJQsL/bK8QOanwbdrYtaORfU47qpTf+E/Tx1lYDx/11ZCgZVzdUMUtY+3M9t1uzzLl9H5/vAi+2HJxLt5wMAUAizbtLisZ5v8GSudkT9Y5oHXpthxcK0+B0KPXX1GJQsUpvL0gT nVMUuzyh Txq6PnymossmmnCUUNcPQyE1vvk0PmiJ3pdHwQhWBf2veJxQjv+A3Xsezl9KVo/z4wicM6+G56yfF0GmijLxLOPziI3PJoPORGzifpJjJbFYMcTB7PG1jAsA0F8VkWhVn4HQvhmyBjBX00Q6DXQaZD6dfRA2M+i/c7duY 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: List-Subscribe: List-Unsubscribe: This is needed to eliminate linux/dma-mapping.h's dependency on linux/mm.h. Signed-off-by: Max Kellermann --- include/linux/mm.h | 25 +------------------------ include/linux/mm/vmalloc_addr.h | 33 +++++++++++++++++++++++++++++++++ 2 files changed, 34 insertions(+), 24 deletions(-) create mode 100644 include/linux/mm/vmalloc_addr.h diff --git a/include/linux/mm.h b/include/linux/mm.h index 68228f43e7ca..ad5971219ef6 100644 --- a/include/linux/mm.h +++ b/include/linux/mm.h @@ -9,6 +9,7 @@ #include #include #include +#include #include #include #include @@ -1072,30 +1073,6 @@ enum { int region_intersects(resource_size_t offset, size_t size, unsigned long flags, unsigned long desc); -/* Support for virtually mapped pages */ -struct page *vmalloc_to_page(const void *addr); -unsigned long vmalloc_to_pfn(const void *addr); - -/* - * Determine if an address is within the vmalloc range - * - * On nommu, vmalloc/vfree wrap through kmalloc/kfree directly, so there - * is no special casing required. - */ -#ifdef CONFIG_MMU -extern bool is_vmalloc_addr(const void *x); -extern int is_vmalloc_or_module_addr(const void *x); -#else -static inline bool is_vmalloc_addr(const void *x) -{ - return false; -} -static inline int is_vmalloc_or_module_addr(const void *x) -{ - return 0; -} -#endif - /* * How many times the entire folio is mapped as a single unit (eg by a * PMD or PUD entry). This is probably not what you want, except for diff --git a/include/linux/mm/vmalloc_addr.h b/include/linux/mm/vmalloc_addr.h new file mode 100644 index 000000000000..86ad2dc94960 --- /dev/null +++ b/include/linux/mm/vmalloc_addr.h @@ -0,0 +1,33 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +#ifndef _LINUX_MM_VMALLOC_ADDR_H +#define _LINUX_MM_VMALLOC_ADDR_H + +#include // for bool + +struct page; + +/* Support for virtually mapped pages */ +struct page *vmalloc_to_page(const void *addr); +unsigned long vmalloc_to_pfn(const void *addr); + +/* + * Determine if an address is within the vmalloc range + * + * On nommu, vmalloc/vfree wrap through kmalloc/kfree directly, so there + * is no special casing required. + */ +#ifdef CONFIG_MMU +extern bool is_vmalloc_addr(const void *x); +extern int is_vmalloc_or_module_addr(const void *x); +#else +static inline bool is_vmalloc_addr(const void *x) +{ + return false; +} +static inline int is_vmalloc_or_module_addr(const void *x) +{ + return 0; +} +#endif + +#endif /* _LINUX_MM_VMALLOC_ADDR_H */ -- 2.39.2