Received: by 2002:a25:f815:0:0:0:0:0 with SMTP id u21csp2646822ybd; Thu, 27 Jun 2019 16:39:03 -0700 (PDT) X-Google-Smtp-Source: APXvYqyc/0jGD0uA6xIz0Dgff4aI5W8FDJ9FQLi+17a6br8PaiKopMjc8rLKvPLe2B/WRvpwEzGA X-Received: by 2002:a17:90a:5d0a:: with SMTP id s10mr9217878pji.94.1561678743607; Thu, 27 Jun 2019 16:39:03 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1561678743; cv=none; d=google.com; s=arc-20160816; b=t+rUsy6y5qXcxxE7uHefHCgvG82mnnr9t9gOCkX/e61cpNlM0WkO6fEEQOlUcV3kSJ inHphaEnhJXPtLnxTvLYrywOLIF/z6YavY1vzJz4T9rqAs7p53tmGDHDIOD1yFvgpIyD cXB1nVabmZR/i1Ngo9G4453HPAjs190qNN0BFrU+D3sXn0X9GyeclCCfW5xoD0ilq9GB sioJbEXti3qnNvbpOG4+uO8+g7kR1MA8qHpP4EWGwwC26U26j7MAVDcmYIvSNzQbLwNn j6EgKsPv9UCHq75AuEk8KBSK7FenBFP+DZkrN4xWakmXEjca9WETkEX0lF0XaIJ8+Ufh aNjg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:user-agent:in-reply-to :content-disposition:mime-version:references:message-id:subject:cc :to:from:date; bh=6ub5rS7DrtMMA8Bt1+uOqsBRl8P5SiRiczVvmt2TfKE=; b=lvWH8QNh2NyPoYq5UUKCwqPY+rZhdUVZb2ZaSnHcfMvuoR6e0GhF2hed4HIO95n9XI My0tI8mdalaRO98rk1FspUwxdQLqIPxL5kcMTMYv44EhGktyAbjvozUHci8RV/MlmcHw H8NmMJX234ncAKeaIlYFXo+YNU+VGwtQ56i+WXJVCefuoVHtnuqyWQtBmKlU/LK78KB/ B8xFzEdA+dn0b3Hh1LD9awRXBDUWkCINybxypg3Wm1cqumah3JTjCPuFXO9+Til6Fq/O Natm97eQUQXcNWNJ+3jmfJKjBEtaJf1LRz2bMd/gagZXvM731vhw6cACodwYaZUoX+pE 7CfA== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=intel.com Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id i32si445984pje.44.2019.06.27.16.38.47; Thu, 27 Jun 2019 16:39:03 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=intel.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726712AbfF0XiO (ORCPT + 99 others); Thu, 27 Jun 2019 19:38:14 -0400 Received: from mga07.intel.com ([134.134.136.100]:21471 "EHLO mga07.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726506AbfF0XiO (ORCPT ); Thu, 27 Jun 2019 19:38:14 -0400 X-Amp-Result: UNKNOWN X-Amp-Original-Verdict: FILE UNKNOWN X-Amp-File-Uploaded: False Received: from orsmga006.jf.intel.com ([10.7.209.51]) by orsmga105.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 27 Jun 2019 16:38:13 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.63,425,1557212400"; d="scan'208";a="167595836" Received: from iweiny-desk2.sc.intel.com ([10.3.52.157]) by orsmga006.jf.intel.com with ESMTP; 27 Jun 2019 16:38:11 -0700 Date: Thu, 27 Jun 2019 16:38:11 -0700 From: Ira Weiny To: Pingfan Liu Cc: Linux-mm@kvack.org, Andrew Morton , Mike Rapoport , "Kirill A. Shutemov" , Thomas Gleixner , John Hubbard , "Aneesh Kumar K.V" , Christoph Hellwig , Keith Busch , Mike Kravetz , Linux-kernel@vger.kernel.org Subject: Re: [PATCHv5] mm/gup: speed up check_and_migrate_cma_pages() on huge page Message-ID: <20190627233805.GA8695@iweiny-DESK2.sc.intel.com> References: <1561612545-28997-1-git-send-email-kernelfans@gmail.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <1561612545-28997-1-git-send-email-kernelfans@gmail.com> User-Agent: Mutt/1.11.1 (2018-12-01) Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Thu, Jun 27, 2019 at 01:15:45PM +0800, Pingfan Liu wrote: > Both hugetlb and thp locate on the same migration type of pageblock, since > they are allocated from a free_list[]. Based on this fact, it is enough to > check on a single subpage to decide the migration type of the whole huge > page. By this way, it saves (2M/4K - 1) times loop for pmd_huge on x86, > similar on other archs. > > Furthermore, when executing isolate_huge_page(), it avoid taking global > hugetlb_lock many times, and meanless remove/add to the local link list > cma_page_list. > > Signed-off-by: Pingfan Liu Reviewed-by: Ira Weiny > Cc: Andrew Morton > Cc: Ira Weiny > Cc: Mike Rapoport > Cc: "Kirill A. Shutemov" > Cc: Thomas Gleixner > Cc: John Hubbard > Cc: "Aneesh Kumar K.V" > Cc: Christoph Hellwig > Cc: Keith Busch > Cc: Mike Kravetz > Cc: Linux-kernel@vger.kernel.org > --- > v3 -> v4: fix C language precedence issue > v4 -> v5: drop the check PageCompound() and improve notes > mm/gup.c | 23 +++++++++++++++-------- > 1 file changed, 15 insertions(+), 8 deletions(-) > > diff --git a/mm/gup.c b/mm/gup.c > index ddde097..1deaad2 100644 > --- a/mm/gup.c > +++ b/mm/gup.c > @@ -1336,25 +1336,30 @@ static long check_and_migrate_cma_pages(struct task_struct *tsk, > struct vm_area_struct **vmas, > unsigned int gup_flags) > { > - long i; > + long i, step; > bool drain_allow = true; > bool migrate_allow = true; > LIST_HEAD(cma_page_list); > > check_again: > - for (i = 0; i < nr_pages; i++) { > + for (i = 0; i < nr_pages;) { > + > + struct page *head = compound_head(pages[i]); > + > + /* > + * gup may start from a tail page. Advance step by the left > + * part. > + */ > + step = (1 << compound_order(head)) - (pages[i] - head); > /* > * If we get a page from the CMA zone, since we are going to > * be pinning these entries, we might as well move them out > * of the CMA zone if possible. > */ > - if (is_migrate_cma_page(pages[i])) { > - > - struct page *head = compound_head(pages[i]); > - > - if (PageHuge(head)) { > + if (is_migrate_cma_page(head)) { > + if (PageHuge(head)) > isolate_huge_page(head, &cma_page_list); > - } else { > + else { > if (!PageLRU(head) && drain_allow) { > lru_add_drain_all(); > drain_allow = false; > @@ -1369,6 +1374,8 @@ static long check_and_migrate_cma_pages(struct task_struct *tsk, > } > } > } > + > + i += step; > } > > if (!list_empty(&cma_page_list)) { > -- > 2.7.5 >