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 1F938C48BF8 for ; Thu, 22 Feb 2024 11:51:14 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id CF3246B0075; Thu, 22 Feb 2024 06:51:08 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id C7CAE6B007B; Thu, 22 Feb 2024 06:51:08 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 9974C6B0078; Thu, 22 Feb 2024 06:51:08 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0017.hostedemail.com [216.40.44.17]) by kanga.kvack.org (Postfix) with ESMTP id 858A66B0074 for ; Thu, 22 Feb 2024 06:51:08 -0500 (EST) Received: from smtpin22.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay06.hostedemail.com (Postfix) with ESMTP id 53921A10B3 for ; Thu, 22 Feb 2024 11:51:08 +0000 (UTC) X-FDA: 81819273816.22.D941ECC Received: from mail-wr1-f45.google.com (mail-wr1-f45.google.com [209.85.221.45]) by imf13.hostedemail.com (Postfix) with ESMTP id 618B32000C for ; Thu, 22 Feb 2024 11:51:06 +0000 (UTC) Authentication-Results: imf13.hostedemail.com; dkim=pass header.d=ionos.com header.s=google header.b=G20G7MxX; dmarc=pass (policy=quarantine) header.from=ionos.com; spf=pass (imf13.hostedemail.com: domain of max.kellermann@ionos.com designates 209.85.221.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=1708602666; 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=7b5/uhjfqeIuQAGiFdEn3Xr4J+TBvtutx0p1n4ubkzU=; b=Qtsr/TF91Z50zj6ENQQ9v071KBjGau6C83o8zLtIb0ysIermRvwpNm8W+WV58soL6dYOPO LD+S8WVdr6my2Zv+lcSG7Gck6ekkCZ+ap2AlwN9ZDc45OeBojv3/1tv+Rt5XaTOLnmKXSA iFWkwYsDiSCrF2j68qaqcH7hatc2X3E= ARC-Authentication-Results: i=1; imf13.hostedemail.com; dkim=pass header.d=ionos.com header.s=google header.b=G20G7MxX; dmarc=pass (policy=quarantine) header.from=ionos.com; spf=pass (imf13.hostedemail.com: domain of max.kellermann@ionos.com designates 209.85.221.45 as permitted sender) smtp.mailfrom=max.kellermann@ionos.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1708602666; a=rsa-sha256; cv=none; b=nWd4W8umrLe/Mso09sG3el6Sd5nyaGoEhhngdBHZ6pEaaRzr/VrmzpsYy6Vv5SS+QPu+5K gNgaLtmnLdJBa0ftJlRNGn7R0oOWeLX4Ype+9qgbbhohg44kVPcvMiS9lAy1XHkxXAsvCk chZlDaxErLSM8rTk9bo1ah2R3y+I7wk= Received: by mail-wr1-f45.google.com with SMTP id ffacd0b85a97d-33d26da3e15so503099f8f.1 for ; Thu, 22 Feb 2024 03:51:06 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ionos.com; s=google; t=1708602665; x=1709207465; 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=7b5/uhjfqeIuQAGiFdEn3Xr4J+TBvtutx0p1n4ubkzU=; b=G20G7MxX37c2NbsrWC+YT+trC2kh708Q6xc0HRaRGcGRStAjn3DKUG28gLFpofdJhQ KTP2HcDnCvTkJcgnxJ3qUEN7B/N4EGMV5SRuRvc2eqvFzOB6Ykpv4pejcq1I9WPBrRux vwfWBpctYVbO1t1g/lpNgKSOVgKSU1VY2TbmB1zyOY0ul/qZKuy49SQ9W41OaSQKMDwe ZpJejctB2+nrZRiS9ffNt0P6Oj0nBCvHKxCRNdcf4t1kg2LJQGNsYTYUhi4A5BR143gS 1NkuJGOT+nFVmW64hv9imsS6x8NHFFUywB9N4L4O6K6PRnbBqrVQ/87a0dDRxP1EiguY DfVA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1708602665; x=1709207465; 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=7b5/uhjfqeIuQAGiFdEn3Xr4J+TBvtutx0p1n4ubkzU=; b=e0dnUp631LYgZu06HKonlByKZ40aJ911W9qLf4xhnvkGw6ZjLtx7KrpbiSJ4gLg5H+ uiTLcEITFNOqt73D/AB9cbAYaJGrX9usSBRoSWyzYcl+B7n00vOOGFnNF8hUQwNPYgSr OzMuuWI2a1dWdzwJII4QBG2mDUXHsJ/FkcYX6EDsLRcQkoksoBPi0HyKnA8YuaB8Vuqg mpCfIMfDaZYcAeKciZhd1EVDh6oMsOvOC98iKkeyuD7rHyp9TbJLWB1Vg1DvjZw8ku0b BrzK2R0RGWQmUWDGSv2UnzVu5rqRyJWNqQcFHcZLf4ueA0S/pUdOn1HH3hHwPm/AkEBb EJww== X-Forwarded-Encrypted: i=1; AJvYcCUSZOPPOXfChtEteF5WGf8D8thWUIygepQG8c4DbeH74efsizUMnTdxvehLpdmXhmPpoPjZAqKH+GH6Xc5+tL+9ttA= X-Gm-Message-State: AOJu0YzU+ijqz01AW3hjvXWmyRruNT9uKs2R1YKgITBjZZ5DOaeCSsp0 cq4cqFFM3tXcl0xviVQ5E452IAaexLe5E64EriYMClRyA504jpdUQMxesdc9b9M= X-Google-Smtp-Source: AGHT+IEKsT+x17IHrY8997OwmeRClTuQ0BNyZeHPQoSXN8JZKWq1sN/JzXVa3pupvyni90LpbItmzg== X-Received: by 2002:a5d:4ac4:0:b0:33d:3ff3:f888 with SMTP id y4-20020a5d4ac4000000b0033d3ff3f888mr2385231wrs.0.1708602664992; Thu, 22 Feb 2024 03:51:04 -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.04 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 22 Feb 2024 03:51:04 -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 03/14] linux/mm.h: move page_kasan_tag() to mm/page_kasan_tag.h Date: Thu, 22 Feb 2024 12:50:44 +0100 Message-Id: <20240222115055.1172877-4-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: 618B32000C X-Rspam-User: X-Rspamd-Server: rspam04 X-Stat-Signature: qqky4h9xfu675wmq94xmcfizxmzi4kmr X-HE-Tag: 1708602666-844453 X-HE-Meta: U2FsdGVkX19Zyiebud5302bk1otivLdEQWVuCaJ6izZPbuSw6FKkGypOuCS/vRivlmZ3fjoUaIXczm4FfI5UQTgULtI9Q0KuHkOEJs9jNvMyqvNIF4Z6wHFQetQdmULxxiPFaMEh0jRqcg7j2sagOdZMj0dcCDHpUIDyRWvCJgXVTCs4w53BrBnFAV7B26NEo45Q8pjVXG6jQ08F3zMzRngJ1XvyP5OxVD744uuXz581OqgxiFOCQoQKcX3ZZgTVoeb3jw4asrXXOm7MUYvLzxoa/uP6TJvt/rtek6VqPEPuvBaKKn9cVIn+pDtDlVdMBXkFd6+q+SfcnQz2/CePwnND3UcFyM65GATfCj4IjAOYwDHqkxwPFLZd5vqFmnAmqGUCYFLtWkl6f4rBu/qszm6G6QcAxkJA75NPbDkY5039rXU4tnwWRWyhGyzcBABd/VN2KkGfNeBX/FxJ+wklqmY0gesHFw2bm/ivVXb1AfE8P5P9xSnkwdeLos+YXpHeIa/xKuMB5V6ReNPd3cSVZuMHtEtT4gLAL4E4L9MtSsYNSfK85t6S6M2dcYah796S28UWOQRJruEwdDDOrlWgWJYNDbpnzQyViIhG5m8k7OGU3lAfaDKEXxVa78zH+Khts/2qun6vdqQP+ZCFToi6Xa6W4maXAEIG1P6K1CBjRf8Ro2M/9BfTCwYIy9TeHqKPaXgNAIM8OH6m41xHlI38XN1L4YsrwE25L2RAOzQpxCoT41ZWZ1p7LzOGe7LPZUt2GO6wtwDbmHP8qIKVrH5dtcC5NO3OodxtBVt7QC3Tqc7MvJHZx8ZHLM22mVLBVuOGvI8eXIUmBKxi4xVO5kpQkKKPzwUNp7v3O7qg/9cstYcSFZ7oglAJvR4pur7IxphpYOou1khsD/T1toTH/Ot2qC2FNV2JHkWhrMZ0DyO2lQHio0srMbRcdYLCHMmwHsuByq+uRAWV+fRqCIXsyPL ZEhiOcAe CE2B+vTQSsl5A8fUel2Gdi7WNaa0s+DJWDBC2Ssn/ZMNIk5PUmmj2Hbr6Zx4hL+7ooD3jQ7kkcqSOAOYtj21fnMv7Ankz7U7TDL1pHketMxEEduxI+JLBk65XC939i1ttC4BphHDYIz+VfMqqHgyCmrzEqwdjiCZAKTz+t3EeU1c8PB1Qokph5OhKrBYGLQplVATHa7K9itBfJepJyqkzz5XwNNHpwH66pm5Hamt8PAzyubC5FHKRLcxD+SFXGksVHhIp4ST3aR7sbY48UE37RUSFSitA6Iv1/mQkTrUsBU+dhxRlUHk1Pf49VeIcOkJYVq8gHUR4W9nRb1opLzlzT2iAPw3gUk7Ijfyj9+/DC4RQnqyaYYLV/7A3njnC/uSuzLShgH5KvCu05qWL8RVlhADckm2OPs7wsPtU9bVRgPTxROU= 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 c042ca394893..ad208d8aea4b 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -14187,6 +14187,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 1743bdeab506..c8d909cc1353 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 @@ -1810,60 +1810,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