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 Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by smtp.lore.kernel.org (Postfix) with ESMTP id 2746EEB64D9 for ; Mon, 19 Jun 2023 19:37:43 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 41C3A8D0002; Mon, 19 Jun 2023 15:37:42 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 3CB8F8D0001; Mon, 19 Jun 2023 15:37:42 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 245968D0002; Mon, 19 Jun 2023 15:37:42 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0017.hostedemail.com [216.40.44.17]) by kanga.kvack.org (Postfix) with ESMTP id 13A5D8D0001 for ; Mon, 19 Jun 2023 15:37:42 -0400 (EDT) Received: from smtpin20.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay09.hostedemail.com (Postfix) with ESMTP id CDD87803B2 for ; Mon, 19 Jun 2023 19:37:41 +0000 (UTC) X-FDA: 80920507122.20.002EF4C Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by imf13.hostedemail.com (Postfix) with ESMTP id ABF1C2000B for ; Mon, 19 Jun 2023 19:37:38 +0000 (UTC) Authentication-Results: imf13.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=QX7U9x2b; spf=pass (imf13.hostedemail.com: domain of peterx@redhat.com designates 170.10.129.124 as permitted sender) smtp.mailfrom=peterx@redhat.com; dmarc=pass (policy=none) header.from=redhat.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1687203458; 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: in-reply-to:in-reply-to:references:references:dkim-signature; bh=tl6PHbc+VyYybGOhiv2rCh7kHt25l23EfmA39lRewBs=; b=mScnByl/bPFg2tm2T93BfR+zaiiU0o3m5KnXODYHVuiUdJ1PUBbr99DU6CASosi5vC8ssO o/afHiUJh11oIjBU9OoLkUDns4hilOBJi4RF6zxNjjrzTTV0AgnLTyw6DoHRAHOooFPm/x t+71EkISoL/mv5Hl7HLVg24uiK2b0wA= ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1687203458; a=rsa-sha256; cv=none; b=lO+cCp/Iy8a5nG1qpWftPA8n12VCZRSGFX83k/pNAt/QolDDR5wTtfxutrnqU7AR/c+NxG LqRuQiujrV7EGVnnSlntipbt3EF941Z+VG0VOaiiuyWeCpgBKVKEDcW+JO9b6D4vsR0cxi gWY5WYz5yQ84GciGmyvtHrIcYtYUawE= ARC-Authentication-Results: i=1; imf13.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=QX7U9x2b; spf=pass (imf13.hostedemail.com: domain of peterx@redhat.com designates 170.10.129.124 as permitted sender) smtp.mailfrom=peterx@redhat.com; dmarc=pass (policy=none) header.from=redhat.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1687203457; 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: in-reply-to:in-reply-to:references:references; bh=tl6PHbc+VyYybGOhiv2rCh7kHt25l23EfmA39lRewBs=; b=QX7U9x2bpKEp6A38t/CIUmQvut0vGIo/wqY6KKMd3yzC6c4j9NzA8uIgaMexN+Yo17icCw P8KlpMFNnRKwUZ9gILIkZzfge0H1+kRNqDwRUCL8BrWtJn9b1jucdAj6bxwIN9u0UsHb2z 41qJwG/wBKbnh9bWHELXibW7b3EVNk4= Received: from mail-qk1-f200.google.com (mail-qk1-f200.google.com [209.85.222.200]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-659-gO2xvMYZO6OAGvsm8MO5-w-1; Mon, 19 Jun 2023 15:37:36 -0400 X-MC-Unique: gO2xvMYZO6OAGvsm8MO5-w-1 Received: by mail-qk1-f200.google.com with SMTP id af79cd13be357-7623c0f2856so44719485a.0 for ; Mon, 19 Jun 2023 12:37:35 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1687203455; x=1689795455; h=in-reply-to:content-disposition:mime-version:references:message-id :subject:cc:to:from:date:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=tl6PHbc+VyYybGOhiv2rCh7kHt25l23EfmA39lRewBs=; b=Wiq/z8JDGjcdivm5D+h2K1DE5xW7jcBT0Vj9kbAkE/3r9PmbWN7WxwNUmuvYpgylZ7 588ZKR4T17ZUlQ7TVMfeD7Vh/jAS37Jh/nLWEVPzP/FRWbRnDBdvZavOqWGhdjPhYhxU sXD607szDzC6x5V9VaBX4lrG0iYC/da5+q4UlLFhVbumrIXy7WpRnvS6g7SD7ppcJ1tV mykSSiWxkqHUCZJrNdQ88BdbYWWPUwrekDfkYrjuw/kVMa5XkpjV9FsfMlwnoTdIbjJI baYicAnj8NBm5BMLXx3RUPXQipRNzGTRVNWgLS5TUikfUqXt1T6wEcYcKUQinXJdmC2O jhjA== X-Gm-Message-State: AC+VfDwLfQa1vlVXGCZ+uyvElPsngKdR4RrnZbEVDoFVk8LZ9D4mS8KV SR557BeLSR0hpBuCm51rKJ4WWdASXGxIOKe2jbPAhFxfLaxNdllAiqsqi3dcY18fKqo97RladV9 4WmAYabJttjE= X-Received: by 2002:a05:6214:5298:b0:62f:1283:6185 with SMTP id kj24-20020a056214529800b0062f12836185mr13121857qvb.2.1687203455489; Mon, 19 Jun 2023 12:37:35 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ6vycr93q9nZDfE7eqifHLn7LWkIsJW1lnFzitjV/i0b+6uSxUhyWoTVcx9J4AH10Kuev/zPQ== X-Received: by 2002:a05:6214:5298:b0:62f:1283:6185 with SMTP id kj24-20020a056214529800b0062f12836185mr13121850qvb.2.1687203455193; Mon, 19 Jun 2023 12:37:35 -0700 (PDT) Received: from x1n (cpe5c7695f3aee0-cm5c7695f3aede.cpe.net.cable.rogers.com. [99.254.144.39]) by smtp.gmail.com with ESMTPSA id f19-20020a0cf3d3000000b005fdbcab3065sm280254qvm.72.2023.06.19.12.37.34 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 19 Jun 2023 12:37:34 -0700 (PDT) Date: Mon, 19 Jun 2023 15:37:30 -0400 From: Peter Xu To: Lorenzo Stoakes Cc: linux-kernel@vger.kernel.org, linux-mm@kvack.org, Matthew Wilcox , Andrea Arcangeli , John Hubbard , Mike Rapoport , David Hildenbrand , Vlastimil Babka , "Kirill A . Shutemov" , Andrew Morton , Mike Kravetz , James Houghton , Hugh Dickins Subject: Re: [PATCH 6/7] mm/gup: Accelerate thp gup even for "pages != NULL" Message-ID: References: <20230613215346.1022773-1-peterx@redhat.com> <20230613215346.1022773-7-peterx@redhat.com> MIME-Version: 1.0 In-Reply-To: X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset=utf-8 Content-Disposition: inline X-Stat-Signature: dtf4xwhb7ow514qc9fnqhgm1fbhgxo9z X-Rspamd-Server: rspam10 X-Rspamd-Queue-Id: ABF1C2000B X-Rspam-User: X-HE-Tag: 1687203458-610307 X-HE-Meta: U2FsdGVkX19ZC91nQ5ld2l7+fsuut8qUCFaIQ52iOBKgrVEsEl/+EX9eK7GrSVAdmDbV6RLR+FfaFpPI0WQfXAhMy/562ir78TTAbygGs5bfGdQq9jypQtBBhLjHMHCKVCF17Xt0igssGkJEo2sYN1/RmR+6zi/EjbOMlrUFOgQHTLQYC1yb8dP/j1JVeEJ8+so7Mx48i1W/bEpbjnkuiSAVlin7JqA1Ea54hiNCdoZEppYGq/8UbURr2wAQo8/IRrcwQsLRi0x5e+O4EOM18av7swMh64CDosp+YdwauQhj9KewCUI74FuBdf65SrkgBV+RjFK/OjCvX64c7QHemYnDwvyFKkRjf3rLO3kdtyp1IKjT6zvOJ7zZDZ/X1nYLVEG3gPOR/D9b1i7+/86u5ZyYtZ4FvxU1GuPayA+Pe3jgQ9lq9QHFZ2PIpFULMnIRTvaXhNYW/s7cUcZfksV8w+AienxsibX67+Pj/eMamz8pRUyB/RoO2IjnN9+635cJ5nufXR5BifQX3k28q4AopM0S02MbRvWVCdgj7SNUmsBlbmbhS9A/beg3VuCqER4hsgShSKK+NeynFiwwRpmUfHC9fBfSc4BstBkhcL1ilCKWCtkGNXPoHuHLDSuMRMdgnirVp1mv5dYxM3xR3wPT+NvNxC1IP3xyf5bJDtblFu1waRt21dK0cyYMFPe+E74D18XkoEgISlrA+apU/gGtQSX5nvYmsmn0AYTISQWORYUQYhgC14pYcylAy2/hJxsELUsJmP2nDdl+ts8rl4vhawt62Xj3AXxt5j2cNfT3+pf2gcwkVWUxldW4yiw1aETWW5rEadVRlb99+Evakl+TGgEBdrSg1fWubk0BltQhl42EFc3k180r+V9JxYvL8A633xFXmG1YSYAXK++AB3sbMNmClq5KHjoM2y2Zk1dqYh+FFMqelJY3IXMvs2Cbuw3pFgVUZj7zjh8CSnjGZ+P dg93GMdP FP/Uu69KYeJQNFI/XH0F2Z4IaCrLNc8J34NcBQ9+CguGembDSjA1Ly1MEiXAD1oRNH47XBSBNQr0bHrvH3aRntjHNrF4lcmrx52uAp/sipxIQdT1EewteVFmL2anD/0ckLI/GHzfTF51pgUDDMcyDT4/e5pMPKOlUcMszPgoPMOJziDWnUIxgO5mzBlmvrGUMZYWsvqGm9WPUC3EiP68dQLhj3UFvINvAKVaT4QOhFu/fGMbnVrFkhqFVLPm/tkJ6rBZIFMPZPZJfNxgcW2LHJKiELFlL5Li3ie0LqEpz7Q9jDN611vuwXRaVVDAWjBAWrJBcJGYmfVRQNQ0O11BtUrK4gtSJWOLpZqJwOSxF3L9OUIj3+UqwhRtymXy6m/4NYDb5UuD3bLF3UECSf0//f3khw2zaGl1VK6a6HMYF//xJ+AgTkyUqx+AEXg== 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: On Sat, Jun 17, 2023 at 09:27:22PM +0100, Lorenzo Stoakes wrote: > On Tue, Jun 13, 2023 at 05:53:45PM -0400, Peter Xu wrote: > > 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); > > I'm not sure this should be warning but otherwise ignoring this returning > NULL? This feels like a case that could come up in realtiy, > e.g. folio_ref_try_add_rcu() fails, or !folio_is_longterm_pinnable(). Note that we hold already at least 1 refcount on the folio (also mentioned in the comment above this chunk of code), so both folio_ref_try_add_rcu() and folio_is_longterm_pinnable() should already have been called on the same folio and passed. If it will fail it should have already, afaict. I still don't see how that would trigger if the refcount won't overflow. Here what I can do is still guard this try_grab_folio() and fail the GUP if for any reason it failed. Perhaps then it means I'll also keep that one untouched in hugetlb_follow_page_mask() too. But I suppose keeping the WARN_ON_ONCE() seems still proper. Thanks, -- Peter Xu