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 F3C6AC3ABC9 for ; Sun, 18 May 2025 15:51:16 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 9F2F76B0082; Sun, 18 May 2025 11:51:14 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 9A2086B0083; Sun, 18 May 2025 11:51:14 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 88F436B0085; Sun, 18 May 2025 11:51:14 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0016.hostedemail.com [216.40.44.16]) by kanga.kvack.org (Postfix) with ESMTP id 698EE6B0082 for ; Sun, 18 May 2025 11:51:14 -0400 (EDT) Received: from smtpin05.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay06.hostedemail.com (Postfix) with ESMTP id 7DC66E4FA5 for ; Sun, 18 May 2025 15:51:15 +0000 (UTC) X-FDA: 83456467710.05.6B2E4CF Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by imf27.hostedemail.com (Postfix) with ESMTP id D1C6C4000B for ; Sun, 18 May 2025 15:51:13 +0000 (UTC) Authentication-Results: imf27.hostedemail.com; dkim=pass header.d=kernel.org header.s=k20201202 header.b=Ims6q9M4; spf=pass (imf27.hostedemail.com: domain of rppt@kernel.org designates 139.178.84.217 as permitted sender) smtp.mailfrom=rppt@kernel.org; dmarc=pass (policy=quarantine) header.from=kernel.org ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1747583474; 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-type:content-transfer-encoding: in-reply-to:in-reply-to:references:references:dkim-signature; bh=0yx/i8jUhYkmUBOS7xikVrkU5+lN9H+1efAAb6qPyWk=; b=0OQnGFgK6kKask2ZArUUhGm6Ve1HkDGhrcSNEISlsQdkFwWszeNXvbbE0Khplb9GQejLFf g8UCMLwmThMLs9QUbx/vDZ5TN7AHjHd/bt5capYIcB8VWEB4it8w+UjqWYJ3YR8v6klnWw DEwjG7dA334AyXypHchlOndd5Wd51z8= ARC-Authentication-Results: i=1; imf27.hostedemail.com; dkim=pass header.d=kernel.org header.s=k20201202 header.b=Ims6q9M4; spf=pass (imf27.hostedemail.com: domain of rppt@kernel.org designates 139.178.84.217 as permitted sender) smtp.mailfrom=rppt@kernel.org; dmarc=pass (policy=quarantine) header.from=kernel.org ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1747583474; a=rsa-sha256; cv=none; b=rVa3gvucrsJEnxqr13okocdXqgrumS/Caj8zs3pYx3s7zoSpyKjofyb8DMIGblg5K46cku WbXCLrcTSuter9y/cHt7D/v5B9YlbnZTT77PzdbpPjqqkz4dvaHEXf11iKA785DojUqGvB Hnxi7DI+kZSxbyEA2VSS7/6LAJ/925M= Received: from smtp.kernel.org (transwarp.subspace.kernel.org [100.75.92.58]) by dfw.source.kernel.org (Postfix) with ESMTP id 691AF5C12B3; Sun, 18 May 2025 15:48:55 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id D6993C4CEE7; Sun, 18 May 2025 15:51:08 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1747583472; bh=f46ZYATqSlZQYJjPraHCnJoSA69zLQj8qTugXkfCsGA=; h=Date:From:To:Cc:Subject:References:In-Reply-To:From; b=Ims6q9M46Czd/XpLtif0k76dTRzbU76gkPqoaANZ1rGHB1B6yZhlQkR6laQnZJGxN 3yOFck4NqY3fpd36L8vxKDmHqbGKC0H+VBZMv5+xZBEnn30xNdjeCKGNDmnzRpge5y X8IHYWj/a0UCymu9OjyhCpRSfu3ibDiDIsLNo1Dk6XPcbgyFwVwDiHZot0/orsql1O sex6JIHSgIuNO6uEvr92py72e+obAPGrCTvJXrds4QQF5pVn2UK/1z7Gqfgk+Op80x LyRBes2wRBOrLbp0LRFX7EZ3CZ900vXp2UgCvOGzAh14n4xXkGCHL45OVVQfv/9qMa hio0UMUW6kvBw== Date: Sun, 18 May 2025 18:51:04 +0300 From: Mike Rapoport To: Changyuan Lyu Cc: akpm@linux-foundation.org, graf@amazon.com, bhe@redhat.com, kexec@lists.infradead.org, linux-kernel@vger.kernel.org, linux-mm@kvack.org, chrisl@kernel.org, pasha.tatashin@soleen.com, jasonmiu@google.com Subject: Re: [PATCH 2/2] KHO: init new_physxa->phys_bits to fix lockdep Message-ID: References: <20250518142315.241670-1-changyuanl@google.com> <20250518142315.241670-3-changyuanl@google.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20250518142315.241670-3-changyuanl@google.com> X-Rspam-User: X-Rspamd-Queue-Id: D1C6C4000B X-Rspamd-Server: rspam09 X-Stat-Signature: w7jup5yqgxp554oykjhgmmpobyfw3crd X-HE-Tag: 1747583473-438580 X-HE-Meta: U2FsdGVkX18uEYyMMId5Ovd9mUr8dwKPwi/gulqHk3jDExJWSwu6GiV1+46KUH2FNaAo1kNPD8K4U1ZLpRrx44jaMZu/TZ63laCjqONjGLVGgYMcFwTG/U3X0QJ7xnzO9WZHoW28A+kEjOVDlCZYgWKF34j6TnTLKPYw5slFOlpow7AbdBFcay8gmur1YYkjYNHDUQxQGSYp64QgdFf/SOSUWKpWMNNR4Ebk/eT0t7RYdS41zr3yjazo6YsLBp9rp5z/CH59lS+rOiwgUPUpysM5BwNzLK2Bmk/sBcDI67gXBedH31NHgM+dyB/UMbfbIXVYVIp/BiG2XT1yQnhzGawvgCjSkxR9lXl2aZCrF8QYAzQ+EDEOP0LdBEyBO1CDvBylxaJ6K/UjO3EqXR37M1/JcvQBBRGl7CAcTl12jEnvuh5Tcmxet/4rgEGPj8f0BAVcdrUIfR1ML2ynqNrBb/T0PlhhngEzKOhmbbvc/psNcQEKKII72vOwtApX7tunUr2qIPVFCeaR95S2IOvRCAnal+xipGU/x2zG+0pXmhpq9bDBG2BLiGO6eTNccHAl3AGsiAcaSO6Fd4Df329Gi0WQejhe6+gZ4aOCatyPpyPDB9cpkCccWDdOMGpD71o9n8U/2stvuzooZEWOf780T451nSbo/rWx7WragzRTcOX992V2GoeHQVOhr6xh0ayFd3uPPuEAcpN2S+VxNDWPgasJvb4+2QxWSfspZ8pF8gay9QHZ5t7WmH8M/cd+Onm+nZrcM8WoJUqqh7tIpy4kCFYRN3BdaT/V+juIpukmBGWERu59mJXJk4UapOkI8Ks2kUr+7MwqBrfpsr95Mxbeqj95dLkrLrPH1RgWvInkKwUpgNXbqvUlsTyDGUB/1RjoHp1V3ulkldO7cvH5kuOzAF+8qkyHsVZirRFkmJgsdv/Qc5V6IXzurx9TrnmibWBifwcDdch/6YK2u6dd959 wYxqimTd sqj/wJ6zVJvPHcO5HevrubB4HprRnEivX3bIE3hDmNzIGbBsHg4lto5I0Fi18mDkKULw/mMoLk220k8224aURCsBZZmMw4QDWeq90wmvAsDem7x8RneBz9b82rujtboL9hghBzJsUBzDVbXeTjKMwtC4fFh/bEje5w5s3wGnZ19CT2d54bNb8XbFIAGa1CRAu2m4sAd3EPr9FfvWhKqhC6OkkOq9HgSs7ssxnl0HQSwwjJBHDL7/uZC/lHkruGu6FyL6ompgKw/+S52llaxZVN1/E3wp9E6kvBjwDmXYtTYPYrgwDBrZHKNEoK8QJQwmXoPKJFk19dhRMQjkgyPKPIGq7U51PAm/I1z3BAifmySDfZJCv7UwcC2BnZxoPAkLK6Skj 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: On Sun, May 18, 2025 at 07:23:15AM -0700, Changyuan Lyu wrote: > From: Pasha Tatashin > > Lockdep shows the following warning: > > INFO: trying to register non-static key. > The code is fine but needs lockdep annotation, or maybe > you didn't initialize this object before use? > turning off the locking correctness validator. > > [] dump_stack_lvl+0x66/0xa0 > [] assign_lock_key+0x10c/0x120 > [] register_lock_class+0xf4/0x2f0 > [] __lock_acquire+0x7f/0x2c40 > [] ? __pfx_hlock_conflict+0x10/0x10 > [] ? native_flush_tlb_global+0x8e/0xa0 > [] ? __flush_tlb_all+0x4e/0xa0 > [] ? __kernel_map_pages+0x112/0x140 > [] ? xa_load_or_alloc+0x67/0xe0 > [] lock_acquire+0xe6/0x280 > [] ? xa_load_or_alloc+0x67/0xe0 > [] _raw_spin_lock+0x30/0x40 > [] ? xa_load_or_alloc+0x67/0xe0 > [] xa_load_or_alloc+0x67/0xe0 > [] kho_preserve_folio+0x90/0x100 > [] __kho_finalize+0xcf/0x400 > [] kho_finalize+0x34/0x70 > > This is becase xa has its own lock, that is not initialized in > xa_load_or_alloc. > > Modifiy __kho_preserve_order(), to properly call > xa_init(&new_physxa->phys_bits); > > Fixes: fc33e4b44b27 ("kexec: enable KHO support for memory preservation") > Signed-off-by: Pasha Tatashin > Signed-off-by: Changyuan Lyu > --- > kernel/kexec_handover.c | 29 +++++++++++++++++++++++++---- > 1 file changed, 25 insertions(+), 4 deletions(-) > > diff --git a/kernel/kexec_handover.c b/kernel/kexec_handover.c > index 69b953551677..f0ac6a9170f8 100644 > --- a/kernel/kexec_handover.c > +++ b/kernel/kexec_handover.c > @@ -144,14 +144,35 @@ static int __kho_preserve_order(struct kho_mem_track *track, unsigned long pfn, > unsigned int order) > { > struct kho_mem_phys_bits *bits; > - struct kho_mem_phys *physxa; > + struct kho_mem_phys *physxa, *new_physxa; > const unsigned long pfn_high = pfn >> order; > > might_sleep(); > > - physxa = xa_load_or_alloc(&track->orders, order, sizeof(*physxa)); > - if (IS_ERR(physxa)) > - return PTR_ERR(physxa); > + physxa = xa_load(&track->orders, order); > + if (!physxa) { > + new_physxa = kzalloc(sizeof(*physxa), GFP_KERNEL); > + if (!new_physxa) > + return -ENOMEM; > + > + xa_init(&new_physxa->phys_bits); > + physxa = xa_cmpxchg(&track->orders, order, NULL, new_physxa, > + GFP_KERNEL); > + if (xa_is_err(physxa)) { > + int err_ret = xa_err(physxa); > + > + xa_destroy(&new_physxa->phys_bits); > + kfree(new_physxa); > + > + return err_ret; > + } > + if (physxa) { > + xa_destroy(&new_physxa->phys_bits); > + kfree(new_physxa); > + } else { > + physxa = new_physxa; > + } > + } You are nearly duplicating xa_load_or_alloc() here. Is xa_destroy() is really needed here? In the end we destroying an empty xarray. Unless xa_destroy() is a must something like this would be simpler IMHO: diff --git a/kernel/kexec_handover.c b/kernel/kexec_handover.c index ef21db6c59d5..4c8303fbf97a 100644 --- a/kernel/kexec_handover.c +++ b/kernel/kexec_handover.c @@ -91,10 +91,12 @@ struct kho_serialization { struct khoser_mem_chunk *preserved_mem_map; }; -static void *xa_load_or_alloc(struct xarray *xa, unsigned long index, size_t sz) +static void *xa_load_or_alloc(struct xarray *xa, unsigned long index, size_t sz, + bool *new) { void *elm, *res; + *new = false; elm = xa_load(xa, index); if (elm) return elm; @@ -112,6 +114,7 @@ static void *xa_load_or_alloc(struct xarray *xa, unsigned long index, size_t sz) return res; } + *new = true; return elm; } @@ -146,15 +149,18 @@ static int __kho_preserve_order(struct kho_mem_track *track, unsigned long pfn, struct kho_mem_phys_bits *bits; struct kho_mem_phys *physxa; const unsigned long pfn_high = pfn >> order; + bool new; might_sleep(); - physxa = xa_load_or_alloc(&track->orders, order, sizeof(*physxa)); + physxa = xa_load_or_alloc(&track->orders, order, sizeof(*physxa), &new); if (IS_ERR(physxa)) return PTR_ERR(physxa); + if (new) + xa_init(&physxa->phys_bits); bits = xa_load_or_alloc(&physxa->phys_bits, pfn_high / PRESERVE_BITS, - sizeof(*bits)); + sizeof(*bits), &new); if (IS_ERR(bits)) return PTR_ERR(bits); And if xa_destroy() is actually required, the allocation of new xarray should be a helper function. > bits = xa_load_or_alloc(&physxa->phys_bits, pfn_high / PRESERVE_BITS, > sizeof(*bits)); > -- > 2.49.0.1101.gccaa498523-goog -- Sincerely yours, Mike.