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 AB1B0C7EE2A for ; Wed, 25 Jun 2025 23:18:48 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 3E78A8D000D; Wed, 25 Jun 2025 19:18:48 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 399B68D0001; Wed, 25 Jun 2025 19:18:48 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 2AED98D000D; Wed, 25 Jun 2025 19:18:48 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0013.hostedemail.com [216.40.44.13]) by kanga.kvack.org (Postfix) with ESMTP id 1E7AF8D0001 for ; Wed, 25 Jun 2025 19:18:48 -0400 (EDT) Received: from smtpin18.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay05.hostedemail.com (Postfix) with ESMTP id CC5FA5708E for ; Wed, 25 Jun 2025 23:18:47 +0000 (UTC) X-FDA: 83595489894.18.55020D9 Received: from mail-yb1-f180.google.com (mail-yb1-f180.google.com [209.85.219.180]) by imf12.hostedemail.com (Postfix) with ESMTP id 010B540008 for ; Wed, 25 Jun 2025 23:18:45 +0000 (UTC) Authentication-Results: imf12.hostedemail.com; dkim=pass header.d=soleen-com.20230601.gappssmtp.com header.s=20230601 header.b=0+alBDwh; spf=pass (imf12.hostedemail.com: domain of pasha.tatashin@soleen.com designates 209.85.219.180 as permitted sender) smtp.mailfrom=pasha.tatashin@soleen.com; dmarc=pass (policy=none) header.from=soleen.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1750893526; 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=inB1PU3JWa0vbtTol7UPnIAGavYFixpKMP3Mnwcd84A=; b=1w6qfHqj1lSiAXEUxGDePH4kgq0q3zLeG1en5Ax/yJH76DHtGqzVGmZTlojHuRmIBY523H 9vSSsyxIp5jbPrOppTbr8I97GutzEVTb4Q6WbHVUXZWxO4PQWoP+FIxJ0fX0wRliC86h3i KNuIYeytayyUfaMwtkErFbLN2rFJbvo= ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1750893526; a=rsa-sha256; cv=none; b=LMLhXknWLGKl7xKhy5a0UaceU1hOmPRyLMdELp3jPfnCdRhlEKzNXIDYg29TlG3BHYQza3 q61FpaPQP4kilJD3wSjdaIX84NlQuokrAXwwbFpZqKFY/KuzUOnwV08YGCMrj1UcxTWSmy oviojdzBJr7gZrQVGygjI3p7vzruXOA= ARC-Authentication-Results: i=1; imf12.hostedemail.com; dkim=pass header.d=soleen-com.20230601.gappssmtp.com header.s=20230601 header.b=0+alBDwh; spf=pass (imf12.hostedemail.com: domain of pasha.tatashin@soleen.com designates 209.85.219.180 as permitted sender) smtp.mailfrom=pasha.tatashin@soleen.com; dmarc=pass (policy=none) header.from=soleen.com Received: by mail-yb1-f180.google.com with SMTP id 3f1490d57ef6-e7311e66a8eso303509276.2 for ; Wed, 25 Jun 2025 16:18:45 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=soleen-com.20230601.gappssmtp.com; s=20230601; t=1750893525; x=1751498325; 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=inB1PU3JWa0vbtTol7UPnIAGavYFixpKMP3Mnwcd84A=; b=0+alBDwhshGZAnrWWWnadYycaIkfNZPWmzr80Tsq//ESBdNeM7grHRfk96ATVpQuhL /G9K0OEEeRQMZ1ycv+mOf4VSWh4+lVeUGbbQmPvSpdmjwZUyVZE6dWJvP38Z8RIYglbX pQTIC5p3JknDDSxdv/S4thS8cDqTP2ac6ocVNwsDdfBgiQOEwLhDwptgUbFnO58PEsVw KdWyMVCaCCxeC7ap9XTrUoL9FN84M+f22jKxx9h5rX6anM7QjHFIjd4Ql2MEzxkn7t2g pfp7gDxz3Xja7Zb0iHxNs+4JcdnsDDoGve2hy02no3paWNg5YFmb2Dw5DLc7OHNHIbFS DW/w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1750893525; x=1751498325; 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=inB1PU3JWa0vbtTol7UPnIAGavYFixpKMP3Mnwcd84A=; b=jKSt9QEbPuHYFIBYyh+qcFl1le5NOYZ1/UJth5OVIfFCSCahmGhJsWqorhlez2/Lbr q2BDL4jHDH3F9v1SZAOzgjqlbi2+gsde/4fSasKlUIoxNBDFi+fH0yoBVDuGRwkCEJpl wxNWVfPpjvMudhh2sdoLdOr7+ZqUobh0HG2cn+zNKDfRLJ0FBW1xX9yG2xlGmf2/Fwwc LLoBVhBPRKKGqiQDLoQpmgoCIuScO+zDMdkt73qZkdjtKSrwxtvYsxKAk2gHrqSGxMAH B+p9cQAaLr8jbW83IdQa7TZ3WVhABcsjgaJinFl//OrSP9D0NJIM40UhlTaQxvvnB6KY FpRg== X-Forwarded-Encrypted: i=1; AJvYcCWeaJkJ1Lfy1Ilb3/HfcWirJZcYh1WuRFpUmli+QShJGUafdsi5YjaoeMxJdKDAyGseQ0G+aylmgw==@kvack.org X-Gm-Message-State: AOJu0Ywzk5AJv5Up0ZmJhZw9txYAVgxR1KpY8bTb+EwgovtBlJy1fnhw zfISKdBHjW/Z3JnXLSHKxDH5vbGTG1S+Jc0DD3+36cOilkraWJXOZQ6fZz9z0g40hRo= X-Gm-Gg: ASbGncsH08AdmVrYziUdyhgQFf6A0NQ+EgWZCtnbgQ3KEic+OSqBwotCIoXny4T4qmi G+lMfejyq80H6T8QBsHzATKw43USCOTS2CL2Lw6H5BespnvJBWTv9iI25wb7oAeUIEshm60KT3Y LYaeTViM7WbMJrPANliYW+1ivGw9jbdoPRohbsI6vlhXPAxa46u95M+9Reeyj/uEpoeGpSttHF8 dvt3bYKhUoGd00LebTXwUg+1QfHDjAfajsQF1SHd1JRbZdyGsYhbVNr01zJjg/h83gIG5CfSEMC ziOT1cEUQvgzJEwcVc6ooU4wvf//FPPT1+KIKe3fSAAHbqpvP5T0PGcZCHGnjCQojlxsA6bqQ0q TMJXnulnoBhLKc3CO/secnzITsA6USAO5zR9LYU3LhJinVrSlrPV8J6abl3vh274= X-Google-Smtp-Source: AGHT+IHRsJtLlwzyJUd/Ox/O3krs7IL9puzl8GoqWoWuzYibrteq8e0xpTf2XL0zflmCtIomZsxpVQ== X-Received: by 2002:a05:6902:10cf:b0:e81:e333:fc38 with SMTP id 3f1490d57ef6-e8601762c25mr6548852276.19.1750893525010; Wed, 25 Jun 2025 16:18:45 -0700 (PDT) Received: from soleen.c.googlers.com.com (64.167.245.35.bc.googleusercontent.com. [35.245.167.64]) by smtp.gmail.com with ESMTPSA id 3f1490d57ef6-e842ac5c538sm3942684276.33.2025.06.25.16.18.43 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 25 Jun 2025 16:18:44 -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, lennart@poettering.net, brauner@kernel.org, linux-api@vger.kernel.org, linux-fsdevel@vger.kernel.org Subject: [PATCH v1 01/32] kho: init new_physxa->phys_bits to fix lockdep Date: Wed, 25 Jun 2025 23:17:48 +0000 Message-ID: <20250625231838.1897085-2-pasha.tatashin@soleen.com> X-Mailer: git-send-email 2.50.0.727.gbf7dc18ff4-goog In-Reply-To: <20250625231838.1897085-1-pasha.tatashin@soleen.com> References: <20250625231838.1897085-1-pasha.tatashin@soleen.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: 010B540008 X-Stat-Signature: ybjiyhdhjore8fndzb5zw8bpgs1ir8q8 X-Rspam-User: X-Rspamd-Server: rspam01 X-HE-Tag: 1750893525-610482 X-HE-Meta: U2FsdGVkX1+OsgKxvNV8N93JMM8mk2mBmORT+LyV6G8FBt75lU7q/+BDEB/L9nvr2ylkdQW7+VZmpFsk4g6N78m8sZ2ku/ok3XQpgmuziOO17o3L3SC8VP7uc6kgoXItLHc0bdXJF8t76+mS/dMwvTxflsrXXM5seKauT0gDd5unI2Yq3GpPncbbiRYBGqxARx6bqTAiNppwPCdzFmUfnCfzUij6lET30FN3XmK3Hlhsnn2von9yEWuRamgUor1vFmq0Sekfbz2Rk6BJ+o/ddmt1MGZpgyWfXySWpB5WUwBPVZ4orDnDJgPU5BkQ49kBJpKQ5qgxIvg1oG8tEzgmBrDRlthfwREhGuQPHVGtwgLVYK7mZl1M9n5aGzw67Fwr2CAxz6yKUYNY3Jx+Fb5JMTh9Ks0VyJFZp7emvRNBSCVhfI/HqJli/qsEAiNdizHvGRB0IriglYTsjcrvAWn72pVBS0MZuoR6DUgglp/WmOSAWoDjInoHd/4HdiqP6M6MC8HVkqgSivxX54DMg1vtuk/6U7wKwZnMNlwyjK+SlY7xj/xkRWWSE4Q8m2f4OLfSrCV1kp22906iSEC8D59zfF86wzH9Ma8suAacEO/9eJQT0N+stHByQHInGzLFT0ApN4Xz/V30SqXG34v1EmQegeDLyAhEctQSRuGTNmj4i43xzwYHe2bkwLwHB3Bo7xIdxSzTbqB1ZXhxCxh56ePeDV+VhDSLXghXSdFZs2cmELGqD2yzqTfWZ0fRyPov4oxFt6y16IvnjxuVxYHoBKmedz/bsXZF2zIVDGqQ2h5M0k9dx/wEEjuPFl+je8RSZGxTLl1zrxXY66cWz0y0BNRZY9/8FGQ8nO+Y0mdCkTFwLalX3DP30oR3HrrR8Dnp5vy8XboT0/wdYoNldjiXYWRNntmZtpYgVBxMdLwVSFejwre3X+SRyiSjRLBDjt3+WYaPQ5gqhJM+sNSGT3x/37A qzrXA3/Y m8xEH6f8YZ8tOrFclJEvXhRg+8e/nYvMinmbx9Q3VnUaFMNtTKWHzPTRpam691pyzy7XPXnfFIIVIWWhjUJ2xsj+1Li6OV7ICY5yK+LSUFKxpKFdB00oDzh5egzrAeuQ42jTSJ59OJOjUIzP16aYI4PJo3TBrzHowdZbGves+mx8ibkz49asCVVhJv9eZKNq7akZEnxBxUrxn5NFqBGrrUdmgXJMjwldXfgHQ7dQPUIF+sYM8iyAzKxEitJcMTgjKqKcx0MRF1fxtWfUZWYWbNJptHONylruwGtIFjP0GbGSJ9hCkxv2bsT2k+EzgrpwWbRs2YUjs4lMjnUtb5yzCLn/eGkl+zRQJF9hum66En9l/4qhO9h6kdfnkcxBqj0mU7Usefe3vcLGW12BJ7E5jMxczVKP1/qWMZ8WWKc4ee5yTHt/8RySIl0954ZamhuWvctKueqJOVaK0h3D9Qo0fLP7x24VxpJzN192P7jR1e1OoG9fIZOVpRHLXYN9jgxEtzTkwFIwQrsNvrz9Y4O3JT7n7dRi7/n34N6Af 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: 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 --- 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 5a21dbe17950..1ff6b242f98c 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; + } + } bits = xa_load_or_alloc(&physxa->phys_bits, pfn_high / PRESERVE_BITS, sizeof(*bits)); -- 2.50.0.727.gbf7dc18ff4-goog