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=-0.7 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI,SPF_PASS,UNPARSEABLE_RELAY,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 6EF12C43144 for ; Fri, 22 Jun 2018 16:04:30 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id E03502456E for ; Fri, 22 Jun 2018 16:04:29 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org E03502456E Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=linux.alibaba.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754489AbeFVQE2 (ORCPT ); Fri, 22 Jun 2018 12:04:28 -0400 Received: from out30-133.freemail.mail.aliyun.com ([115.124.30.133]:35753 "EHLO out30-133.freemail.mail.aliyun.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754277AbeFVQE0 (ORCPT ); Fri, 22 Jun 2018 12:04:26 -0400 X-Alimail-AntiSpam: AC=PASS;BC=-1|-1;BR=01201311R181e4;CH=green;FP=0|-1|-1|-1|0|-1|-1|-1;HT=e01f04452;MF=yang.shi@linux.alibaba.com;NM=1;PH=DS;RN=6;SR=0;TI=SMTPD_---0T3AXmk._1529683453; Received: from US-143344MP.local(mailfrom:yang.shi@linux.alibaba.com fp:SMTPD_---0T3AXmk._1529683453) by smtp.aliyun-inc.com(127.0.0.1); Sat, 23 Jun 2018 00:04:15 +0800 Subject: Re: [v2 PATCH 1/2] mm: thp: register mm for khugepaged when merging vma for shmem To: "Kirill A. Shutemov" Cc: hughd@google.com, vbabka@suse.cz, akpm@linux-foundation.org, linux-mm@kvack.org, linux-kernel@vger.kernel.org References: <1529622949-75504-1-git-send-email-yang.shi@linux.alibaba.com> <20180622075958.mzagr2ayufiuokea@black.fi.intel.com> From: Yang Shi Message-ID: Date: Fri, 22 Jun 2018 09:04:12 -0700 User-Agent: Mozilla/5.0 (Macintosh; Intel Mac OS X 10.12; rv:52.0) Gecko/20100101 Thunderbird/52.7.0 MIME-Version: 1.0 In-Reply-To: <20180622075958.mzagr2ayufiuokea@black.fi.intel.com> Content-Type: text/plain; charset=utf-8; format=flowed Content-Transfer-Encoding: 7bit Content-Language: en-US Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On 6/22/18 12:59 AM, Kirill A. Shutemov wrote: > On Thu, Jun 21, 2018 at 11:15:48PM +0000, yang.shi@linux.alibaba.com wrote: >> When merging anonymous page vma, if the size of vma can fit in at least >> one hugepage, the mm will be registered for khugepaged for collapsing >> THP in the future. >> >> But, it skips shmem vma. Doing so for shmem too, but not file-private >> mapping, when merging vma in order to increase the odd to collapse >> hugepage by khugepaged. >> >> Signed-off-by: Yang Shi >> Cc: Hugh Dickins >> Cc: Kirill A. Shutemov >> Cc: Vlastimil Babka >> --- >> v1 --> 2: >> * Exclude file-private mapping per Kirill's comment >> >> mm/khugepaged.c | 8 ++++++-- >> 1 file changed, 6 insertions(+), 2 deletions(-) >> >> diff --git a/mm/khugepaged.c b/mm/khugepaged.c >> index d7b2a4b..9b0ec30 100644 >> --- a/mm/khugepaged.c >> +++ b/mm/khugepaged.c >> @@ -440,8 +440,12 @@ int khugepaged_enter_vma_merge(struct vm_area_struct *vma, >> * page fault if needed. >> */ >> return 0; >> - if (vma->vm_ops || (vm_flags & VM_NO_KHUGEPAGED)) >> - /* khugepaged not yet working on file or special mappings */ >> + if ((vma->vm_ops && (!shmem_file(vma->vm_file) || vma->anon_vma)) || >> + (vm_flags & VM_NO_KHUGEPAGED)) >> + /* >> + * khugepaged not yet working on non-shmem file or special >> + * mappings. And, file-private shmem THP is not supported. >> + */ >> return 0; > My point was that vma->anon_vma check above this one should not prevent > collapse for shmem. > > Looking into this more, I think we should just replace all these checks > with hugepage_vma_check() call. I got a little bit confused here. I thought the condition to *not* collapse file-private shmem mapping should be: shmem_file(vma->vm_file) && vma->anon_vma Is this right? If it is right, it looks hugepage_vma_check() can't do this since it just returns true if shmem_file is true and it is page aligned without checking vma->anon_vma. Thanks, Yang >