From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from canpmsgout03.his.huawei.com (canpmsgout03.his.huawei.com [113.46.200.218]) (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 1EB562EB10 for ; Mon, 24 Aug 2026 02:46:42 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=113.46.200.218 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1787539607; cv=none; b=PzXUrX86Qt1jkiFoR1nCHAD14e3J1lX7QXWlcVQwWZAvoJQFfROph+a7/DPFUZyqBB4DlS6nqcaVbaWbhhWoJcJxeiztJQPFQ7oU7p0x888EVy14KAL3BaK3xvfxFSSg1cUSxiW/pqMIMATgOu/rFkz54IwDd85QVhRB7AGV9WA= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1787539607; c=relaxed/simple; bh=k3drt6rAaBl/yu1N/CSlfIHsE4QYLNqlvtbX2uypswI=; h=From:To:CC:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=NxlO+dUyIMD4ogdY+5vo1Ms9rUN3gg9wI62iHPl8nYAy5TO6wPpqbwlLG1M7PlaVsyAzIV5o+/64Z9MgpW/F2TbcJ4lnQoh32cNCfVrIQgIXPTCpN68KpvFC0x/rWhCfEhfHe5BctkrtTY79QNw1eWSFwGzTxkcNfkZGEyL3y/Q= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=huawei.com; spf=pass smtp.mailfrom=huawei.com; dkim=pass (1024-bit key) header.d=huawei.com header.i=@huawei.com header.b=I2RdeO+i; arc=none smtp.client-ip=113.46.200.218 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=huawei.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=huawei.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=huawei.com header.i=@huawei.com header.b="I2RdeO+i" dkim-signature: v=1; a=rsa-sha256; d=huawei.com; s=dkim; c=relaxed/relaxed; q=dns/txt; h=From; bh=pNZbPImN1HBVjw42D9IBO0B2LYorjmfZ4vM9pHSZXPA=; b=I2RdeO+iwb22nkG/IYlzNCm9HdhqW7GckDNeGGN/3EmcJ2TiP1syF4ThvRRNCX2uBpDHdCrdQ pRAiQ1xQ4S1Way6fXAwqUobXUv+IydhgMSqP8gaq3gVoEZbAap9p9+qYTpplARZNSyq6JrG6c5A 9sIP94/YG/HyLTu3suFMpFk= Received: from mail.maildlp.com (unknown [172.19.162.144]) by canpmsgout03.his.huawei.com (SkyGuard) with ESMTPS id 4hSw4f2rkYzpSvB; Mon, 24 Aug 2026 10:35:30 +0800 (CST) Received: from kwepemo200009.china.huawei.com (unknown [7.202.195.26]) by mail.maildlp.com (Postfix) with ESMTPS id B608B40538; Mon, 24 Aug 2026 10:46:34 +0800 (CST) Received: from huawei.com (10.50.159.234) by kwepemo200009.china.huawei.com (7.202.195.26) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.2562.45; Mon, 24 Aug 2026 10:46:33 +0800 From: LongWei27 To: Alexander Graf , Mike Rapoport , Pasha Tatashin CC: Pratyush Yadav , , , , , Long Wei Subject: [PATCH V2] kho: Convert error handling to immediate return pattern Date: Mon, 24 Aug 2026 10:44:48 +0800 Message-ID: <20260824024448.550552-1-longwei27@huawei.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <00c96a62-f783-497c-a7ac-1de495e4af06@huawei.com> References: <00c96a62-f783-497c-a7ac-1de495e4af06@huawei.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain X-ClientProxiedBy: kwepems200001.china.huawei.com (7.221.188.67) To kwepemo200009.china.huawei.com (7.202.195.26) From: Long Wei Replace the chained error accumulation (err |= func()) with immediate per-step error checking and early return in kho_out_fdt_setup(). Two problems with the current approach: 1. It continues executing FDT operations even after a failure, which is pointless and potentially unsafe on an invalid FDT context. 2. Bitwise OR of multiple negative error codes produces a result that may not represent any actual error, making debugging misleading. Early return fails fast and preserves the original error code for accurate diagnosis. No functional change intended. Signed-off-by: Long Wei --- kernel/liveupdate/kexec_handover.c | 32 +++++++++++++++++++++--------- 1 file changed, 23 insertions(+), 9 deletions(-) diff --git a/kernel/liveupdate/kexec_handover.c b/kernel/liveupdate/kexec_handover.c index 175c08a6e..93443ad84 100644 --- a/kernel/liveupdate/kexec_handover.c +++ b/kernel/liveupdate/kexec_handover.c @@ -1438,20 +1438,34 @@ static __init int kho_out_fdt_setup(void) int err; err = fdt_create(root, PAGE_SIZE); - err |= fdt_finish_reservemap(root); - err |= fdt_begin_node(root, ""); - err |= fdt_property_string(root, "compatible", KHO_FDT_COMPATIBLE); + if (err) + return err; + err = fdt_finish_reservemap(root); + if (err) + return err; + err = fdt_begin_node(root, ""); + if (err) + return err; + err = fdt_property_string(root, "compatible", KHO_FDT_COMPATIBLE); + if (err) + return err; preserved_mem_tree_pa = virt_to_phys(tree->root); - err |= fdt_property(root, KHO_FDT_MEMORY_MAP_PROP_NAME, - &preserved_mem_tree_pa, - sizeof(preserved_mem_tree_pa)); + err = fdt_property(root, KHO_FDT_MEMORY_MAP_PROP_NAME, + &preserved_mem_tree_pa, + sizeof(preserved_mem_tree_pa)); + if (err) + return err; - err |= fdt_end_node(root); - err |= fdt_finish(root); + err = fdt_end_node(root); + if (err) + return err; + err = fdt_finish(root); + if (err) + return err; - return err; + return 0; } static void __init kho_in_kexec_metadata(void) -- 2.43.0