From patchwork Tue Mar 12 09:41:27 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Max Kellermann X-Patchwork-Id: 13589722 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 A9D02C54E66 for ; Tue, 12 Mar 2024 09:42:13 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 4DD5B8D002F; Tue, 12 Mar 2024 05:42:02 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 490588D000D; Tue, 12 Mar 2024 05:42:02 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 2B8A98D002F; Tue, 12 Mar 2024 05:42:02 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0012.hostedemail.com [216.40.44.12]) by kanga.kvack.org (Postfix) with ESMTP id 17FBA8D000D for ; Tue, 12 Mar 2024 05:42:02 -0400 (EDT) Received: from smtpin23.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay01.hostedemail.com (Postfix) with ESMTP id DEB251C08EF for ; Tue, 12 Mar 2024 09:42:01 +0000 (UTC) X-FDA: 81887895642.23.9630CA8 Received: from mail-ej1-f43.google.com (mail-ej1-f43.google.com [209.85.218.43]) by imf22.hostedemail.com (Postfix) with ESMTP id 2A270C000C for ; Tue, 12 Mar 2024 09:41:59 +0000 (UTC) Authentication-Results: imf22.hostedemail.com; dkim=pass header.d=ionos.com header.s=google header.b=L783exgL; dmarc=pass (policy=quarantine) header.from=ionos.com; spf=pass (imf22.hostedemail.com: domain of max.kellermann@ionos.com designates 209.85.218.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=1710236520; 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=TT7smv1j1+eH6dLDpyJyxapeCn0BRAoD8ideYTGL8g4=; b=or7lUXBuxbmw4eM+BoKUC83jneaB7+sTyy0GjCshmK1S1qrLQee6xG5BDqJ8qFofCres59 OXnjUf8wTMzQVwzVWIzeBESw0+73wheRhk2UQzEKwH4H+HDVxsQ8Z6p2IxphgtftghZ/UG ih46dzyEGOY+b2tYKRhUoNtXhB+EL/M= ARC-Authentication-Results: i=1; imf22.hostedemail.com; dkim=pass header.d=ionos.com header.s=google header.b=L783exgL; dmarc=pass (policy=quarantine) header.from=ionos.com; spf=pass (imf22.hostedemail.com: domain of max.kellermann@ionos.com designates 209.85.218.43 as permitted sender) smtp.mailfrom=max.kellermann@ionos.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1710236520; a=rsa-sha256; cv=none; b=QfmpVkOrS9Y80TtgpQ2wXKVUr7IvpMTeTz+53hnk73buFeUvctU2qYIuTQB5njiJ3QHBzd oJz+fjTYQHwA1j74NXRXsKg0oNZ3Yqt+BrhwrhOju3rmKPlG7PxgAjMXRpevjmQ2k3a+y0 kKH6KqUH/mrA85NhWFR3Q1OJqUEIWTY= Received: by mail-ej1-f43.google.com with SMTP id a640c23a62f3a-a45b6fcd5e8so634487366b.1 for ; Tue, 12 Mar 2024 02:41:59 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ionos.com; s=google; t=1710236519; x=1710841319; 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=TT7smv1j1+eH6dLDpyJyxapeCn0BRAoD8ideYTGL8g4=; b=L783exgLZWCSbgygUuQWKhDDSNPFawpq/+UWvV2rYmm1NkiseMblTMJJHjPvqYXEFA hsDvY/ydRXCgbpBo6RC2zYnILc8NrZDtx66V/urHXUDl4Dg9dcBq+IOHVEvZj3H6Ls8i dsWFVyw/EeS7a8qkZyXs/VY+Fbk++WYoEd02g52B8+WTyYIbpH3Dr4IkoW+PrkDBcBOO 9a9DF0fzozoMaboh3PqpexIKbfNVzdYup6v6os5C3tYNfAQJYaQVa8BkwzZ2DdDgArdP rTHDCstikpiqI88eH930RfHUsHc2mwtyZyxtCP+1F9I/Ymo/KNhXC2c8FDcw8tvCFAnT L2mA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1710236519; x=1710841319; 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=TT7smv1j1+eH6dLDpyJyxapeCn0BRAoD8ideYTGL8g4=; b=J9e2wt+5LSNC+dAwrmaH3/9cCaLwHiXBgm3evxHg/+dR3hrWFVZ8U7TQ/rTTpmRaj9 UveDzqYRoekHE1KOuI8vuKWHtQmws/QN2F36IfVDYX+AgQML90vo0IopdT/i04cjOiZb 75qnXAhPxEtp8pYF1+Dn7kRJbCQL3WcvA56Qnbet6WrLWdJsjl7JqMNDRKMf0aXol4k6 Q/JBT4VKTp8FHhu5si0iNXTrjDSUyPqqLwFHhKGKefOlpOtoYk9tadex0AlOhw9JDx1R 5J68P8zna91gIT94RWdSfxoeeoxe9DqfdDs0UCVq3qNaOYm1VfQn/IBHlFONvTVA0PUf kscg== X-Forwarded-Encrypted: i=1; AJvYcCUao33dGXW3S7mhc62MVr/zgS0L9tFy86KennSrCAUOTRMgxjLtcwQBevLTfGRH+e1g4J4pbsWg9S2eZ59JUXDKcSo= X-Gm-Message-State: AOJu0Yw7XqKMkPeyRo3+IHw9sD4vD79KbDJX4RDcCLhuOJkNTTZkX3ai PEYvnSo+4NSLRSwkNO1PKYeWwzUxLXFnA3WAE2xN3WWTjWc+io4o5KS2QGLPRks= X-Google-Smtp-Source: AGHT+IH7z82KjX3aHCRWUOCeL5FyYqD0JcQ3ejtaHjG0l89tCOrVbvS2n36rt9l5T0g5qz32g+2nTg== X-Received: by 2002:a17:906:7751:b0:a43:f22e:57a6 with SMTP id o17-20020a170906775100b00a43f22e57a6mr852298ejn.67.1710236518882; Tue, 12 Mar 2024 02:41:58 -0700 (PDT) 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 jw22-20020a170906e95600b00a4623030893sm2091961ejb.126.2024.03.12.02.41.57 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 12 Mar 2024 02:41:57 -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.au, Max Kellermann Subject: [PATCH v4 09/15] linux/mm.h: move devmap-related declarations to mm/devmap_managed.h Date: Tue, 12 Mar 2024 10:41:27 +0100 Message-Id: <20240312094133.2084996-10-max.kellermann@ionos.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20240312094133.2084996-1-max.kellermann@ionos.com> References: <20240312094133.2084996-1-max.kellermann@ionos.com> MIME-Version: 1.0 X-Rspamd-Queue-Id: 2A270C000C X-Rspam-User: X-Rspamd-Server: rspam04 X-Stat-Signature: 4yafjt3ye3bibjkcupc6xidiygz53umn X-HE-Tag: 1710236519-548032 X-HE-Meta: U2FsdGVkX1/oSeo1KvlkXYrqVdxqpJap2TfnvC/K2BLYn4yjvmzIGSKVh4nxHaELKd8WGNmWORJrmTtel17pYtKP7rCDXGEyozpRkK+r5Ye11l38r3GNSU8zWj3aJPvutAo4dVvFVxkwO2CIPg4ESSOH6A2qQ2Zugw2iul9xah0QVjRhH84ONiWoqdtmcekTxfZRJACIyG3b1DXj3o1TZzeENDIMBYuz9En/jcO+wkJNn8njuQH7os1mBIujFbS6dtYF2RcPDszTg8g9G9Hy4IvHS6I/PVLfKu/0Qb07JvpPUcN0rUx9mrWQQCMrrP06fccQTE4X4+Uj6D7ZR2ruA9DolztsnUeJIKvPi0EufOod1IYV+BytqD0ISp5vD46NMNjXacO638ovgetUNHv1xhRMBmKkGqjoFPjU7aMebkcCMcESmiX49M5FkOMFx8DMxsaWXByvo4C6Yo2TUDQmJ4WyLAut80Ds8MFZ1ur+XVs/g+kfndvqlI5lpHEKRzJ3K84RH0EucVhtYRvZejr+IvU29f64hle8KmIEP/ldkyqlIx6lmaG8lGutjiqxbv8YmAu9e2LFsTg8psTgIbtGH3Kqx3SXQccXkWiskp1MhStcvVmuhH5vOiyj0YPDJio+43OZ0hFYrnbNINWpIcwtRrW7Q+bNbmckoYP+Z1xl+Pu9s8u/VOTsHsR+AlR9Rv3tV+snFcfftGcFkljL668nTcMIjM8kxVsouHwkt8PCDbpPBedifbYAfTmbPCZw2KQsAcG5kV2Z873zChbN8Pn22UFUyRukTeMfZklb0q+y1/QePsq6psZ6C7/7k9gA3REkEDnpFa0PxlqVM7HEY/eeIWVfh41SerikWrkP4o+HMEyspbzZRs8PVVYOfTy/QguyIzZG/7fbvLpqDAk8QmlzJZPM3C3JqwS1niLs3oH+LPNM5YW1W58rVuTV7TkuRoX7MhELGpZMfrSM/oyakiL kMspcpeX xn1kWSpforlgAwBguspqgaRATRLX+bZpfCStyWts3PKaAeFUmMei3DBiXisN+vv66Q8SueHeTZVx272e5nloLJU+nNTlh1A7RdJtrcMdZCzXMiE9beyqtatzUJF76NU0Mgeb2pyu9p73i8Bf5n+AHHJnGFMqhZV0B8oZJ 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. put_devmap_managed_page() is called by put_page(). Moving it to a separate header allows us to move put_page() to a separate lean header as well. Signed-off-by: Max Kellermann --- include/linux/mm.h | 25 +-------------------- include/linux/mm/devmap_managed.h | 37 +++++++++++++++++++++++++++++++ 2 files changed, 38 insertions(+), 24 deletions(-) create mode 100644 include/linux/mm/devmap_managed.h diff --git a/include/linux/mm.h b/include/linux/mm.h index e6c2df977abc..61f1312a626e 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 @@ -1357,30 +1358,6 @@ vm_fault_t finish_fault(struct vm_fault *vmf); * back into memory. */ -#if defined(CONFIG_ZONE_DEVICE) && defined(CONFIG_FS_DAX) -DECLARE_STATIC_KEY_FALSE(devmap_managed_key); - -bool __put_devmap_managed_page_refs(struct page *page, int refs); -static inline bool put_devmap_managed_page_refs(struct page *page, int refs) -{ - if (!static_branch_unlikely(&devmap_managed_key)) - return false; - if (!is_zone_device_page(page)) - return false; - return __put_devmap_managed_page_refs(page, refs); -} -#else /* CONFIG_ZONE_DEVICE && CONFIG_FS_DAX */ -static inline bool put_devmap_managed_page_refs(struct page *page, int refs) -{ - return false; -} -#endif /* CONFIG_ZONE_DEVICE && CONFIG_FS_DAX */ - -static inline bool put_devmap_managed_page(struct page *page) -{ - return put_devmap_managed_page_refs(page, 1); -} - /* 127: arbitrary random number, small enough to assemble well */ #define folio_ref_zero_or_close_to_overflow(folio) \ ((unsigned int) folio_ref_count(folio) + 127u <= 127u) diff --git a/include/linux/mm/devmap_managed.h b/include/linux/mm/devmap_managed.h new file mode 100644 index 000000000000..0773529d80b2 --- /dev/null +++ b/include/linux/mm/devmap_managed.h @@ -0,0 +1,37 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +#ifndef _LINUX_MM_DEVMAP_MANAGED_H +#define _LINUX_MM_DEVMAP_MANAGED_H + +#include // for bool + +struct page; + +#if defined(CONFIG_ZONE_DEVICE) && defined(CONFIG_FS_DAX) + +#include // for DECLARE_STATIC_KEY_FALSE(), static_branch_unlikely() +#include // is_zone_device_page() + +DECLARE_STATIC_KEY_FALSE(devmap_managed_key); + +bool __put_devmap_managed_page_refs(struct page *page, int refs); +static inline bool put_devmap_managed_page_refs(struct page *page, int refs) +{ + if (!static_branch_unlikely(&devmap_managed_key)) + return false; + if (!is_zone_device_page(page)) + return false; + return __put_devmap_managed_page_refs(page, refs); +} +#else /* CONFIG_ZONE_DEVICE && CONFIG_FS_DAX */ +static inline bool put_devmap_managed_page_refs(struct page *page, int refs) +{ + return false; +} +#endif /* CONFIG_ZONE_DEVICE && CONFIG_FS_DAX */ + +static inline bool put_devmap_managed_page(struct page *page) +{ + return put_devmap_managed_page_refs(page, 1); +} + +#endif /* _LINUX_MM_DEVMAP_MANAGED_H */