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 6F208EB64D7 for ; Tue, 20 Jun 2023 15:24:25 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 0662A8D0006; Tue, 20 Jun 2023 11:24:25 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id F312F8D0001; Tue, 20 Jun 2023 11:24:24 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id DABC88D0006; Tue, 20 Jun 2023 11:24:24 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0010.hostedemail.com [216.40.44.10]) by kanga.kvack.org (Postfix) with ESMTP id CB9F88D0001 for ; Tue, 20 Jun 2023 11:24:24 -0400 (EDT) Received: from smtpin29.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay02.hostedemail.com (Postfix) with ESMTP id 87878121248 for ; Tue, 20 Jun 2023 15:24:24 +0000 (UTC) X-FDA: 80923497648.29.D553E4B Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by imf24.hostedemail.com (Postfix) with ESMTP id 4C68D18001F for ; Tue, 20 Jun 2023 15:24:22 +0000 (UTC) Authentication-Results: imf24.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=EWu2Lw75; dmarc=pass (policy=none) header.from=redhat.com; spf=pass (imf24.hostedemail.com: domain of david@redhat.com designates 170.10.133.124 as permitted sender) smtp.mailfrom=david@redhat.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1687274662; 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=1jZI8VCXZuXM8omQpTyWulHnxj1e7QD/bvDv9W/ML+Y=; b=aQy37P3JY/WguFySp0Nty1cOy4L93+k2ffEXjiSkUjheYEHgl/tgX+vvvhsif7+CzPIQDL SfGsFpeDLTEjIdXx39vXZtEUrGi46PDBhqgOcefFWA5FWLNS6OJbp8PJ/pPnBHKedK1n3b l/+vk/oMUF+OVpIDZB9QpbJk5RRMqg0= ARC-Authentication-Results: i=1; imf24.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=EWu2Lw75; dmarc=pass (policy=none) header.from=redhat.com; spf=pass (imf24.hostedemail.com: domain of david@redhat.com designates 170.10.133.124 as permitted sender) smtp.mailfrom=david@redhat.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1687274662; a=rsa-sha256; cv=none; b=GieXgFxsAuEka/0RHOWLZ4L+Xz/rUQAyP7LzHMSHC1Z5tMoIzOFrdOAKRP+9PvXjx/Lz9o EqRtIsL/uglG1I+UKo04yjnv5p98uTFEu8pLvo0bhOVH2+pQj4yjlFQ3enjxSjYK8nHf6o h3F94EYrmP4QMw0otRYIRlHKMCVwVIA= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1687274661; 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=1jZI8VCXZuXM8omQpTyWulHnxj1e7QD/bvDv9W/ML+Y=; b=EWu2Lw75tRo8nCkl7bi0Y97MQBmW69iPTW8LLekpKN37rf0I0Qsd42VSfwERzctyk0S4PC +XMVyK6zPMHpH2djUbakknGDsp10n7JoMGL+Tw/8tpVIKvafIkAYHhl8STuNFJzEpzYNMQ 3y7y99U6TcmQ9PLUVoI5maK6x5vPcCs= Received: from mail-lf1-f70.google.com (mail-lf1-f70.google.com [209.85.167.70]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-652-gPvW9dW-NtaGlJkkrTX3Ew-1; Tue, 20 Jun 2023 11:24:14 -0400 X-MC-Unique: gPvW9dW-NtaGlJkkrTX3Ew-1 Received: by mail-lf1-f70.google.com with SMTP id 2adb3069b0e04-4f86cb1e258so2011540e87.3 for ; Tue, 20 Jun 2023 08:24:02 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1687274641; x=1689866641; h=content-transfer-encoding:in-reply-to:organization:from:references :cc:to:content-language:subject:user-agent:mime-version:date :message-id:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=1jZI8VCXZuXM8omQpTyWulHnxj1e7QD/bvDv9W/ML+Y=; b=Z6ABunHMA3TL4udVJS8YFRFQKPgXa30ZvWR8ZNu2Y2VDpAn86fd6oBi5nYD2aK7LLa ilcsV1UqEf87GDqPRPVZd1utfhJT+dI64IHToPsCIg5P7xfNjZk8Dn/5Tkn0m9S+EI1H bkR6V+IsB43Akc+UMUuP9yI6tgkqMY7WPzF3hn7vrBIMaQKziHPtdXm0idkiQT/fb9Rh WtRrGDDFt/vHivnq+Gps2heUaL7wAvyu+VTE2vtCAUFnADUqPVp56db72LwQPERGugQJ 0L8XTmAdvvfJs3WzWFYO0P/gtvUlQbxnzWCBRruv/QSGZApb824tDkwlkP+zUPjyp45e RzDg== X-Gm-Message-State: AC+VfDxKMeh/T319qC+vw2DnhjvXW/fiKuQ47IYGiP6NBppbwjtWGZqA 0IUkKaGwEQSSQx1f7Uv0JK1AoK0BZyiXjs6+JZpKmmdYozHaYuhbYLGmJa0IjkoSJ9/SjIMnK/r UTGKheQPCvNo= X-Received: by 2002:a19:5e01:0:b0:4f6:45af:70b8 with SMTP id s1-20020a195e01000000b004f645af70b8mr7261842lfb.58.1687274641309; Tue, 20 Jun 2023 08:24:01 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ5Y3rF0ME/txUd/uYe0tBQ1/QOJOfNykKQCjCvsEGedq6dIPBTjUzKm3PIFzTzLtyE7xur7KQ== X-Received: by 2002:a19:5e01:0:b0:4f6:45af:70b8 with SMTP id s1-20020a195e01000000b004f645af70b8mr7261812lfb.58.1687274640644; Tue, 20 Jun 2023 08:24:00 -0700 (PDT) Received: from [192.168.3.108] (p4ff23bc9.dip0.t-ipconnect.de. [79.242.59.201]) by smtp.gmail.com with ESMTPSA id z8-20020a05600c220800b003f9b12b1598sm5631222wml.22.2023.06.20.08.23.59 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Tue, 20 Jun 2023 08:24:00 -0700 (PDT) Message-ID: <451b1e7c-3669-7b55-7daa-9a2911aaf5c5@redhat.com> Date: Tue, 20 Jun 2023 17:23:59 +0200 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:102.0) Gecko/20100101 Thunderbird/102.12.0 Subject: Re: [PATCH v2 4/8] mm/gup: Cleanup next_page handling To: Peter Xu , linux-mm@kvack.org, linux-kernel@vger.kernel.org Cc: Andrea Arcangeli , Mike Rapoport , Matthew Wilcox , Vlastimil Babka , John Hubbard , "Kirill A . Shutemov" , James Houghton , Andrew Morton , Lorenzo Stoakes , Hugh Dickins , Mike Kravetz , Jason Gunthorpe References: <20230619231044.112894-1-peterx@redhat.com> <20230619231044.112894-5-peterx@redhat.com> From: David Hildenbrand Organization: Red Hat In-Reply-To: <20230619231044.112894-5-peterx@redhat.com> X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Language: en-US Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit X-Rspamd-Queue-Id: 4C68D18001F X-Rspam-User: X-Rspamd-Server: rspam05 X-Stat-Signature: ymbypg6cyz7nr91yck6ix747bj7oqcru X-HE-Tag: 1687274662-967032 X-HE-Meta: U2FsdGVkX19uUeadAEs+SfEVxbd4CZQd3SlK3HUiBx7rKQxOrcpH+DydPhqaJmPGJZjlXx46Ir7w4SlVXrEFcAk+52JRMESDXGsXgqxPSzsiFcohg7eftDPqQwl6B7I4YxV0Yn0RHngezkcL0z3HrsxLQhiZcwrnw2SttiKsy5tZTDv3hhsevRLOzyARtBmjHW0TlQokgmwVgYSybsH4Q7oHatxrhyhOkGD/83okUJaNC6dT7mPhLaeiogy3mUCdyAQE6gxkhK3qyMAD+0RrywVNhpCjOrZpXJxhANnL7e3Dhfm3lK3JV39dOBBnIk/XIJRa0Ta6Xrdmy1BLD7LwbbGcWZPc+TBhV0mNHKG2HRDTi2MPbOGAhbQAbnp4ggdJZu4hMd2dTz4roOPC4XQg0MEBlUZe5Qq0jsFMhPglhiOBftOAzAJrapZmkUh+CQHfNHi2A6t98TJByCCqaTS9tbVPHCrDZnhQi4SHyewy6+CWh+HXXFfT46/jlCNUJhH4SQeBrXoBB1ejmsYc3yyKQIbIV8y3dfz1dgEJf94tuefBzNDtQn80+h6lvZjG+HZmBWXXAeCz/OwnbYF6YDhhZvAMARa6W1qmEeJG69soRObHYnXSq1yLedIJuyJbNPht62Jj+8mmqXB7dTpV3k4XFzIDVVI3m+1etFPZtsq/icrYDZtW4gY5SXFeUfQ37e1AvtP6tT2gbWJ5leW54WlMQlmlYzhCNxi3brJWQJRv/BCJGsAOO8KQW8Te6PQB01IT48bc7cSpWGa2dxaa0D1ASPW4bGv66jB+1RZ5MYpa1pSkxQg9N9VF+6iumPSCgXJdL0MCYdohwv4dUoC5ZicdIH4zo862XL1k4k2tAtCuznVr+5o0vFYEpCtFxDIPgHzVII93nVYinxTqJgW6+aVNeQUZRk4Kk7z/aoMqixH7H82cFGlL6z/wfaIS4yLTuIfdZeWHtCl8E68wwAAt9dz RYs8t0Pt xR3PMH3MZBr0SklwivMI21bVnapkPk23n1TvOiw090oiZ+FN5FWgk+DbnvZ+iGx7k8A5mDMHCuR6VTE579vPZTeFibLx+gZFpsY7QiiD2N69qdOmz3iGhYZR3YxO2sObxpyI87HVOidpGwJsmvNZ9JLBmD+nnX9rF07zZwuyXcVvCyC7vp6g4UkmrAkCWT+b6rEr36jehFH4pWkPCxctp++330L7czeFGmcX4ZKdHiY71MZguqi2nEf7hB6NTqBcDSJYll5j94LOLJhfKcSJb0T4z1XDhoSsVQjRkTVwjQ8Xt76074np5vVc3mMq1wc8Ws79dUZaghCUD82nnVShZOBJNc34NBj6OBFkrS5dK3cYFlG2jcJ/mNt62Dn2C9gQYeqRG0yvsGUWvvPHphRbJsFZuNZf4AQLlUfPT7nr5qb/+rvw9SKcAxFZQEmtefiT8pIkRsj9wXdo3FXxfJOKAIxbrHE4c+eYrvYP1Ox94M5aCVrOIYqNulEjr2w== 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 20.06.23 01:10, 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". > > Reviewed-by: Lorenzo Stoakes > 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 9fc9271cba8d..4a00d609033e 100644 > --- a/mm/gup.c > +++ b/mm/gup.c > @@ -1124,7 +1124,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); > if (ret) > goto out; > ctx.page_mask = 0; > @@ -1194,19 +1194,18 @@ static long __get_user_pages(struct mm_struct *mm, > ret = PTR_ERR(page); > goto out; > } > - > - goto next_page; > } 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); > ctx.page_mask = 0; > } > -next_page: > + > page_increm = 1 + (~(start >> PAGE_SHIFT) & ctx.page_mask); > if (page_increm > nr_pages) > page_increm = nr_pages; Acked-by: David Hildenbrand -- Cheers, David / dhildenb