From mboxrd@z Thu Jan 1 00:00:00 1970 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 3FE18CD1297 for ; Fri, 5 Apr 2024 11:58:32 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 24F146B0163; Fri, 5 Apr 2024 07:58:30 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 16A796B0168; Fri, 5 Apr 2024 07:58:29 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id D71116B0164; Fri, 5 Apr 2024 07:58:29 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0012.hostedemail.com [216.40.44.12]) by kanga.kvack.org (Postfix) with ESMTP id AF5076B0163 for ; Fri, 5 Apr 2024 07:58:29 -0400 (EDT) Received: from smtpin30.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay08.hostedemail.com (Postfix) with ESMTP id 617AD140842 for ; Fri, 5 Apr 2024 11:58:29 +0000 (UTC) X-FDA: 81975330738.30.E913D33 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by imf26.hostedemail.com (Postfix) with ESMTP id 90653140015 for ; Fri, 5 Apr 2024 11:58:27 +0000 (UTC) Authentication-Results: imf26.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=SnfPExZf; spf=pass (imf26.hostedemail.com: domain of pbonzini@redhat.com designates 170.10.133.124 as permitted sender) smtp.mailfrom=pbonzini@redhat.com; dmarc=pass (policy=none) header.from=redhat.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1712318307; 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=bNbIAMV3AIIh+finZC0kYCtErDA0HoO+gaZWe4mDURE=; b=YlsmYaswGdGbQHl/iJ4xgbGx5V2pbBGr6BO9+BGB6hmFYxpiKj/EPg2vnFMygzZqzzo6CV DHtyyU/0HNLWZKuQSgEYjThIMgNOjWbSO6miZVl3IEgcApQ8b7bC527mycj4UW2+B1LAXK pnEIOPqsYkKMzGu+iSNrJUXdFa6nWDk= ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1712318307; a=rsa-sha256; cv=none; b=I9UaUZDi4q9d8uZh/MQFk9eM8bx2XKsrAmrcKbzPhKkbaNFHrm6G2kHS66Tkpdxz3wFBd5 XFwFp3VRzuBGN5fK0CNMfFj7LTRnP9ZNvs6pnSmCCLLlSBYk2TIx77HJb/YJ9ESHw2OKyz yd1qWGOs1eM2sMLp1JGiuC5A1DYGjcI= ARC-Authentication-Results: i=1; imf26.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=SnfPExZf; spf=pass (imf26.hostedemail.com: domain of pbonzini@redhat.com designates 170.10.133.124 as permitted sender) smtp.mailfrom=pbonzini@redhat.com; dmarc=pass (policy=none) header.from=redhat.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1712318306; 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=bNbIAMV3AIIh+finZC0kYCtErDA0HoO+gaZWe4mDURE=; b=SnfPExZfj0WL2UxB4nml7MDopgTEIuwvknZjwbj7ouf/2C/7q2n2l10F83KNuqOffuJ4HB cZeOKxo9gefehzI8hhC6CYTajtc88D/kGCGizkbGJqnJSSuMLE7mL6rQf/AUzF4H+b2J94 h5f5jLXKcU5mZk2sZtp10/UI7j8vxP4= Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-216-j7EJIyIYM6OGTJqf_yp9KQ-1; Fri, 05 Apr 2024 07:58:23 -0400 X-MC-Unique: j7EJIyIYM6OGTJqf_yp9KQ-1 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.rdu2.redhat.com [10.11.54.2]) (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 mimecast-mx02.redhat.com (Postfix) with ESMTPS id 584B885CF01; Fri, 5 Apr 2024 11:58:22 +0000 (UTC) Received: from virtlab701.virt.lab.eng.bos.redhat.com (virtlab701.virt.lab.eng.bos.redhat.com [10.19.152.228]) by smtp.corp.redhat.com (Postfix) with ESMTP id D080D40C6CB5; Fri, 5 Apr 2024 11:58:20 +0000 (UTC) From: Paolo Bonzini To: linux-kernel@vger.kernel.org, kvm@vger.kernel.org Cc: Marc Zyngier , Oliver Upton , Tianrui Zhao , Bibo Mao , Thomas Bogendoerfer , Nicholas Piggin , Anup Patel , Atish Patra , Sean Christopherson , Andrew Morton , David Hildenbrand , linux-arm-kernel@lists.infradead.org, kvmarm@lists.linux.dev, loongarch@lists.linux.dev, linux-mips@vger.kernel.org, linuxppc-dev@lists.ozlabs.org, kvm-riscv@lists.infradead.org, linux-mm@kvack.org, linux-trace-kernel@vger.kernel.org, linux-perf-users@vger.kernel.org Subject: [PATCH 4/4] mm: replace set_pte_at_notify() with just set_pte_at() Date: Fri, 5 Apr 2024 07:58:15 -0400 Message-ID: <20240405115815.3226315-5-pbonzini@redhat.com> In-Reply-To: <20240405115815.3226315-1-pbonzini@redhat.com> References: <20240405115815.3226315-1-pbonzini@redhat.com> MIME-Version: 1.0 Content-Type: text/plain Content-Transfer-Encoding: 8bit X-Scanned-By: MIMEDefang 3.4.1 on 10.11.54.2 X-Rspamd-Queue-Id: 90653140015 X-Rspam-User: X-Stat-Signature: 7rucz1spz66ki6s445qdoqhrztym1sfj X-Rspamd-Server: rspam03 X-HE-Tag: 1712318307-662028 X-HE-Meta: U2FsdGVkX1+mDIwGiYrDcRXGjyeC/4f8dAZhD7QZJeYXJvtqSWYjKlpGsOSxHCR8KgYNIGn8yraJ1I8A+puPSf5l50PasIoaY8Nt8LA5DiolzHC6lj/AzkhQ/ACBh+y6izf0aNjB1eVSEJNiXWuFwvR7A6EDnIKImpOgq50JKByfXLHc+AAHk+Qlaxzd4KLPDHdclrn2FpWicFd3NmsrJ5ikf13ACShFOaPgc5DGr59jsTQ3LC2btGPbj4J8ohhckr5Y5RNAFqZjHFaSHljs/Ruf+idJXryeXasTuX28tkchaTnXNnMaD2/6uOE57JP7/20ph/Iyrr3bCihtkKNeX1LCcFtX/pFkIxnok9YnLnNLC4Q6kIp4INSirMPdI+OCPV8pRWUYGhM4VMZ6HcI44vPjQmcRu0HDkE8HsFeY498MdpZmm/0wJcF3wYjk/EvR5yMbrQi5BnoOqxVVUCIDuTwvyY355CYP5NxAQgM8USAafh2QrPWBv7cTx9FX0xq/R/B2hHqnOM3MjGqic0XV8cZspai3aeuFZ5CuKXW2NEnqDnVeGs4oLgd1w02aD8NsDnmpvF9VFu6pyed7cSiJAm4d6ezubXiIr43H6q27l7byBjP7gIZ2Du6ZEJ+AnkrPyrebE8JQMwKSkd8pMPtGulT8/PN1gBglPL5lD7EZwHuUlc/Iv1y3JLs57Qk5LvVRlkSJk7GSnV7C2vrfLyvDCOHn9UcfpmCqxPkz/YcMAc/HEQ3ZtfKkS2n0PESXcYfMWO4Li61VF7t/MnXLRwkPUjq4+woS774wpgJzzBZ4XXfm9lDdrTqsMg3EGToj4SAbqB8Vm227cBk53hLQqMf8Y/tFLh7xv6TeyJNO02UlFSr4GGv3gGCrlOebHGVI9AKh7XDkcIV7y/WeTmpxdmUe74+RGaiIBec/j/vXtUilooKOZux+M1qBkXJVXwyrKQtTiBk/npuRdp+sRJ1+YWV QPfXLhQF jKXNq9ig1pa0E8C7aBRFBr0xZLLZA+y1FX2puxYgCjiCYT0jI9Zm4PxPhHwhkv9UWLtl637BbfBySLz59j35CLFssLMG5sfumNz3AB7Csi64gJiqW6EOLyHBtjn1a1r3Dm+/JT2fNO9fbaMeMTxgGbWRiUbUl6Y2N4XNLuDNxDQY4j3S5XCDksxX7sH2E4MOmud9GUWn5/8Y3is45LzbdQ9NFQhdVa4VVU+j+vO3LcRCUYkV2+H7nGMYWL8DWYDqGpzJX 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: With the demise of the .change_pte() MMU notifier callback, there is no notification happening in set_pte_at_notify(). It is a synonym of set_pte_at() and can be replaced with it. Signed-off-by: Paolo Bonzini --- include/linux/mmu_notifier.h | 2 -- kernel/events/uprobes.c | 5 ++--- mm/ksm.c | 4 ++-- mm/memory.c | 7 +------ mm/migrate_device.c | 8 ++------ 5 files changed, 7 insertions(+), 19 deletions(-) diff --git a/include/linux/mmu_notifier.h b/include/linux/mmu_notifier.h index 8c72bf651606..d39ebb10caeb 100644 --- a/include/linux/mmu_notifier.h +++ b/include/linux/mmu_notifier.h @@ -657,6 +657,4 @@ static inline void mmu_notifier_synchronize(void) #endif /* CONFIG_MMU_NOTIFIER */ -#define set_pte_at_notify set_pte_at - #endif /* _LINUX_MMU_NOTIFIER_H */ diff --git a/kernel/events/uprobes.c b/kernel/events/uprobes.c index e4834d23e1d1..f4523b95c945 100644 --- a/kernel/events/uprobes.c +++ b/kernel/events/uprobes.c @@ -18,7 +18,6 @@ #include #include #include /* anon_vma_prepare */ -#include /* set_pte_at_notify */ #include /* folio_free_swap */ #include /* user_enable_single_step */ #include /* notifier mechanism */ @@ -195,8 +194,8 @@ static int __replace_page(struct vm_area_struct *vma, unsigned long addr, flush_cache_page(vma, addr, pte_pfn(ptep_get(pvmw.pte))); ptep_clear_flush(vma, addr, pvmw.pte); if (new_page) - set_pte_at_notify(mm, addr, pvmw.pte, - mk_pte(new_page, vma->vm_page_prot)); + set_pte_at(mm, addr, pvmw.pte, + mk_pte(new_page, vma->vm_page_prot)); folio_remove_rmap_pte(old_folio, old_page, vma); if (!folio_mapped(old_folio)) diff --git a/mm/ksm.c b/mm/ksm.c index 8c001819cf10..108a4d167824 100644 --- a/mm/ksm.c +++ b/mm/ksm.c @@ -1345,7 +1345,7 @@ static int write_protect_page(struct vm_area_struct *vma, struct page *page, if (pte_write(entry)) entry = pte_wrprotect(entry); - set_pte_at_notify(mm, pvmw.address, pvmw.pte, entry); + set_pte_at(mm, pvmw.address, pvmw.pte, entry); } *orig_pte = entry; err = 0; @@ -1447,7 +1447,7 @@ static int replace_page(struct vm_area_struct *vma, struct page *page, * See Documentation/mm/mmu_notifier.rst */ ptep_clear_flush(vma, addr, ptep); - set_pte_at_notify(mm, addr, ptep, newpte); + set_pte_at(mm, addr, ptep, newpte); folio = page_folio(page); folio_remove_rmap_pte(folio, page, vma); diff --git a/mm/memory.c b/mm/memory.c index f2bc6dd15eb8..9a6f4d8aa379 100644 --- a/mm/memory.c +++ b/mm/memory.c @@ -3327,13 +3327,8 @@ static vm_fault_t wp_page_copy(struct vm_fault *vmf) ptep_clear_flush(vma, vmf->address, vmf->pte); folio_add_new_anon_rmap(new_folio, vma, vmf->address); folio_add_lru_vma(new_folio, vma); - /* - * We call the notify macro here because, when using secondary - * mmu page tables (such as kvm shadow page tables), we want the - * new page to be mapped directly into the secondary page table. - */ BUG_ON(unshare && pte_write(entry)); - set_pte_at_notify(mm, vmf->address, vmf->pte, entry); + set_pte_at(mm, vmf->address, vmf->pte, entry); update_mmu_cache_range(vmf, vma, vmf->address, vmf->pte, 1); if (old_folio) { /* diff --git a/mm/migrate_device.c b/mm/migrate_device.c index b6c27c76e1a0..66206734b1b9 100644 --- a/mm/migrate_device.c +++ b/mm/migrate_device.c @@ -664,13 +664,9 @@ static void migrate_vma_insert_page(struct migrate_vma *migrate, if (flush) { flush_cache_page(vma, addr, pte_pfn(orig_pte)); ptep_clear_flush(vma, addr, ptep); - set_pte_at_notify(mm, addr, ptep, entry); - update_mmu_cache(vma, addr, ptep); - } else { - /* No need to invalidate - it was non-present before */ - set_pte_at(mm, addr, ptep, entry); - update_mmu_cache(vma, addr, ptep); } + set_pte_at(mm, addr, ptep, entry); + update_mmu_cache(vma, addr, ptep); pte_unmap_unlock(ptep, ptl); *src = MIGRATE_PFN_MIGRATE; -- 2.43.0