From patchwork Mon Apr 7 03:03:06 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Baoquan He X-Patchwork-Id: 14039662 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 679ABC36002 for ; Mon, 7 Apr 2025 03:03:56 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id E3A2D6B000E; Sun, 6 Apr 2025 23:03:54 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id DBFC06B0010; Sun, 6 Apr 2025 23:03:54 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id C87296B0011; Sun, 6 Apr 2025 23:03:54 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0013.hostedemail.com [216.40.44.13]) by kanga.kvack.org (Postfix) with ESMTP id A42D16B000E for ; Sun, 6 Apr 2025 23:03:54 -0400 (EDT) Received: from smtpin14.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay06.hostedemail.com (Postfix) with ESMTP id 3BEC9BA0EA for ; Mon, 7 Apr 2025 03:03:55 +0000 (UTC) X-FDA: 83305753230.14.CB790BA Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by imf10.hostedemail.com (Postfix) with ESMTP id 79153C0007 for ; Mon, 7 Apr 2025 03:03:53 +0000 (UTC) Authentication-Results: imf10.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b="A/tnNizp"; dmarc=pass (policy=quarantine) header.from=redhat.com; spf=pass (imf10.hostedemail.com: domain of bhe@redhat.com designates 170.10.133.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=1743995033; 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=AQ/UrRbnj3b02IVX/znAR8Dzkmamadv/LnZeVQ24gFU=; b=OITMqC4zj9Uyy5KdWpvVfJP99taW1+Nd1+cuJwQb2HzTKMVYYxSZdMOj4ODq+hjMIwVsOY TUaK7FS2bNuDay2IyH9OpEs+QwHwoiKmThbNkvMK0T9ISSNZMgzLyTi3G09nDzqVTfM28e iW1KSQ+N78nVfwzZChWg9pVXrZwBbUc= ARC-Authentication-Results: i=1; imf10.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b="A/tnNizp"; dmarc=pass (policy=quarantine) header.from=redhat.com; spf=pass (imf10.hostedemail.com: domain of bhe@redhat.com designates 170.10.133.124 as permitted sender) smtp.mailfrom=bhe@redhat.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1743995033; a=rsa-sha256; cv=none; b=ViqgzFqgsU7bw9AUDTvmuvtaCtJ8MCo45vIWB6KFVOln2LFDNyaS1lfleIzVJ7tALVlMbi wLOUgIZ1JDrtMiv/ym/Qxh2Px4Gtnqx9lphFqC1tlwhk1G8yBdh4unQYtQX70Y+kwWncR1 bke0Rb9flPVwaOhK+2HISoZE6u7Lbdw= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1743995032; 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=AQ/UrRbnj3b02IVX/znAR8Dzkmamadv/LnZeVQ24gFU=; b=A/tnNizpVacWzJ78IOw/HUXUO1yR16CY9VhExiRgprRgZrNVSaQeETnVJr1n97YPmbS/2P K9P+8y+EPbGDX9Vzm1nm+OZrjxaHqgouPMTO+NSwPrxNesrzp0rjCO+4JD0L1B6FvaFwXb b/g03lgtfVuoUnQKEVUd4PEj7Vi4hZc= 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-402-_D5q2rZONMCapjucfqhvkg-1; Sun, 06 Apr 2025 23:03:49 -0400 X-MC-Unique: _D5q2rZONMCapjucfqhvkg-1 X-Mimecast-MFC-AGG-ID: _D5q2rZONMCapjucfqhvkg_1743995028 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 1AA4B1800361; Mon, 7 Apr 2025 03:03:48 +0000 (UTC) Received: from MiWiFi-R3L-srv.redhat.com (unknown [10.72.112.15]) by mx-prod-int-08.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id CB5CC1801A6D; Mon, 7 Apr 2025 03:03:42 +0000 (UTC) From: Baoquan He To: linux-mm@kvack.org Cc: akpm@linux-foundation.org, osalvador@suse.de, david@redhat.com, mingo@kernel.org, yanjun.zhu@linux.dev, linux-kernel@vger.kernel.org, Baoquan He Subject: [PATCH v3 3/3] mm/gup: remove gup_fast_pgd_leaf() and clean up the relevant codes Date: Mon, 7 Apr 2025 11:03:06 +0800 Message-ID: <20250407030306.411977-4-bhe@redhat.com> In-Reply-To: <20250407030306.411977-1-bhe@redhat.com> References: <20250407030306.411977-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: rspam11 X-Rspamd-Queue-Id: 79153C0007 X-Stat-Signature: ntqcmkeibbfz83c4hhdx7iyiy1eg3pmd X-Rspam-User: X-HE-Tag: 1743995033-740544 X-HE-Meta: U2FsdGVkX18PJkKSUQ+6I80AL3mVSrW5mIa59NiZsDDbLO0qjvpUSLr9ZNzRb0ecs3WwbdBsKKIxc5ZTO0C0c7Wrartjsp0XOUr1+AvAzQSe2eH9x9r73pkhrGVYmU4WVhR0aQksPM5YrHsSYs7JlfpgS8tsZ0s77Ao0/2VaGSI79+5F9eSJLbwBV54yZoVn4/p5SCL4mqLoMu1zilC11XwAkpgAKhLhWfuRn7p7dLNTHTYNtn2a2P0cMX3S2qbVzoOswm/zCbzfmCe4nD7R5nrwpjnh2f5hb5z9nW4OmA12QsHHWzlTsDV0KO0XPnMcOVXQFwPyY+nj3TlaOHBpe/WBa6paC32V3PXnZDX+mmZakfrahdGaRDO748irJhKgbw5EiKQgwcoF4b20ywACw0DVkmHfR3kfpxSMldcUmYIi1mg2nXH2rsoFkbQ6c+74bAZUV/LJUMQO+cC4sKho4bsINItctOAoHtz+YBZ7UJ/20DyzVj08N4UVEDXgSCKiHg1AavGkQotixDKTvdOSrOyaFmpPuck5ZA/D6S6vhTC0toCK8uJizbojSLyDLLSj8Y92gdAYIMs6PTeZkDknsP3VE2jyhvPa55I0kmYJaJhDp2msCLCWSWLHaJ7Nq++2vJuWK+UVcVFUJrTH6aqnspbLj7JLAC/ZR7GEUrQXD7vbY+PH9QRzfV6NZ3HSticuYprvstoj7jI/Rg+2ay8Qst0gtxOJ+tptNc6b58DZMYt4F33LPKLJqbYK8Zxrp45vKY5PKofQVXjv7ctUOAYkmHOdy+YabBxKUrsPSJN3POZQn1KUd83nnEmOQVdhaMqKMUna3qRsSJVQYtF8Z/4Zj0kVl+Uq96+heqZ+qRN9MgF/YCTsVfGnPb8lysv3R79XPzfCTdGNeOV4thlo+pcj53QKio6NxK0tTswtBO4RLiimSAFFSqfFm2nAEzqgQ0Um6+wOiU7Qh2mZplsRoZM wdQeVW6s lB73NiMq9w6qzBrM5RtzGL3MUd+FQWsE6Jq6tvFvhohye8SQKSNTBHELa/AvAKpBK4d+LQQAz4MXR0oZcEx6GKxpq8/I8xuseu2PJXRs278YytdeLXwpB/ydxAAqG1pgI8vN8kXhPMfMLe1HzKjIDh3Im/GO8I6dEFxttwCZg7Bc2VtpiA4gyrTMPDIKTeCRr74HCaPBLcudfU30RtYcRTnjEiMsnNp09wBA7N2Mdn2h2cMxyddZ7n/cg8Cfu7eJdHTAt0gpr1etQeCeLsy4svps9hIOizvMJsZz0Lpk0Nfxo6lUm72J/VrDe+xc+cFmpdVGE3+tyxuqMNKbwc5z5m0BDAvMlSj0JZYzAozmbGUn+lTWvtvPk+kR4LcWsN0XoB75h 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 only 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 Reviewed-by: Oscar Salvador Acked-by: David Hildenbrand --- mm/gup.c | 49 +++---------------------------------------------- 1 file changed, 3 insertions(+), 46 deletions(-) diff --git a/mm/gup.c b/mm/gup.c index 5b3ac5a867a3..c9237db3cdb3 100644 --- a/mm/gup.c +++ b/mm/gup.c @@ -3172,46 +3172,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) @@ -3306,12 +3266,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); }