From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-alma10-1.taild15c8.ts.net [100.103.45.18]) (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 BF3A443F8A6 for ; Thu, 30 Jul 2026 14:33:24 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=100.103.45.18 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1785422005; cv=none; b=ek0OyiDcXeDRoUB3ZvjGpS1rwjXZzoT/guMtL2aHXASCkGoqNxp8OsKjSWp2QGMDFu4828P1lnMXrll8TdezPr1ISW0kr6cRGVQnYl1YsfoesYDGIEWtdbMbjlx7ZMsXQkdtUh++NZxvTTQ1rwisQufRFflZSM0jBPq7McjUT5I= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1785422005; c=relaxed/simple; bh=j+3ryEbBkjgtCV2Tj4S7bXHXoGCuu11v9ERfbkAztXU=; h=Message-ID:Date:MIME-Version:Subject:To:Cc:References:From: In-Reply-To:Content-Type; b=A9rGxJnt3MUQsqAVHRgR4luPBlxrSMjUD8lI7hFPHeJh/OofuYWUW+Nx5gcW74QDU1hRTdIWOGp7L5gbUil7feUWqATX3OxNcFMKnuVcbwGAr0FsKwhsuNV8ZyK02bAQE/dpbSN+AQAywDMAmmoNP9lA+36rOMT7m30o2YLAE18= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=gtdSMADP; arc=none smtp.client-ip=100.103.45.18 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="gtdSMADP" Received: by smtp.kernel.org (Postfix) with ESMTPSA id CD0271F000E9; Thu, 30 Jul 2026 14:33:21 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=kernel.org; s=k20260515; t=1785422004; bh=6ZHqHPyn9esPSjQFHnHllZM176p2EyCQfO0nPMuXAdQ=; h=Date:Subject:To:Cc:References:From:In-Reply-To; b=gtdSMADP6PTwim+s/ByaPoCCJNsnpeFcBwCjK1dihUMAlMkGFmrQUnUZIWEUIEWJx yiek0iDpXbnH7PIeVYpjO/R+sPbJLTa2uVW9P4ijmyg7AdCmbE55jtbeh15csaGz25 QG84dclbmlUL2a8VNvzWsJ0hf5xB8rGfqwPpSiwfWqnq8/EXvuzK9cm0HVh7mZkeIc ubrwFThbSdboBvYPrLFlQ8gS4oCivtEocxUJUC3sJXGxzU2q5hDLNtKq9tut1viswB 3/mlemDfIV4fANzDayMW4qP1o+mfVekKbAE9rx7NIAiD9cf/d5ss25FVuv99nuznE6 IdCyxLdx8i2YA== Message-ID: <42ab7c21-25cd-4ed1-b43f-b155e82db1a0@kernel.org> Date: Thu, 30 Jul 2026 16:33:18 +0200 Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Subject: Re: [PATCH] powerpc/kexec: Simplify kdump_extra_elfcorehdr_size() To: Thorsten Blum , Madhavan Srinivasan , Michael Ellerman , Nicholas Piggin , Sourabh Jain , Aditya Gupta , Hari Bathini Cc: linuxppc-dev@lists.ozlabs.org, linux-kernel@vger.kernel.org References: <20260730131940.597739-2-thorsten.blum@linux.dev> Content-Language: fr-FR From: "Christophe Leroy (CS GROUP)" In-Reply-To: <20260730131940.597739-2-thorsten.blum@linux.dev> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 8bit Le 30/07/2026 à 15:19, Thorsten Blum a écrit : > Return the size directly and drop the extra_sz variable to simplify > kdump_extra_elfcorehdr_size(). The two warning paths now fall through > to the existing return 0 at the end of the function. > > Signed-off-by: Thorsten Blum > --- > arch/powerpc/kexec/file_load_64.c | 6 +----- > 1 file changed, 1 insertion(+), 5 deletions(-) > > diff --git a/arch/powerpc/kexec/file_load_64.c b/arch/powerpc/kexec/file_load_64.c > index c3503d698428..d0c544079e03 100644 > --- a/arch/powerpc/kexec/file_load_64.c > +++ b/arch/powerpc/kexec/file_load_64.c > @@ -377,16 +377,12 @@ static int load_backup_segment(struct kimage *image, struct kexec_buf *kbuf) > static unsigned int kdump_extra_elfcorehdr_size(struct crash_mem *cmem) > { > #if defined(CONFIG_CRASH_HOTPLUG) && defined(CONFIG_MEMORY_HOTPLUG) > - unsigned int extra_sz = 0; > - > if (CONFIG_CRASH_MAX_MEMORY_RANGES > (unsigned int)PN_XNUM) > pr_warn("Number of Phdrs %u exceeds max\n", CONFIG_CRASH_MAX_MEMORY_RANGES); > else if (cmem->nr_ranges >= CONFIG_CRASH_MAX_MEMORY_RANGES) > pr_warn("Configured crash mem ranges may not be enough\n"); > else > - extra_sz = (CONFIG_CRASH_MAX_MEMORY_RANGES - cmem->nr_ranges) * sizeof(Elf64_Phdr); > - > - return extra_sz; > + return (CONFIG_CRASH_MAX_MEMORY_RANGES - cmem->nr_ranges) * sizeof(Elf64_Phdr); I don't understand. Previously, when cmem->nr_ranges >= CONFIG_CRASH_MAX_MEMORY_RANGES you would return 0. Now you will return something different. For instance if cmem->nr_ranges is (CONFIG_CRASH_MAX_MEMORY_RANGES + 1) you will return (unsigned int)(-1 * sizeof(Elf64_Phdr)) > #endif > return 0; > }