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 C95FEC48BEB for ; Thu, 15 Feb 2024 14:56:21 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 5A6A58D0023; Thu, 15 Feb 2024 09:56:18 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 531258D0022; Thu, 15 Feb 2024 09:56:18 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 383E38D0023; Thu, 15 Feb 2024 09:56:18 -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 227DA8D0022 for ; Thu, 15 Feb 2024 09:56:18 -0500 (EST) Received: from smtpin06.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay09.hostedemail.com (Postfix) with ESMTP id F0568809AF for ; Thu, 15 Feb 2024 14:56:17 +0000 (UTC) X-FDA: 81794338794.06.B0068F8 Received: from mail-ej1-f51.google.com (mail-ej1-f51.google.com [209.85.218.51]) by imf10.hostedemail.com (Postfix) with ESMTP id 42DAFC0025 for ; Thu, 15 Feb 2024 14:56:15 +0000 (UTC) Authentication-Results: imf10.hostedemail.com; dkim=pass header.d=ionos.com header.s=google header.b="aUi+AY/C"; dmarc=pass (policy=quarantine) header.from=ionos.com; spf=pass (imf10.hostedemail.com: domain of max.kellermann@ionos.com designates 209.85.218.51 as permitted sender) smtp.mailfrom=max.kellermann@ionos.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1708008976; a=rsa-sha256; cv=none; b=PwwepgeFvdNYvHV6TsYhDDSH8dYJwbp3w6E+3KEgvt4V+yJg/swuDNUtUZGPT4QswWlQ6I UlAKUEeLtKSGnw7GEk/umvMaJl8WuaMHkmNnmE6jRPfvtZwv7+T+HuCF+Zfxv2uPtTHoXP JlhatwizGeuhD5tZbQYJOTE+3SHcKTM= ARC-Authentication-Results: i=1; imf10.hostedemail.com; dkim=pass header.d=ionos.com header.s=google header.b="aUi+AY/C"; dmarc=pass (policy=quarantine) header.from=ionos.com; spf=pass (imf10.hostedemail.com: domain of max.kellermann@ionos.com designates 209.85.218.51 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=1708008976; 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=5yWhRxx5j9/Xhrml0aMKDxvuRZarY+DeLwc3tl7RleQ=; b=OyIOfJSwZ9jo2FOKD7vvOUbgCx1IOBs6TbstTGpqfXl5Yhk8y/01diRca90LshjNI3eAfu XWAqDUIIFsqe5Wu4jw3tF0UGyH8go1AFTQrzfAepckCNM/0bgBPmI3RxYe1eT4D0Be1shx QE8PMga77nl6xtHIBblPvdaaFaW6TcI= Received: by mail-ej1-f51.google.com with SMTP id a640c23a62f3a-a3c1a6c10bbso116264366b.3 for ; Thu, 15 Feb 2024 06:56:15 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ionos.com; s=google; t=1708008975; x=1708613775; 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=5yWhRxx5j9/Xhrml0aMKDxvuRZarY+DeLwc3tl7RleQ=; b=aUi+AY/CpmO85rjvtA/Zak2Pi2PMkv7kn0TJ4DPQwEXrY7Nn1xlzxk28+eItpUZM6v qCrBFFGir+qP/klqomWFCqNLSK+SWBCoTHLYKaAow+wRuIxjr71Za2J0tqbMMhKl2JnM Li92DjPGFEHkFCYFsV8+qy9Jq0tOEaff6qerZWKgCDNBic2+k9uwyEgZf+kMHJ5ltB2M VLcxWmOJzO7OjqJ4YT/EIbEleh82TUoMYOG4ybrEHs9CaSRPdwMoEuBDzSEMoRegU4zf 3wrKywHTPf8+ucOsJl7rSadMG+7VZA0/icJSIHxo//tW1R3SnUgsLlyNDwR8nPr3L44c NXgg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1708008975; x=1708613775; 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=5yWhRxx5j9/Xhrml0aMKDxvuRZarY+DeLwc3tl7RleQ=; b=Pe+kHk4rMuRYpfvHSeukU8Wvvt1+i8WcU1nXduZpEFy2CIugfR5+j2b8dLSt5nJsz+ /+hGFEsjxsmBPCfTqGtzCZx7ipOB0ZmwYeS3wFPKr8hL8dR9xsBrn4V/DlSrwfiw7NAF nX/Gk6fqT9zEtadwXwwUMvCJ3COrbl4MsBVSen9mJh0uSdYXLxs3UUPOetjZuiq0W3Ge tv2vwNgRcYrVffGSnJfOpH78wYNg4bTru1otOTCffiYxv+GN+MtiHWDYo4LpdK16RxYT k02ADClg8GlklIHLqubuAd8kddhp6FbAsTv+/DEDA1O6+divRPXV3T+P+ZfUZAWUvDMR KdEA== X-Forwarded-Encrypted: i=1; AJvYcCX+qkfBMbWYItfy/vtx/Antsj/u+lDJ/Yjr+COHuVSd1JUUZbrzaLTePV1wT0B43ZME3KaiKOtCnspo/4NuRRH8d5E= X-Gm-Message-State: AOJu0Yz79dju0+BUl37WK9TZt4fE8W3DScgNyzhweOlYtw/bCpDsB3AI 731h3qtG8mllPHPO0c49oJqG85eNcNhUWhlat/yddoRD9BqMyatEFWYnWbvooI76VjfmzNo1uls r X-Google-Smtp-Source: AGHT+IEh5MY1NSY3moqMbuwNAu7FXKM3QrZkqq8fUn4fINWuAnXtgbc+LSmCPQJW7QL2YVRWsHbq+Q== X-Received: by 2002:a17:906:1186:b0:a39:6c07:d31c with SMTP id n6-20020a170906118600b00a396c07d31cmr1552619eja.25.1708008972867; Thu, 15 Feb 2024 06:56:12 -0800 (PST) Received: from raven.intern.cm-ag (p200300dc6f267100023064fffe740809.dip0.t-ipconnect.de. [2003:dc:6f26:7100:230:64ff:fe74:809]) by smtp.gmail.com with ESMTPSA id s18-20020a170906169200b00a3d1897ab68sm631175ejd.113.2024.02.15.06.56.12 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 15 Feb 2024 06:56:12 -0800 (PST) From: Max Kellermann To: akpm@linux-foundation.org, linux-mm@kvack.org, linux-kernel@vger.kernel.org Cc: Max Kellermann Subject: [PATCH v1 03/14] linux/mm.h: move page_kasan_tag() to mm/page_kasan_tag.h Date: Thu, 15 Feb 2024 15:55:51 +0100 Message-Id: <20240215145602.1371274-4-max.kellermann@ionos.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20240215145602.1371274-1-max.kellermann@ionos.com> References: <20240215145602.1371274-1-max.kellermann@ionos.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Rspam-User: X-Rspamd-Server: rspam06 X-Rspamd-Queue-Id: 42DAFC0025 X-Stat-Signature: qqbssp61wwyx8u1dbfoycqmgxh9o5xxz X-HE-Tag: 1708008975-53361 X-HE-Meta: U2FsdGVkX19n/nVNqZPiORQpaLOYlT9ZlN6tfthwGL/bLT22kaBj/nO+smziZHabeKgoVD9tl1FJRp5kTNH0ypwN1c5bBHJndhNIsjCI0dhyQWEzT21I1EKxKWD1RMdcynzvbww5DzoB5zJ6NpZ72ETc2k54byMzmkIBUhoJgF3goeSIfEedymglSfhb5WgTCyzfWk/MJAu+kuNPc8xqLsoWV1nBJncmQVctgyXJcbzbCoZHj8YzTy2LLy1xKe1fPXJZVBOJvgs17qz4iAl441hNsQ2NvIko7XCQRgMvQqcWTHlc7AYtzUZtXgb7l4NZyHpK1tQfT+Gr7tv5mJCb/G5n1ruV/pyjyj8eWVQwV9O0YmfvTf3ceEog+Iki0d+Mr0HLsQKKz5y8YLzGg2QctyIc4yO1mYeMK+uUiecPlNnQ07BQON6qHC2R/yoSXnCziQvSnUXaqWfdPDphGXE7gKP91rT3XetjUizZNqPtTNBIS53bxS9Gn4Yj34keOw2xo069jnkXZBg95YnP0QpSIpQtV7V+ijGn6gfZqGUakc3u6SqvLah30C/QNHL+vAXObDjvzvBvDYgKfaKLb+bJgy4Z4iRVCgvPQp+YOU9lh4dl2m/x8yBbFr+44glnwHtyF5QpnWKmBbM+XR61rlsj7d6/2h5Xxuij5lB+pCjdlWxer2BLi0m24WLy9l8EI+uwWiF0DaJWkm1Poyfw91G+KvscGxFdB2Qjn2wcwY9c7Eir40CuhOgM3hSkyz2AiZpilDfa2QsRkvtFOFe012G68ESLhabE0YAn+BL8mc9y9X6OLHdT1pH5DBnSJVdCqSSSJVgLuUE8RUxvA/awChK0Gm1Bt5yvZLGt6x/ApUiRAScf7pXFEHeb9HidzJuZK05JYXru/IoIoKLt/e/8EuXjY7Cr1ANSb8W0yW7lUvkNOZElChSsH9CyjEH6BsX9isTkiKqjRcCpptYUkQApHCp XErm9dnt tzXKUASw49YzuBouutknHA8CcgM0vg5SYXs6ZDXSSM6L7d6d8eI8R3eZ/vpn5oBREild+CAw4g76Bs3+Q8dJshswskCLGkz/OIfwRYGAFqCjTvvhfpSlBhn/NyOGnc4DRj2crPlukpiLSKW1a5DMP5HwM0s4MAW8v33J1 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 in linux/mm.h. 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 897fbf1b0701..4fba8597b2c1 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -14227,6 +14227,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 6095c86aa040..decc0cb8ed32 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 @@ -1805,60 +1805,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