From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.8 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 2312CC43331 for ; Tue, 24 Mar 2020 13:31:17 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id E2787206F6 for ; Tue, 24 Mar 2020 13:31:16 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1585056677; bh=mb5sH4ljXlw3r8hOGeKmIv5E5UNFQ2DZexBOLnTxdFs=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=XQG7/Fve+uQOXvM+SsxS//XpXQMe379z03BEg0SddJmh/Nxxm/qrwPVJSAnDuDN+f XK3ELHcrYEmvASH2CA8J4f3KHt7JoqL19t9lcdcYfg2yZVfdT8lSAWuLwxFql04xir zY5oiG3vbTOqpOcHgSymCrNcEQz/GyhAbRaCVHQU= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728726AbgCXNUj (ORCPT ); Tue, 24 Mar 2020 09:20:39 -0400 Received: from mail.kernel.org ([198.145.29.99]:42006 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728944AbgCXNUi (ORCPT ); Tue, 24 Mar 2020 09:20:38 -0400 Received: from localhost (83-86-89-107.cable.dynamic.v4.ziggo.nl [83.86.89.107]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 6DEA520870; Tue, 24 Mar 2020 13:20:37 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1585056037; bh=mb5sH4ljXlw3r8hOGeKmIv5E5UNFQ2DZexBOLnTxdFs=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=MRdLQY4xvH1GZm3yqnV6Rl+ZS8I5QTIN6M2ofRum7DdXKzDnwrmqn6ly0bAi5FmE4 qcD89VduHnyEODnoq07ZxDgIPZsTmdCYTDJB+TbpGljQ0tV2/oRqh6d+H4/qOWFR5S t40WDjsvGzgL+tP+AasX2OvZzMop0YtaqDrbUAZE= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Johannes Weiner , Chris Down , Andrew Morton , Tejun Heo , Roman Gushchin , Michal Hocko , Nathan Chancellor , Linus Torvalds Subject: [PATCH 5.4 085/102] mm, memcg: fix corruption on 64-bit divisor in memory.high throttling Date: Tue, 24 Mar 2020 14:11:17 +0100 Message-Id: <20200324130815.158734807@linuxfoundation.org> X-Mailer: git-send-email 2.25.2 In-Reply-To: <20200324130806.544601211@linuxfoundation.org> References: <20200324130806.544601211@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Chris Down commit d397a45fc741c80c32a14e2de008441e9976f50c upstream. Commit 0e4b01df8659 had a bunch of fixups to use the right division method. However, it seems that after all that it still wasn't right -- div_u64 takes a 32-bit divisor. The headroom is still large (2^32 pages), so on mundane systems you won't hit this, but this should definitely be fixed. Fixes: 0e4b01df8659 ("mm, memcg: throttle allocators when failing reclaim over memory.high") Reported-by: Johannes Weiner Signed-off-by: Chris Down Signed-off-by: Andrew Morton Acked-by: Johannes Weiner Cc: Tejun Heo Cc: Roman Gushchin Cc: Michal Hocko Cc: Nathan Chancellor Cc: [5.4.x+] Link: http://lkml.kernel.org/r/80780887060514967d414b3cd91f9a316a16ab98.1584036142.git.chris@chrisdown.name Signed-off-by: Linus Torvalds Signed-off-by: Greg Kroah-Hartman --- mm/memcontrol.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --- a/mm/memcontrol.c +++ b/mm/memcontrol.c @@ -2456,7 +2456,7 @@ void mem_cgroup_handle_over_high(void) */ clamped_high = max(high, 1UL); - overage = div_u64((u64)(usage - high) << MEMCG_DELAY_PRECISION_SHIFT, + overage = div64_u64((u64)(usage - high) << MEMCG_DELAY_PRECISION_SHIFT, clamped_high); penalty_jiffies = ((u64)overage * overage * HZ)