From mboxrd@z Thu Jan 1 00:00:00 1970 Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.remote-ip=113.46.200.217 ARC-Seal: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; cv=none; t=1793697390; b=RXi1OA0wWNvimAlqX2r1q58ZFY03vHp/gigrKCjqiFnF+w0PCvKmIjbXhj10YYQkCS/v yMwZzZRF/+UZja0uNFyyyIhMzocbAKJWby932JW0sYLb/cwAT9acRENOvq0W7/hDCRtl3 GgxSKh+KsaBHF5o+LuFQk97miQ1IWgsbCGUFbrtyyFTD8PyDaanoRj5FVxfaJTYNOZ1fF /cdrHcxiaJ3Z1OeovX11pMrP+CGaTKWcqf0R709m9tj6V8eV9dsgLl7z2StlRkXPmBhRq rtamjEoU8KTLjzQlndVXtgO9ENFSV17zQ/GX0zK4n6U9jkU7w7AePkOvXTjfV10dWUQ== ARC-Message-Signature: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; c=relaxed/relaxed; t=1793697390; h=DMARC-Filter:dkim-signature:Received:Received:Received:Message-ID: Date:MIME-Version:User-Agent:Subject:To:References:From:In-Reply-To: Content-Type:Content-Transfer-Encoding:X-Originating-IP: X-ClientProxiedBy; bh=c/0hZKufvkH/OYW00aRP0EoGvS2iUIY4dlDmgt6M/Mw=; b=GH1dNUoERxh7NNqyQYPkYp5mjxJxwmj+c/xtf5o6FBRl2iFdysvt9IpYHx21mLvptCh5 1Uf1EyZqh6h8dF/E5xgeF2HTGvOf2S9opFNTGy4b7X5MyuOhTBX3HyXBMDTipWlzfEzFq fXctWWZJl/NnfmjHCn88MWpwA2NBdVVhPc/OW+g+eVqMWmafXqgWj2V61FAb5MmCSc6Kv F4gR5BWUE/me5ta3AwE5BfQ7stG0STwzCikUGBH8Cv3Rv2bos97CPYfWD/JOuRRRhVZ1w DmPSzaLwM9FQaOtjQ0jby33u5CyXxistY1Qmls+evqgYxgVV4Hm4Qdq9SBMV11qGZXw== ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass header.from=huawei.com; spf=pass smtp.mailfrom=huawei.com; dkim=pass header.d=huawei.com header.i=@huawei.com header.a=rsa-sha256 header.s=dkim header.b=4DXGQ09b; arc=none smtp.remote-ip=113.46.200.217 Received: from canpmsgout02.his.huawei.com (canpmsgout02.his.huawei.com [113.46.200.217]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (prime256v1) server-digest SHA256) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 3E80F606A334 for ; Tue, 3 Nov 2026 09:16:28 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.2 smtp.subspace.kernel.org 3E80F606A334 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, unprotected) header.d=huawei.com header.i=@huawei.com header.a=rsa-sha256 header.s=dkim header.b=4DXGQ09b dkim-signature: v=1; a=rsa-sha256; d=huawei.com; s=dkim; c=relaxed/relaxed; q=dns/txt; h=From; bh=c/0hZKufvkH/OYW00aRP0EoGvS2iUIY4dlDmgt6M/Mw=; b=4DXGQ09bqE2PEAJtjiuGEIxPkyR4WjwiC7ksDXHrbemdIxEQDHk6VaPRbtJElOvQBITMnTqnY srWuVrJKqwgvc1zcbqHERnrW2EJ6xbZjtycFl6KEG6RooII6hHAUnHUHO9DbyxyTM0ByJl5fvpa OfjJ7hHwPYGxreXazxTjPfg= Received: from mail.maildlp.com (unknown [172.19.162.197]) by canpmsgout02.his.huawei.com (SkyGuard) with ESMTPS id 4jJjbp6kLMzcZxn; Tue, 3 Nov 2026 17:15:50 +0800 (CST) Received: from kwepemk200008.china.huawei.com (unknown [7.202.194.74]) by mail.maildlp.com (Postfix) with ESMTPS id CBADA40579; Tue, 3 Nov 2026 17:16:15 +0800 (CST) Received: from [10.67.110.68] (10.67.110.68) by kwepemk200008.china.huawei.com (7.202.194.74) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.2562.45; Tue, 3 Nov 2026 17:16:13 +0800 Message-ID: <9ef43c59-72b8-4ef8-96cd-0dfd133cde0f@huawei.com> Date: Tue, 3 Nov 2026 17:16:13 +0800 X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Subject: Re: [PATCH v7 05/15] LoongArch: kexec_file: Fix CMA page leaks in segment placement retry loops To: , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , References: <20261026075201.699550-1-ruanjinjie@huawei.com> <20261026075201.699550-6-ruanjinjie@huawei.com> From: Jinjie Ruan In-Reply-To: <20261026075201.699550-6-ruanjinjie@huawei.com> Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: 8bit X-ClientProxiedBy: kwepems100001.china.huawei.com (7.221.188.238) To kwepemk200008.china.huawei.com (7.202.194.74) Will fix sashiko review issue in v8. 在 2026/10/26 15:51, Jinjie Ruan 写道: > The retry loop drops nr_segments, leaking the CMA pages of the failed > segments. Release them first, and disable CMA for the retry: it > ignores buf_min and would hand out the same region forever. > > Cc: Huacai Chen > Cc: WANG Xuerui > Cc: Youling Tang > Cc: Mike Rapoport (Microsoft) > Cc: Sourabh Jain > Cc: Kees Cook > Cc: stable@vger.kernel.org > Link: https://sashiko.dev/#/patchset/20260729031235.2840255-1-ruanjinjie%40huawei.com > Fixes: 55d990f0084c ("LoongArch: Add EFI binary support for kexec_file") > Signed-off-by: Jinjie Ruan > --- > arch/loongarch/kernel/kexec_efi.c | 8 ++++++++ > arch/loongarch/kernel/machine_kexec_file.c | 6 +++++- > 2 files changed, 13 insertions(+), 1 deletion(-) > > diff --git a/arch/loongarch/kernel/kexec_efi.c b/arch/loongarch/kernel/kexec_efi.c > index 5ee78ebb1546..d42711b895a2 100644 > --- a/arch/loongarch/kernel/kexec_efi.c > +++ b/arch/loongarch/kernel/kexec_efi.c > @@ -86,6 +86,14 @@ static void *efi_kexec_load(struct kimage *image, > * We couldn't find space for the other segments; erase the > * kernel segment and try the next available hole. > */ > + /* > + * kexec_alloc_contig() ignores buf_min, so disable CMA to > + * let the retry make progress. > + */ > + if (image->segment_cma[kernel_segment_number]) > + image->no_cma = true; > + > + kexec_free_segment_cma(image, kernel_segment_number); > image->nr_segments -= 1; > kbuf.buf_min = kernel_segment->mem + kernel_segment->memsz; > kbuf.mem = KEXEC_BUF_MEM_UNKNOWN; > diff --git a/arch/loongarch/kernel/machine_kexec_file.c b/arch/loongarch/kernel/machine_kexec_file.c > index 5412aa9f3568..62a5be102065 100644 > --- a/arch/loongarch/kernel/machine_kexec_file.c > +++ b/arch/loongarch/kernel/machine_kexec_file.c > @@ -217,7 +217,11 @@ int load_other_segments(struct kimage *image, > return 0; > > out_err: > - image->nr_segments = orig_segments; > + while (image->nr_segments > orig_segments) { > + kexec_free_segment_cma(image, image->nr_segments - 1); > + image->nr_segments--; > + } > + > kfree(modified_cmdline); > return ret; > } -- Best regards, Jinjie