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=-2.7 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI,SPF_PASS,UNPARSEABLE_RELAY,URIBL_BLOCKED,USER_AGENT_GIT 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 7878AC43143 for ; Thu, 21 Jun 2018 23:16:20 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 3107722533 for ; Thu, 21 Jun 2018 23:16:20 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 3107722533 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 S934126AbeFUXQT (ORCPT ); Thu, 21 Jun 2018 19:16:19 -0400 Received: from out30-130.freemail.mail.aliyun.com ([115.124.30.130]:46496 "EHLO out30-130.freemail.mail.aliyun.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S933996AbeFUXQR (ORCPT ); Thu, 21 Jun 2018 19:16:17 -0400 X-Alimail-AntiSpam: AC=PASS;BC=-1|-1;BR=01201311R281e4;CH=green;FP=0|-1|-1|-1|0|-1|-1|-1;HT=e01e04400;MF=yang.shi@linux.alibaba.com;NM=1;PH=DS;RN=7;SR=0;TI=SMTPD_---0T389Jdj_1529622950; Received: from e19h19392.et15sqa.tbsite.net(mailfrom:yang.shi@linux.alibaba.com fp:SMTPD_---0T389Jdj_1529622950) by smtp.aliyun-inc.com(127.0.0.1); Fri, 22 Jun 2018 07:16:01 +0800 From: Yang Shi To: hughd@google.com, kirill.shutemov@linux.intel.com, vbabka@suse.cz, akpm@linux-foundation.org Cc: yang.shi@linux.alibaba.com, linux-mm@kvack.org, linux-kernel@vger.kernel.org Subject: [v2 PATCH 1/2] mm: thp: register mm for khugepaged when merging vma for shmem Date: Fri, 22 Jun 2018 07:15:48 +0800 Message-Id: <1529622949-75504-1-git-send-email-yang.shi@linux.alibaba.com> X-Mailer: git-send-email 1.8.3.1 Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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; hstart = (vma->vm_start + ~HPAGE_PMD_MASK) & HPAGE_PMD_MASK; hend = vma->vm_end & HPAGE_PMD_MASK; -- 1.8.3.1