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 1FCE3C4345F for ; Tue, 30 Apr 2024 15:30:03 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 1DE166B009B; Tue, 30 Apr 2024 11:29:54 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 166F16B009C; Tue, 30 Apr 2024 11:29:54 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id ED3FA6B009D; Tue, 30 Apr 2024 11:29:53 -0400 (EDT) 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 C76C86B009B for ; Tue, 30 Apr 2024 11:29:53 -0400 (EDT) Received: from smtpin09.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay08.hostedemail.com (Postfix) with ESMTP id 6FD93140885 for ; Tue, 30 Apr 2024 15:29:53 +0000 (UTC) X-FDA: 82066583466.09.5FD058A Received: from mail-ed1-f43.google.com (mail-ed1-f43.google.com [209.85.208.43]) by imf09.hostedemail.com (Postfix) with ESMTP id 65B0E140032 for ; Tue, 30 Apr 2024 15:29:51 +0000 (UTC) Authentication-Results: imf09.hostedemail.com; dkim=pass header.d=ionos.com header.s=google header.b=LTeFR6bf; dmarc=pass (policy=quarantine) header.from=ionos.com; spf=pass (imf09.hostedemail.com: domain of max.kellermann@ionos.com designates 209.85.208.43 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=1714490991; 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=+zWX/z6nYSF+/tdZF0rQrJaKpSzMmIZva46DvflyFrA=; b=sVWAozipj6ZFoq88wcEhx3OqD6Jg+/EhYeLyJSbIrmF5y1YMjNqolzXTaa1Ylielv0kohk Ctb3C9pzUzOfFgIZ3XP+FYCwXKJZcY42+Tm5Z5KNSI9YssjfCYsyCsHIEexLcpTsmF2j81 k0qmAZ3EbEE3Bs8oLDzhWvsuzwGBN94= ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1714490991; a=rsa-sha256; cv=none; b=v/COwSVDw/FqyXvNilkO3xxRvU1AaBcl2VqG/RRG3Mpw84JGUVvjblA4jyXfWvbu4PaW/9 k6dqnw6ZxLzP82rW5tE5dGJgH7OFHxOG90BEwfQbQoCVZ6EqG27G5QNAHDZ6hU5obR551F 8VUwdJnMC9FasCJtgxQXWMbYZRs4iIo= ARC-Authentication-Results: i=1; imf09.hostedemail.com; dkim=pass header.d=ionos.com header.s=google header.b=LTeFR6bf; dmarc=pass (policy=quarantine) header.from=ionos.com; spf=pass (imf09.hostedemail.com: domain of max.kellermann@ionos.com designates 209.85.208.43 as permitted sender) smtp.mailfrom=max.kellermann@ionos.com Received: by mail-ed1-f43.google.com with SMTP id 4fb4d7f45d1cf-56e69a51a33so5274886a12.1 for ; Tue, 30 Apr 2024 08:29:51 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ionos.com; s=google; t=1714490990; x=1715095790; 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=+zWX/z6nYSF+/tdZF0rQrJaKpSzMmIZva46DvflyFrA=; b=LTeFR6bfSXyH+dbK4bNqW9F7hIPP4RtaZjlFQCBYWCgpe+A6HD+VVz7sKb541RAfJS wn3kZkW4GXqlJYPGGvJKWEzTJS9vWQQAA3VuJgPeN2OZPUNFmcmriNqEyjykcO2HfLWX 5y18q3epvRRkUHUt+yyQCHK3+JmuqArJcufptKfIU1Avuu/K9G5VfFYq7rTCMdbuJsHt N/RbnXuVWC2D4K42t+7cIx28A7iL2BpW/KKZ2hKMAHstnz8f/q/em+lY9QHMzQjM+aIF vkBDRLS4mwswXBRFbAKlgv2Mv8/osgD8T4+0D2C0dOzdw4hvr5dYQ1u07nIWz6DM6Y7r v7Pw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1714490990; x=1715095790; 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=+zWX/z6nYSF+/tdZF0rQrJaKpSzMmIZva46DvflyFrA=; b=ZbVi1hFkmh/+vsoOH0ubsZLttWl3aVcBqHZJdOU+HIBJq37LRfal/wAp/FXciRyxbr 2PLrL+3shmjA/5kUarakAfwZ/RkB36UoWOmb5gsKDdDao/bVTu5hgdEo3rx9m0Escy1n Wv3ro19JXPCONBMxTE/2Fkesj7xiIw5j2wTsxXvaZ+AUaLzUNcd3un7LS3l1jhRE+/eB 8BtDfvJpnAl764Q6l0QDGeD5VA4SvBcqnq04pNlIdlEhJCo16fcs/7j3cvOKHaXINYbL rG0WXS/NnunR43ZjEyMaMxKU5nqELpbbRorDqRf4stxKNb4B8o7dh3QRCr/F2dCXmW+9 cTkg== X-Forwarded-Encrypted: i=1; AJvYcCWCIjtWyXZhi2kYA4IS8oX/vOm8v96zbhLyFPRbG9IQM5sNuv/HLRS9f8ura/kpl1ehzOjzxELfH9dpUNeUcZ9BGD0= X-Gm-Message-State: AOJu0YzYiYGk19fJdvIWrUmNvQ/NBT+DKkxQQ7T6QK7Gvb6EQsDZDdUc c6VSMwX4sIXuIhVIJCNwc+Pgq+07+3sLndKqpnMGM7S0HY3vgWVEytGOF/60Kb3UAPXg7Usb7YH V X-Google-Smtp-Source: AGHT+IFI9+eHfJPwg0KmGKTIU9F8oGfKNRqJhbeLvPRCs2L2dSMFQ2rnIpwCHqmm8+2/A2Edm99eJw== X-Received: by 2002:a17:906:2a44:b0:a58:7f48:18c4 with SMTP id k4-20020a1709062a4400b00a587f4818c4mr33388eje.68.1714490990054; Tue, 30 Apr 2024 08:29:50 -0700 (PDT) Received: from raven.intern.cm-ag (p200300dc6f06e100023064fffe740809.dip0.t-ipconnect.de. [2003:dc:6f06:e100:230:64ff:fe74:809]) by smtp.gmail.com with ESMTPSA id a10-20020a1709066d4a00b00a52567ca1b6sm15278137ejt.94.2024.04.30.08.29.49 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 30 Apr 2024 08:29:49 -0700 (PDT) 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, david@redhat.com.au, Max Kellermann Subject: [PATCH v5 04/15] linux/mm.h: move page_kasan_tag() to mm/page_kasan_tag.h Date: Tue, 30 Apr 2024 17:29:20 +0200 Message-Id: <20240430152931.1137975-5-max.kellermann@ionos.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20240430152931.1137975-1-max.kellermann@ionos.com> References: <20240430152931.1137975-1-max.kellermann@ionos.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Rspamd-Server: rspam08 X-Rspamd-Queue-Id: 65B0E140032 X-Stat-Signature: muofrzrxsdriu5jg13ow4w45q8nrywjc X-Rspam-User: X-HE-Tag: 1714490991-805923 X-HE-Meta: U2FsdGVkX18rfnhM6FIdpPfr4D8UAPvEZucHzbaqwMB95xFAWtcevn3uhaBKTtplEnC0JBmkiAtVX8Nn1Fv/oHqkUWya/X2cAeBAgjWPxPi4ohj7z60Dpe2TSOCp0DlU5Ls+D52jETdSaB/ME5q8IBi86WNkAo+qTzBHxmMtfD6kxHFv9SVdT4QhQiXDr8k1RDKLI0/ar7J/uujGSSU8xx6S70lfAXTurFuPlSL6/iPmWewPulrPcHeFZ1qLKnRpWQPqFCgqmk48sNrWQFVhQEIyXPzzty+mK4cogvRIWmzI+SLES6hZq8sQqBwNMQl1ywbsqsIoxQu85M0qAnobP6JG252nbA2L1Q5AystVVjW9MdbFlnmm46aZ+X4RfX5Sop3NcqHNvEOJUPbGlA00q3WZPSu0Hrz4sNypsvakDXCce4UifHKRxurohQLN/+y8b5ZVYRpHH/0bEybkPcaysCEa0MuCJtiGKVnCtIJQMSNnFR6HJqtps2036+/XyLQxQH/LBGNR4nUVuiGnbM1/5pFQMSC27qOY257SeRSAQ3Y4OANg+c21FekZh/q1dhPOzVnkQyfbrJykERQpQ7i0MSbsBfIKXzG/38UV7Q/+Vz6odvsz8E3VCiGuCC9RhAjZcgWsobOgC/Cd7+NLoSG8LlOgwlCHmXdPKzP9uzDD2idw6jFROil6nASi6FcTghxbdnef/0c6R2IJrZASDhxn6XtmAsLRO/7PlEjdWqORGlhpYGpRXmaMhbbOawZvlBHBQhfEAhgLz+TEzhbURb6EubI+AZ2Ro0PcEjNFcUqQthjbyORvJrHAE5jarGcYySiXpHqaswS7qi4wjcGlkNVk+XudE9AhAkzjQ79XOGSkx7721wnKqRWTPBF+VQWwnA8w1FZStPM7i7XN8fRLnPH+YhtOwN5a6DYn9YqPxQ8/DHwVX9GAoKx8sOUpfYstqZdEKqesAcbJzKhhU4wzOLA hPYfEIHr 7pp4MhAr9gfXutiamBsdp6lnbmjIFVe14E3OLtlDyZhsNNnIALftfJC6QXjyBc6iTlB8iTvdOntEzGm6xLY5qIRJrCfDGSdQObn0oIcVz4MgeDQLN4O8KNAY5fQByp+E0hxw0GrWn061Bkxmre9IClTMPQU/mB5o4FjB1kmnnK6u/xsOcwaEZlkEXgVpZQL8fjXVpc1tj2+JOvpUCl1PODKWAXa2w4I421MlLXgJtY8npSqoc98K2tbC11K6qUh9JK8HjGT0f5tF7+TF5g3XS2n2QGQORmXGWa+qzYctNbxUM59mK4z8C4Y42CK5GdH/2q7AAzpk8JFAkqRBt0ilSWPSidKQTjSyAJYZjiN8GvT1F8HQHLfLi2EvZymKnTitjR6YLbNpIi9pP2aNHS+1AQSS80U7W91UO4dzpeLZjvweRGQ0= 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 1c4bc4b4e388..512f67555853 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -14380,6 +14380,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 9849dfda44d4..4a176690ab95 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 @@ -28,7 +29,6 @@ #include #include #include -#include #include #include @@ -1820,60 +1820,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