From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (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 4173B2B9BC; Tue, 16 Jul 2024 16:08:21 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1721146101; cv=none; b=oQ/YRmebKg77XoB77PCpYNmf0xK9LH9AWnHFdaxSp/hHTSw8aYBtEALvVmfO3TaiwLufSAu65W6wuxso1D+29xyIx82kRNtmAZ+2SZRyu5fs6Qsp1ztsqUPp8qYsrVAVKl3nZ6hPESq6ppmSzOOjJUV0y2NFqj5ROUFGHDx3isU= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1721146101; c=relaxed/simple; bh=2IvjQvb95xaV3ed8dHT0pa3nNLXJI6lXY+ERsN5x4tU=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=RU4dPnF+ZKaA4IIlrPI9BSn2KG5BiAhWyN+tX4ePUKddTp5HuMdQb1CQDeMah7lsN3xxm8+3uFu55HyMpB8b83hCvJ0UMdNonAP3yZoDbT+2LB2ykNV6RIVBHjC2ckV9zP99crQ5Gb0vnWMDUxLF/8fLiGFeQjW9T8p5PxsST80= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=a7EGv8SG; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="a7EGv8SG" Received: by smtp.kernel.org (Postfix) with ESMTPSA id BD40FC4AF0E; Tue, 16 Jul 2024 16:08:20 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1721146101; bh=2IvjQvb95xaV3ed8dHT0pa3nNLXJI6lXY+ERsN5x4tU=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=a7EGv8SGddIlbfkHeMc50fuR2gtTRcnvHOXZxORGjFuOf3DORB+1LTiNP5nwpVVQH TgAd0qs5n5NtwLuTxiY83fQAPwCgo5QqMNAcCuCqibrQxx1KD0frydirSEc9ukOQUx vgWKKbd+mb/bvHDT9/1ZrwWslfu1/0ypdqT6tO4w= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Jan Kara , Zach OKeefe , Andrew Morton Subject: [PATCH 5.15 055/144] Revert "mm/writeback: fix possible divide-by-zero in wb_dirty_limits(), again" Date: Tue, 16 Jul 2024 17:32:04 +0200 Message-ID: <20240716152754.662902862@linuxfoundation.org> X-Mailer: git-send-email 2.45.2 In-Reply-To: <20240716152752.524497140@linuxfoundation.org> References: <20240716152752.524497140@linuxfoundation.org> User-Agent: quilt/0.67 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: patches@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 5.15-stable review patch. If anyone has any objections, please let me know. ------------------ From: Jan Kara commit 30139c702048f1097342a31302cbd3d478f50c63 upstream. Patch series "mm: Avoid possible overflows in dirty throttling". Dirty throttling logic assumes dirty limits in page units fit into 32-bits. This patch series makes sure this is true (see patch 2/2 for more details). This patch (of 2): This reverts commit 9319b647902cbd5cc884ac08a8a6d54ce111fc78. The commit is broken in several ways. Firstly, the removed (u64) cast from the multiplication will introduce a multiplication overflow on 32-bit archs if wb_thresh * bg_thresh >= 1<<32 (which is actually common - the default settings with 4GB of RAM will trigger this). Secondly, the div64_u64() is unnecessarily expensive on 32-bit archs. We have div64_ul() in case we want to be safe & cheap. Thirdly, if dirty thresholds are larger than 1<<32 pages, then dirty balancing is going to blow up in many other spectacular ways anyway so trying to fix one possible overflow is just moot. Link: https://lkml.kernel.org/r/20240621144017.30993-1-jack@suse.cz Link: https://lkml.kernel.org/r/20240621144246.11148-1-jack@suse.cz Fixes: 9319b647902c ("mm/writeback: fix possible divide-by-zero in wb_dirty_limits(), again") Signed-off-by: Jan Kara Reviewed-By: Zach O'Keefe Cc: Signed-off-by: Andrew Morton Signed-off-by: Greg Kroah-Hartman --- mm/page-writeback.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --- a/mm/page-writeback.c +++ b/mm/page-writeback.c @@ -1551,7 +1551,7 @@ static inline void wb_dirty_limits(struc */ dtc->wb_thresh = __wb_calc_thresh(dtc); dtc->wb_bg_thresh = dtc->thresh ? - div64_u64(dtc->wb_thresh * dtc->bg_thresh, dtc->thresh) : 0; + div_u64((u64)dtc->wb_thresh * dtc->bg_thresh, dtc->thresh) : 0; /* * In order to avoid the stacked BDI deadlock we need