From patchwork Thu Jun 27 05:15:45 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Pingfan Liu X-Patchwork-Id: 11018783 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id B291A1575 for ; Thu, 27 Jun 2019 05:16:24 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 9E85328A18 for ; Thu, 27 Jun 2019 05:16:24 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 8FA0B28A1A; Thu, 27 Jun 2019 05:16:24 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-3.0 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FROM,MAILING_LIST_MULTI,RCVD_IN_DNSWL_NONE autolearn=ham version=3.3.1 Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 098B428A18 for ; Thu, 27 Jun 2019 05:16:23 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 72B196B0003; Thu, 27 Jun 2019 01:16:22 -0400 (EDT) Delivered-To: linux-mm-outgoing@kvack.org Received: by kanga.kvack.org (Postfix, from userid 40) id 6DC4A8E0003; Thu, 27 Jun 2019 01:16:22 -0400 (EDT) X-Original-To: int-list-linux-mm@kvack.org X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 5A3758E0002; Thu, 27 Jun 2019 01:16:22 -0400 (EDT) X-Original-To: Linux-mm@kvack.org X-Delivered-To: Linux-mm@kvack.org Received: from mail-pl1-f197.google.com (mail-pl1-f197.google.com [209.85.214.197]) by kanga.kvack.org (Postfix) with ESMTP id 25CFE6B0003 for ; Thu, 27 Jun 2019 01:16:22 -0400 (EDT) Received: by mail-pl1-f197.google.com with SMTP id e95so766734plb.9 for ; Wed, 26 Jun 2019 22:16:22 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:dkim-signature:from:to:cc:subject:date :message-id; bh=dLHMpSvXQSD083tckUaqr5lCc43yf6mebuGn+jSw2ow=; b=Hzzp21idDK0Xdjr784NNHdjZ1GwT2mB7AkddEVZ9EBHtVPVhtgohP0037ubipRXzeZ tOok9LOxTbaCDuBxw3HYlE/lesjqqLnDK1g9I806zMdT0scqHyYhQcyAwMXWWQ8opYpr bGXR7m0eHL5fjoTZzanfJyO4/vgVj2cK5oVHztCHTdEEnTxt7SmY2Yup+QqHo8hP31h3 M24o1MfJ4mc8qvf3HijgNRXdL2UiC4SGiy9evMwa38JNJO5YMeR3sqkjR9ZMRL5xaovY m20jJkX3EGBjyxqMK/8wU9xatUfrv0vYC1FsEpYXsgC2v8q5bjyV3zxiinFjypJPx6kk HUYA== X-Gm-Message-State: APjAAAU11S7m/dArZI4ttfaGGhT6sFaTCHAfAJH5wGwPg3P1SctGQTkU IxSyMeAi7iS2OSKNuYwc1KmrLf4LqO02j8gR+W8KzbT4mhdUtLqUzAqP3iqOoaYKqIXKBlE9cRW Gef7rKfjQCouEgYjZj7xyEmNT2SF4eb0rKZxL0vxvZRONoVHOPqFzYAoUeD0rKAc6sQ== X-Received: by 2002:a17:90a:a601:: with SMTP id c1mr3572745pjq.24.1561612581703; Wed, 26 Jun 2019 22:16:21 -0700 (PDT) X-Received: by 2002:a17:90a:a601:: with SMTP id c1mr3572685pjq.24.1561612580775; Wed, 26 Jun 2019 22:16:20 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1561612580; cv=none; d=google.com; s=arc-20160816; b=mcI24fQi44kk6d6X1vW2f7vYAMtNki4NImKX53SoSAutdypo+vF0PIgqOaMfWB/n0x +WouMiEam9xxnkclp26L8b1uVKK5togWrQI1AQuowYiRrcc5nboEbnvlmabd1lxcjuS+ 4mZZ4BKpx8xfngbwynw1FqboBiGe2wdu92PWwXNSv1GcoPZfzmabGZwNvlTvAdNhQl0Z 2wIAgFnvp0a/Xgq38kUbhgyaKNha+QWSsl6bIXJ7uwCf4TRat3304AQu4PVPU6fDucZE xZftF87Og72D3c4gDH7Ot+tity776bYseH8vYpAbqsDN4WNo/WeLKlVm//9qEWSbU6Vo mAAg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=message-id:date:subject:cc:to:from:dkim-signature; bh=dLHMpSvXQSD083tckUaqr5lCc43yf6mebuGn+jSw2ow=; b=rtO55f6zbI+3+MEyMtiLz0+b/+zE55OHYCfv6im37OK+F350QXcIdxehx+oLaK0WwE xg/Agrz2dyIrEH4hnYuHquBF2QBvInpW1VTPvfccEPg43+fKaNClxnFQSZnvDU+dQdt5 FFb1q5ghe9kr0tu3eSevwDV9XK/5/5C70uZ9hlnnIU876UqJAitmQVLW9VlwPGj/dFkF yyj+E7Rjc0ZDdD7PUxjJBIbYWxchUaG1+IVcWwDhRvNY2DFCMIhpCItcvxvybda5Okfr HBgAFyW+2nBAa5k99NQzNSscy3es0OjTHmHDbvCgNFUyw7vWM/AEA5oCwLGYqedeQJZU uylA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@gmail.com header.s=20161025 header.b=hLjGSXHQ; spf=pass (google.com: domain of kernelfans@gmail.com designates 209.85.220.65 as permitted sender) smtp.mailfrom=kernelfans@gmail.com; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: from mail-sor-f65.google.com (mail-sor-f65.google.com. [209.85.220.65]) by mx.google.com with SMTPS id r3sor1152982pls.29.2019.06.26.22.16.20 for (Google Transport Security); Wed, 26 Jun 2019 22:16:20 -0700 (PDT) Received-SPF: pass (google.com: domain of kernelfans@gmail.com designates 209.85.220.65 as permitted sender) client-ip=209.85.220.65; Authentication-Results: mx.google.com; dkim=pass header.i=@gmail.com header.s=20161025 header.b=hLjGSXHQ; spf=pass (google.com: domain of kernelfans@gmail.com designates 209.85.220.65 as permitted sender) smtp.mailfrom=kernelfans@gmail.com; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id; bh=dLHMpSvXQSD083tckUaqr5lCc43yf6mebuGn+jSw2ow=; b=hLjGSXHQ3ZySmpg9L0hRhXitIUKUzmq5ycHBXmG8iserze4xv8lurnOhm95Qx/T8+0 TrfKvR4p7nH6HbcWLxlQULke+4Muh+7TxjjsXB5cUtr61SaAsy4RczXGK/vLuRj8HHWQ XGBJTBwp+7kLH4CxfebhqThEtaPZnnG4C7caDEkq+lCUAINs0hP4ZDyxiHqy/0Q1R1Xm mLaOU6xmRlcFBlqyyWww7OKiCbbMQSPtX4sFrK+aUht9grjZMeNNp9WPjnr3Up8arurO IA5V9kSJUJRHNtLPAA0FhRFxJ2qaenwf9uXIxmsktgVde0aBfje4RNAV+NRwLKomINdu R9eg== X-Google-Smtp-Source: APXvYqykoHphjYKkFLbMk8cRKv9nNo4OG3LontM4l5mWgAo0zB4rw4ZWsU/+nRm5s9kiLMS7f8GAwg== X-Received: by 2002:a17:902:2a27:: with SMTP id i36mr2307823plb.161.1561612580340; Wed, 26 Jun 2019 22:16:20 -0700 (PDT) Received: from mylaptop.redhat.com ([2408:8207:7820:4fb0:dc47:8733:627e:cd6d]) by smtp.gmail.com with ESMTPSA id k3sm812688pgo.81.2019.06.26.22.16.11 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 26 Jun 2019 22:16:19 -0700 (PDT) From: Pingfan Liu To: Linux-mm@kvack.org Cc: Pingfan Liu , Andrew Morton , Ira Weiny , 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: [PATCHv5] mm/gup: speed up check_and_migrate_cma_pages() on huge page Date: Thu, 27 Jun 2019 13:15:45 +0800 Message-Id: <1561612545-28997-1-git-send-email-kernelfans@gmail.com> X-Mailer: git-send-email 2.7.5 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: X-Virus-Scanned: ClamAV using ClamSMTP 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 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 Reviewed-by: Ira Weiny --- 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)) {