From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id C3940346AE8 for ; Tue, 17 Mar 2026 21:08:29 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1773781709; cv=none; b=b8Y54sLOtgWK8+dU6B9gPFYopuJPq4Ts4E6dSzmAbQ998w1BHOjH/EZQUep3/ghMlCjBQK1updKhJ9QL4q+g6Hp1BxqA+jdL0xwpRwoSXhaj9T8+lGPuRAjzQj51yhDhzOA4C+5pK5GwRkUOOFcjvIGukjaeLspon0xkCYX0ULI= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1773781709; c=relaxed/simple; bh=23rJd7OQTs97ptMEKnft/LfTEyuJevK5LsE998S/Bu8=; h=Date:From:To:Cc:Subject:Message-Id:In-Reply-To:References: Mime-Version:Content-Type; b=AHLImle0w9CjiaCQlPefGjZPRC1gRPB5KbROERszKNMSXoau5+jLaZRaMkBzrYBLR714f978F1bYEPwcluaGyzonVHiQIiBI94eFaeNBIjZgRM5nFOTTUnvmK0EoWXi12M0v0JVjBG6yu4oLPqEB5DcTlX7EulqRlWi4Qtpngpg= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linux-foundation.org header.i=@linux-foundation.org header.b=gnzTwDHB; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linux-foundation.org header.i=@linux-foundation.org header.b="gnzTwDHB" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 0C6C2C4CEF7; Tue, 17 Mar 2026 21:08:28 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linux-foundation.org; s=korg; t=1773781709; bh=23rJd7OQTs97ptMEKnft/LfTEyuJevK5LsE998S/Bu8=; h=Date:From:To:Cc:Subject:In-Reply-To:References:From; b=gnzTwDHB+LON/8XQTI6j0sODF2eLkRSJ1rjux0lTpj8qsELE5DIxmkIGh4fk+dd1e 0YkkbbXECZgs+rvbbcHjVXs0gr1Q72rIqEmn4oI4J1Jfdy5nSBAzd4zarK/s9y/9Lh 7xQ9cfkWLOtayLoivQWDPP4i2PlozPDucLf74H74= Date: Tue, 17 Mar 2026 14:08:28 -0700 From: Andrew Morton To: Pratyush Yadav Cc: ranxiaokai627@163.com, graf@amazon.com, rppt@kernel.org, pasha.tatashin@soleen.com, jasonmiu@google.com, linux-kernel@vger.kernel.org, kexec@lists.infradead.org, ran.xiaokai@zte.com.cn, Breno Leitao Subject: Re: [PATCH] kho: fix child node parsing for debugfs in/sub_fdts Message-Id: <20260317140828.f5edbc151f85ffb8751b0f2d@linux-foundation.org> In-Reply-To: <2vxzse9yddpr.fsf@kernel.org> References: <20260309033530.244508-1-ranxiaokai627@163.com> <2vxzpl58f3oh.fsf@kernel.org> <20260314154637.86a7d4f07800b59c00049814@linux-foundation.org> <2vxzse9yddpr.fsf@kernel.org> X-Mailer: Sylpheed 3.8.0beta1 (GTK+ 2.24.33; x86_64-pc-linux-gnu) Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: Mime-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit On Tue, 17 Mar 2026 09:09:36 +0000 Pratyush Yadav wrote: > On Sat, Mar 14 2026, Andrew Morton wrote: > > > On Fri, 13 Mar 2026 10:02:06 +0000 Pratyush Yadav wrote: > > > >> On Mon, Mar 09 2026, ranxiaokai627@163.com wrote: > >> > >> > From: Ran Xiaokai > >> > > >> > Commit e0c1731f5d57 ("kho: adopt radix tree for preserved memory tracking") > >> > changed KHO_FDT_SUB_TREE_PROP_NAME from "fdt" to "preserved-data". However, > >> > kho debugfs code still hard-coded the "fdt" string when parsing the > >> > device tree, causing the debugfs node /debugfs/kho/in/sub_fdts/ > >> > fail to parse child nodes correctly. > >> > > >> > Fix this by including the header file and using KHO_FDT_SUB_TREE_PROP_NAME > >> > instead of the hard-coded string. > >> > > >> > Fixes: e0c1731f5d57 ("kho: adopt radix tree for preserved memory tracking") > >> > Signed-off-by: Ran Xiaokai > >> > >> Breno's patch [0] also fixes this, but I'd rather have this go through > >> hotfixes and get backported to stable, and Breno's series to build on > >> top of this. > >> > >> [0] https://lore.kernel.org/linux-mm/20260309-kho-v8-4-c3abcf4ac750@debian.org/ > > > > Confused. This patch (kho: fix child node parsing for debugfs > > in/sub_fdts) fixes the mm-unstable patch "kho: adopt radix tree for > > preserved memory tracking". > > > > So what are you suggesting be added to -stable? > > > > (Please lay it all out very clearly, idenfifying patches by name!) > > Sorry, my bad for causing the confusion. I thought the radix tree > patches ("kho: adopt radix tree for preserved memory tracking") already > landed in mainline, but I went and checked and it seems that they > haven't. They are still in mm-unstable. So we should just meld this > patch ("kho: fix child node parsing for debugfs in/sub_fdts") into > ("kho: adopt radix tree for preserved memory tracking"). OK, that's how we presently have things: kho-adopt-radix-tree-for-preserved-memory-tracking.patch kho-adopt-radix-tree-for-preserved-memory-tracking-fix.patch <- "kho: fix child node..." kho-remove-finalize-state-and-clients.patch > There is nothing that needs to be added to -stable, and there is nothing > that needs to go to hotfixes. Great. > Breno's patch ("kho: fix kho_in_debugfs_init() to handle non-FDT blobs") > also fixes this bug, but then also adds some other changes with it. So > Breno's patch will cause conflicts once applied on top of this patch, > but they should be simple enough to resolve I think. OK, let's deal with that when the time comes.