From patchwork Mon Mar 6 16:15:48 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gerald Schaefer X-Patchwork-Id: 13161687 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 8D69DC64EC4 for ; Mon, 6 Mar 2023 16:16:54 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 06B866B0071; Mon, 6 Mar 2023 11:16:54 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 01BFC6B0072; Mon, 6 Mar 2023 11:16:53 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id DFEE0280001; Mon, 6 Mar 2023 11:16:53 -0500 (EST) 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 D12646B0071 for ; Mon, 6 Mar 2023 11:16:53 -0500 (EST) Received: from smtpin07.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay01.hostedemail.com (Postfix) with ESMTP id 7FB621C622E for ; Mon, 6 Mar 2023 16:16:53 +0000 (UTC) X-FDA: 80538977106.07.01F8755 Received: from mx0b-001b2d01.pphosted.com (mx0b-001b2d01.pphosted.com [148.163.158.5]) by imf14.hostedemail.com (Postfix) with ESMTP id 2BD06100018 for ; Mon, 6 Mar 2023 16:16:49 +0000 (UTC) Authentication-Results: imf14.hostedemail.com; dkim=pass header.d=ibm.com header.s=pp1 header.b=qgIC+66x; spf=pass (imf14.hostedemail.com: domain of gerald.schaefer@linux.ibm.com designates 148.163.158.5 as permitted sender) smtp.mailfrom=gerald.schaefer@linux.ibm.com; dmarc=pass (policy=none) header.from=ibm.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1678119410; 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:references:dkim-signature; bh=BTJFZUSxiEWggn1zMTH9DiLoAKpycnCu/7ed6LXGAvk=; b=dh9LUjx5pQ8Zht/3U1SXsn1r5J1IBjYo9PPAm3R3/YNlkSuGnApDRjCYVHez1N8gvjmGwb pqQ7HQH7OvBP7hq8bPGy8QlQu1hi9rxyS0FTsyYNo3BgKEkDZ/eWbZ7avuKei9UlGzElfL qCsDofIW6m1cmRsvx/S7t+JOElBLK4Y= ARC-Authentication-Results: i=1; imf14.hostedemail.com; dkim=pass header.d=ibm.com header.s=pp1 header.b=qgIC+66x; spf=pass (imf14.hostedemail.com: domain of gerald.schaefer@linux.ibm.com designates 148.163.158.5 as permitted sender) smtp.mailfrom=gerald.schaefer@linux.ibm.com; dmarc=pass (policy=none) header.from=ibm.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1678119410; a=rsa-sha256; cv=none; b=nkZ3AA0os/0FpbGHhffRmPBjPsTKWarvzBpf0IPG7CbCrbrSYhtGC0aaRy/Fj5rDgFeKZZ zJjbjW/EwET10DK9g7HOBNoBQX6XEesPuJkHUWRSvjvg1bb9vEXbi8X/BJHRZLwkEh8PY1 veReU4oOyVf6c9ZRRdNp7S8xNlPQYJ4= Received: from pps.filterd (m0098417.ppops.net [127.0.0.1]) by mx0a-001b2d01.pphosted.com (8.17.1.19/8.17.1.19) with ESMTP id 326FqQlW005341; Mon, 6 Mar 2023 16:16:19 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ibm.com; h=from : to : cc : subject : date : message-id : mime-version : content-transfer-encoding; s=pp1; bh=BTJFZUSxiEWggn1zMTH9DiLoAKpycnCu/7ed6LXGAvk=; b=qgIC+66xyQksuyboaCTNGdaBk1/QigzHYhhF4+0tJh4kTCDJG8Jgg5PxZuOe5ZNaaCaZ 890Iq6HqEAjbgUfkOXy5qj7LIinS5Mhlkteqk18rRyJ9lyM7fJ+MeNIWSrRGTePRH+xk AOhcX94RqcLxx/42kIivrrd/v6n33QotwUDd8kw0kXSq47sI5PbUnw3f461cITYiPn9V dUREg6rswV9PZVTOaizAEA9/iwmmvQHttTsY23CU7XDw76mpNJJcRpFE/6OmsEGho0bl mXaqZ6a5N7qu+hjk146cD1KDeIHditdAK26vK4kn7hMjRZL3EkspibjkjZ2V1zn3+3bT yA== Received: from pps.reinject (localhost [127.0.0.1]) by mx0a-001b2d01.pphosted.com (PPS) with ESMTPS id 3p50n48eac-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Mon, 06 Mar 2023 16:16:19 +0000 Received: from m0098417.ppops.net (m0098417.ppops.net [127.0.0.1]) by pps.reinject (8.17.1.5/8.17.1.5) with ESMTP id 326Bw5Lc029579; Mon, 6 Mar 2023 16:16:18 GMT Received: from ppma05fra.de.ibm.com (6c.4a.5195.ip4.static.sl-reverse.com [149.81.74.108]) by mx0a-001b2d01.pphosted.com (PPS) with ESMTPS id 3p50n48e9e-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Mon, 06 Mar 2023 16:16:18 +0000 Received: from pps.filterd (ppma05fra.de.ibm.com [127.0.0.1]) by ppma05fra.de.ibm.com (8.17.1.19/8.17.1.19) with ESMTP id 3265XPh5030498; Mon, 6 Mar 2023 16:16:16 GMT Received: from smtprelay07.fra02v.mail.ibm.com ([9.218.2.229]) by ppma05fra.de.ibm.com (PPS) with ESMTPS id 3p417q2by5-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Mon, 06 Mar 2023 16:16:16 +0000 Received: from smtpav05.fra02v.mail.ibm.com (smtpav05.fra02v.mail.ibm.com [10.20.54.104]) by smtprelay07.fra02v.mail.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id 326GGCjG38142264 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Mon, 6 Mar 2023 16:16:13 GMT Received: from smtpav05.fra02v.mail.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id C811420049; Mon, 6 Mar 2023 16:16:12 +0000 (GMT) Received: from smtpav05.fra02v.mail.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 3A9EC20040; Mon, 6 Mar 2023 16:16:12 +0000 (GMT) Received: from tuxmaker.boeblingen.de.ibm.com (unknown [9.152.85.9]) by smtpav05.fra02v.mail.ibm.com (Postfix) with ESMTP; Mon, 6 Mar 2023 16:16:12 +0000 (GMT) From: Gerald Schaefer To: Andrew Morton Cc: David Hildenbrand , Matthew Wilcox , Catalin Marinas , Anshuman Khandual , Will Deacon , Thomas Bogendoerfer , Michael Ellerman , Nicholas Piggin , Christophe Leroy , Thomas Gleixner , Ingo Molnar , Borislav Petkov , Dave Hansen , Alexander Gordeev , linux-mips , linux-power , linux-x86 , linux-s390 , LKML , linux-mm Subject: [PATCH] mm: add PTE pointer parameter to flush_tlb_fix_spurious_fault() Date: Mon, 6 Mar 2023 17:15:48 +0100 Message-Id: <20230306161548.661740-1-gerald.schaefer@linux.ibm.com> X-Mailer: git-send-email 2.37.2 MIME-Version: 1.0 X-TM-AS-GCONF: 00 X-Proofpoint-ORIG-GUID: 8La9G2yLPVsHgQLa6GKGur7yIvPNIJqC X-Proofpoint-GUID: DeAjCU7ZGi5ehOrbeAqu-0KrsMqfJwxv X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.219,Aquarius:18.0.942,Hydra:6.0.573,FMLib:17.11.170.22 definitions=2023-03-06_08,2023-03-06_01,2023-02-09_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 malwarescore=0 adultscore=0 mlxlogscore=999 bulkscore=0 phishscore=0 priorityscore=1501 clxscore=1011 impostorscore=0 suspectscore=0 lowpriorityscore=0 spamscore=0 mlxscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2212070000 definitions=main-2303060142 X-Rspamd-Server: rspam05 X-Rspamd-Queue-Id: 2BD06100018 X-Stat-Signature: y6hnyo85nmzqqmnwxs3b6atom1by6koe X-Rspam-User: X-HE-Tag: 1678119409-495717 X-HE-Meta: U2FsdGVkX19EnEyGTpiwvAlff//zK6fSJlSKnTsyZj393pGS/kMrBbXUhS8rp0fH6viHHKsKwMFA43DuW19UCoChCfEnYyKFqHO6LWRAYLqP6xiNmpAWM7IWwNtbULdcYnhRgjSGTx0vaMlvvc4vYA+dwTFdameD5o73Ae2FbmKYW5pQrR5AYNeDc/h9zwUKFYyzvZHhELkVNyCah+cCBFwGd5iMRnLu8k0Mstcl1EHU8d9zDmNgMI4+D5L2CsjbqMqOQXQ1a88gOYpr3lQYv8QLWYPxgYyA6smiY2ZgCwTNSDeQYIB6qI7b7KWxSndqUv07oxH5O6fq6t6EzVXrbg4C6QozoyEL/gjgzZ9HBcQ012LqI143lQDzGkmvkXPy1Wbxk/40Um5IG6C+CkbVBiBe9Vns9doriD/QEDnWGpxLnLqZGeln9syK/WP8NieX8wKFcFkBb2sPuHC0hL9WucWqqjZoOOkmESABSGcA1fQoxkgvTbOZiRzcrjksZzoiYyQGLZJgfFHmrZXSBYVP1cmLIZPrOzkniJgqowu2qvN9jSgh/QoYTR2k/8qxW6zDFopwP01kv2PypwJGPtjcsgpdDaK8LF/hsyqMHCoHW7zq/AL9B3Wreet+n7tSXqyRJMBcoe9v5w4BAgyD9REH7DCZ3Oml81k9JTvx73gSQcNDLpHSbM4y673D2sBjyertV1W49dL6k3vgEXKOnFH5tEgeo6urMe+Ulik0efdoQ3SZaciU2bSIHUobVHiofFMGJcpQ2DEd3gQKhDolS9z/Sltgxbc6rRrFZm48LWO8oHX5ikSvmSqiolNtJkmI58iM5TPFLZLeDbWOt5JvMzIJlnTB4hY6qC0JB+aT+d+ib0ONtXciZw51bVUJ28j0QB9pFD4Yq2ifZB55zy0EhnNpLyJ0BtK+HpYYuaa2zaB0MKRcW995RCkFALm7GtC/sWZ1txcSR99caNpDWRCZCKc 4mh5mERA AE3sibWSG/kXMtR7dhDLRY8Y8uWtp0z2GAYMGqQ26mbGKS1oF72JLccDlFurLTIMyaJRtg7wHrnkBs2upkqTCXpLgs6/Z2a7ZSX5dVo9SWaQIIhc53RSYepbvnBuG0/ScHZMUNK3+GpM58LoQ2962biFaXdU3HQ1BywnU9fMXHFlZMRE9OrS1e8F/4wUIabdKJRZY6q7PIPs0u+fLwNH2oiCpVw== 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: s390 can do more fine-grained handling of spurious TLB protection faults, when there also is the PTE pointer available. Therefore, pass on the PTE pointer to flush_tlb_fix_spurious_fault() as an additional parameter. This will add no functional change to other architectures, but those with private flush_tlb_fix_spurious_fault() implementations need to be made aware of the new parameter. Reviewed-by: Alexander Gordeev Signed-off-by: Gerald Schaefer Acked-by: Catalin Marinas Acked-by: Michael Ellerman (powerpc) Acked-by: David Hildenbrand --- arch/arm64/include/asm/pgtable.h | 2 +- arch/mips/include/asm/pgtable.h | 3 ++- arch/powerpc/include/asm/book3s/64/tlbflush.h | 3 ++- arch/s390/include/asm/pgtable.h | 12 +++++++----- arch/x86/include/asm/pgtable.h | 2 +- include/linux/pgtable.h | 2 +- mm/memory.c | 3 ++- mm/pgtable-generic.c | 2 +- 8 files changed, 17 insertions(+), 12 deletions(-) diff --git a/arch/arm64/include/asm/pgtable.h b/arch/arm64/include/asm/pgtable.h index b6ba466e2e8a..0bd18de9fd97 100644 --- a/arch/arm64/include/asm/pgtable.h +++ b/arch/arm64/include/asm/pgtable.h @@ -57,7 +57,7 @@ static inline bool arch_thp_swp_supported(void) * fault on one CPU which has been handled concurrently by another CPU * does not need to perform additional invalidation. */ -#define flush_tlb_fix_spurious_fault(vma, address) do { } while (0) +#define flush_tlb_fix_spurious_fault(vma, address, ptep) do { } while (0) /* * ZERO_PAGE is a global shared page that is always zero: used diff --git a/arch/mips/include/asm/pgtable.h b/arch/mips/include/asm/pgtable.h index 791389bf3c12..574fa14ac8b2 100644 --- a/arch/mips/include/asm/pgtable.h +++ b/arch/mips/include/asm/pgtable.h @@ -469,7 +469,8 @@ static inline pgprot_t pgprot_writecombine(pgprot_t _prot) } static inline void flush_tlb_fix_spurious_fault(struct vm_area_struct *vma, - unsigned long address) + unsigned long address, + pte_t *ptep) { } diff --git a/arch/powerpc/include/asm/book3s/64/tlbflush.h b/arch/powerpc/include/asm/book3s/64/tlbflush.h index 2bbc0fcce04a..ff7f0ee179e5 100644 --- a/arch/powerpc/include/asm/book3s/64/tlbflush.h +++ b/arch/powerpc/include/asm/book3s/64/tlbflush.h @@ -121,7 +121,8 @@ static inline void flush_tlb_page(struct vm_area_struct *vma, #define flush_tlb_fix_spurious_fault flush_tlb_fix_spurious_fault static inline void flush_tlb_fix_spurious_fault(struct vm_area_struct *vma, - unsigned long address) + unsigned long address, + pte_t *ptep) { /* * Book3S 64 does not require spurious fault flushes because the PTE diff --git a/arch/s390/include/asm/pgtable.h b/arch/s390/include/asm/pgtable.h index 2c70b4d1263d..c1f6b46ec555 100644 --- a/arch/s390/include/asm/pgtable.h +++ b/arch/s390/include/asm/pgtable.h @@ -1239,7 +1239,8 @@ static inline int pte_allow_rdp(pte_t old, pte_t new) } static inline void flush_tlb_fix_spurious_fault(struct vm_area_struct *vma, - unsigned long address) + unsigned long address, + pte_t *ptep) { /* * RDP might not have propagated the PTE protection reset to all CPUs, @@ -1247,11 +1248,12 @@ static inline void flush_tlb_fix_spurious_fault(struct vm_area_struct *vma, * NOTE: This will also be called when a racing pagetable update on * another thread already installed the correct PTE. Both cases cannot * really be distinguished. - * Therefore, only do the local TLB flush when RDP can be used, to avoid - * unnecessary overhead. + * Therefore, only do the local TLB flush when RDP can be used, and the + * PTE does not have _PAGE_PROTECT set, to avoid unnecessary overhead. + * A local RDP can be used to do the flush. */ - if (MACHINE_HAS_RDP) - asm volatile("ptlb" : : : "memory"); + if (MACHINE_HAS_RDP && !(pte_val(*ptep) & _PAGE_PROTECT)) + __ptep_rdp(address, ptep, 0, 0, 1); } #define flush_tlb_fix_spurious_fault flush_tlb_fix_spurious_fault diff --git a/arch/x86/include/asm/pgtable.h b/arch/x86/include/asm/pgtable.h index 7425f32e5293..15ae4d6ba476 100644 --- a/arch/x86/include/asm/pgtable.h +++ b/arch/x86/include/asm/pgtable.h @@ -1097,7 +1097,7 @@ static inline void ptep_set_wrprotect(struct mm_struct *mm, clear_bit(_PAGE_BIT_RW, (unsigned long *)&ptep->pte); } -#define flush_tlb_fix_spurious_fault(vma, address) do { } while (0) +#define flush_tlb_fix_spurious_fault(vma, address, ptep) do { } while (0) #define mk_pmd(page, pgprot) pfn_pmd(page_to_pfn(page), (pgprot)) diff --git a/include/linux/pgtable.h b/include/linux/pgtable.h index 9dc936bc77d1..c5a51481bbb9 100644 --- a/include/linux/pgtable.h +++ b/include/linux/pgtable.h @@ -817,7 +817,7 @@ static inline void arch_swap_restore(swp_entry_t entry, struct folio *folio) #endif #ifndef flush_tlb_fix_spurious_fault -#define flush_tlb_fix_spurious_fault(vma, address) flush_tlb_page(vma, address) +#define flush_tlb_fix_spurious_fault(vma, address, ptep) flush_tlb_page(vma, address) #endif /* diff --git a/mm/memory.c b/mm/memory.c index 0adf23ea5416..7ca7951adcf5 100644 --- a/mm/memory.c +++ b/mm/memory.c @@ -4956,7 +4956,8 @@ static vm_fault_t handle_pte_fault(struct vm_fault *vmf) * with threads. */ if (vmf->flags & FAULT_FLAG_WRITE) - flush_tlb_fix_spurious_fault(vmf->vma, vmf->address); + flush_tlb_fix_spurious_fault(vmf->vma, vmf->address, + vmf->pte); } unlock: pte_unmap_unlock(vmf->pte, vmf->ptl); diff --git a/mm/pgtable-generic.c b/mm/pgtable-generic.c index 90ab721a12a8..d2fc52bffafc 100644 --- a/mm/pgtable-generic.c +++ b/mm/pgtable-generic.c @@ -69,7 +69,7 @@ int ptep_set_access_flags(struct vm_area_struct *vma, int changed = !pte_same(*ptep, entry); if (changed) { set_pte_at(vma->vm_mm, address, ptep, entry); - flush_tlb_fix_spurious_fault(vma, address); + flush_tlb_fix_spurious_fault(vma, address, ptep); } return changed; }