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 9845EEB64D9 for ; Sat, 17 Jun 2023 19:48:45 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 063716B0075; Sat, 17 Jun 2023 15:48:45 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 014056B0078; Sat, 17 Jun 2023 15:48:44 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id DF6B18E0002; Sat, 17 Jun 2023 15:48:44 -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 CD2C66B0075 for ; Sat, 17 Jun 2023 15:48:44 -0400 (EDT) Received: from smtpin27.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay08.hostedemail.com (Postfix) with ESMTP id 8E624140222 for ; Sat, 17 Jun 2023 19:48:44 +0000 (UTC) X-FDA: 80913277368.27.C57D50C Received: from mail-wm1-f53.google.com (mail-wm1-f53.google.com [209.85.128.53]) by imf25.hostedemail.com (Postfix) with ESMTP id A29DAA0002 for ; Sat, 17 Jun 2023 19:48:42 +0000 (UTC) Authentication-Results: imf25.hostedemail.com; dkim=pass header.d=gmail.com header.s=20221208 header.b=KhnI54ST; dmarc=pass (policy=none) header.from=gmail.com; spf=pass (imf25.hostedemail.com: domain of lstoakes@gmail.com designates 209.85.128.53 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=1687031322; 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=jlLud9fUjWTG1BAYyfaScj42f1iE+kplSpMj/YmXmBc=; b=08Y3pT69ruRsC1Ja2T6dcQlI7YxJ7plKwJIsKiYkiU3u3zb3ZzrFkEXYLYAcw+e85JVjti ai7g0aVOvO170s/AyfY9vKa+QwZelX/1Nnk8b67a//CYV4ZT2U2LG9r2bdJUazdQN8aIFS Z8ObiCmJ8O8mRKh/oTniIiUcl7la3vo= ARC-Authentication-Results: i=1; imf25.hostedemail.com; dkim=pass header.d=gmail.com header.s=20221208 header.b=KhnI54ST; dmarc=pass (policy=none) header.from=gmail.com; spf=pass (imf25.hostedemail.com: domain of lstoakes@gmail.com designates 209.85.128.53 as permitted sender) smtp.mailfrom=lstoakes@gmail.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1687031322; a=rsa-sha256; cv=none; b=x9xpiCwwgV/B2uHR7o9ctmOZlSx1+LJZCoRxO2s+lCnn2iSGFUfVLq8vZEsUtpWJbEc5mr FIx9ebhxFT7L2yuLbD14QoTWuFpVKIYIKmt5SUWPhKK96tWb9/ieXRsnYnqS6mvTjh6xX1 UIn2JrLzN4VmwyN8y8UBVNpsHNJnOmE= Received: by mail-wm1-f53.google.com with SMTP id 5b1f17b1804b1-3f906d8fca3so4253045e9.1 for ; Sat, 17 Jun 2023 12:48:42 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1687031321; x=1689623321; 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=jlLud9fUjWTG1BAYyfaScj42f1iE+kplSpMj/YmXmBc=; b=KhnI54STxI15hEJpXsh/ENw0PqfyO9C/kPIsaZXVMi/uN5t5h8CDd00otWlOi74H79 +j3gT+rjwymjKQp4D0lpy8BjV5SwT0r0+HUS8bFwp4NxAD4csfPjvzf4KlDzKdGFG0Mv rkHHtzPBD18oUAEImBCfWOpVEozyCmhs6PuTj7DHo2V12g8/wMTMNdjnkzWQUhtu/3Qw oclL8EqitZdAuYA4a1NrWvt00SmPAs7k7M4lvSrOYeXRkKsYz0oPU1agkKmBrulzgNRY FpweJn3bo1lEr5iMFC89f/2jNNcxCoimEDqL1u8reMUTqsPRJpHocN1NPxVFLK8Q+y2/ kWnw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1687031321; x=1689623321; 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=jlLud9fUjWTG1BAYyfaScj42f1iE+kplSpMj/YmXmBc=; b=D2F9WsaPHltNKu6CnOaejyJYMqWPLeboRBH4mx5AGF+PBKoNZGdm7r4gfYlDA3i+Hg NdBNPyL74dOUAdll/K41w9/4SaG0sI4dlyi4IrM+LpgQ8U7o5i16KGCjYpI+LUQhmTfT +sW2Gaa6mmQVu8WGsm++ZrN6c59u+DhAMPPjWjQrLcZZsGAwYMeswkcLbwM9u+GvKRx0 Xf1UmHsC+3vMjOVpbR0TqC6iQgoobu9eFK1bKkAwZCPubZwd92LpAgmH8U4kyEg4SIa6 n/2AJG36ffcrNnpD8LDg4k7qCnUlwnZ3ZNTFtUq3ll7Bzz4hZoab30qSyzEWOZ0JhMRH 7huQ== X-Gm-Message-State: AC+VfDwa9RIxRk9pndA1Kc6l+ZtYBa0VpXSHQ0cTHzj20q4rVEf6VQ8z TDiMTattP6/e7+tcw9tQZXc= X-Google-Smtp-Source: ACHHUZ4E6pjgtV/NPkGE1Sb8nK9sAmKY2Q2xyz3vXVK+XTnHnC4yHwPgKyIOlkNrnl3ncCII/AyJ0w== X-Received: by 2002:a1c:7c17:0:b0:3f9:aca:48c3 with SMTP id x23-20020a1c7c17000000b003f90aca48c3mr237960wmc.0.1687031320771; Sat, 17 Jun 2023 12:48:40 -0700 (PDT) Received: from localhost ([2a00:23c5:dc8c:8701:1663:9a35:5a7b:1d76]) by smtp.gmail.com with ESMTPSA id h12-20020adffd4c000000b0031130b9b173sm1675719wrs.34.2023.06.17.12.48.39 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 17 Jun 2023 12:48:39 -0700 (PDT) Date: Sat, 17 Jun 2023 20:48:38 +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: 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: <20230613215346.1022773-6-peterx@redhat.com> X-Rspam-User: X-Stat-Signature: jhkixtum7enbfxgbwkpb3e3h4sh53smr X-Rspamd-Server: rspam07 X-Rspamd-Queue-Id: A29DAA0002 X-HE-Tag: 1687031322-28131 X-HE-Meta: U2FsdGVkX1/IGLXq71B5VE9y+5fgSkv5bjKRdmd+y54n2ZUVz9GNzhH4QSKoNgP/55cT/d/qDbiiwE4wkz1LxaadRCroYizI2Q1u+70YAbOkjHjoAda7XpzpR5oCoGdurr4ROt03comykC07AuZwRiNhMVy+AnJ9SbVZdId+SCxhRCo8Y36D9T9ywypXaVzZ5bzRN8m7bPCLPMWBtP6f3A1W6IQnuNOB0X1RxD1Hr78YpaojIGbBapPYd6Iy+07Hw9CCE38/lcnUarbkDqguqNBwAzbdnUruE0e26dRWzPrM7AmXkRVvYZCvvxUoifr5nEpK/9jefWQjEtaBjqVH8XWcHJuCY7UAql+rCjtKvcLBixZUo8zBw+kz7eZo67wfQhQsk2Y5Avob20jvOassmMVa4EWPUTCDBqpCmmf9HRfiTo0usk5t7pR4OvGLhY+O8N8NSBhngh+3MjH2SkT3VIHy04WnAdWhfPO7fnc44EQ4JmDQfw2WhDcjAORLsFCbMXvFVZ6v+/unCbX/xjSl4nskxIry/qMm1kK+7jlPoviWi9dX61S4eZOCODijisirmeiy+u+h/PW9MTnzAfT0lLGxsw7uYNBFm7SusIZM2qfIILAHq+3rG6Do0vvnvnTS/R4otAxWVq4/XNUCp2815CG1Hq+zqW/qHHeG6VgMmBxRCL70CKVNBAQzKc+Twtyr95ziZ9AemN/TV4RVEM9RvsQs3gCfk2qmPIg6fjshYC5B2KE9sSpV5Srn5ybhfc45j++kkhuPeTp+Ha/qsJYMU82eaFtVcsL7jx3FcC7mb+lKeeFyeMcqsRft4kcl29AcjFpT+e2Ta7LDzltPBcybfDCVb4f5gbh1NqSvdC7mw0hLQh+G1TpCpAS2TrOUo5ToLOrEdQBxfCUweizW+QFArAmIBzYX3reLpBO+4vkuen2Zbj2NqMj49WSGaFjOcvOMg1eE6xegFY+KSjcckqf uAec0woC 3/bk1Jx0ies+dcI7lo4SUS5dcdY6MjliRrFWWbZ4mbGCd+31Uc+MgKyO0AGKbeaJB8RzNBj8krjUWGU0eyy8uS5dbdm/8vuRPCnBkohDREbMBvMztQfmbIhRn/+456rX7vMSY6CqRW0gZVlO4ScYw/QcGONmXDAU5E81s89yKW7FSLpm5LbYyDC7TTG7qh72kUq2xDSHoeJy0Jls5Tfa1CemxfzMAQMQNJVvEuDUxu/nuOWxz9eF1v2zlocCR18vNwg6Ta5beW0c9Lnx6CVMoNrKnkio/4uiC8bCCf7vtPZMe6+jUwygz0pMJzBzPvXgO/S6+A4yZMkmyKC028xbVtHHx9ZkxlN0Z4wF493rcUaqbySyWQTpFTrPGJfZFlqBzm4zx5KeviYQr8OW/1SXDzxJOccUFdTs5J2ExC+88ntkCmS7TaKw+5OTKY4vnDaLWPN4u8Xe0TQdXUtUQ6pPzbt3T201IccVfDpT4G2zyzKiVtjeFFpTMXgP/Vw== 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 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. > @@ -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