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=-8.5 required=3.0 tests=INCLUDES_PATCH, MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,USER_AGENT_SANE_1 autolearn=ham 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 BE79EC43603 for ; Thu, 12 Dec 2019 10:41:10 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id 87AAD206DA for ; Thu, 12 Dec 2019 10:41:10 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 87AAD206DA Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=kernel.org Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=owner-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix) id 15BFA6B3701; Thu, 12 Dec 2019 05:41:10 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 10D206B3702; Thu, 12 Dec 2019 05:41:10 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 021696B3703; Thu, 12 Dec 2019 05:41:09 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0009.hostedemail.com [216.40.44.9]) by kanga.kvack.org (Postfix) with ESMTP id E19926B3701 for ; Thu, 12 Dec 2019 05:41:09 -0500 (EST) Received: from smtpin29.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay01.hostedemail.com (Postfix) with SMTP id 8D3CE180AD81C for ; Thu, 12 Dec 2019 10:41:09 +0000 (UTC) X-FDA: 76256147058.29.oven53_2729547d07a0a X-HE-Tag: oven53_2729547d07a0a X-Filterd-Recvd-Size: 4291 Received: from mail-wr1-f66.google.com (mail-wr1-f66.google.com [209.85.221.66]) by imf20.hostedemail.com (Postfix) with ESMTP for ; Thu, 12 Dec 2019 10:41:08 +0000 (UTC) Received: by mail-wr1-f66.google.com with SMTP id y11so2170461wrt.6 for ; Thu, 12 Dec 2019 02:41:08 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:from:to:cc:subject:message-id:references :mime-version:content-disposition:in-reply-to:user-agent; bh=S1F+4TtH6sI5cY7070NYFBNoEudVsb5hE0A8Xjrz5eo=; b=DO/Lkrz9qCw6q0awsxXEkb5cW4v0diWK1VQpaIukNdfNBVfqO95h2Ic6yDlW5cztfL 8i+TV/lI1hs1S6GyXtJUfB/kbS+rshfp5Y+1/s3efW4HIY9X3VdnSB/qSw0NgCDxyMwX EN6bQcDXCdvS4Ecc6otWJk9bJZQW9AzXMTU2G6G3gBvcMRfucE8fKuewU5R6zbTKgBq9 zTqzSMcY9BUpKJDT2/TMWldUyyF86eNtB56vpaXlq3Ycq5FasgPHQn8ntCDRbbuNAeIe EZ0lT2JlDBLdpSxpQWN9Eq3Ae9pj+Pt9lt1kqqRakHb6AX9LxzQGqG+LBtXjT11mRXEk Gc9A== X-Gm-Message-State: APjAAAWvpbHMoJiXV2/iu0aEfnm8f0Axu67kaCUUWtHCR4+j5SHpy9qP xQF84Lxng6eYJFm6uV5F2zw= X-Google-Smtp-Source: APXvYqxOce3OTxugq2NkVg7LzBetfJZWQP02bBZN2IlNy0Ymm6100zVdUAOzD2ENCSn8R+WsdvEx0A== X-Received: by 2002:a5d:67c7:: with SMTP id n7mr5367757wrw.319.1576147267915; Thu, 12 Dec 2019 02:41:07 -0800 (PST) Received: from localhost (ip-37-188-179-200.eurotel.cz. [37.188.179.200]) by smtp.gmail.com with ESMTPSA id w20sm5587444wmk.34.2019.12.12.02.41.06 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 12 Dec 2019 02:41:06 -0800 (PST) Date: Thu, 12 Dec 2019 11:41:05 +0100 From: Michal Hocko To: Ilya Dryomov Cc: linux-mm@kvack.org, linux-kernel@vger.kernel.org, Edward Chron , David Rientjes , Andrew Morton , Linus Torvalds Subject: Re: [PATCH] mm/oom: fix pgtables units mismatch in Killed process message Message-ID: <20191212104105.GB12165@dhcp22.suse.cz> References: <20191211202830.1600-1-idryomov@gmail.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20191211202830.1600-1-idryomov@gmail.com> User-Agent: Mutt/1.12.2 (2019-09-21) 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: On Wed 11-12-19 21:28:30, Ilya Dryomov wrote: > pr_err() expects kB, but mm_pgtables_bytes() returns the number of > bytes. As everything else is printed in kB, I chose to fix the value > rather than the string. > > Before: > > [ pid ] uid tgid total_vm rss pgtables_bytes swapents oom_score_adj name > ... > [ 1878] 1000 1878 217253 151144 1269760 0 0 python > ... > Out of memory: Killed process 1878 (python) total-vm:869012kB, anon-rss:604572kB, file-rss:4kB, shmem-rss:0kB, UID:1000 pgtables:1269760kB oom_score_adj:0 > > After: > > [ pid ] uid tgid total_vm rss pgtables_bytes swapents oom_score_adj name > ... > [ 1436] 1000 1436 217253 151890 1294336 0 0 python > ... > Out of memory: Killed process 1436 (python) total-vm:869012kB, anon-rss:607516kB, file-rss:44kB, shmem-rss:0kB, UID:1000 pgtables:1264kB oom_score_adj:0 > > Fixes: 70cb6d267790 ("mm/oom: add oom_score_adj and pgtables to Killed process message") > Signed-off-by: Ilya Dryomov Ups, I have missed that when reviewing 70cb6d267790. Acked-by: Michal Hocko Thanks! > --- > mm/oom_kill.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/mm/oom_kill.c b/mm/oom_kill.c > index 71e3acea7817..d58c481b3df8 100644 > --- a/mm/oom_kill.c > +++ b/mm/oom_kill.c > @@ -890,7 +890,7 @@ static void __oom_kill_process(struct task_struct *victim, const char *message) > K(get_mm_counter(mm, MM_FILEPAGES)), > K(get_mm_counter(mm, MM_SHMEMPAGES)), > from_kuid(&init_user_ns, task_uid(victim)), > - mm_pgtables_bytes(mm), victim->signal->oom_score_adj); > + mm_pgtables_bytes(mm) >> 10, victim->signal->oom_score_adj); > task_unlock(victim); > > /* > -- > 2.19.2 > -- Michal Hocko SUSE Labs