From patchwork Thu Jul 27 21:28:44 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David Hildenbrand X-Patchwork-Id: 13330786 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 7E8B7EB64DD for ; Thu, 27 Jul 2023 21:29:03 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 133726B0078; Thu, 27 Jul 2023 17:29:03 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 095C56B007D; Thu, 27 Jul 2023 17:29:03 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id EA0666B007E; Thu, 27 Jul 2023 17:29:02 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0015.hostedemail.com [216.40.44.15]) by kanga.kvack.org (Postfix) with ESMTP id DD2496B0078 for ; Thu, 27 Jul 2023 17:29:02 -0400 (EDT) Received: from smtpin16.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay06.hostedemail.com (Postfix) with ESMTP id AAE42B1A35 for ; Thu, 27 Jul 2023 21:29:02 +0000 (UTC) X-FDA: 81058682124.16.06B03DE Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by imf19.hostedemail.com (Postfix) with ESMTP id DF5321A0004 for ; Thu, 27 Jul 2023 21:29:00 +0000 (UTC) Authentication-Results: imf19.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b="QHOHv/1C"; dmarc=pass (policy=none) header.from=redhat.com; spf=pass (imf19.hostedemail.com: domain of david@redhat.com designates 170.10.129.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=1690493340; 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-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:dkim-signature; bh=Gg+vYFf2MUM715aNnpsI37yVDyYtQwBsTVNC7NmhATc=; b=34NXL0/kVusfzkaTh4JOu0sdSVw9my4D3HGhEjrcJLJJ85AjzvGtb6/ac8Xvdti1srVqXa DxC4NE5CPV4xeKPofPo+H0xUgSNOHI6BTMS1s2N4au+roRKXT9ojSgFz1N9onIZDsr8P2D UB2T2txuCWw7kHNnzfpovQyscYtapms= ARC-Authentication-Results: i=1; imf19.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b="QHOHv/1C"; dmarc=pass (policy=none) header.from=redhat.com; spf=pass (imf19.hostedemail.com: domain of david@redhat.com designates 170.10.129.124 as permitted sender) smtp.mailfrom=david@redhat.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1690493341; a=rsa-sha256; cv=none; b=4VmBwcx9FrlF59my2COtvRum2KOlmx45C9qeh4gbvJcaUqvOfesSKSk2we5oe4/HYwX5v0 4Av+lELgDr3PCrGv4DAAxJc0PDn7mftNQc0Qzd4q0tAm/JJhf1UufnoQwPmWWFQd/rnXDt 89tUnyeTPBoTE/06+TD21RmujQjNijo= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1690493340; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=Gg+vYFf2MUM715aNnpsI37yVDyYtQwBsTVNC7NmhATc=; b=QHOHv/1CDnhpUBLSAHulIX+UPkwIN4UVYG3o4EdKyx+ABoD7kJGKq1YzgoH6XW4Wb2Q0RG rjjTgBWepIsxL2spK0YaBonwD5eW4q+CfrJvgvsp9ODkPZs7P4g/QGb9czyIanu+uANqnF Uy9FMSpAIEvvWzqKjMSgaLl48KKRwZg= Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-359-RlyUAFoMPPO8N1iA8aE7qw-1; Thu, 27 Jul 2023 17:28:58 -0400 X-MC-Unique: RlyUAFoMPPO8N1iA8aE7qw-1 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.rdu2.redhat.com [10.11.54.1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 924CC805951; Thu, 27 Jul 2023 21:28:57 +0000 (UTC) Received: from t14s.redhat.com (unknown [10.39.192.55]) by smtp.corp.redhat.com (Postfix) with ESMTP id 91ABF40C2063; Thu, 27 Jul 2023 21:28:55 +0000 (UTC) From: David Hildenbrand To: linux-kernel@vger.kernel.org Cc: linux-mm@kvack.org, linux-fsdevel@vger.kernel.org, David Hildenbrand , Andrew Morton , Linus Torvalds , liubo , Peter Xu , Matthew Wilcox , Hugh Dickins , Jason Gunthorpe , John Hubbard Subject: [PATCH v1 3/4] smaps: use vm_normal_page_pmd() instead of follow_trans_huge_pmd() Date: Thu, 27 Jul 2023 23:28:44 +0200 Message-ID: <20230727212845.135673-4-david@redhat.com> In-Reply-To: <20230727212845.135673-1-david@redhat.com> References: <20230727212845.135673-1-david@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.1 X-Rspamd-Queue-Id: DF5321A0004 X-Rspam-User: X-Rspamd-Server: rspam05 X-Stat-Signature: axysdzdwjkkr8pu5cnycq9ujitadu8c3 X-HE-Tag: 1690493340-797275 X-HE-Meta: U2FsdGVkX1864zm8wQ7Q//rpczIDncQ+E0IbMRvBFhoZAQdKW+mszSenOmEcr/Y2uEqSafmHuUCDQcD4BmFYGU9iESQOa2NsrrBltceiZl41EJsXN+gqB/mL6d9agoIcsUdOzfbscTXj0wCCzyG73lk3glBuQmLuGyBhcJZOV1fklBqlwb6ZlYgGcAESakttQovhl288ZnjVZ2DK+FsSf7LKB/nuHbfyyFYJc8ROlRww38VAvpbbUMC65tFygz4wja3X9TCb62te24k2pEqoJW89qk2+MTEUHXPTdww6k/QWTe4J48VVllrImtdRs8eF2NREvOArIuEYXBokTlFoj0QXwpQqJVqJHdv+V5F8cCDLb9MVrrYgAlrkOeMweuUGbNRuCVu/0cK5vSgBN7ihXsdtnGKEZUb7GJzS6LEVN62PAfKkA9/qrwQZ2Bfiz/2vIPslxs7TQpF7RooRk43/uGZole/rnwq49dyF/0censEF/5BjcAeSXLEoUTqncsDl6ImSwIVPjRKqYYB+5v2XtnqzVOnXU59Gn2qI5C2H+1QC0V0pDqd2yBajrVCG/XfHl21iQGGZKBDPTPlSgWSIZ/B3Co7HVa7JVV4WVew7Qjknyhv8hup4LznooP+5myp6Yw6JZ3zHhPz3zvqGrSvS4v+bNDGBaB2c5JAXobatC0JKfhXB8Wj/ZcTCTdnk2QWXtvccWoVwjNnK0nKRHk4K8YaTcFO7Y2UD8bgQEva90TJBHW5/nyn+qCYJPLqsdyoyM3OFGqbiuY+Oph4rtcGPdtxSHt7cBnwzPAn+QrAnGLz1EiNLzWKHF6IRm3IUcTvUaZnyupX5JvlEQjQhc3Z46Anu/Q4pnsB9brw1Kdl0FByJ0ghiTjFWHs03YZSWjZlnnoSsdFS67wXeW1HBOzcjPl1GtTRroUXknNNi7Ms0xs1sJQsXlqF16+5PpHziWknLQTYynk7j5LC/TJUonRJ 3XxSm7sJ 5xqG6FDX/R8MxGMVO8CCDy5DHwsBrVkUBU6EBdhlMykTx9PVYPMyDd4l8xd0PboU+7kwz1y08vh1wpqLSPuQQdkohMvGwKeo0nl3iiI0rwZCNi4QQ3hFhjr6j0BoZjiOCitIRuPZ8fM/m5gOmJz+5r1RzFilt3dDNlqgRon6eIh6t8qFAxcvFz5IvJ7cZJHGtKPeMiWe436+OGVpOOO7JbgbJVnQZrMRizW42 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: We really shouldn't be using a GUP-internal helper if it can be avoided, and avoiding the FOLL_FORCE here is certainly desirable. Similar to smaps_pte_entry() that uses vm_normal_page(), let's use vm_normal_page_pmd() -- that didn't exist back when we introduced that code -- that similarly refuses to return the huge zeropage. Signed-off-by: David Hildenbrand --- fs/proc/task_mmu.c | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/fs/proc/task_mmu.c b/fs/proc/task_mmu.c index 7075ce11dc7d..b8ea270bf68b 100644 --- a/fs/proc/task_mmu.c +++ b/fs/proc/task_mmu.c @@ -571,12 +571,7 @@ static void smaps_pmd_entry(pmd_t *pmd, unsigned long addr, bool migration = false; if (pmd_present(*pmd)) { - /* - * FOLL_DUMP will return -EFAULT on huge zero page - * FOLL_FORCE follow a PROT_NONE mapped page - */ - page = follow_trans_huge_pmd(vma, addr, pmd, - FOLL_DUMP | FOLL_FORCE); + page = vm_normal_page_pmd(vma, addr, *pmd); } else if (unlikely(thp_migration_supported() && is_swap_pmd(*pmd))) { swp_entry_t entry = pmd_to_swp_entry(*pmd);