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 BE428C3ABDD for ; Thu, 15 May 2025 18:23:38 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id C22686B00AD; Thu, 15 May 2025 14:23:33 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id BB11A6B00AE; Thu, 15 May 2025 14:23:33 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 9B2D76B00AF; Thu, 15 May 2025 14:23:33 -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 72AF76B00AD for ; Thu, 15 May 2025 14:23:33 -0400 (EDT) Received: from smtpin15.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay08.hostedemail.com (Postfix) with ESMTP id 7FE5D1404AF for ; Thu, 15 May 2025 18:23:33 +0000 (UTC) X-FDA: 83445965106.15.07F9558 Received: from mail-qt1-f171.google.com (mail-qt1-f171.google.com [209.85.160.171]) by imf06.hostedemail.com (Postfix) with ESMTP id B0938180010 for ; Thu, 15 May 2025 18:23:31 +0000 (UTC) Authentication-Results: imf06.hostedemail.com; dkim=pass header.d=soleen-com.20230601.gappssmtp.com header.s=20230601 header.b="cml4i/cb"; dmarc=pass (policy=none) header.from=soleen.com; spf=pass (imf06.hostedemail.com: domain of pasha.tatashin@soleen.com designates 209.85.160.171 as permitted sender) smtp.mailfrom=pasha.tatashin@soleen.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1747333411; a=rsa-sha256; cv=none; b=x0mY1Qmc7bXDhLHMKdp/QbTs8uu9BWsvnwIbyuST4bbhYI6+i7mfprp8hKbs3y8BOj2qFZ k4bkJj2kOeYD6t+fN7/ey2nM+PIypRhgMieposu0VB0weB+YDirByBJ+nj452bLfa9nggZ +Hfzu9VmfKuPL8b2sgUcQJjHGvByk1c= ARC-Authentication-Results: i=1; imf06.hostedemail.com; dkim=pass header.d=soleen-com.20230601.gappssmtp.com header.s=20230601 header.b="cml4i/cb"; dmarc=pass (policy=none) header.from=soleen.com; spf=pass (imf06.hostedemail.com: domain of pasha.tatashin@soleen.com designates 209.85.160.171 as permitted sender) smtp.mailfrom=pasha.tatashin@soleen.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1747333411; h=from:from:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:mime-version:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:dkim-signature; bh=FLBg4PWpdjUgYuKX869tnqzLKlnuTQmJAhNrRi7i9EE=; b=kTjfvdrIaoLnWnsFJC0oFmwhDrTPXIDGw7xj0NIt/t4lCLmrjxxncS4zbzrPqpAPnm2iD7 1f6Nhkz0kfWQfcIPdKDym6uH9fpDh/Qc6jrxGQ23MtEQzzr8sIk8Tu+3/tgJJ9KaACWxVw PNDgaNgxmLn6OabK/wOda+kqI/kCrTE= Received: by mail-qt1-f171.google.com with SMTP id d75a77b69052e-47664364628so15695371cf.1 for ; Thu, 15 May 2025 11:23:31 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=soleen-com.20230601.gappssmtp.com; s=20230601; t=1747333411; x=1747938211; darn=kvack.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=FLBg4PWpdjUgYuKX869tnqzLKlnuTQmJAhNrRi7i9EE=; b=cml4i/cbz0bGI3H65rbU87AgmcDpo/tcvCR0ULxJnOQJFOxfZ0m/hjwj2wHNdxIjn4 CfRMGlVuzJX7RnEGaL7NGtTz9zvECAr+y/wxw8QPGQyGWYor4jGQmOwxY+CqUjOY2Zj3 MYIDOyg3dvZ8jo3TMtb5qrc/oRZFqX1h35joEok+C1l1NhnYPaEQlhesc+oiO33NfKlK gLDfIPsy3Q8Q3d+7z1BKFah6mCmrXpfAd30RGVAa9hh4AXQ0DJkYGaROTLwR7RnkAiy8 NfLs/OgrP+j6o4+aNAzlZ/Vy5G1y8hhA6uQl/msyMIPbP727ecJVOjeNhD+Hmf2KBaIt DCKA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1747333411; x=1747938211; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=FLBg4PWpdjUgYuKX869tnqzLKlnuTQmJAhNrRi7i9EE=; b=B8Y4Uo4f5R4xkTMokg8tZuFHzv2ps1buvXlE4BHH1iiBkE5z5qlA1lC+9A0Ow7erSG 96CaynuS60CtQ1z1yirBZHAII1ZvZhaSNKjQ6reM14yVEU9NfHspmYcmFR8DJXWqiVQp nzLTJfjJ2R0g+gDuRYs/FOpRFSzYDML3U2IOnF6Ze/97gb1EBie9Spp8WjCNYKx9Ob1b IEqVc925IihP1qlMf0fhito7Ky64KXKrQYeYlPyJxGqc2zseE+0RIc+ovOAGUFkyBK31 vbH3n4ckYMokCJMwU7MFJcw2zv2Dha2m/hduIEqCxokzBxdMWiwNRXJM7YOvvHdQ+23n 6MSg== X-Forwarded-Encrypted: i=1; AJvYcCVx1/VpGYvi5PCmDtAQuvf+WWJqNVQ05RkLwKru/qZR+uGgCL+LnxrEIr6cigEWCLnpFZudeMVc7A==@kvack.org X-Gm-Message-State: AOJu0Yx+QMpavpviGViHtZM2gHYf8QEHWEUd5fjhASnmF1d8Ex1Yo1LR pvBrg/lSAlf3fwPtX/zzOVcvGbhmBjHGuCyAsOqwxIRxcoeyTBcB3NvXYsjDvGBdZ1A= X-Gm-Gg: ASbGncu1R9wJ75KRkJYuiFvG2zcxh67ep6tMLbaIT9qzOMeMOJaK7veGromW3BXmvCq E+Fx1rTTDQLFhiPHBairBlN4uopF5Dd0liXKvuxOZb4+bUrAxjSONRAM3F1/uciq1EhaBYCyR+b aY/glCylRGrqhxliXOzCsVPtXYl1XloZH2EcpLqjzl1vhD3Mp2im0wfKzF0FN/aTf0uAv+5G8p9 L8u6+8H1b6vnbGJzSgJJ9NUbFZq5PdQG/AJL2kPF92wQMfPFG+xQJax/kHNKNIkumRbq2+r/RPZ 0Tf5NOZufi3p2Zv+Mn77/nWf5PSh89+xMarzbQKvWRXPcSlk19C2Yztj4ZRH6jK6AIq2/TQub1n p3IeRL5T0BW2CGJjscqXgiAad0hlVLM7r0poLNOMKNcmt X-Google-Smtp-Source: AGHT+IHdVpoXFzO5vpvPCK/fe5GtMM9oE80sh2/xmjSmGwo/5647bcIutgv4NbFJWhbe73WlciRiuA== X-Received: by 2002:a05:622a:1999:b0:48d:4887:9850 with SMTP id d75a77b69052e-494a0e2b131mr70141661cf.19.1747333410606; Thu, 15 May 2025 11:23:30 -0700 (PDT) Received: from soleen.c.googlers.com.com (138.200.150.34.bc.googleusercontent.com. [34.150.200.138]) by smtp.gmail.com with ESMTPSA id af79cd13be357-7cd466fc2afsm18218685a.0.2025.05.15.11.23.29 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 15 May 2025 11:23:30 -0700 (PDT) From: Pasha Tatashin To: pratyush@kernel.org, jasonmiu@google.com, graf@amazon.com, changyuanl@google.com, pasha.tatashin@soleen.com, rppt@kernel.org, dmatlack@google.com, rientjes@google.com, corbet@lwn.net, rdunlap@infradead.org, ilpo.jarvinen@linux.intel.com, kanie@linux.alibaba.com, ojeda@kernel.org, aliceryhl@google.com, masahiroy@kernel.org, akpm@linux-foundation.org, tj@kernel.org, yoann.congal@smile.fr, mmaurer@google.com, roman.gushchin@linux.dev, chenridong@huawei.com, axboe@kernel.dk, mark.rutland@arm.com, jannh@google.com, vincent.guittot@linaro.org, hannes@cmpxchg.org, dan.j.williams@intel.com, david@redhat.com, joel.granados@kernel.org, rostedt@goodmis.org, anna.schumaker@oracle.com, song@kernel.org, zhangguopeng@kylinos.cn, linux@weissschuh.net, linux-kernel@vger.kernel.org, linux-doc@vger.kernel.org, linux-mm@kvack.org, gregkh@linuxfoundation.org, tglx@linutronix.de, mingo@redhat.com, bp@alien8.de, dave.hansen@linux.intel.com, x86@kernel.org, hpa@zytor.com, rafael@kernel.org, dakr@kernel.org, bartosz.golaszewski@linaro.org, cw00.choi@samsung.com, myungjoo.ham@samsung.com, yesanishhere@gmail.com, Jonathan.Cameron@huawei.com, quic_zijuhu@quicinc.com, aleksander.lobakin@intel.com, ira.weiny@intel.com, andriy.shevchenko@linux.intel.com, leon@kernel.org, lukas@wunner.de, bhelgaas@google.com, wagi@kernel.org, djeffery@redhat.com, stuart.w.hayes@gmail.com, ptyadav@amazon.de Subject: [RFC v2 03/16] kho: add kho_unpreserve_folio/phys Date: Thu, 15 May 2025 18:23:07 +0000 Message-ID: <20250515182322.117840-4-pasha.tatashin@soleen.com> X-Mailer: git-send-email 2.49.0.1101.gccaa498523-goog In-Reply-To: <20250515182322.117840-1-pasha.tatashin@soleen.com> References: <20250515182322.117840-1-pasha.tatashin@soleen.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Stat-Signature: 4thbcyj8kni5bditdociduxmbugs8hzi X-Rspam-User: X-Rspamd-Queue-Id: B0938180010 X-Rspamd-Server: rspam06 X-HE-Tag: 1747333411-366932 X-HE-Meta: U2FsdGVkX18JFEvjaX729iF+oSIgaJtd0VUDrzBkxl8AiXwWe2nr/Yk5JrmC/KPyrZH7GnkG0HbjTDcp313jQLI7BDkap7dJ8GgZYa477yX9mPZWV09z+M1MQW8+9YVaQtZrxD45SdGSVEha4FvNy8RxmW2OmPTAP9cisL8KWTZ+pCqtmWBMp/Sw1gtVJV+MmMdbt6sPkEVnZLNfAFShMVZtjhBo1goUCVMoUJbJppyxyRpNvZCOPEx1R5AIA40HsEshC+yS/+uvsNmSMEP/qGqKKtUdS4vGjTGXrjiin55iG9sKilNhvK2seJZe8jLJe05PxpC8dW0f/gYGM1HsdzM0H+jnhuoxwbD9V8XSMJ1PtVQP3wd+rCpBUf7IDr+xl3I4t/nkMlD8WXrlVQCMHwq9dbNCwoxfi3mXLeVlxRVPKZDHLGQ4qnMsPczjg2vgvcOeC3iIx2e0h8xK24zFbCBOepYwzAuGW1PnLpfUsLUEIoJvbk4rcRO4ajPgeEpof8RceDG+RUlz9XlZhmc4SZmFj/Fjfrs7/s4hN6IfXzaqYUjCCI/Spv6hwZAxqSM2oX4qpUJpRdKLQC2H7VaMti+eedNRI59kRmnr3KFlF6hJvMlPpUGmhBFsHHqWQGFcLe75K8aoIrixkzmUGm++HwE8/jc0yXcpjhKwCios7M+HCb2RC/qqgey+yk5HXuu4m+ydRgWKiwqeFWX63VONOyd6WQm20DTV5IV6ZK55E6rVrD0Dk1u6jG6btYWhk5NJDvZy0EhtBVeycsyJoxYCHvSxeYv1Oss21edIxhl1i8jmY2xt57bpUSxhh5lIvV5syWWgs2TfcsOtC4BP8+Fj0IQ5aPFsF9J2Bw5uLIu6fE/g2GjnQiVTH3gVw1b9OpHqXhAo0EQKZIgetd0PbsbITP7px4mofgWfuGlbV7u2lY4/VK3UxTo6RZkipHKtom1JsRyKCCiEW67kp6vbdHZ Jzl2kLlH bPPOyt8PZox2oGpbDN4cVnHbvLKrO9TzZlCvVa7pw7/w190jGmF6lGDM3rOgb6BnvedLfkUlENKnwVllA9X44uy56QMwoXcfYH3uaiaW6rxzHYEcODsiXpNOqLVOiHByZe97vLgBJChGf6OHqHEy3wZXjEhptXkKb5Gi/12u2i46dbYBoKfM+jpjVqHsRWBVdWCx5SYF0ijrrxnEsCkG+8ibJyVnwcqH6xjsL+TB8nDZRMPvYfPEHvRmLrh2mGq83f7lDp+tB8qB7JKVwN+sdDu1FuLw3zLgHq3ntf5q+a5J1jyfojo7unfi8/gOqx3UW6QXRxLXcS6p04xQrw4COwl206zW87knfrnQBVnwES1jcBbOozK6O53RAl8keBx6oJtBD1tzbsPbL1t6vuPur3jbbQjxZBUavAH1Uw1iGyEde7tm0kNwCslpEwQoeBaF5WN4XTRiN0SGJbg8gRZ43AnUH7wMGLbglQDjfDBjqgNm/hW/o0OKmIQ7iT3z5g1paeWjcPgKRUGHNcg9nPsd09fwVQg== 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: From: Changyuan Lyu Allow users of KHO to cancel the previous preservation by adding the necessary interfaces to unpreserve folio. Signed-off-by: Changyuan Lyu Co-developed-by: Pasha Tatashin Signed-off-by: Pasha Tatashin --- include/linux/kexec_handover.h | 12 +++++ kernel/kexec_handover.c | 84 ++++++++++++++++++++++++++++------ 2 files changed, 83 insertions(+), 13 deletions(-) diff --git a/include/linux/kexec_handover.h b/include/linux/kexec_handover.h index f98565def593..3d209f9e9d3a 100644 --- a/include/linux/kexec_handover.h +++ b/include/linux/kexec_handover.h @@ -42,7 +42,9 @@ struct kho_serialization; bool kho_is_enabled(void); int kho_preserve_folio(struct folio *folio); +int kho_unpreserve_folio(struct folio *folio); int kho_preserve_phys(phys_addr_t phys, size_t size); +int kho_unpreserve_phys(phys_addr_t phys, size_t size); struct folio *kho_restore_folio(phys_addr_t phys); int kho_add_subtree(struct kho_serialization *ser, const char *name, void *fdt); int kho_retrieve_subtree(const char *name, phys_addr_t *phys); @@ -69,11 +71,21 @@ static inline int kho_preserve_folio(struct folio *folio) return -EOPNOTSUPP; } +static inline int kho_unpreserve_folio(struct folio *folio) +{ + return -EOPNOTSUPP; +} + static inline int kho_preserve_phys(phys_addr_t phys, size_t size) { return -EOPNOTSUPP; } +static inline int kho_unpreserve_phys(phys_addr_t phys, size_t size) +{ + return -EOPNOTSUPP; +} + static inline struct folio *kho_restore_folio(phys_addr_t phys) { return NULL; diff --git a/kernel/kexec_handover.c b/kernel/kexec_handover.c index 8ff561e36a87..eb305e7e6129 100644 --- a/kernel/kexec_handover.c +++ b/kernel/kexec_handover.c @@ -101,26 +101,33 @@ static void *xa_load_or_alloc(struct xarray *xa, unsigned long index, size_t sz) return elm; } -static void __kho_unpreserve(struct kho_mem_track *track, unsigned long pfn, - unsigned long end_pfn) +static void __kho_unpreserve_order(struct kho_mem_track *track, unsigned long pfn, + unsigned int order) { struct kho_mem_phys_bits *bits; struct kho_mem_phys *physxa; + const unsigned long pfn_high = pfn >> order; - while (pfn < end_pfn) { - const unsigned int order = - min(count_trailing_zeros(pfn), ilog2(end_pfn - pfn)); - const unsigned long pfn_high = pfn >> order; + physxa = xa_load(&track->orders, order); + if (!physxa) + return; - physxa = xa_load(&track->orders, order); - if (!physxa) - continue; + bits = xa_load(&physxa->phys_bits, pfn_high / PRESERVE_BITS); + if (!bits) + return; - bits = xa_load(&physxa->phys_bits, pfn_high / PRESERVE_BITS); - if (!bits) - continue; + clear_bit(pfn_high % PRESERVE_BITS, bits->preserve); +} - clear_bit(pfn_high % PRESERVE_BITS, bits->preserve); +static void __kho_unpreserve(struct kho_mem_track *track, unsigned long pfn, + unsigned long end_pfn) +{ + unsigned int order; + + while (pfn < end_pfn) { + order = min(count_trailing_zeros(pfn), ilog2(end_pfn - pfn)); + + __kho_unpreserve_order(track, pfn, order); pfn += 1 << order; } @@ -607,6 +614,29 @@ int kho_preserve_folio(struct folio *folio) } EXPORT_SYMBOL_GPL(kho_preserve_folio); +/** + * kho_unpreserve_folio - unpreserve a folio. + * @folio: folio to unpreserve. + * + * Instructs KHO to unpreserve a folio that was preserved by + * kho_preserve_folio() before. + * + * Return: 0 on success, error code on failure + */ +int kho_unpreserve_folio(struct folio *folio) +{ + const unsigned long pfn = folio_pfn(folio); + const unsigned int order = folio_order(folio); + struct kho_mem_track *track = &kho_out.ser.track; + + if (kho_out.finalized) + return -EBUSY; + + __kho_unpreserve_order(track, pfn, order); + return 0; +} +EXPORT_SYMBOL_GPL(kho_unpreserve_folio); + /** * kho_preserve_phys - preserve a physically contiguous range across kexec. * @phys: physical address of the range. @@ -652,6 +682,34 @@ int kho_preserve_phys(phys_addr_t phys, size_t size) } EXPORT_SYMBOL_GPL(kho_preserve_phys); +/** + * kho_unpreserve_phys - unpreserve a physically contiguous range across kexec. + * @phys: physical address of the range. + * @size: size of the range. + * + * Instructs KHO to unpreserve the memory range from @phys to @phys + @size + * across kexec. + * + * Return: 0 on success, error code on failure + */ +int kho_unpreserve_phys(phys_addr_t phys, size_t size) +{ + struct kho_mem_track *track = &kho_out.ser.track; + unsigned long pfn = PHYS_PFN(phys); + unsigned long end_pfn = PHYS_PFN(phys + size); + + if (kho_out.finalized) + return -EBUSY; + + if (!PAGE_ALIGNED(phys) || !PAGE_ALIGNED(size)) + return -EINVAL; + + __kho_unpreserve(track, pfn, end_pfn); + + return 0; +} +EXPORT_SYMBOL_GPL(kho_unpreserve_phys); + int __kho_abort(void) { int err; -- 2.49.0.1101.gccaa498523-goog