From patchwork Sun Mar 30 12:17:14 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Baoquan He X-Patchwork-Id: 14032904 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 04B58C28B20 for ; Sun, 30 Mar 2025 12:17:50 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 874BA280007; Sun, 30 Mar 2025 08:17:49 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 7FE8B280004; Sun, 30 Mar 2025 08:17:49 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 67733280007; Sun, 30 Mar 2025 08:17:49 -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 45810280004 for ; Sun, 30 Mar 2025 08:17:49 -0400 (EDT) Received: from smtpin22.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay01.hostedemail.com (Postfix) with ESMTP id 70F841CB55C for ; Sun, 30 Mar 2025 12:17:49 +0000 (UTC) X-FDA: 83278118658.22.AA27D31 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by imf27.hostedemail.com (Postfix) with ESMTP id D2DAB4000E for ; Sun, 30 Mar 2025 12:17:47 +0000 (UTC) Authentication-Results: imf27.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=SBWCTnW1; dmarc=pass (policy=quarantine) header.from=redhat.com; spf=pass (imf27.hostedemail.com: domain of bhe@redhat.com designates 170.10.129.124 as permitted sender) smtp.mailfrom=bhe@redhat.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1743337067; 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=hxqDMoJetNer7F1DwMLPFhLQrU8sSqdg39HX8cZyX4Y=; b=C19AU/PHdKD2elBbL0CkOKyrxZ9kb/x0pzvPqujwpDeKGniR4HIfWteie3GtHeRUWAN2yq Vr9M7CakEe/wM5/irJYBNPfIZYeg1U9qLrNqsV8pNjaJGC/cXxZUGHo64Zh40zXvdkewau op26+DlvrMsjcjR+qcT43YVSieKRwzE= ARC-Authentication-Results: i=1; imf27.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=SBWCTnW1; dmarc=pass (policy=quarantine) header.from=redhat.com; spf=pass (imf27.hostedemail.com: domain of bhe@redhat.com designates 170.10.129.124 as permitted sender) smtp.mailfrom=bhe@redhat.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1743337067; a=rsa-sha256; cv=none; b=eaisU1i2np6u3mML2/UnXIO9yNUmOEYucymVs+Rp8RAlPLpmAurw3iXQityqTbjuSKA2om BCnJ/PB/4vo655B/lJS0BldR+MT5JgNmaowSnPg4KXCzuAVSv2ig/vsy580vxIFj2MJPhw wi39Vsn94xIeB5iSdXNywzWE5Q41bXA= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1743337067; 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=hxqDMoJetNer7F1DwMLPFhLQrU8sSqdg39HX8cZyX4Y=; b=SBWCTnW1iM2ul+g6V3EgV3mt54ZfoUrAWkRxsrSzR+8ccObDxQYqyvY5Vj3g74ohwxMtlH oE630Qc5BoOYGkhZeb2NArnAWkrusfaW0/zA23FnqPjY0EGIy/oZxBrbSgtIEpBo7NHJWs aED3mP56knpo4BYQvMZzJyF3laWVkuo= Received: from mx-prod-mc-06.mail-002.prod.us-west-2.aws.redhat.com (ec2-35-165-154-97.us-west-2.compute.amazonaws.com [35.165.154.97]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-371-Zv7FARzWNZOEPs16cB8FOQ-1; Sun, 30 Mar 2025 08:17:43 -0400 X-MC-Unique: Zv7FARzWNZOEPs16cB8FOQ-1 X-Mimecast-MFC-AGG-ID: Zv7FARzWNZOEPs16cB8FOQ_1743337062 Received: from mx-prod-int-08.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-08.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.111]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mx-prod-mc-06.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 200B31800266; Sun, 30 Mar 2025 12:17:42 +0000 (UTC) Received: from MiWiFi-R3L-srv.redhat.com (unknown [10.72.112.17]) by mx-prod-int-08.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 630CE180094A; Sun, 30 Mar 2025 12:17:38 +0000 (UTC) From: Baoquan He To: akpm@linux-foundation.org Cc: linux-mm@kvack.org, linux-kernel@vger.kernel.org, Baoquan He Subject: [PATCH 4/7] mm/gup: remove gup_fast_pgd_leaf() and clean up the relevant codes Date: Sun, 30 Mar 2025 20:17:14 +0800 Message-ID: <20250330121718.175815-5-bhe@redhat.com> In-Reply-To: <20250330121718.175815-1-bhe@redhat.com> References: <20250330121718.175815-1-bhe@redhat.com> MIME-Version: 1.0 Content-type: text/plain X-Scanned-By: MIMEDefang 3.4.1 on 10.30.177.111 X-Rspamd-Server: rspam01 X-Stat-Signature: cbxc5fu18xuz8nxnhk3ugi63utimk6ye X-Rspam-User: X-Rspamd-Queue-Id: D2DAB4000E X-HE-Tag: 1743337067-961735 X-HE-Meta: U2FsdGVkX18PU4I7YLabC05kbuaL1yvd1b82zL6apQvJnO8wpeIND8O06h0g2xUpXi/EYkigHqY1FNPexCueilGYILPPOJRwCBJ1W5FAzjuIKQ/5BGdcc/GbFzP7F3ZfLbKOnKozpUPfzTvCx8Rm8SMzxvbHcC+QINJRutc3o3hUO1A2Sc3j6HsZIix7TaKFkvFYRGicIR+VKWdQpYczSHjO3RW8sfRcWxfF8PrhI7KZ5ru9y004jtHOh+XeAZ3fpVM/DxHWGiFSEQ86cet7/RPYRVOtPZ5iG2oMbb2u5XYdLzZ2SPS2Ag6+Ag93zVaovsXe1RkaMsqOeZ5xcCkJMMkdSJ3hI15l9cxo6WkO5W31YHryEGgjA9RCB+ImcRlsTw2Z0BZEjIJLSH7/pW1UvNb1nz7sP0vNrfvJIQroZwpVVi6/TF9rgP4Ez/YxzT231zrPlnax4L1DSUsM7J6RIz1O9HS8OxIM4hpAcw1lZPqAX4jVhQhvD0erg1jp22co3/+fcB5P82ORCubdJzB8J1TAw1T/IC3plxUbftiNXcB6hrmawLewAJn/HOgrXK9S7esKWpBrCDlbU/gyJign5R5Iu4nzA+ESO4ClmcHoa6LcXlo7k69Zszouhcn0YEY16WP84GZKe2Rlc3KYCXkHHme+4X5I034c4cXhv1KgAQxW+m8xRA9fXsYguGG0OQuQGBSWRW+g3NEajpIfcNavYVjffRNjIDdQZSqhc3mirXYhPN+jdAwnjWPAf8zxXKofUK+kAQ86diyoXb7xmD5yeahphWN1t1OtAnL/+JTtlPbE2odRlrxPtShtIBC6LEyj48EHLjajbeNO2l2sgExnH/VtSdlWPrFRKpYnJNF9acctSZbP22mwE0KFwDu9FYFt2b8gdDSSY6BqY+fqV0CTdpcTOg/VSlcCmUzy7rFOe73RCgyXf7ebzKBvKY24tClYFCl9U0OU38LJyiwYZ/h CNR57MLg tDlgZpywPZbBlY/WIbpSW5N2fNo1y+tHe8mrGpFnlibGGxdFTC0vJ45MwpqnVsrWvcHq0XpTr5LpN2WTkoxpsOCkzoG4QoAHolud4ZxyLXzwHI7c= 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: List-Subscribe: List-Unsubscribe: In the current kernel, only pud huge page is supported in some architectures. P4d and pgd huge pages haven't been supported yet. And in mm/gup.c, there's no pgd huge page handling in the follow_page_mask() code path. Hence it doesn't make sense to have gup_fast_pgd_leaf() in gup_fast code path. Here remove gup_fast_pgd_leaf() and clean up the relevant codes. Signed-off-by: Baoquan He --- mm/gup.c | 49 +++---------------------------------------------- 1 file changed, 3 insertions(+), 46 deletions(-) diff --git a/mm/gup.c b/mm/gup.c index 3345a065c2cb..3d2c57f59b4d 100644 --- a/mm/gup.c +++ b/mm/gup.c @@ -3168,46 +3168,6 @@ static int gup_fast_pud_leaf(pud_t orig, pud_t *pudp, unsigned long addr, return 1; } -static int gup_fast_pgd_leaf(pgd_t orig, pgd_t *pgdp, unsigned long addr, - unsigned long end, unsigned int flags, struct page **pages, - int *nr) -{ - int refs; - struct page *page; - struct folio *folio; - - if (!pgd_access_permitted(orig, flags & FOLL_WRITE)) - return 0; - - BUILD_BUG_ON(pgd_devmap(orig)); - - page = pgd_page(orig); - refs = record_subpages(page, PGDIR_SIZE, addr, end, pages + *nr); - - folio = try_grab_folio_fast(page, refs, flags); - if (!folio) - return 0; - - if (unlikely(pgd_val(orig) != pgd_val(*pgdp))) { - gup_put_folio(folio, refs, flags); - return 0; - } - - if (!pgd_write(orig) && gup_must_unshare(NULL, flags, &folio->page)) { - gup_put_folio(folio, refs, flags); - return 0; - } - - if (!gup_fast_folio_allowed(folio, flags)) { - gup_put_folio(folio, refs, flags); - return 0; - } - - *nr += refs; - folio_set_referenced(folio); - return 1; -} - static int gup_fast_pmd_range(pud_t *pudp, pud_t pud, unsigned long addr, unsigned long end, unsigned int flags, struct page **pages, int *nr) @@ -3302,12 +3262,9 @@ static void gup_fast_pgd_range(unsigned long addr, unsigned long end, next = pgd_addr_end(addr, end); if (pgd_none(pgd)) return; - if (unlikely(pgd_leaf(pgd))) { - if (!gup_fast_pgd_leaf(pgd, pgdp, addr, next, flags, - pages, nr)) - return; - } else if (!gup_fast_p4d_range(pgdp, pgd, addr, next, flags, - pages, nr)) + BUILD_BUG_ON(pgd_leaf(pgd)); + if (!gup_fast_p4d_range(pgdp, pgd, addr, next, flags, + pages, nr)) return; } while (pgdp++, addr = next, addr != end); }