From patchwork Fri Jun 16 11:08:17 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Aneesh Kumar K.V" X-Patchwork-Id: 13282628 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 BAFA7EB64D7 for ; Fri, 16 Jun 2023 11:09:45 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 517D06B0082; Fri, 16 Jun 2023 07:09:45 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 4C88F6B0083; Fri, 16 Jun 2023 07:09:45 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 31B958E0001; Fri, 16 Jun 2023 07:09:45 -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 237166B0082 for ; Fri, 16 Jun 2023 07:09:45 -0400 (EDT) Received: from smtpin12.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay07.hostedemail.com (Postfix) with ESMTP id E0093160BC8 for ; Fri, 16 Jun 2023 11:09:44 +0000 (UTC) X-FDA: 80908340688.12.C839664 Received: from mx0a-001b2d01.pphosted.com (mx0a-001b2d01.pphosted.com [148.163.156.1]) by imf13.hostedemail.com (Postfix) with ESMTP id 5E66D2001C for ; Fri, 16 Jun 2023 11:09:42 +0000 (UTC) Authentication-Results: imf13.hostedemail.com; dkim=pass header.d=ibm.com header.s=pp1 header.b=mzyfGpFm; dmarc=pass (policy=none) header.from=ibm.com; spf=pass (imf13.hostedemail.com: domain of aneesh.kumar@linux.ibm.com designates 148.163.156.1 as permitted sender) smtp.mailfrom=aneesh.kumar@linux.ibm.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1686913782; 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=IgFHfZ1KySuiFsDTbSIBfgisCKdqais3tV9iLIh71Vs=; b=heDJiHr8W1B1JWjYC2z0Kn9CGtjPe3jFmU0b4cOPQfwGs4taK4G4j8t99f4xtcQXe0omhv TyblwqhpR0VxqhdOrnr/rHnZ7aqdQcvBmhjVcnbc+ipHoCyUki8EU7cr4EzGzCB3cgL7HK lY3S8Z44TtcnXc6EOGbwEYenR7Pzx5U= ARC-Authentication-Results: i=1; imf13.hostedemail.com; dkim=pass header.d=ibm.com header.s=pp1 header.b=mzyfGpFm; dmarc=pass (policy=none) header.from=ibm.com; spf=pass (imf13.hostedemail.com: domain of aneesh.kumar@linux.ibm.com designates 148.163.156.1 as permitted sender) smtp.mailfrom=aneesh.kumar@linux.ibm.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1686913782; a=rsa-sha256; cv=none; b=K10y39hEmX+dph+PAw1Wjul9F5Q+DpVFoJvTsJ8rsLe9lFwLgFKSrj47/pkLPEl5WKn3Ny A5HsmDol75Z1K0iqVjrgaKRpzgvabwODVm8bSYNwyHGx1pyzk5RVqKXJILCyime3tPRjW1 8pUkR6t5++o9Tyk3htmRC0Uu6X6yZ44= Received: from pps.filterd (m0353727.ppops.net [127.0.0.1]) by mx0a-001b2d01.pphosted.com (8.17.1.19/8.17.1.19) with ESMTP id 35GAkmQD025344; Fri, 16 Jun 2023 11:09:32 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ibm.com; h=from : to : cc : subject : date : message-id : in-reply-to : references : mime-version : content-transfer-encoding; s=pp1; bh=IgFHfZ1KySuiFsDTbSIBfgisCKdqais3tV9iLIh71Vs=; b=mzyfGpFmT1Pch2wcBqn6wqSFt4rvnmNvEziRTRlvBlf2gSK1UwSCeZIOjLH56a88vOnk cofmx54awuupmgO0NKJsL3Lzi/XUmd19wMBjQaMvo/lYsMhgKhLaYnpnSLxKrSqzit7e B7Lfdj/r2SDOTyd+46luR5tz+hJLiiOoRUXi/zvxyXjmSSZBI2VitgnQiW3yan2Dry6b PKKyKVLUNtuo2LNzePPcP9FVoNcUwEMPfQP5bD1MTZlH1o7t1vD3qKcDJ92bON7HUPIv MoPanUKPAY/Og9ypeL6Ir022AkcvlAYPDdoG0jYd1usn9TPccSUlRoZUADM/4fZHPtEP lw== Received: from pps.reinject (localhost [127.0.0.1]) by mx0a-001b2d01.pphosted.com (PPS) with ESMTPS id 3r8p9nggks-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Fri, 16 Jun 2023 11:09:31 +0000 Received: from m0353727.ppops.net (m0353727.ppops.net [127.0.0.1]) by pps.reinject (8.17.1.5/8.17.1.5) with ESMTP id 35GAmUQC028781; Fri, 16 Jun 2023 11:09:31 GMT Received: from ppma03dal.us.ibm.com (b.bd.3ea9.ip4.static.sl-reverse.com [169.62.189.11]) by mx0a-001b2d01.pphosted.com (PPS) with ESMTPS id 3r8p9nggka-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Fri, 16 Jun 2023 11:09:31 +0000 Received: from pps.filterd (ppma03dal.us.ibm.com [127.0.0.1]) by ppma03dal.us.ibm.com (8.17.1.19/8.17.1.19) with ESMTP id 35G8oUp8030230; Fri, 16 Jun 2023 11:09:30 GMT Received: from smtprelay05.dal12v.mail.ibm.com ([9.208.130.101]) by ppma03dal.us.ibm.com (PPS) with ESMTPS id 3r4gt529c8-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Fri, 16 Jun 2023 11:09:30 +0000 Received: from smtpav02.wdc07v.mail.ibm.com (smtpav02.wdc07v.mail.ibm.com [10.39.53.229]) by smtprelay05.dal12v.mail.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id 35GB9SY764028950 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Fri, 16 Jun 2023 11:09:29 GMT Received: from smtpav02.wdc07v.mail.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 9BF7358058; Fri, 16 Jun 2023 11:09:28 +0000 (GMT) Received: from smtpav02.wdc07v.mail.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 69F6258059; Fri, 16 Jun 2023 11:09:23 +0000 (GMT) Received: from skywalker.ibmuc.com (unknown [9.43.52.24]) by smtpav02.wdc07v.mail.ibm.com (Postfix) with ESMTP; Fri, 16 Jun 2023 11:09:23 +0000 (GMT) From: "Aneesh Kumar K.V" To: linux-mm@kvack.org, akpm@linux-foundation.org, mpe@ellerman.id.au, linuxppc-dev@lists.ozlabs.org, npiggin@gmail.com, christophe.leroy@csgroup.eu Cc: Oscar Salvador , Mike Kravetz , Dan Williams , Joao Martins , Catalin Marinas , Muchun Song , Will Deacon , "Aneesh Kumar K.V" Subject: [PATCH v2 07/16] mm: Change pudp_huge_get_and_clear_full take vm_area_struct as arg Date: Fri, 16 Jun 2023 16:38:17 +0530 Message-Id: <20230616110826.344417-8-aneesh.kumar@linux.ibm.com> X-Mailer: git-send-email 2.40.1 In-Reply-To: <20230616110826.344417-1-aneesh.kumar@linux.ibm.com> References: <20230616110826.344417-1-aneesh.kumar@linux.ibm.com> MIME-Version: 1.0 X-TM-AS-GCONF: 00 X-Proofpoint-GUID: GMvt6BQvPqImc8Zg_D1LAzg79RDphZh5 X-Proofpoint-ORIG-GUID: dG-IK40REO7GSnDV6A5S9Cqi2Ldrs4gE X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.254,Aquarius:18.0.957,Hydra:6.0.591,FMLib:17.11.176.26 definitions=2023-06-16_07,2023-06-16_01,2023-05-22_02 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 impostorscore=0 clxscore=1015 bulkscore=0 mlxlogscore=999 priorityscore=1501 phishscore=0 suspectscore=0 adultscore=0 malwarescore=0 lowpriorityscore=0 spamscore=0 mlxscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2305260000 definitions=main-2306160099 X-Rspam-User: X-Stat-Signature: ox7jt5d7q1q6q977ce65miennjkxbc5s X-Rspamd-Server: rspam07 X-Rspamd-Queue-Id: 5E66D2001C X-HE-Tag: 1686913782-554263 X-HE-Meta: U2FsdGVkX188jTvi19KHRK5kqxfkXtob3ezotdAibW1Rt/4YHGdcIFqeaHba/0BQ36aulyXjRgz/Crk1fVnftSDuS7tkiyNnsnBArah3JVSKyk+wN9Fvab9knJ6mDLNFD5QccpcdAPnrg5l9mbmbN808UgPxfdG+qIJMQhPilYhPGZ/yDo5jfFDS74bLjbECKf+gLMBlqw7xS7lzw4RfklLrrmkWYnWd2xe0R4XrK4t0Il+hAiZEEslZYjszT/jF/IpcVbKdSM0lppf20YbFsjr7rOQMdJDkcNvrOg3JjI1QFezpIfyh3eLcjcX9X4EM9yr+b0kaaLq9x6US178FURaEzlP6sGh+OTx9W6Kwf3lfTtBuICQuNGtU+Z9s/ZzJVrds7uMlh2y9IFgEn3WEXZhsXXCN+RZ9AWQYwKMKG430+lVUwTwV7sDpotp7VFqka5HFY/KPBGqRb0IN8eY/QJXsIf+/zivPQVFCP0sLyocN73Jp0j17Oce7g7FVyt+I4zDXlJ+WawzWIf3DTjkSo5iAgmL6vXGMRWxO2Rgj51HnzamyfyFqE1inQW4Wg7NS9QWQsJJ/LJt595086ILj50kGFk+n7ll0con434NcMNjZscFDfBx+uS8rLNBHURu/+xJNo/XGK/0mdRaoF2AxFPUcnwqKtF38BoKt3KSvwLrzqmilnInJ4q+0Es4rKuypmOSQmpDRwTz9lHTLQAkW2M+j2PkZBOs3MuLx88MVwsBEUXMVMC4Qx1s877QxoR2HEXrsEsTnoGWiutIuziUQOF+5w9RlDEW9adS4lWddtYw6CuuJQZs/TtJnMY0PsITp1nR86BzVZaEtuo5/qijMaBaF+Ix/b38SNhbNvRnh3Rf6XP62K2jB6MI0Ei8yueWjdm92xA4F2IwRgOHm2lkNpXfnKDEQhn308waTKdDqhqa6Ah5BstVpG3vXh+ulNItkrfegIYOPGEqzewLFWgq Y9mivJgK h8E66SkzrswZmCwCnS+Cc7eq7VAF7uyBJkBF2u8pfwX7Qv/iSAaNOxX9LjzWui7Q89ecp0jG4zYP9gY9yyxS0gOnmH9zmlBFuQgdZqrnqKWPeUSfaAa77ZJzwGtjerqLQEtFRu9RrJxmFbaSo2lRZDnCebP8zWtSj3o4PPERQLoM/PaMkx2wjirvQYnBX3RiytL3A 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 will use this in a later patch to do tlb flush when clearing pud entries on powerpc. This is similar to commit 93a98695f2f9 ("mm: change pmdp_huge_get_and_clear_full take vm_area_struct as arg") Signed-off-by: Aneesh Kumar K.V --- include/linux/pgtable.h | 4 ++-- mm/debug_vm_pgtable.c | 2 +- mm/huge_memory.c | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/include/linux/pgtable.h b/include/linux/pgtable.h index b3f4dd0240f5..2fe19720075e 100644 --- a/include/linux/pgtable.h +++ b/include/linux/pgtable.h @@ -442,11 +442,11 @@ static inline pmd_t pmdp_huge_get_and_clear_full(struct vm_area_struct *vma, #endif #ifndef __HAVE_ARCH_PUDP_HUGE_GET_AND_CLEAR_FULL -static inline pud_t pudp_huge_get_and_clear_full(struct mm_struct *mm, +static inline pud_t pudp_huge_get_and_clear_full(struct vm_area_struct *vma, unsigned long address, pud_t *pudp, int full) { - return pudp_huge_get_and_clear(mm, address, pudp); + return pudp_huge_get_and_clear(vma->vm_mm, address, pudp); } #endif #endif /* CONFIG_TRANSPARENT_HUGEPAGE */ diff --git a/mm/debug_vm_pgtable.c b/mm/debug_vm_pgtable.c index c54177aabebd..c2bf25d5e5cd 100644 --- a/mm/debug_vm_pgtable.c +++ b/mm/debug_vm_pgtable.c @@ -382,7 +382,7 @@ static void __init pud_advanced_tests(struct pgtable_debug_args *args) WARN_ON(!(pud_write(pud) && pud_dirty(pud))); #ifndef __PAGETABLE_PMD_FOLDED - pudp_huge_get_and_clear_full(args->mm, vaddr, args->pudp, 1); + pudp_huge_get_and_clear_full(args->vma, vaddr, args->pudp, 1); pud = READ_ONCE(*args->pudp); WARN_ON(!pud_none(pud)); #endif /* __PAGETABLE_PMD_FOLDED */ diff --git a/mm/huge_memory.c b/mm/huge_memory.c index 624671aaa60d..8774b4751a84 100644 --- a/mm/huge_memory.c +++ b/mm/huge_memory.c @@ -1980,7 +1980,7 @@ int zap_huge_pud(struct mmu_gather *tlb, struct vm_area_struct *vma, if (!ptl) return 0; - pudp_huge_get_and_clear_full(tlb->mm, addr, pud, tlb->fullmm); + pudp_huge_get_and_clear_full(vma, addr, pud, tlb->fullmm); tlb_remove_pud_tlb_entry(tlb, pud, addr); if (vma_is_special_huge(vma)) { spin_unlock(ptl);