From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-pz2-f0.google.com (mail-pz2-f0.google.com [74.125.228.0]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 3AD3944BC92 for ; Fri, 14 Aug 2026 08:14:58 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=74.125.228.0 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1786695303; cv=none; b=bk5x/hp07t1ySj6ZJY1/v91waWgyeWbBQ2MZj8UFokNEv1Ck/stbWUcZUY4utbGiqzHuhD2FGmQuD2jSvLvyBWxt+6a1QFAkhrZsaeKdJCd6A115N6vUe74N5RqdV6CFfIHbrIdoPtb38d89t9esRjOg4qTcyEctUaY3MWdq+1k= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1786695303; c=relaxed/simple; bh=rFFNpVYOrMT3Qp2yvuqi8mrntpoQOyo34lqRocpDQdw=; h=From:To:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=isAJd4qFI4J5dbxE2yGLWhmNPDDeoMXPGT3LNYRPGprbQan+9C9cQW18BfXZiVW7+BROfD+a+J72WVba6RXDYRpuU0Vm2W7S91U9V+U168zSyZR8u+qvldnn8/lEpvlYLO1gY6mWmyi+BL+bL8x9Dwx68niNCI1Ag0dX1iZL0q8= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=hOkQEXn2; arc=none smtp.client-ip=74.125.228.0 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="hOkQEXn2" Received: by mail-pz2-f0.google.com with SMTP id 41be03b00d2f7-c96739a46acso352037a12.1 for ; Fri, 14 Aug 2026 01:14:58 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1786695296; x=1787300096; darn=vger.kernel.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:content-type; bh=0Dek3piBTzvrC20sVx/LLDc7oP2Vk+2MRJebwHoj0TY=; b=hOkQEXn2eJCIIKBnnfZLhAOBM5dMr4bOITz7gf+/4lYU8HXtj7wml792SrGUyvl9t2 K8Mbx6cnL76tKXSYTxwnEjN3/SdBS94PXwu5oUnN3lxe7Pjrds77Kq4UTQ/Y2MWOXd7J MJIJP6F9NjSLI2F/LTFAKWpVgm7zW735Whu4eLsXF/4g3Z2R2ZwQy21BK2yH4XlPOgB8 ZAFbNmknHJa1ONGyd6+ANd6dHRZOjxtmhx85Ryz10UP+OmMtO7PSgAygCQZfcykd7Kxk IoMSQxkeTj/lwakBn4DZ37zqnRAONj5wYs4vXkzGccp6sICzTlWQ+vvsmiDtJw8nvBPb 33Dw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1786695296; x=1787300096; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-gg:x-gm-message-state:from:to :cc:subject:date:message-id:reply-to:content-type; bh=0Dek3piBTzvrC20sVx/LLDc7oP2Vk+2MRJebwHoj0TY=; b=c/lwG/MGKR3L1+KDPvtI2qLFl6ZT3kHtTCZwHl7o+Nyj1G9JCZb3jkuE/uSNp9YwPK o1kQFgtdql67OO+IYoHoBH4oPGz+pjCqlXDxOEjCieuuW+xz1RlrnDVt3/IqM8A5m2kV mfWIwnlpwEf/FFWoRcGQAbKQOLnMTxLQXtujHyx8dgBaufaEjMyY2WQ2/+E+KJEYJxHY w6VH7MXy2OKP5Tn1MbyvqBcu9X3/2mBKvWa/OhKHy4anlf41vQYNjd1pp0bATGRQy6VU RD1/e8cqTWtMsohFGGD15ctNujuCOxBfENGQ0OSAY7R+q/r2tofnr0pQvjigb+Zw9dDV TMbg== X-Forwarded-Encrypted: i=1; AHgh+RodPYtYTjrs9QQp/gd+67RpJNyHny0GBVKUUQHfO0qKGHqQ0o3ZmbjWvGNtzMY1KKNc7J1W8X9dumSbjUE=@vger.kernel.org X-Gm-Message-State: AOJu0YxT+tmZBh60RjCdqs1hltttkW57Lb0vL45srMPirlP1HeOIBg9p 46MH7bejbvvGWgjzA+cdo5pQsgOQKCPJH2bbNfX23Xwd3+Zlt3i1IQGd X-Gm-Gg: AR+sD13boQ/JY9gtLIctva8bkd0RRmS1qoicMXCSr9tpQAEnLE1QDUGpCjbilw2qp/i hsPeLI9lxD/CQvgQSOaURmKlYbwa9KVDevYDGSy9IKrkmFdpoLDk4gyqC0P6MssSoU4dK6d80P1 FAznApaGS1KArLMz5eIU77OCY/rAc5VrLdh2XIHXORhpLiAS7LtzGfUBHGn8wVtKXYCKXRrnHwN JQESuHA+qcokpnoTn/oWzBtmu4Qvw4ahtsi73+1RE0Q64wxwojXjGLIwq2klJarA4RA91QLPyI1 XmT/Qz7F163U6T7oW28HYnhwD/g8jUwPFmCCXVdJOsUQ2V/Ys5LMOtQ6q0PyLZ5UWJN8b5GF3L6 bY7WZApz3Kv5F47pKpOVIzG+I7bXrkfpC+wrjbZq9K/y+tE0ETFFa5+SO1032h4VpilhuLvHkdZ GCG5DNWJjPq7x42ewIKhEL6QyIFX8dBkEjF/Nz/wk+KtrJ0MiVBNeAuvtwGb71MPmt1WuMJSYPR W5CDwM80xU= X-Received: by 2002:a05:6a00:6c8f:b0:847:8449:2ba6 with SMTP id d2e1a72fcca58-84fddf90cc4mr4930621b3a.8.1786695296460; Fri, 14 Aug 2026 01:14:56 -0700 (PDT) Received: from intel.company.local ([122.11.210.25]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-8517cfeb39esm149986b3a.4.2026.08.14.01.14.52 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 14 Aug 2026 01:14:55 -0700 (PDT) From: Wandun Chen To: robh@kernel.org, saravanak@kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH 1/3] of: reserved_mem: skip init for regions whose early reservation failed Date: Fri, 14 Aug 2026 16:14:41 +0800 Message-ID: <20260814081443.1061046-2-chenwandun1@gmail.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20260814081443.1061046-1-chenwandun1@gmail.com> References: <20260814081443.1061046-1-chenwandun1@gmail.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 From: Wandun Chen __reserved_mem_reserve_reg() discards the error from early_init_dt_reserve_memory() and returns 0 unconditionally, so the caller counts the node in total_reserved_mem_cnt and the late scan initializes it without checking whether the early reservation actually succeeded. A region whose reservation failed is then handed to a device assuming the memory is protected. Propagate the error so failed reservations are no longer counted, and record the failed nodes so fdt_scan_reserved_mem_late() can skip them. Recording the failed nodes explicitly is necessary because fdt_scan_reserved_mem_late() rescans the DT independently. It cannot tell from memblock whether early reservation succeeded. The failed-node array is bounded by MAX_RESERVED_REGIONS, the number of static regions is not bounded by it, so on overflow the extra nodes fall back to being initialized, which is the current behavior. Fixes: 8a6e02d0c00e ("of: reserved_mem: Restructure how the reserved memory regions are processed") Signed-off-by: Wandun Chen --- drivers/of/of_reserved_mem.c | 49 ++++++++++++++++++++++++++++-------- 1 file changed, 39 insertions(+), 10 deletions(-) diff --git a/drivers/of/of_reserved_mem.c b/drivers/of/of_reserved_mem.c index 8c9d6395d6a3..f20747725de4 100644 --- a/drivers/of/of_reserved_mem.c +++ b/drivers/of/of_reserved_mem.c @@ -32,6 +32,19 @@ static struct reserved_mem *reserved_mem __refdata = reserved_mem_array; static int total_reserved_mem_cnt = MAX_RESERVED_REGIONS; static int reserved_mem_count; +static int reserve_failed_nodes[MAX_RESERVED_REGIONS] __initdata; +static int reserve_failed_nodes_cnt __initdata; + +static bool __init reserved_mem_node_reserve_failed(int node) +{ + int i; + + for (i = 0; i < reserve_failed_nodes_cnt; i++) + if (reserve_failed_nodes[i] == node) + return true; + return false; +} + static int __init early_init_dt_alloc_reserved_memory_arch(phys_addr_t size, phys_addr_t align, phys_addr_t start, phys_addr_t end, bool nomap, phys_addr_t *res_base) @@ -167,14 +180,19 @@ static int __init __reserved_mem_reserve_reg(unsigned long node, base = b; size = s; - if (size && early_init_dt_reserve_memory(base, size, nomap) == 0) { - fdt_fixup_reserved_mem_node(node, base, size); - pr_debug("Reserved memory: reserved region for node '%s': base %pa, size %lu MiB\n", - uname, &base, (unsigned long)(size / SZ_1M)); - } else { + if (!size) + return -EINVAL; + + err = early_init_dt_reserve_memory(base, size, nomap); + if (err) { pr_err("Reserved memory: failed to reserve memory for node '%s': base %pa, size %lu MiB\n", uname, &base, (unsigned long)(size / SZ_1M)); + return err; } + + fdt_fixup_reserved_mem_node(node, base, size); + pr_debug("Reserved memory: reserved region for node '%s': base %pa, size %lu MiB\n", + uname, &base, (unsigned long)(size / SZ_1M)); return 0; } @@ -306,10 +324,14 @@ void __init fdt_scan_reserved_mem_late(void) base = b; size = s; - if (size) { - uname = fdt_get_name(fdt, child, NULL); - fdt_init_reserved_mem_node(child, uname, base, size); - } + if (!size) + continue; + + if (reserved_mem_node_reserve_failed(child)) + continue; + + uname = fdt_get_name(fdt, child, NULL); + fdt_init_reserved_mem_node(child, uname, base, size); } /* check for overlapping reserved regions */ @@ -357,8 +379,15 @@ int __init fdt_scan_reserved_mem(void) uname = fdt_get_name(fdt, child, NULL); err = __reserved_mem_reserve_reg(child, uname); - if (!err) + if (!err) { count++; + } else if (err != -ENOENT) { + if (reserve_failed_nodes_cnt < MAX_RESERVED_REGIONS) + reserve_failed_nodes[reserve_failed_nodes_cnt++] = child; + else + pr_err("too many failed regions, '%s' reservation failed\n", + uname); + } /* * Save the nodes for the dynamically-placed regions -- 2.43.0