From mboxrd@z Thu Jan 1 00:00:00 1970 Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.remote-ip=113.46.200.216 ARC-Seal: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; cv=none; t=1793697367; b=elp34w93b3dWU2uzBm0KqtJxJe6h6AzHeT9UwMtwJSZO/sA47xcnqHJkRPGq9GEe2GHV oXywS75bouXFPIP50wU8xfrJLT4eEF57V3Zjfwj3ax/842T5AiUEm3BEpbYWdt1J2YYlT BaxMKsJ28My1yQ45LOP0LnEi4MihsvPsF9wZi499K4Rq48sBoqdimcEEu8aEvFm4/ci30 k4R78n+hQ13Z4uuICO61AI7QLgt8+2FXvCxNWl84UymvYjA82M29NxIarnt8KjWHg1nxG rhXc/KF4QYJp8Bt9VtN8NUQZuTHVmSBn9b0Y2mN1QtwmQzmUx16WxP8HBb0s3qXg28A== ARC-Message-Signature: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; c=relaxed/relaxed; t=1793697367; 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=48sfBtezaLrmsDLxpZBqDtVgmBMh4esLZj8eSRsa2cM=; b=mUSrw0jpiIWX7A/ZdARHcHEv5nCM3/I2pguMucXM7M19upmwM3SrLlLXYXsQddF5wnzQ rQziaXLa0et0UeAzemW7ynkX7dN10gKEJxDGTyUl155H63W1QlukFpz9EyeEn3z6hNnO1 ohu2EDpNB26hhRnbMrCy4TvgIThP1cILmOX4RxG0ueFEzX6J+eK5gMw2L50iz47PMUuhh uFasBBUmQYWmpzLRyByb8Ubv2bEubsameaMBExGixy7ydej0iq9l76v11hVjJ08JByPnE 0gkx74FcojQX9+P0rfnXxSJXsOoouXxeqrB9D74CEK1W4yZduUoQ7ZbMiUpLQuBAC/g== 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="MQ7/wjZC"; arc=none smtp.remote-ip=113.46.200.216 Received: from canpmsgout01.his.huawei.com (canpmsgout01.his.huawei.com [113.46.200.216]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (prime256v1)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id AA87A606A324 for ; Tue, 3 Nov 2026 09:16:05 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.2 smtp.subspace.kernel.org AA87A606A324 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=MQ7/wjZC dkim-signature: v=1; a=rsa-sha256; d=huawei.com; s=dkim; c=relaxed/relaxed; q=dns/txt; h=From; bh=48sfBtezaLrmsDLxpZBqDtVgmBMh4esLZj8eSRsa2cM=; b=MQ7/wjZCJByib4DUAG1rr8PWbq4ZKNqzIaaZ0Biehny2BBZjAjV3wKEwUZvkviWzcCEbf0g+v XU2u1c0FR7BeFFcd2sKiP2M9NRejpiGNFnV1aQNjASXnIdM5gSq78pUOH9pz1/Cnp1FM1nmDrIn G/mzrhIC2kG1FA5PLDo4uzc= Received: from mail.maildlp.com (unknown [172.19.162.144]) by canpmsgout01.his.huawei.com (SkyGuard) with ESMTPS id 4jJjbc4bwXz1T4JR; Tue, 3 Nov 2026 17:15:40 +0800 (CST) Received: from kwepemk200008.china.huawei.com (unknown [7.202.194.74]) by mail.maildlp.com (Postfix) with ESMTPS id D79EB40538; Tue, 3 Nov 2026 17:15:58 +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:15:57 +0800 Message-ID: Date: Tue, 3 Nov 2026 17:15:56 +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 03/15] arm64: kexec_file: Fix CMA page leaks in segment placement retry loops To: , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , References: <20261026075201.699550-1-ruanjinjie@huawei.com> <20261026075201.699550-4-ruanjinjie@huawei.com> From: Jinjie Ruan In-Reply-To: <20261026075201.699550-4-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: Catalin Marinas > Cc: Will Deacon > Cc: Breno Leitao > Cc: Pratyush Yadav > Cc: Andrew Morton > Cc: Yeoreum Yun > Cc: Baoquan He > Cc: stable@vger.kernel.org > Fixes: 07d24902977e ("kexec: enable CMA based contiguous allocation") > Signed-off-by: Jinjie Ruan > --- > arch/arm64/kernel/kexec_image.c | 8 ++++++++ > arch/arm64/kernel/machine_kexec_file.c | 5 ++++- > 2 files changed, 12 insertions(+), 1 deletion(-) > > diff --git a/arch/arm64/kernel/kexec_image.c b/arch/arm64/kernel/kexec_image.c > index 74d24c8aa2fa..6ed1991e3142 100644 > --- a/arch/arm64/kernel/kexec_image.c > +++ b/arch/arm64/kernel/kexec_image.c > @@ -111,6 +111,14 @@ static void *image_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/arm64/kernel/machine_kexec_file.c b/arch/arm64/kernel/machine_kexec_file.c > index 854d872dfd0f..e48f29167b38 100644 > --- a/arch/arm64/kernel/machine_kexec_file.c > +++ b/arch/arm64/kernel/machine_kexec_file.c > @@ -179,7 +179,10 @@ 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--; > + } > kvfree(dtb); > return ret; > } -- Best regards, Jinjie