From patchwork Tue Sep 24 06:09:55 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Qi Zheng X-Patchwork-Id: 13810126 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 B1C64CF9C6B for ; Tue, 24 Sep 2024 06:10:51 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 48F2E6B008C; Tue, 24 Sep 2024 02:10:51 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 418056B0092; Tue, 24 Sep 2024 02:10:51 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 291E06B0093; Tue, 24 Sep 2024 02:10:51 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0016.hostedemail.com [216.40.44.16]) by kanga.kvack.org (Postfix) with ESMTP id 05AB26B008C for ; Tue, 24 Sep 2024 02:10:50 -0400 (EDT) Received: from smtpin08.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay09.hostedemail.com (Postfix) with ESMTP id 825AB8185B for ; Tue, 24 Sep 2024 06:10:50 +0000 (UTC) X-FDA: 82598608260.08.8A3D68E Received: from mail-pl1-f175.google.com (mail-pl1-f175.google.com [209.85.214.175]) by imf26.hostedemail.com (Postfix) with ESMTP id A7641140009 for ; Tue, 24 Sep 2024 06:10:48 +0000 (UTC) Authentication-Results: imf26.hostedemail.com; dkim=pass header.d=bytedance.com header.s=google header.b=APEjLCx0; dmarc=pass (policy=quarantine) header.from=bytedance.com; spf=pass (imf26.hostedemail.com: domain of zhengqi.arch@bytedance.com designates 209.85.214.175 as permitted sender) smtp.mailfrom=zhengqi.arch@bytedance.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1727158234; a=rsa-sha256; cv=none; b=2Z6qvdaTOBB8H7RRyYxSTPmZFd/0OFdtKMRNQCfg3EGOnmzbPbIZowjV3WsChOzHS8i1+a 6M2yaFu8y9PS0XHPBnpV5VoV7hlVAWhCU6vRF3LTz+p5T5PKTEiQOJOkKda56aGgpFflp8 8zNqeSCc0RP5q7rziS1K0GQdrOValYQ= ARC-Authentication-Results: i=1; imf26.hostedemail.com; dkim=pass header.d=bytedance.com header.s=google header.b=APEjLCx0; dmarc=pass (policy=quarantine) header.from=bytedance.com; spf=pass (imf26.hostedemail.com: domain of zhengqi.arch@bytedance.com designates 209.85.214.175 as permitted sender) smtp.mailfrom=zhengqi.arch@bytedance.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1727158234; 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=BmENsM1LVZMrc0W501TyzYIERT8c75Mhan1AJ9vs73Q=; b=HIrn78hoObIGwGEWI9V1EyLaAbd4LUUR+nRP6Qm1VSM2jTzMR/DpUAI83BIVfw1kxSURkr oVpOINrqrEDQjLlCE6DTcT0Yj/kb+e7D2LJJPKtnyjx9W+hhP0wD8N54MRa/9jy6DRv2ZF uJ0IrhmnorlJyqTsaFquLdbMov2NoEQ= Received: by mail-pl1-f175.google.com with SMTP id d9443c01a7336-2068bee21d8so51317845ad.2 for ; Mon, 23 Sep 2024 23:10:48 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bytedance.com; s=google; t=1727158247; x=1727763047; darn=kvack.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=BmENsM1LVZMrc0W501TyzYIERT8c75Mhan1AJ9vs73Q=; b=APEjLCx0rS/kePaDF3kXqjA3QnEKbiFuWipA3ubLkrX9yXqS6ilADTELTP32muqLU7 LKJorxSpIIswSToOV8qgzLdA+9p1J765zJnit7aKGEUX0tWXPk/7lkdpI6tI2K86MGv8 vAF7mfH6BTe2D/sp4NSE54z5mmEeWhyRoPNr4rHgdUWr45OZEMDDxGpxAoz9uHQFj4nG 7TUYcuCN0qaYuL0X7WTdtmoOMxNpI0thH2WQGkU/D8BQ/PlAZx/xv76gHO0cSWf2QHNY t+Z2MHqrqcnEDHFmkSc4nNbt59ez6+Nc9XNgPrByxWyLSQOWynqMPlm6RNQj14mFoTlL uSDQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1727158247; x=1727763047; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=BmENsM1LVZMrc0W501TyzYIERT8c75Mhan1AJ9vs73Q=; b=FrBsV1yvmWyxwosVOtebLoEXkGoVGwk0AJWzUoK+SRDp3jAY/h33lMQJrTfc5Yyvyy 7SgOWmAZ787ijBzBF53l2kBvSI7d662z1yrqQcOSeBXGJQmA+CB42XtN7Wvz/kUrIFkT NjhIEyf7jYSerJZYhcOoCnolYIjHo7nTv6XT/ADj5kuUVF1oWJjUy8FSWJv21Ngk7cOE 4I/FgNxTnRzt/f+qbA24REMiL34CNmLv7CS5uFu2AEZB2UCiqeKg57vP41UH+BOMLe+V EvmQrB+Tdf8JcxTm21Ry1J5ozyH+2GFL7xLb07kjkZfmDzvwEG1WEiPLa031FUJCPh8B IEuQ== X-Forwarded-Encrypted: i=1; AJvYcCUkER8C04xRH2tzqETTQSUW4ab9ZZDoxoHV6rKFln0KWyVHinH9bIYzEU1ZZwYD4iGsFwH2VoGHMg==@kvack.org X-Gm-Message-State: AOJu0YwSTawOEvE9FDmWyHwt2qahntu0GqtKs6gqwG/4czAmRwn+K48x WusU/tDoboWJiRomajn3yj49NdbyhdU8i80PBCM7Vv2bjOZFswu94B1xC9gKr2c= X-Google-Smtp-Source: AGHT+IGm87aqttqV2Aef0OLuq60VY3Mp4w41J7dgMXq2Y+1L52786e2U6HUOab2ZHlW+VZaRsZgruQ== X-Received: by 2002:a17:903:22c5:b0:205:6f2d:adf7 with SMTP id d9443c01a7336-208d83a8387mr177369015ad.21.1727158246651; Mon, 23 Sep 2024 23:10:46 -0700 (PDT) Received: from C02DW0BEMD6R.bytedance.net ([63.216.146.178]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-20af17229c9sm4344885ad.85.2024.09.23.23.10.41 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 23 Sep 2024 23:10:46 -0700 (PDT) From: Qi Zheng To: david@redhat.com, hughd@google.com, willy@infradead.org, muchun.song@linux.dev, vbabka@kernel.org, akpm@linux-foundation.org, rppt@kernel.org, vishal.moola@gmail.com, peterx@redhat.com, ryan.roberts@arm.com, christophe.leroy2@cs-soprasteria.com Cc: linux-kernel@vger.kernel.org, linux-mm@kvack.org, linux-arm-kernel@lists.infradead.org, linuxppc-dev@lists.ozlabs.org, Qi Zheng Subject: [PATCH v4 03/13] mm: filemap: filemap_fault_recheck_pte_none() use pte_offset_map_ro_nolock() Date: Tue, 24 Sep 2024 14:09:55 +0800 Message-Id: X-Mailer: git-send-email 2.24.3 (Apple Git-128) In-Reply-To: References: MIME-Version: 1.0 X-Rspam-User: X-Stat-Signature: a8yi8rsy4s6jfe5z1ax3we34rqmjd6xm X-Rspamd-Queue-Id: A7641140009 X-Rspamd-Server: rspam02 X-HE-Tag: 1727158248-468553 X-HE-Meta: U2FsdGVkX1+Ek2jpOHJccJZ43tuCoqguFMh3KuTI5i7otsPczLyDdhozJDyAtCluCC3wJX/V4EbFhkEywdzGLR/3SH3JJzeYjL9VaDP5SfuiWHukFteYUriplAqBmm38/JNTfSetMoiTjOarJ0TVKYwKVpdHAPNt1Q4OcPhaJX0AGGWx2XZ1aLaUUsEiS3Q3WpZrqsKFN8EVsRzVpDx6EB127QpVwrf16oXtXe1nx5Vy8a7TYgmDV63nKd3MqLiUwnZacWzxs+O6jx5XWXOAt6kqFBgBpHl/euhVxMEJ8kpfq996n5Ku2JuBpsJMxRnCxoSFLjvBowE2mkfIfWb8cEyRdrx1iL+7AZVk3c6vUSgJ1HslepkCsAkBBFcLCqD6KD0MRjjY1j7FrpkbQM9RBam95Cvbp4sA0P6vrIAql13tgtwiRGf7TfXVMtCDwgLe5ppY04W574xTulAH/dXMKQAwyqtb5kUZlhoZd7j1WrHFVWHGUnq7udd33R6Lgf6vy96PLxGnLyK3jmAroeqjaoNFn5QOd4XaoO6aQ7Fwz9jeCogDyjgBsn9fMi3hx57E2Cohc6Huz6FZevs+Dn09KHYrVFD1/0v9DjOAX3k3dwAzaM3gfaapyMJbpbur/V1XC6dDDW0d75PRMBS6FQpHOHyOpcTQDvcTLRsrHlCB3W728zSK11mIS6SYGkIg95WeooK5rrufHdJ1vldDHn3KtJH1ivEKGLWrCMCVK5SXXdErM6A6qRiap+DEr9WFU+lGDq73gtihJGeXisyUooegfKoRaRCBBRRfF0uPE8XiGvKY3/5VeJjBbKuvsG4vx3YyueeA2smb/fG61lFQr+/GpbISTT7Oz3oeNx3EO2pcrGf3UEvo6hg+Eizvt0c9tZZJBDmm+npxlz/roT85SVzSfK3XpB1AqAIv0H8UuZ6LM5Dx2JhoGylpFaDAs/FbSHxybdQVBPqPBraDgifGBu8 WqwPZB3B jasQGuZnMNTIzoqz/d0GJaElDTFi+VNqV1fRdnzPuMtVgf7WFkKzK39cJ9BHy4urAwWeECGFCQlw5eZHxoPbrwkleLYaNVQ9e1D2FfvbHtAfzyrTyWE8nF/UaNtdiNAbCJtgDc0c/CxofLsR0i1Dyy6xH0IspuPaiAu0MQVaCn+ToVBj2Z/L9Wem3JIIf34o1YdTU7jg1zIqJfgw2Xxazhjv4PklYUGcPg2FunBRNDLFcZl2r87wMTVlwpzlhpjUhzr/JI3DQCltKqsI4nT3tkQPBJRXRt29dW4VS/2TV0zQRGCF305tIsz87Vu4NkmDjqSX1olq8DZNmwKVlHjnaeXmDF9HbpAitKeDNgk7tWHPD7F5nSida9h7a6aKILzNjV5oKzXv7MMESd1i4dGb8YYzhhqkaSm/kW/VduRGfxfMFv1t8uDEzgNyV4cvpBYuBXuGF9jKJPBcXS5k= 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 filemap_fault_recheck_pte_none(), we just do pte_none() check, so convert it to using pte_offset_map_ro_nolock(). Signed-off-by: Qi Zheng Acked-by: David Hildenbrand Reviewed-by: Muchun Song --- mm/filemap.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/mm/filemap.c b/mm/filemap.c index 3e46ca45e13dc..6c6ff8722550f 100644 --- a/mm/filemap.c +++ b/mm/filemap.c @@ -3271,8 +3271,8 @@ static vm_fault_t filemap_fault_recheck_pte_none(struct vm_fault *vmf) if (!(vmf->flags & FAULT_FLAG_ORIG_PTE_VALID)) return 0; - ptep = pte_offset_map_nolock(vma->vm_mm, vmf->pmd, vmf->address, - &vmf->ptl); + ptep = pte_offset_map_ro_nolock(vma->vm_mm, vmf->pmd, vmf->address, + &vmf->ptl); if (unlikely(!ptep)) return VM_FAULT_NOPAGE;