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=-7.0 required=3.0 tests=INCLUDES_PATCH, MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED 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 23A43C43331 for ; Fri, 3 Apr 2020 13:11:28 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id D48502073B for ; Fri, 3 Apr 2020 13:11:27 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org D48502073B 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 4D6F18E0008; Fri, 3 Apr 2020 09:11:27 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 487288E0007; Fri, 3 Apr 2020 09:11:27 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 34FE28E0008; Fri, 3 Apr 2020 09:11:27 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0217.hostedemail.com [216.40.44.217]) by kanga.kvack.org (Postfix) with ESMTP id 1A1EE8E0007 for ; Fri, 3 Apr 2020 09:11:27 -0400 (EDT) Received: from smtpin06.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay04.hostedemail.com (Postfix) with ESMTP id D3DF9501F for ; Fri, 3 Apr 2020 13:11:26 +0000 (UTC) X-FDA: 76666580172.06.noise51_46ca80b20362f X-HE-Tag: noise51_46ca80b20362f X-Filterd-Recvd-Size: 7124 Received: from mail-wr1-f68.google.com (mail-wr1-f68.google.com [209.85.221.68]) by imf39.hostedemail.com (Postfix) with ESMTP for ; Fri, 3 Apr 2020 13:11:26 +0000 (UTC) Received: by mail-wr1-f68.google.com with SMTP id s8so6328656wrt.7 for ; Fri, 03 Apr 2020 06:11:26 -0700 (PDT) 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:content-transfer-encoding :in-reply-to; bh=sYr8OBRiI7sjd0RI0DMwUta+4ZeeowcjRgVxOP3pOQM=; b=TKS0h5IwWLR7ktD6pt8PyrCP2guJXmcT3ffP3mgz4c+gJtuvLGbFVXKEMiBRZFBgqX f1aYYPhfLX7ez2lt9bXzzRYbcpoInyLCI8MFaqoiHr+heXLBr7yGXS6Kptox+51PTZpL 2Jn6JnssHYLNYHOF0fZl7BQBAf3RQtzLQ4xuZ9+FNYHxfa5PeLfQi6JJ+0D/mZo3lEF5 DZLrFlAHyXY8O/zNz1kDi8EFm2V2nZwijLL2BAIVTppARnZViN6gM95VnboJCotGBfK9 3eCpEJkvYtBeRwNCgxRIk9tKC3oWU6nxBr2rATNbLbH6KCbBTLmxZmZ7DG8ov4+Sgdhn TalQ== X-Gm-Message-State: AGi0PuaYLfTB57TDWQrjleLMMcuEfblMM/F71SYTST3jHEnEw4ScY99N gMImHoqgmlmh+kRtABGZhMY= X-Google-Smtp-Source: APiQypKc5W+3lb6YNN/2F+K8g/qM6QEizkbMI/vzSV7g+skqyLHS+QuTh6HCwhlfPgjTyrR9d1XugA== X-Received: by 2002:adf:aad7:: with SMTP id i23mr8891403wrc.184.1585919485158; Fri, 03 Apr 2020 06:11:25 -0700 (PDT) Received: from localhost (ip-37-188-180-223.eurotel.cz. [37.188.180.223]) by smtp.gmail.com with ESMTPSA id u5sm13195631wrp.81.2020.04.03.06.11.24 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 03 Apr 2020 06:11:24 -0700 (PDT) Date: Fri, 3 Apr 2020 15:11:23 +0200 From: Michal Hocko To: "Huang, Ying" Cc: Andrew Morton , linux-mm@kvack.org, linux-kernel@vger.kernel.org, Zi Yan , Andrea Arcangeli , "Kirill A . Shutemov" , Vlastimil Babka , Alexey Dobriyan , Konstantin Khlebnikov , =?iso-8859-1?B?Suly9G1l?= Glisse , Yang Shi Subject: Re: [PATCH -V3] /proc/PID/smaps: Add PMD migration entry parsing Message-ID: <20200403131123.GD22681@dhcp22.suse.cz> References: <20200403123059.1846960-1-ying.huang@intel.com> MIME-Version: 1.0 Content-Type: text/plain; charset=iso-8859-1 Content-Disposition: inline In-Reply-To: <20200403123059.1846960-1-ying.huang@intel.com> Content-Transfer-Encoding: quoted-printable 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 Fri 03-04-20 20:30:59, Huang, Ying wrote: > From: Huang Ying >=20 > Now, when read /proc/PID/smaps, the PMD migration entry in page table i= s simply > ignored. To improve the accuracy of /proc/PID/smaps, its parsing and p= rocessing > is added. >=20 > To test the patch, we run pmbench to eat 400 MB memory in background, t= hen run > /usr/bin/migratepages and `cat /proc/PID/smaps` every second. The issu= e as > follows can be reproduced within 60 seconds. >=20 > Before the patch, for the fully populated 400 MB anonymous VMA, some TH= P pages > under migration may be lost as below. >=20 > 7f3f6a7e5000-7f3f837e5000 rw-p 00000000 00:00 0 > Size: 409600 kB > KernelPageSize: 4 kB > MMUPageSize: 4 kB > Rss: 407552 kB > Pss: 407552 kB > Shared_Clean: 0 kB > Shared_Dirty: 0 kB > Private_Clean: 0 kB > Private_Dirty: 407552 kB > Referenced: 301056 kB > Anonymous: 407552 kB > LazyFree: 0 kB > AnonHugePages: 405504 kB > ShmemPmdMapped: 0 kB > FilePmdMapped: 0 kB > Shared_Hugetlb: 0 kB > Private_Hugetlb: 0 kB > Swap: 0 kB > SwapPss: 0 kB > Locked: 0 kB > THPeligible: 1 > VmFlags: rd wr mr mw me ac >=20 > After the patch, it will be always, >=20 > 7f3f6a7e5000-7f3f837e5000 rw-p 00000000 00:00 0 > Size: 409600 kB > KernelPageSize: 4 kB > MMUPageSize: 4 kB > Rss: 409600 kB > Pss: 409600 kB > Shared_Clean: 0 kB > Shared_Dirty: 0 kB > Private_Clean: 0 kB > Private_Dirty: 409600 kB > Referenced: 294912 kB > Anonymous: 409600 kB > LazyFree: 0 kB > AnonHugePages: 407552 kB > ShmemPmdMapped: 0 kB > FilePmdMapped: 0 kB > Shared_Hugetlb: 0 kB > Private_Hugetlb: 0 kB > Swap: 0 kB > SwapPss: 0 kB > Locked: 0 kB > THPeligible: 1 > VmFlags: rd wr mr mw me ac >=20 > Signed-off-by: "Huang, Ying" > Reviewed-by: Zi Yan > Cc: Andrea Arcangeli > Cc: Kirill A. Shutemov > Cc: Vlastimil Babka > Cc: Alexey Dobriyan > Cc: Michal Hocko > Cc: Konstantin Khlebnikov > Cc: "J=E9r=F4me Glisse" > Cc: Yang Shi Acked-by: Michal Hocko Thanks! > --- >=20 > v3: >=20 > - Revised patch description and remove VM_WARN_ON_ONCE() per Michal's c= omments >=20 > v2: >=20 > - Use thp_migration_supported() in condition to reduce code size if THP > migration isn't enabled. >=20 > - Replace VM_BUG_ON() with VM_WARN_ON_ONCE(), it's not necessary to nuk= ing > kernel for this. >=20 > --- > fs/proc/task_mmu.c | 16 +++++++++++----- > 1 file changed, 11 insertions(+), 5 deletions(-) >=20 > diff --git a/fs/proc/task_mmu.c b/fs/proc/task_mmu.c > index 8d382d4ec067..36dc7417c0df 100644 > --- a/fs/proc/task_mmu.c > +++ b/fs/proc/task_mmu.c > @@ -546,10 +546,17 @@ static void smaps_pmd_entry(pmd_t *pmd, unsigned = long addr, > struct mem_size_stats *mss =3D walk->private; > struct vm_area_struct *vma =3D walk->vma; > bool locked =3D !!(vma->vm_flags & VM_LOCKED); > - struct page *page; > + struct page *page =3D NULL; > + > + if (pmd_present(*pmd)) { > + /* FOLL_DUMP will return -EFAULT on huge zero page */ > + page =3D follow_trans_huge_pmd(vma, addr, pmd, FOLL_DUMP); > + } else if (unlikely(thp_migration_supported() && is_swap_pmd(*pmd))) = { > + swp_entry_t entry =3D pmd_to_swp_entry(*pmd); > =20 > - /* FOLL_DUMP will return -EFAULT on huge zero page */ > - page =3D follow_trans_huge_pmd(vma, addr, pmd, FOLL_DUMP); > + if (is_migration_entry(entry)) > + page =3D migration_entry_to_page(entry); > + } > if (IS_ERR_OR_NULL(page)) > return; > if (PageAnon(page)) > @@ -578,8 +585,7 @@ static int smaps_pte_range(pmd_t *pmd, unsigned lon= g addr, unsigned long end, > =20 > ptl =3D pmd_trans_huge_lock(pmd, vma); > if (ptl) { > - if (pmd_present(*pmd)) > - smaps_pmd_entry(pmd, addr, walk); > + smaps_pmd_entry(pmd, addr, walk); > spin_unlock(ptl); > goto out; > } > --=20 > 2.25.0 --=20 Michal Hocko SUSE Labs