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=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED autolearn=no 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 3E324C2D0A3 for ; Mon, 2 Nov 2020 01:08:00 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id D2B7A2145D for ; Mon, 2 Nov 2020 01:07:59 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=kernel.org header.i=@kernel.org header.b="TIVNvCj/" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org D2B7A2145D Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=linux-foundation.org Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=owner-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix) id 7718A6B0089; Sun, 1 Nov 2020 20:07:59 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 6FB216B008A; Sun, 1 Nov 2020 20:07:59 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 5742D6B008C; Sun, 1 Nov 2020 20:07:59 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0226.hostedemail.com [216.40.44.226]) by kanga.kvack.org (Postfix) with ESMTP id 24E9F6B0089 for ; Sun, 1 Nov 2020 20:07:59 -0500 (EST) Received: from smtpin04.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay03.hostedemail.com (Postfix) with ESMTP id BA7568249980 for ; Mon, 2 Nov 2020 01:07:58 +0000 (UTC) X-FDA: 77437691436.04.bread76_5a111e5272ab Received: from filter.hostedemail.com (10.5.16.251.rfc1918.com [10.5.16.251]) by smtpin04.hostedemail.com (Postfix) with ESMTP id 9A6A5800519D for ; Mon, 2 Nov 2020 01:07:58 +0000 (UTC) X-HE-Tag: bread76_5a111e5272ab X-Filterd-Recvd-Size: 2487 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by imf11.hostedemail.com (Postfix) with ESMTP for ; Mon, 2 Nov 2020 01:07:58 +0000 (UTC) Received: from localhost.localdomain (c-73-231-172-41.hsd1.ca.comcast.net [73.231.172.41]) (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 2791722272; Mon, 2 Nov 2020 01:07:57 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1604279277; bh=XVnr5KpwBnyWJFxMQ7brN6nwBPjxCN9Aa6KqmEEuKHM=; h=Date:From:To:Subject:In-Reply-To:From; b=TIVNvCj/rqk5/wgDAobSbzjzuezz9F3oahI0x+pMZczG3p4WyVJKmS01cNXto8TWL lIPm20WfHQFZjrhxapLmokSyNjvgc9/RoMIkVZr1X3nOqusWiNgzSKhJn2+woQXZdw QHYXQEsta358QLPc8sDnTQ7oGaHXQuY9FH+bM4FU= Date: Sun, 01 Nov 2020 17:07:56 -0800 From: Andrew Morton To: adobriyan@gmail.com, akpm@linux-foundation.org, chaithco@redhat.com, linux-mm@kvack.org, mhocko@suse.com, mm-commits@vger.kernel.org, torvalds@linux-foundation.org Subject: [patch 11/15] mm, oom: keep oom_adj under or at upper limit when printing Message-ID: <20201102010756.AS_nVXHtR%akpm@linux-foundation.org> In-Reply-To: <20201101170656.48abbd5e88375219f868af5e@linux-foundation.org> User-Agent: s-nail v14.8.16 X-Bogosity: Ham, tests=bogofilter, spamicity=0.000000, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: From: Charles Haithcock Subject: mm, oom: keep oom_adj under or at upper limit when printing For oom_score_adj values in the range [942,999], the current calculations will print 16 for oom_adj. This patch simply limits the output so output is inline with docs. Link: https://lkml.kernel.org/r/20201020165130.33927-1-chaithco@redhat.com Signed-off-by: Charles Haithcock Acked-by: Michal Hocko Cc: Alexey Dobriyan Signed-off-by: Andrew Morton --- fs/proc/base.c | 2 ++ 1 file changed, 2 insertions(+) --- a/fs/proc/base.c~mm-oom-keep-oom_adj-under-or-at-upper-limit-when-printing +++ a/fs/proc/base.c @@ -1049,6 +1049,8 @@ static ssize_t oom_adj_read(struct file oom_adj = (task->signal->oom_score_adj * -OOM_DISABLE) / OOM_SCORE_ADJ_MAX; put_task_struct(task); + if (oom_adj > OOM_ADJUST_MAX) + oom_adj = OOM_ADJUST_MAX; len = snprintf(buffer, sizeof(buffer), "%d\n", oom_adj); return simple_read_from_buffer(buf, count, ppos, buffer, len); } _