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 DD587C54E41 for ; Tue, 5 Mar 2024 08:59:44 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 45A056B008A; Tue, 5 Mar 2024 03:59:41 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 3BBAE6B008C; Tue, 5 Mar 2024 03:59:41 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 1E7E76B0093; Tue, 5 Mar 2024 03:59:41 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0011.hostedemail.com [216.40.44.11]) by kanga.kvack.org (Postfix) with ESMTP id 09FE96B008A for ; Tue, 5 Mar 2024 03:59:41 -0500 (EST) Received: from smtpin26.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay10.hostedemail.com (Postfix) with ESMTP id CA1D9C0DB4 for ; Tue, 5 Mar 2024 08:59:40 +0000 (UTC) X-FDA: 81862387320.26.6B42E0C Received: from mail-ej1-f45.google.com (mail-ej1-f45.google.com [209.85.218.45]) by imf01.hostedemail.com (Postfix) with ESMTP id 138784000F for ; Tue, 5 Mar 2024 08:59:38 +0000 (UTC) Authentication-Results: imf01.hostedemail.com; dkim=pass header.d=ionos.com header.s=google header.b=bCqXWWi1; dmarc=pass (policy=quarantine) header.from=ionos.com; spf=pass (imf01.hostedemail.com: domain of max.kellermann@ionos.com designates 209.85.218.45 as permitted sender) smtp.mailfrom=max.kellermann@ionos.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1709629179; 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=yHNy+forpiTP10uEWDszfRKNVIJTNDDzicOChwXOTNY=; b=zHW+ASAV1eHgbHes8vVW2lb/rRztV7PKap6b3QfMCOBRF/Lot6bD6GZ+jhh7kveyNZOoLX QP0YPJ/RSLvdtjL6Oxu/q09QyNXiY53BLL2e4zMqfV1eo0NE9B4nrWv9EXPF0wxm6uqvPm KCKkzO+eDeShrk9aDLsbVZ/yjm1Mato= ARC-Authentication-Results: i=1; imf01.hostedemail.com; dkim=pass header.d=ionos.com header.s=google header.b=bCqXWWi1; dmarc=pass (policy=quarantine) header.from=ionos.com; spf=pass (imf01.hostedemail.com: domain of max.kellermann@ionos.com designates 209.85.218.45 as permitted sender) smtp.mailfrom=max.kellermann@ionos.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1709629179; a=rsa-sha256; cv=none; b=a9bELQaDKuP9+9moWTqtrXMf4LFC4JAtZU2YFVPOZgQzn4r+K8kUszlewfB6ExNc2b3rkx 2iP8JTRR+Qhojy2NDAaSAn3oLNy/e5N8hvuaauaBfvXqua2GYlsRnJU88ce9+ZYknOZ2bZ NlmfL+LzCrPPN8k/k/p+4hUx1ELR3hc= Received: by mail-ej1-f45.google.com with SMTP id a640c23a62f3a-a452877ddcaso257852566b.3 for ; Tue, 05 Mar 2024 00:59:38 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ionos.com; s=google; t=1709629177; x=1710233977; 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=yHNy+forpiTP10uEWDszfRKNVIJTNDDzicOChwXOTNY=; b=bCqXWWi1dktZaiJVyelZXah1mfC+Tgf5/wZrUjI3lPf26b9JTw3K+Jx0wckRUDFbyq Ck9C0Px9yN9qpbGZZcnF4jRe5BFj5ImtvhAvaaqcM8a7JSPFM659iOwfBSIUzEMsW9Pl Ql4n51/TX/hCVIF3VPy8blRZs6LX+PCuLecfHL1T17jBmmgnupUTYzvsqjm3t6s2b5d2 /2wll3qAB7gTqN7tBWK2QxSTaHWuGm+K3dk9Zz6KsSAc2Ea9W2vuMWXKBhE39cg6RLtr gG043YcGE1l9rCHeILOdOxiekijmeAfBoCYEiB1wuUNwgRev4gi4WD507Nj1OJNnFduR SVJA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1709629177; x=1710233977; 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=yHNy+forpiTP10uEWDszfRKNVIJTNDDzicOChwXOTNY=; b=g6xW8tN/MtfcY4s97858j9V8pnY/c+ImuwyKqT72MDdqdApORa3ztvLr0DwITFcdiZ vxeqi+wYGZlAvoeFLgv7Ssf8dqYcnVqI6u8um+XJWaEwRNNZSBjddyCOfSLIiMUnaENq gq4y59+E4H8mSoxVbwnHhy6CR/tifqmxlJjV6QRQ1naXTZiJNNUfC30PskhuzG7OXZ/K m2qTVbYklZq1Kx0U7ImiCtcYyz+iVmVrcdX0Gr5M7Ruh/7aP6lhvnoRBKxTkPc/0I2Yl 3OeVO2m++xJmODt7MFgqKeiRTiWZxfP1Pwd/8f339bbcAKoGUUYHVpUOpCwJQYqhhRAs lrvg== X-Forwarded-Encrypted: i=1; AJvYcCWOanDw4IRjWltGWw/5yqVG4an2bDJLb2cIHP32rME+jSCiWV+S/GbviBJp/VJAq6cREEz5d7zWgljjvEoBARSmZZw= X-Gm-Message-State: AOJu0Yxgkf7Z0zHaQ4+Mr7TGZSqTjI6WgEKFO1LISWnMA0CKN5cRuLIH PoFKjxXaIxVyEz9ilcJ9xh+4sgvvi5ruD476LkNFn3tSvlMMmPGK0CFsJh9b2Mw= X-Google-Smtp-Source: AGHT+IFyEMaXcRKYaPhF1ktAQM4+jtLzlghr9ZNeqLIJk/JzZPpWzQgHVLLePNuDZ+0vJD35Sgn1CA== X-Received: by 2002:a17:906:d8c9:b0:a45:a7e1:62c3 with SMTP id re9-20020a170906d8c900b00a45a7e162c3mr665645ejb.70.1709629177775; Tue, 05 Mar 2024 00:59:37 -0800 (PST) Received: from raven.blarg.de (p200300dc6f010900023064fffe740809.dip0.t-ipconnect.de. [2003:dc:6f01:900:230:64ff:fe74:809]) by smtp.gmail.com with ESMTPSA id gs4-20020a170906f18400b00a449d12cdc5sm4453005ejb.119.2024.03.05.00.59.36 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 05 Mar 2024 00:59:36 -0800 (PST) From: Max Kellermann To: akpm@linux-foundation.org, linux-mm@kvack.org, linux-kernel@vger.kernel.org Cc: willy@infradead.org, sfr@canb.auug.org.au, Max Kellermann Subject: [PATCH v3 03/14] linux/mm.h: move page_kasan_tag() to mm/page_kasan_tag.h Date: Tue, 5 Mar 2024 09:59:08 +0100 Message-Id: <20240305085919.1601395-4-max.kellermann@ionos.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20240305085919.1601395-1-max.kellermann@ionos.com> References: <20240305085919.1601395-1-max.kellermann@ionos.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: 138784000F X-Rspam-User: X-Rspamd-Server: rspam05 X-Stat-Signature: 7nkwx5zbeuyws73izba3c15apx4y45if X-HE-Tag: 1709629178-672799 X-HE-Meta: U2FsdGVkX187xLXKNvBQKUBlCNGCDN1wvC0ZZwYWzUfenaDVg7jeV0tw6HlogoWGYOJsV6KDlMq4Z5Bm7HogczahEZaKM0oEDS6BnG4GsICKJ7rFB+/HoEqdVA4sYjMN5gEsGuUn9EQyTNbWAj3Fawyr/z1hw8DVp4L+bjQ4KfFt3K8vu8PRFLsnkqVwReDzQ6SaWk4BcA2IyFVXTJ3TOeNXN3coHrVWGGJ014xrvMDUjNlnmcBX/90c/S55HP0VBxpyaS21LqKtkf1mE3MBYnJh7WoFTYKKKoQ91r1sS+55MZo/UBobHobYUqCc4DBGYbbaFZoXt1huU+iI/50BvLM2xD2NhGkTOx0f5CkGEsfxs/xljcFszd5Cq1eMg+UEAZCZlv658w2ix0t8At+lV7VcdLLp34mooua3I6TsFmENOiCk3UkNRaL6Ps1zRHkjdoIDqt3RNlEdl4Cu5210GwClwFFZmCAy7ppXf+OngjGWldqLtLwi8s2qFHrf3Yrg3phj4urX4i5GKU1bCO490S8wSTTiPhsmexHdZEGxDwA3akJXLS/u+/SlR+2qoGqPcv10qad6Eex1d7lpqT2oqiwZigiW1yFaT5GL9UlMrTydAfhHbdLtf+OBzFcXCH2AVzgI53cnZosOAtPqNKSuiBGNYi814KnszefnNQqOPlNwle2iM3j8w8MVon8hvMdZLI66E2LXpSbdTA8BjY0GBfUouINGwHY16aCs72xSme5V/HZJEJ0Jqa/bjH6g1J0XT9VafxqlIrcAYvnKH8wxdVsKniad2r/QGHYpO60QVeNA3NdgN0jMjvQcqryqT5K9ryj7Sd+XBRNlNYu1n2ZGJ9UprUcSW4GxSzlGEOXWJ5/qsIloyYVt46+aIaXicMmdT/tlHy+j6uieXc4O2VypcVdibTDDj26aS0ZMOlTAvUDj/C9AucHUh4+c3nOn2wG8XFw6Mi2S5eS2qFeTbRi VWGBMM5U wNlDWfg5g1Lme6HdlUOfVR3ifQbkj59suPvxQDBlLxCF1ONW6JnKeFetQ/lLzuhKECMhtnfWpEAsy/JB9OsD72a/K2WPFi2mNnau2FIso5FDwPA3FFNKRmpu8Yu3aqv6LwfBfX9Lq6Lye358hIPaMnPN9TtJhswVw8ikU 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: Prepare to reduce dependencies on linux/mm.h. page_kasan_tag() is used by the page_to_virt() macro in ARM64 (but asm/memory.h does not include linux/mm.h). Thus, in order to be able to use anything that calls page_to_virt(), linux/mm.h needs to be included. This would prevent us from moving page_address() to a separate header, because it calls lowmem_page_address() which in turn calls page_to_virt(). To prepare for this move, we move page_kasan_tag() out of linux/mm.h into a separate lean header. A side effect of this patch is that the include line is moved inside the "#ifdef CONFIG_KASAN..." block, i.e. it is not included at all if KASAN is disabled. Signed-off-by: Max Kellermann --- MAINTAINERS | 1 + include/linux/mm.h | 56 +------------------------- include/linux/mm/page_kasan_tag.h | 66 +++++++++++++++++++++++++++++++ 3 files changed, 68 insertions(+), 55 deletions(-) create mode 100644 include/linux/mm/page_kasan_tag.h diff --git a/MAINTAINERS b/MAINTAINERS index 9e5bb60c55fe..dbfe08329154 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -14210,6 +14210,7 @@ F: include/linux/mempolicy.h F: include/linux/mempool.h F: include/linux/memremap.h F: include/linux/mm.h +F: include/linux/mm/*.h F: include/linux/mm_*.h F: include/linux/mmzone.h F: include/linux/mmu_notifier.h diff --git a/include/linux/mm.h b/include/linux/mm.h index 0436b919f1c7..e140ee45f49c 100644 --- a/include/linux/mm.h +++ b/include/linux/mm.h @@ -2,6 +2,7 @@ #ifndef _LINUX_MM_H #define _LINUX_MM_H +#include #include #include #include @@ -27,7 +28,6 @@ #include #include #include -#include #include #include @@ -1818,60 +1818,6 @@ static inline void vma_set_access_pid_bit(struct vm_area_struct *vma) } #endif /* CONFIG_NUMA_BALANCING */ -#if defined(CONFIG_KASAN_SW_TAGS) || defined(CONFIG_KASAN_HW_TAGS) - -/* - * KASAN per-page tags are stored xor'ed with 0xff. This allows to avoid - * setting tags for all pages to native kernel tag value 0xff, as the default - * value 0x00 maps to 0xff. - */ - -static inline u8 page_kasan_tag(const struct page *page) -{ - u8 tag = KASAN_TAG_KERNEL; - - if (kasan_enabled()) { - tag = (page->flags >> KASAN_TAG_PGSHIFT) & KASAN_TAG_MASK; - tag ^= 0xff; - } - - return tag; -} - -static inline void page_kasan_tag_set(struct page *page, u8 tag) -{ - unsigned long old_flags, flags; - - if (!kasan_enabled()) - return; - - tag ^= 0xff; - old_flags = READ_ONCE(page->flags); - do { - flags = old_flags; - flags &= ~(KASAN_TAG_MASK << KASAN_TAG_PGSHIFT); - flags |= (tag & KASAN_TAG_MASK) << KASAN_TAG_PGSHIFT; - } while (unlikely(!try_cmpxchg(&page->flags, &old_flags, flags))); -} - -static inline void page_kasan_tag_reset(struct page *page) -{ - if (kasan_enabled()) - page_kasan_tag_set(page, KASAN_TAG_KERNEL); -} - -#else /* CONFIG_KASAN_SW_TAGS || CONFIG_KASAN_HW_TAGS */ - -static inline u8 page_kasan_tag(const struct page *page) -{ - return 0xff; -} - -static inline void page_kasan_tag_set(struct page *page, u8 tag) { } -static inline void page_kasan_tag_reset(struct page *page) { } - -#endif /* CONFIG_KASAN_SW_TAGS || CONFIG_KASAN_HW_TAGS */ - static inline struct zone *page_zone(const struct page *page) { return &NODE_DATA(page_to_nid(page))->node_zones[page_zonenum(page)]; diff --git a/include/linux/mm/page_kasan_tag.h b/include/linux/mm/page_kasan_tag.h new file mode 100644 index 000000000000..1210c62170a3 --- /dev/null +++ b/include/linux/mm/page_kasan_tag.h @@ -0,0 +1,66 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +#ifndef _LINUX_MM_PAGE_KASAN_TAG_H +#define _LINUX_MM_PAGE_KASAN_TAG_H + +#include + +struct page; + +#if defined(CONFIG_KASAN_SW_TAGS) || defined(CONFIG_KASAN_HW_TAGS) + +#include +#include // for struct page + +/* + * KASAN per-page tags are stored xor'ed with 0xff. This allows to avoid + * setting tags for all pages to native kernel tag value 0xff, as the default + * value 0x00 maps to 0xff. + */ + +static inline u8 page_kasan_tag(const struct page *page) +{ + u8 tag = KASAN_TAG_KERNEL; + + if (kasan_enabled()) { + tag = (page->flags >> KASAN_TAG_PGSHIFT) & KASAN_TAG_MASK; + tag ^= 0xff; + } + + return tag; +} + +static inline void page_kasan_tag_set(struct page *page, u8 tag) +{ + unsigned long old_flags, flags; + + if (!kasan_enabled()) + return; + + tag ^= 0xff; + old_flags = READ_ONCE(page->flags); + do { + flags = old_flags; + flags &= ~(KASAN_TAG_MASK << KASAN_TAG_PGSHIFT); + flags |= (tag & KASAN_TAG_MASK) << KASAN_TAG_PGSHIFT; + } while (unlikely(!try_cmpxchg(&page->flags, &old_flags, flags))); +} + +static inline void page_kasan_tag_reset(struct page *page) +{ + if (kasan_enabled()) + page_kasan_tag_set(page, KASAN_TAG_KERNEL); +} + +#else /* CONFIG_KASAN_SW_TAGS || CONFIG_KASAN_HW_TAGS */ + +static inline u8 page_kasan_tag(const struct page *page) +{ + return 0xff; +} + +static inline void page_kasan_tag_set(struct page *page, u8 tag) { } +static inline void page_kasan_tag_reset(struct page *page) { } + +#endif /* CONFIG_KASAN_SW_TAGS || CONFIG_KASAN_HW_TAGS */ + +#endif /* _LINUX_MM_PAGE_KASAN_TAG_H */ -- 2.39.2