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: 127215 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:918b:0:b0:3e4:2afc:c1 with SMTP id s11csp41305vqg; Thu, 27 Jul 2023 15:15:49 -0700 (PDT) X-Google-Smtp-Source: APBJJlGefQi2thb+dwhMoG81y+E90CDVYhxGDePbQDztc70tvfI34R5kZX38rjSSAQz4/QT4k4sB X-Received: by 2002:a17:903:1d1:b0:1a9:40d5:b0ae with SMTP id e17-20020a17090301d100b001a940d5b0aemr594629plh.12.1690496148925; Thu, 27 Jul 2023 15:15:48 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1690496148; cv=none; d=google.com; s=arc-20160816; b=cW3sVegmUiEe6nIMORskAoIhFAIbGakrK1to+GF5HDsFhrCALpSRgvsHEqW+v7OmJI N2G9fh/RCnhgYiIVIdFa2qz1i4nIW1eVTOF2mVSlpsmQ7Zq6ncwHxwaI1etdL851QPEs i2RK4yu05FhvNRkzJgx80YxZ5PTfSYlzkc/sQGP4HYMDgnDpTCaJ2N//bqBDauG19pFM ZHxAXV0Kfkh3aWd5THrsDO88TvcPe0Mu9TI972OMgiMDIvjmf7YMFWAau4YrvsYq3arV Xrq8CZiB8BDnaMnC22MU7N4msCP/ARPJXOMR2R9TfKU0Hl/VUquowQU571lTH5jde3vZ l9aA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=Gg+vYFf2MUM715aNnpsI37yVDyYtQwBsTVNC7NmhATc=; fh=7Rgwgprh6RG9EUsex42/VTSquO8kknsMsxso4zkcjrY=; b=0DqBJD8mc8uALtDryumPl3xivcLHU9zY4oDar/Ka6nBvgYePwAFvViYO+yvL+mEXnu eGXEV2iBHelT6EokllfiS4eZlpGlWICtxaoPX7Y5JFRLf6YqCitsGvRHApGohjXvUCTD VsRtQOM0L88yxh60iKKfzaFi9wKa+xkcPCRifDjKPdOnO8gKQ+nWrc4BapLEdG3xqseq +tr/7PBqEJrMioRJOZcsWxHHgElm3Af+Jdkdl4HPQ8Y7oW7JVuR2J3+WuUc5qmErOAci 3vTXHYMUu7Z7q5OwlJy9K20WOWC94uN1jMvcIlSFAUIBbeB6IChtdLulII8f9EbGK2Zv qYhQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=aHuPhlKK; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=redhat.com Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id g12-20020a170902c98c00b001bb2ef676c4si1821819plc.202.2023.07.27.15.15.36; Thu, 27 Jul 2023 15:15:48 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=aHuPhlKK; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=redhat.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230106AbjG0Vag (ORCPT + 99 others); Thu, 27 Jul 2023 17:30:36 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:52892 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230231AbjG0VaY (ORCPT ); Thu, 27 Jul 2023 17:30:24 -0400 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 7CA4419BF for ; Thu, 27 Jul 2023 14:29:02 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1690493341; 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=aHuPhlKKbrDbKy1cg/mJXooRQ+2/ikLLxttMfZU9DPvA+v0s+iXqPRJGNxwwiB0eK/yg/M mS9OJrdlOs9fHQYC3OMsU0fhj9ufv+eSZc0u3/uir4Xok9k335rF/kv7U1rPy1dFWhrC+7 5XzJCP0iwOm/a6Z45h97wk7TZb3HqRU= 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-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H4,RCVD_IN_MSPIKE_WL,SPF_HELO_NONE,SPF_NONE, T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1772613689707209087 X-GMAIL-MSGID: 1772613689707209087 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);