From patchwork Mon Jun 19 23:10:41 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Xu X-Patchwork-Id: 13285012 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by smtp.lore.kernel.org (Postfix) with ESMTP id AD91CEB64D9 for ; Mon, 19 Jun 2023 23:11:01 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 0E9788D0008; Mon, 19 Jun 2023 19:10:59 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 076968D0001; Mon, 19 Jun 2023 19:10:58 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id DBAFF8D0008; Mon, 19 Jun 2023 19:10:58 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0014.hostedemail.com [216.40.44.14]) by kanga.kvack.org (Postfix) with ESMTP id C9DB68D0001 for ; Mon, 19 Jun 2023 19:10:58 -0400 (EDT) Received: from smtpin23.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay09.hostedemail.com (Postfix) with ESMTP id A10698045A for ; Mon, 19 Jun 2023 23:10:58 +0000 (UTC) X-FDA: 80921044596.23.63EF08E Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by imf22.hostedemail.com (Postfix) with ESMTP id 6A012C0008 for ; Mon, 19 Jun 2023 23:10:56 +0000 (UTC) Authentication-Results: imf22.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=MjpfCDht; dmarc=pass (policy=none) header.from=redhat.com; spf=pass (imf22.hostedemail.com: domain of peterx@redhat.com designates 170.10.129.124 as permitted sender) smtp.mailfrom=peterx@redhat.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1687216256; h=from:from:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:dkim-signature; bh=00BT5P4M9oBALYuFaAi0Lj2RlKWYXU3sXFeAAd1zvs8=; b=MqMpobrD8rCXfisWMm/HJdJGPF7adhZH47zXayT2veMQwGXCMMNF6D3a+gh/vpvE8m7Cgv AD31E3kVmTyO30zFjJnQLUPSajWG5nGKDzS6mQlzPnvMypq+mWVENYXiNPVAIe/n+65VgD M/0UeVwDxw/gx16Mu97IhSbPYNiyyyc= ARC-Authentication-Results: i=1; imf22.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=MjpfCDht; dmarc=pass (policy=none) header.from=redhat.com; spf=pass (imf22.hostedemail.com: domain of peterx@redhat.com designates 170.10.129.124 as permitted sender) smtp.mailfrom=peterx@redhat.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1687216256; a=rsa-sha256; cv=none; b=oKU9iy0yErXIHZuzbh5n5T9dV1+kQlR15QK+EoYs0s1UHRzfZyNgFy0itOE/JJaLU4rqx1 wRHy016+3TGRatngB/vA/EIk4/1xeNYjlEi5NjxmlvWm9zbmgWJr7LWIzRFs1RJxJiMcjy DkPDe+cILW+9YJ/VrXnN6dsAteIlGZk= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1687216255; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=00BT5P4M9oBALYuFaAi0Lj2RlKWYXU3sXFeAAd1zvs8=; b=MjpfCDhtiFFmQK6WQS137pnmLSK5X+JNWAjV+1tqlRmqVyVaCgZxYaUIJtAu2B3yKoVU8A wXpmHtsmR5UggTFGWqAqGRJ5DdtTzfiYv/gIqdNckeWDkA+RcxfQy49PPJQP93eOr/RKFT HI5Espd9mJm31pgZDUfw41MDX+BlPS4= Received: from mail-qk1-f197.google.com (mail-qk1-f197.google.com [209.85.222.197]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-619-jtDlg1dTPTWG5AxD-sTk3A-1; Mon, 19 Jun 2023 19:10:54 -0400 X-MC-Unique: jtDlg1dTPTWG5AxD-sTk3A-1 Received: by mail-qk1-f197.google.com with SMTP id af79cd13be357-7625940fbf3so29807885a.0 for ; Mon, 19 Jun 2023 16:10:54 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1687216254; x=1689808254; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=00BT5P4M9oBALYuFaAi0Lj2RlKWYXU3sXFeAAd1zvs8=; b=CWrIRt449jLYN7bMrNHSziBs7kNQyTHZLINOdIgdCKzy0Vkw8q6xUxMwhM0iWSXsZd FIlftFdNY20I+qgNdfVG0l0A83eUXRMSuit16pBkrm5iDr7RYj+6q/yV6Lt+gk1I2kWO VsmlxLszdXtmRWhmrF+844tKQsexH9znR2L3yWAlJd7y5Un7QKlavJ8XnNKw/N7/BRTV tb5W0n0iRr2xeVWlMshO5h+q75OXo4TbZXkla/EgPpBiGyOIDqRBNSXhmfd69PiJyw2P W41EN6hMU3qyLp/UPPkf/8C8TaVkv7yMVTNLnu1QxYCwdKtHZzGADHcI+877lp4sq4wx eiqg== X-Gm-Message-State: AC+VfDwdin8TRf5cVqEpNCppJfWJ7dSloE5UmXbJ6ryWdYmGQTSDqP/d 1+iT5kfeDCRVcnPQrlyK24tKoMzc2nQLTtVASNW39Qbjfte7MhfSDilmxyqQqk7+Nn448my9SDa cWRGBcLWJPR27Feo7jyX/vHc79rm45AmbPq0RGkSY2/MJi2A/xr6Ly7eUelcFf/y3Hwpz X-Received: by 2002:a05:620a:2889:b0:75b:23a1:82a4 with SMTP id j9-20020a05620a288900b0075b23a182a4mr13246421qkp.5.1687216253947; Mon, 19 Jun 2023 16:10:53 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ6UOYeqlkYR0J6Chpj2TyYjEYwQWzUGGOpxx8Hlzqu19xtpfM0scU4fcVU/UZq38b/9mzJjIA== X-Received: by 2002:a05:620a:2889:b0:75b:23a1:82a4 with SMTP id j9-20020a05620a288900b0075b23a182a4mr13246392qkp.5.1687216253602; Mon, 19 Jun 2023 16:10:53 -0700 (PDT) Received: from x1n.. (cpe5c7695f3aee0-cm5c7695f3aede.cpe.net.cable.rogers.com. [99.254.144.39]) by smtp.gmail.com with ESMTPSA id t15-20020a05620a034f00b007592f2016f4sm405864qkm.110.2023.06.19.16.10.52 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 19 Jun 2023 16:10:53 -0700 (PDT) From: Peter Xu To: linux-mm@kvack.org, linux-kernel@vger.kernel.org Cc: Andrea Arcangeli , Mike Rapoport , David Hildenbrand , Matthew Wilcox , Vlastimil Babka , John Hubbard , "Kirill A . Shutemov" , James Houghton , Andrew Morton , Lorenzo Stoakes , Hugh Dickins , Mike Kravetz , peterx@redhat.com, Jason Gunthorpe Subject: [PATCH v2 5/8] mm/gup: Accelerate thp gup even for "pages != NULL" Date: Mon, 19 Jun 2023 19:10:41 -0400 Message-Id: <20230619231044.112894-6-peterx@redhat.com> X-Mailer: git-send-email 2.40.1 In-Reply-To: <20230619231044.112894-1-peterx@redhat.com> References: <20230619231044.112894-1-peterx@redhat.com> MIME-Version: 1.0 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com X-Rspamd-Queue-Id: 6A012C0008 X-Rspam-User: X-Rspamd-Server: rspam04 X-Stat-Signature: mygcrwfqn5165c8qxrtrz1hyju17z7hg X-HE-Tag: 1687216256-705216 X-HE-Meta: U2FsdGVkX1+pev6fZh6LH9DYt3OvvQoTUD1n3z/Bhhi6CWxjZXeb880y0ugmcocDqjC6YexedogkDJQJZ5V9RAsk3SrON3v7epx0DuU+72k5UvLKk/5vfgJ8ArlhOkj9gPNxM5uq590LltscrVI1cOVm4m+MJO1b0JALEmyg/s0RtXMdaG6vcNzyTyHT0ibSFVcolRYofwBY/9giFNH+LcIIn8FHgqoLGICQo0zQ0XtOx6vlLiJhra3GRFNc1xXaBBBG4vS3AfuYMfIcDfONIgYvoi9OCqvQWEP68Ch4ENOXG7FlNb3syrK6SN5q6tFdYVZWMhYGh7oZzTXBqUjVa1KNlKyhYnuGarmo4wm+1fSjC+OXehifP2zWKYKi873n8plEza6JQOTTLIn+YgmlvJ0f8srTm3J4peottDTYEeBUQG0RGqlSKOZcgtwgeLBh3hwtV8G5myw5kV6JqkUrgZf2ysjd5JF0sAJZj/IqcvI4pa20Ih1s09zECvn+c1H1TKMVdlOe+E2RaUYddbTLbfsvMdXynr+NH0J7g7QrcEnA9xT7ufQ0/0BcPTqcMxBek8ItsinTU7aXfenZ9sCum7cEnBMxbwpriH7p6duHWvbTzpTExibd7TZxceq16p0iCvDTDywvlbVClCPaBfsFFHlWhCpR5q95tViQMjCnGEvUZzi136OnMs85fVIuJvA766h/bGpMdrCafO80d2cuxQxcdtTMJd4vPWK43BbDiDQBRw8YuUWY/dmS4oKSSizLVjXqpA+uLxtE9JQBwADU5pYj7AQl/vggpCNTOwavdPJfqh/HGXezNMrhoZxWPe1mjpsh7fMNXq8OK1J0J9BMrUtKkh2MH8WDKXeLUqxZqEAbVpGh9WirO5Pqph0AqDqRUSXB79Ho3GRl6sdzcGJvD2c7MQrsUSROhsPtbzCNxLG6Lr44eiFCD9aMUX7roRK4nIkceFKccm0fmFGXzYS Shpiv4Ek W+k/RCL/t8EgtSioRkkStgvVuL8tV9Mk52zmo9e5+/doBkQQOxhFUTZ89sWA/AtDgKYMVa6IdNf752vxUcjwpyum2ZiR4cmvi6GOcLW9uIOR/i/KRuRIa0IxtqkBDXaqrGMZFqCrUHA0vdL7ogeiHMRsLKAmxc4mF99lTEgaOrqtXpCySzjX4RpXRTk1a15J6BCirUU6u4U21sP/x3EfnPxHzekgENrgjNodZHggA536zFnrc7ufxdb4l2cB7vKnk65GAI/4NSP4xqMUxJLssAu6iWm3xmCzhrVK/l1Y0CBGrJ0CHa6EptUpKOVHiDvetG7jgw5H88ZA3QILmqI/gi3hP25BiMoLUjqlXMBHqogOac4cu9zduq2Y7yPBQfPv6MPK35ggom7XY4z/YYDYiWRBIVHJxokaSS4bye7dR+4XOTsMWIGTmJA0cXg== 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: The acceleration of THP was done with ctx.page_mask, however it'll be ignored if **pages is non-NULL. The old optimization was introduced in 2013 in 240aadeedc4a ("mm: accelerate mm_populate() treatment of THP pages"). It didn't explain why we can't optimize the **pages non-NULL case. It's possible that at that time the major goal was for mm_populate() which should be enough back then. Optimize thp for all cases, by properly looping over each subpage, doing cache flushes, and boost refcounts / pincounts where needed in one go. This can be verified using gup_test below: # chrt -f 1 ./gup_test -m 512 -t -L -n 1024 -r 10 Before: 13992.50 ( +-8.75%) After: 378.50 (+-69.62%) Signed-off-by: Peter Xu Reviewed-by: Lorenzo Stoakes --- mm/gup.c | 51 ++++++++++++++++++++++++++++++++++++++++++++------- 1 file changed, 44 insertions(+), 7 deletions(-) diff --git a/mm/gup.c b/mm/gup.c index 4a00d609033e..b50272012e49 100644 --- a/mm/gup.c +++ b/mm/gup.c @@ -1199,16 +1199,53 @@ static long __get_user_pages(struct mm_struct *mm, goto out; } next_page: - if (pages) { - pages[i] = page; - flush_anon_page(vma, page, start); - flush_dcache_page(page); - ctx.page_mask = 0; - } - page_increm = 1 + (~(start >> PAGE_SHIFT) & ctx.page_mask); if (page_increm > nr_pages) page_increm = nr_pages; + + if (pages) { + struct page *subpage; + unsigned int j; + + /* + * This must be a large folio (and doesn't need to + * be the whole folio; it can be part of it), do + * the refcount work for all the subpages too. + * + * NOTE: here the page may not be the head page + * e.g. when start addr is not thp-size aligned. + * try_grab_folio() should have taken care of tail + * pages. + */ + if (page_increm > 1) { + struct folio *folio; + + /* + * Since we already hold refcount on the + * large folio, this should never fail. + */ + folio = try_grab_folio(page, page_increm - 1, + foll_flags); + if (WARN_ON_ONCE(!folio)) { + /* + * Release the 1st page ref if the + * folio is problematic, fail hard. + */ + gup_put_folio(page_folio(page), 1, + foll_flags); + ret = -EFAULT; + goto out; + } + } + + for (j = 0; j < page_increm; j++) { + subpage = nth_page(page, j); + pages[i+j] = subpage; + flush_anon_page(vma, subpage, start + j * PAGE_SIZE); + flush_dcache_page(subpage); + } + } + i += page_increm; start += page_increm * PAGE_SIZE; nr_pages -= page_increm;