From patchwork Tue Jun 13 21:53:45 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Xu X-Patchwork-Id: 13279238 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 286A0EB64DB for ; Tue, 13 Jun 2023 21:54:12 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 745706B0081; Tue, 13 Jun 2023 17:54:11 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 6F5E86B0082; Tue, 13 Jun 2023 17:54:11 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 597966B0083; Tue, 13 Jun 2023 17:54:11 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0012.hostedemail.com [216.40.44.12]) by kanga.kvack.org (Postfix) with ESMTP id 4BEEE6B0081 for ; Tue, 13 Jun 2023 17:54:11 -0400 (EDT) Received: from smtpin23.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay08.hostedemail.com (Postfix) with ESMTP id 23BA3140369 for ; Tue, 13 Jun 2023 21:54:11 +0000 (UTC) X-FDA: 80899078302.23.B846919 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by imf08.hostedemail.com (Postfix) with ESMTP id 19C8916001E for ; Tue, 13 Jun 2023 21:54:08 +0000 (UTC) Authentication-Results: imf08.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=XzCv58Ck; dmarc=pass (policy=none) header.from=redhat.com; spf=pass (imf08.hostedemail.com: domain of peterx@redhat.com designates 170.10.133.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=1686693249; 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=HwdaHYLXZAtZykSCGumfFt7VLYdtQYhxN3KKFt+1ERs=; b=TEJgJYbyUDPpx8NiY68YfBLVzZbOdJ6AmRUhkf+xrE3F1yPyIUcCmgSZbH+JhS6nv115+8 QEqlyCceSeUFB+pi0n5W67IkAqSC+d6g7il/sWMlwAk305Gthv6JBIB/0LNE4KOcw3vMJ2 2oWFEbWqobaxFhuKdgkwrstzBC5H3Ak= ARC-Authentication-Results: i=1; imf08.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=XzCv58Ck; dmarc=pass (policy=none) header.from=redhat.com; spf=pass (imf08.hostedemail.com: domain of peterx@redhat.com designates 170.10.133.124 as permitted sender) smtp.mailfrom=peterx@redhat.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1686693249; a=rsa-sha256; cv=none; b=KKxAiNDvPeQPWVV0mXNzDro7lPJjk2vB4VIXFM/JiIHJspqGQaq1FRhX+STKimhH5lqD/9 LTatabM/5VJI+Ylw9ea6wJTOpWulJmwL1UyzB4ZLx4PfM4hpWzfffapno4vopH3efiXd0A YWelobjAsGef03AdaNN1PfpZkOL4FBM= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1686693248; 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=HwdaHYLXZAtZykSCGumfFt7VLYdtQYhxN3KKFt+1ERs=; b=XzCv58CkTaBQ956sxi7DDhvu3KpiIyryJLgZsGWJbtd/nNIBtkV/h20i67xHrXhomfXaoS VQ/2VVdQskEGZqQTw3X2N1A9n1shPlzXZ5iXKFxKUaVB4IKfVnqffnaPvVbfNzB+ylyXRm 3oRDujfh3RaRqZnha4CTlO6Kpsanxnc= Received: from mail-qt1-f197.google.com (mail-qt1-f197.google.com [209.85.160.197]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-490-bdPDXKZDMseqwO2MOkNl5Q-1; Tue, 13 Jun 2023 17:54:06 -0400 X-MC-Unique: bdPDXKZDMseqwO2MOkNl5Q-1 Received: by mail-qt1-f197.google.com with SMTP id d75a77b69052e-3f8b055287fso11088951cf.0 for ; Tue, 13 Jun 2023 14:54:05 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1686693245; x=1689285245; 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=HwdaHYLXZAtZykSCGumfFt7VLYdtQYhxN3KKFt+1ERs=; b=iaLb2ijftDWp0nLjYUsZleQQjuLKrp2jbwIKvPZ7yVlvHQkBPBc9kwWpMj+fDtAT2t 0chsmVfRC8RYVHDdqjqf4XcUMjG1H6bcbNI3R1e2e904aMKFROUoFJWyRAt0vvJn0Grc l+vn/SVdOFCmGu/ThnOg9NDFVREIGuZQMiGausgg4kHnX39pB0A4eFFMiFdAaiZRigGj /EaHYVoQd+uO9RImEkln20pLGkF+VRrDsuY3RwtZNTwi2xTSYUpK7NbT6IHt9tMz94Ki JaKtVte9ZvEQWzWUYOGJoeHbQRZqcBl9LDmNeRfBixwpDoVqYK6KwRXBDCJSmNaKVBPM 1/Kw== X-Gm-Message-State: AC+VfDxxlbE2GKofQVakvTdzkjsgQjve4ck+kS+c7lxdCuxJBoydDyU2 W9+9TJTwn0Dxs+JNVJK63lOUFlp+Pp0OgaqgaSEbUoEMx/GPDLas+D1wNkQzbaRDDogaeFKYBO9 aWAoyJn9k10M= X-Received: by 2002:ac8:5c4e:0:b0:3f6:b556:7c97 with SMTP id j14-20020ac85c4e000000b003f6b5567c97mr18597053qtj.4.1686693245182; Tue, 13 Jun 2023 14:54:05 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ5oqukQ8w9LAlWsT5JOrpxotagWUzu2HoxH3Yt91lRCBju32vz1LdI431t9L/5PA4lN4Cy+gA== X-Received: by 2002:ac8:5c4e:0:b0:3f6:b556:7c97 with SMTP id j14-20020ac85c4e000000b003f6b5567c97mr18597030qtj.4.1686693244966; Tue, 13 Jun 2023 14:54:04 -0700 (PDT) Received: from x1n.redhat.com (cpe5c7695f3aee0-cm5c7695f3aede.cpe.net.cable.rogers.com. [99.254.144.39]) by smtp.gmail.com with ESMTPSA id fz24-20020a05622a5a9800b003f9bccc3182sm4522330qtb.32.2023.06.13.14.54.02 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 13 Jun 2023 14:54:04 -0700 (PDT) From: Peter Xu To: linux-kernel@vger.kernel.org, linux-mm@kvack.org Cc: Matthew Wilcox , Andrea Arcangeli , John Hubbard , Mike Rapoport , David Hildenbrand , Vlastimil Babka , peterx@redhat.com, "Kirill A . Shutemov" , Andrew Morton , Mike Kravetz , James Houghton , Hugh Dickins Subject: [PATCH 6/7] mm/gup: Accelerate thp gup even for "pages != NULL" Date: Tue, 13 Jun 2023 17:53:45 -0400 Message-Id: <20230613215346.1022773-7-peterx@redhat.com> X-Mailer: git-send-email 2.40.1 In-Reply-To: <20230613215346.1022773-1-peterx@redhat.com> References: <20230613215346.1022773-1-peterx@redhat.com> MIME-Version: 1.0 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com X-Rspamd-Queue-Id: 19C8916001E X-Rspam-User: X-Rspamd-Server: rspam05 X-Stat-Signature: x4ifc1zz8ikwcp5sryjwnu5dc79m19qe X-HE-Tag: 1686693248-962996 X-HE-Meta: U2FsdGVkX19/dedTKdFyAM+BNXiqzVbfh1Zj4M/+Hz/O7Ix8QCtQ/GHRYix3wFljalG0EsY28d95fKhpiNtrRGo1+CMbuDvNJaPNDA93l/CAsjfGgzpgbEPXvlcA1NRX0uQTsn+af5nF8h7FFHn7nDrkPXzzcYs8+lcnqm/hMYouXlp47+OqXVb2BvHFJeiU2GNYGcOOJ51C5zadmUvLCGX9KttT2KSVGXa2hHOmLoq5YCYvaTdGOJn8r7A4UJw+SbYEy9+DBEGdX2kf51E36+uk3ULBsyjwKW/tvcU/JqcxUX0+ryAgcfvb010oSFYi/cbnQsIdixe4w2uASK9VSrWlB9JwCgk35X1T6QXn8NNuOeNVxE7VzM1OuDDzSI6r0fCq4D+2Tie2muzvXb2/FqNQebCxXxS7XH2qThcZRTgJEasqW7zJPILxeXXOrpNTebrXH7MhMVnuBjC0upOa+dWA7HvVkm073FvwpHItvbAMqiVVfQqMyEKQH1xpbY40NUPqQT/y4RgYsnq/9jXqVBHdKAiebxiKfh3ZVfhfRak2erK1TWW0bveYWxLba4pYw+ssiv3NS+V4PwVno3cbAFqr1Lg9/tcgF0haN5kSxzqJqpxpXPRcluE4cOo+l3R4uymDvZNIexotLu5Q/C/vWBjo3b9Ho0oe3fAoQWqLJztWc0U6jd/l1mAp9TTF4pRGpl3uQtbci2T+7xCM3TDlS3x5e5KYe9PAofPPx7Jsjj3xFJ8oj0fw37LS+9KtyBdwzqni1JccqEFoWlnhxiHvorbNBov7xeIfM0VE0CYeLcQdVnLBFVJrsSEOmMHF3wIXPxPsTplqbBW8icwiYC4DQMvuBowC/SwREcx3ao74HBJvIeyc5uz8eUk63C98BdaZiq8Idk8VI3wZD5rUp74AIO6QeaWYd8J9IQrYn2CkAQzWGr59EuiwLpkUSsstVTaXuvEiuSBQ/pZ7u4Idopo sHCIAKIy bq4A6Pev8Zbw/rR6uRWykkr3Izma5IEbHdYPlX0sja8FTD7Pm2+t5vxUJejfetkhfND12IM2abVMxTOdcWvIq/AlUCixaRI6Pvu5Bqqtyd4R7vaYZsyQ9LaNPgzNQ2pxrzXDIUmxmqcb44AvxHSX6vFxWGjTFG3iMscYDAJRaH+UsOffneT8JDzit/uoJKQdmHpzrudvXdZowHXtG10rhSMxm11AspvETlMNBOPIQUd/RU468hGK3EHyqZuTNmPt1sEbUjn6FRiaZx8RXreVyi5HtGuNJ6kyNbP51b1p+a/7vYVlgwjenSLXnUqaV2y9fQvmuWhrLQB0YY8ZMT8OliAD0K3lT0rEPY7Cy26hFvOOesW+q4vfgWjlmy2NScbN/Vg5l8oqC2HvZqp8ohFkJ20MwyUr5Ee2Byj+ekJc+BZIQCrFPhfCNZaHx1Q== 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 --- mm/gup.c | 36 +++++++++++++++++++++++++++++------- 1 file changed, 29 insertions(+), 7 deletions(-) diff --git a/mm/gup.c b/mm/gup.c index a2d1b3c4b104..cdabc8ea783b 100644 --- a/mm/gup.c +++ b/mm/gup.c @@ -1210,16 +1210,38 @@ 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. + * Since we already hold refcount on the head page, + * it should never fail. + * + * NOTE: here the page may not be the head page + * e.g. when start addr is not thp-size aligned. + */ + if (page_increm > 1) + WARN_ON_ONCE( + try_grab_folio(compound_head(page), + page_increm - 1, + foll_flags) == NULL); + + 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;