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 6D6A0EB64D9 for ; Sat, 17 Jun 2023 20:00:41 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 9AEC36B0075; Sat, 17 Jun 2023 16:00:40 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 95DF16B0078; Sat, 17 Jun 2023 16:00:40 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 7FEAA8E0002; Sat, 17 Jun 2023 16:00:40 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0011.hostedemail.com [216.40.44.11]) by kanga.kvack.org (Postfix) with ESMTP id 70FD76B0075 for ; Sat, 17 Jun 2023 16:00:40 -0400 (EDT) Received: from smtpin07.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay06.hostedemail.com (Postfix) with ESMTP id 4052FB0031 for ; Sat, 17 Jun 2023 20:00:40 +0000 (UTC) X-FDA: 80913307440.07.A44F464 Received: from mail-wm1-f41.google.com (mail-wm1-f41.google.com [209.85.128.41]) by imf28.hostedemail.com (Postfix) with ESMTP id 669BCC0015 for ; Sat, 17 Jun 2023 20:00:38 +0000 (UTC) Authentication-Results: imf28.hostedemail.com; dkim=pass header.d=gmail.com header.s=20221208 header.b=djJC0NR1; dmarc=pass (policy=none) header.from=gmail.com; spf=pass (imf28.hostedemail.com: domain of lstoakes@gmail.com designates 209.85.128.41 as permitted sender) smtp.mailfrom=lstoakes@gmail.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1687032038; 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=rjQBbhtm5eFOCdJt5kp50w9SBFIRdDI6B5ZIGzHw3zg=; b=lg/4yhTaNPrsqON9al5TYK4UbG+TzMscmGWlod+sWvG5mqqIAjKKyW6Ig2afXhLEZABCkO CeSG1TfjHY31GukhckBtx9ETzxklPDCYGXMaN0elsI5FEO/PBlajwK3zafwsqqc0iilMRT PHVjyF+jJViYqRSw+sO7+9ivSuxLuKw= ARC-Authentication-Results: i=1; imf28.hostedemail.com; dkim=pass header.d=gmail.com header.s=20221208 header.b=djJC0NR1; dmarc=pass (policy=none) header.from=gmail.com; spf=pass (imf28.hostedemail.com: domain of lstoakes@gmail.com designates 209.85.128.41 as permitted sender) smtp.mailfrom=lstoakes@gmail.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1687032038; a=rsa-sha256; cv=none; b=NB6XXcMoUrW2pT2NRkqxtkA82XLhCV85EEKV0acnTn3xiS579I3pVpr5gNQkuTD4vDUeYl Zd58Onw+r695y7tWSp/8MWqJ7LXsI0H+zWKlUAjebDBtNiAIdsOrmw9WLn2UldWEKrD2Gj kj7H7Vx2t7Sd0sJTYeSrzAALBjaNHLA= Received: by mail-wm1-f41.google.com with SMTP id 5b1f17b1804b1-3f900cd3f69so7501375e9.0 for ; Sat, 17 Jun 2023 13:00:38 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1687032037; x=1689624037; h=in-reply-to:content-disposition:mime-version:references:message-id :subject:cc:to:from:date:from:to:cc:subject:date:message-id:reply-to; bh=rjQBbhtm5eFOCdJt5kp50w9SBFIRdDI6B5ZIGzHw3zg=; b=djJC0NR1UN7CPeXIMuuinoOO5NNoUqSqSzxWupXz5tWWxLRpZ98D+frbgyQCqMMQ7D B/u9IFUiIYOBwdcMYM4gBk6uuyMHswAlgQwT91JXhTocGHuRxC2W5G8KNAdXfXorbL90 g08DDN7BY7ArbgyElxg8hdOqV4VxPS6SuzT0D90Mrpa7dbzhfHYN87M+cAsqCLaS6EJJ +ykE3PG42Z4xH+gHe0wyLR0tJGI3z7lqjIHwQgNy6scOrPhHsgHg4Sjd1r9EHTj10YeY YDrP7BLluZhGHdrniP2379nfLd2fjZHpU8b89PX5EA15IrLbZhkuhodhG4kuxgA5GfOx EWTg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1687032037; x=1689624037; 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=rjQBbhtm5eFOCdJt5kp50w9SBFIRdDI6B5ZIGzHw3zg=; b=UJjRU1xpx39jrZ9f90pCc4CEm2uIXBXibMCYEfInnhUHAoXvxk4QTAcTiQjOfDGdg6 3Dcke3XzrGtR/mCaZesEQ2q/KRIszK9/OBAuTl0gsfDHBeennQOo9oYZgSxuXu8ZwZFX xoZtLooQIX6QhEQSr320b3lPfu1Z0I7YhycFtY9cNWMKa0uwMTbxS86JYWRUDn6tAuoq e2C4lkmHuwGeVA6GnbT/2zmNjS002cnS9OXGY6R+VZmhFa6TeuctxSHEUbzn4aRDR113 dNImtMGW1MPNDwEY6NCTw3jkvc3Tfr88JIKjg6SzHMmzOqrBRuSbpGHo5ZsW/7xF0ETo hLNQ== X-Gm-Message-State: AC+VfDytbHNZ05kOgKk2sK+rjfFM+rQ5hUT0jA8eB7v4m5S42AhL6Wyn NZ6hR5ZMtURNlYYZG5HOlMY= X-Google-Smtp-Source: ACHHUZ4iaQZPLPAEHNuODHsC/grrxgljsjJ+UnDI65fvNlOzgHePOg/aJkZLS9ticiCBESSKzPzx6g== X-Received: by 2002:a05:600c:214d:b0:3f9:ad7:ae86 with SMTP id v13-20020a05600c214d00b003f90ad7ae86mr225704wml.37.1687032036550; Sat, 17 Jun 2023 13:00:36 -0700 (PDT) Received: from localhost ([2a00:23c5:dc8c:8701:1663:9a35:5a7b:1d76]) by smtp.gmail.com with ESMTPSA id c25-20020a05600c0ad900b003f18b942338sm5891713wmr.3.2023.06.17.13.00.35 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 17 Jun 2023 13:00:35 -0700 (PDT) Date: Sat, 17 Jun 2023 21:00:34 +0100 From: Lorenzo Stoakes To: Peter Xu 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 5/7] mm/gup: Cleanup next_page handling Message-ID: <5886f78c-3ff8-4b64-9aa6-027c22e7d5fc@lucifer.local> References: <20230613215346.1022773-1-peterx@redhat.com> <20230613215346.1022773-6-peterx@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: X-Rspam-User: X-Stat-Signature: jpjgjgimqcztj35qqm79rxm45jbjx3ri X-Rspamd-Server: rspam07 X-Rspamd-Queue-Id: 669BCC0015 X-HE-Tag: 1687032038-100666 X-HE-Meta: U2FsdGVkX18FMrzmh9CLc7WEr/pv5qkvQTFInHY6Tmz9275cZPCBgPksvxHDtyMW76F6acShFpDM9+Rtv7iyWOAYCxJjqNncrCzzxyZK8pCHU+HmJt8BLpO1urw5n9ERQQx5mLEJwng+MKa4kWMTA6hMq9WaP4p3kBFeKTNQLdSdyf12+byVyEbyr40MqF8aInHso1v+MGGvOodvur9tKMkJvsGGMYFP1MvFK/ar0AHP9BlmIqcRKo2XpCig9uQ7g9cY4kuhZjX6zNml9J53h65JZfqZbTUV8XM+qREfdVqhNIJNifsU92a/DD/vxH3QYpzNaJsPj25mZIXGAu6J0werzbwF9bUX+XTWGo9HDFQaq09X7U+a2k74H+SKuj88Nc21O8CFoEW/udVvgFbXG/EJn+FKqi9Fnp/+N1c9MLId3a9xGwA9F+O3uy4JcHajGjM09/JGfa0u0LwLY2qznE7VW6LteF3ihzXWaHVRN2+jPSTUqoazyGsM9oQRJB7gSyroznuhPFxScKTLy2XPmzfjNFmPoK2kwu/kaoMV8bo/dn15trmWcS/EAvTZPJrp3TaRBw6A/WLKkvbsIaTk6E3lnBNDwKHtGAFxMiNtRrMOFXpJQEDe6H9uMG07adeozktEH0UjKihN5UsOMWxc4r7qPBB6DPkkbBt4WAhCmJ6Uvo/3LvsSvOsLd+3k7LCFnqxlgb6hF7iISJzenqZTsZpp7BAa+kxrRMwptfZy0s+O5cw8fu303ujdTxhHFzbvh8y69QqMBBa09HVpxbnxYEtq6TDl9lKDkaLRyIrFe2aAuwc2XSQGQb4M6CtVVsfCPtRUZ9NMg0efXgf1fsqV2kNBKrEPvQOnao84PR6GUNPi+xK5CPwijJ+h2VrXrSQXSFTbRrHyhDpObcV2MHM40sWhUiNkRrUdzsu8xZ/tdfEKFG4DZg5/nEvdGDOT/wpPI2fegIgDeahCPUHhQtH S/BeBfEM +JTIuh3dBC5c2/WZ4ppuoqrw2h1m6H38fzgzHR0o3b8JwrOiRvYdnArneBEoHVHV8YrF0QJeY8koJChbKQkaZTKx7WR4cFXFEb16cu+W65T/7aqEhYRJTZUYus7RIv9BBUaPusx8RGvURKhRsZodrLaJl7y9Omg9xZnMcf0Aof2lUlY0ddKiYIGF5D7y9ZVk4tfy6COEykINwCYgkqeDn5/Ns9/gJwWke2PbAA5EMJNj66zoJPFflAKWloXMIHFjxjyGjbd3iowCerveUysaC8wQ7AVyLt4JAP8f1/7v2ZmAoDpGxL6ltZ53vEYrx2FSjsxOCCZp30uJE5wq6puw1amoVx5uQzYrY9Bz79IWd+6VwXXYUi6GdKPuVtBMNbT4z9izzxwnDOMzeJ7SDL2Mr4O3o/3Hu4U6bKbWnrjnvS8NoCRzvu2rbfsUcamZXocxzQPZUSxvGZBMl2192CWyZ1CS9O3zIsbtERz4GKjJqUZSH5LM37aJRBgMD1Q== 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 08:48:38PM +0100, Lorenzo Stoakes wrote: > On Tue, Jun 13, 2023 at 05:53:44PM -0400, Peter Xu wrote: > > The only path that doesn't use generic "**pages" handling is the gate vma. > > Make it use the same path, meanwhile tune the next_page label upper to > > cover "**pages" handling. This prepares for THP handling for "**pages". > > > > Signed-off-by: Peter Xu > > --- > > mm/gup.c | 7 +++---- > > 1 file changed, 3 insertions(+), 4 deletions(-) > > > > diff --git a/mm/gup.c b/mm/gup.c > > index 8d59ae4554e7..a2d1b3c4b104 100644 > > --- a/mm/gup.c > > +++ b/mm/gup.c > > @@ -1135,7 +1135,7 @@ static long __get_user_pages(struct mm_struct *mm, > > if (!vma && in_gate_area(mm, start)) { > > ret = get_gate_page(mm, start & PAGE_MASK, > > gup_flags, &vma, > > - pages ? &pages[i] : NULL); > > + pages ? &page : NULL); > > Good spot... ugh that we handled this differently. > > > if (ret) > > goto out; > > ctx.page_mask = 0; > > We can drop this line now right? As the new next_page block will duplicate > this. OK I can see why you left this in given the last patch in the series :) Please disregard. > > > @@ -1205,19 +1205,18 @@ static long __get_user_pages(struct mm_struct *mm, > > ret = PTR_ERR(page); > > goto out; > > } > > - > > - goto next_page; > > This is neat, we've already checked if pages != NULL so the if (pages) > block at the new next_page label will not be run. > > > } else if (IS_ERR(page)) { > > ret = PTR_ERR(page); > > goto out; > > } > > +next_page: > > if (pages) { > > pages[i] = page; > > flush_anon_page(vma, page, start); > > flush_dcache_page(page); > > I guess there's no harm that we now flush here, though it seems to me to be > superfluous, it's not a big deal I don't think. > > > ctx.page_mask = 0; > > } > > -next_page: > > + > > page_increm = 1 + (~(start >> PAGE_SHIFT) & ctx.page_mask); > > if (page_increm > nr_pages) > > page_increm = nr_pages; > > -- > > 2.40.1 > > > > Other than that, LGTM, > > Reviewed-by: Lorenzo Stoakes