From patchwork Wed Dec 5 04:11:46 2018 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: 10712949 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 8FD4F1057 for ; Wed, 5 Dec 2018 04:12:48 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 7DA7E2CBCA for ; Wed, 5 Dec 2018 04:12:48 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 71DE42CBCF; Wed, 5 Dec 2018 04:12:48 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-2.9 required=2.0 tests=BAYES_00,MAILING_LIST_MULTI, RCVD_IN_DNSWL_NONE autolearn=ham version=3.3.1 Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id D423D2CBCB for ; Wed, 5 Dec 2018 04:12:47 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 9D9176B725C; Tue, 4 Dec 2018 23:12:46 -0500 (EST) Delivered-To: linux-mm-outgoing@kvack.org Received: by kanga.kvack.org (Postfix, from userid 40) id 9879D6B725D; Tue, 4 Dec 2018 23:12:46 -0500 (EST) X-Original-To: int-list-linux-mm@kvack.org X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 876336B725E; Tue, 4 Dec 2018 23:12:46 -0500 (EST) X-Original-To: linux-mm@kvack.org X-Delivered-To: linux-mm@kvack.org Received: from mail-ed1-f70.google.com (mail-ed1-f70.google.com [209.85.208.70]) by kanga.kvack.org (Postfix) with ESMTP id 315386B725C for ; Tue, 4 Dec 2018 23:12:46 -0500 (EST) Received: by mail-ed1-f70.google.com with SMTP id y35so9252199edb.5 for ; Tue, 04 Dec 2018 20:12:46 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-original-authentication-results:x-gm-message-state:from:to:cc :subject:date:in-reply-to:references:mime-version :content-transfer-encoding:message-id; bh=XL+bKPftCRQAJBMeBUSxrhwzOSZDMjOzvRIxxDW8xAo=; b=U6n3jRPinBQKIZJy/IPYQ5z5Etpb9DVeM9FMD4s5jPid9AmOtfr7NzhjRv2HnJTvkc oRNNz4Kykg81HMJu059b1RfOyQI3kvRJ64yPfYnDpRhP+8/d+trMTL08xa1W29uwqIzJ uaVvy8v/Fz2Q/TrRCQLc6mbEfdkeuvISJeiKZ86JmfRflVTqHwoNr9ZaWQegma+UgThm Kev8h50FiztpAnntXZ7hOGcz1PT7o2Zp5mcPyTR+xSbUaHq3Sutjm7x193SRQpPHjGLR TE7A2wijT4VFZ9/IGMYK51guGSEVIsmgq581h0WFKvRsH7mieaxa1S9IiUKWTCflD6za tgYQ== X-Original-Authentication-Results: mx.google.com; spf=pass (google.com: domain of aneesh.kumar@linux.ibm.com designates 148.163.158.5 as permitted sender) smtp.mailfrom=aneesh.kumar@linux.ibm.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=ibm.com X-Gm-Message-State: AA+aEWY47nYLnXsQGWF4NYpKN+BX9mVlokrW0oDXE9jTgjhQpGYKvq1u pDND9jxkyakj1MIkM0m6y+9KPzYOWJmjRccwQzMVTBvEmKP816+35QiCryzONvbwgDa6tJf6JxJ 7GkPyUjf4SvyTRXyGuAcvb0oU6Pmale6TOOXm+JCHsebai1MiYEGsW2/I/qTTrd8gwg== X-Received: by 2002:a50:b205:: with SMTP id o5mr19451990edd.245.1543983165641; Tue, 04 Dec 2018 20:12:45 -0800 (PST) X-Google-Smtp-Source: AFSGD/UMctNCNX4JqMfHZhjEab3DZQIZtp5Ym6DT/ltytpqFUEV7XU+cYS1PPYj/tnpC7/N2ePa6 X-Received: by 2002:a50:b205:: with SMTP id o5mr19451962edd.245.1543983164759; Tue, 04 Dec 2018 20:12:44 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1543983164; cv=none; d=google.com; s=arc-20160816; b=pMD38VmS0UKK5G3M2pj4Eamu+CnSZmSm3Z8I9vGb8BizFcdRUI0Z0VPBgAegGOApPi PsyC/OHCy0Wpps7msDiEl8tShj11JPFDZjPI0JTpJh/JOcEwskZbkS/NEEQ2pFuh887G ABWakimZrocnZG5S3w213RIPO5b7CQw9mZyNb7dQV2kTtd/hT+jT3c/qCSM8qB5i4nOe AX//HCJIU3Uqoyz7fDJo7zY+hOve/74LqnzbDX4T96g4999fd6wmEV3V88WFV75355cu gsK3VOAlJdeUDTdfRtBaoFil5xzy2Zt+iIAGLapDtvWjwGntslT/iJA4Vp8WTADK2njL S4MQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=message-id:content-transfer-encoding:mime-version:references :in-reply-to:date:subject:cc:to:from; bh=XL+bKPftCRQAJBMeBUSxrhwzOSZDMjOzvRIxxDW8xAo=; b=k9QMDKbus3SzWOJ3YKSzov6xbanbDh5CD84PsCcZiTUJmhan3wxXwdSmzgBpqOm20o 9peLT1K4elSJAKMEGBsyeY6CHvaqlwUsvjGKt4I29GWF4sUrPo/r831Ay2CLeqsCOp9G CFf1Dp2eJ6yzNF+Ax9V3ubkpsNdc9abhglOwEd8qL+tvZ+bWOg4IRS0j3wJ0vpFl+cjI 4oPLCKA+//AWjS3sCuwRCAYRxjPs/aN5M4NLZXXv2EvzuJOWqXEtD6uzy37SLtsZz78e S7k9jkqe+gZzub71CpVZC3NbuwcsNJS0qrFsY9D8SXAG8A3zuIRLfxfG/QyQi/ca1eD6 wosQ== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of aneesh.kumar@linux.ibm.com designates 148.163.158.5 as permitted sender) smtp.mailfrom=aneesh.kumar@linux.ibm.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=ibm.com Received: from mx0a-001b2d01.pphosted.com (mx0b-001b2d01.pphosted.com. [148.163.158.5]) by mx.google.com with ESMTPS id z10si34845edc.301.2018.12.04.20.12.44 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 04 Dec 2018 20:12:44 -0800 (PST) Received-SPF: pass (google.com: domain of aneesh.kumar@linux.ibm.com designates 148.163.158.5 as permitted sender) client-ip=148.163.158.5; Authentication-Results: mx.google.com; spf=pass (google.com: domain of aneesh.kumar@linux.ibm.com designates 148.163.158.5 as permitted sender) smtp.mailfrom=aneesh.kumar@linux.ibm.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=ibm.com Received: from pps.filterd (m0098420.ppops.net [127.0.0.1]) by mx0b-001b2d01.pphosted.com (8.16.0.22/8.16.0.22) with SMTP id wB548x4D123249 for ; Tue, 4 Dec 2018 23:12:43 -0500 Received: from e31.co.us.ibm.com (e31.co.us.ibm.com [32.97.110.149]) by mx0b-001b2d01.pphosted.com with ESMTP id 2p66b52fm4-1 (version=TLSv1.2 cipher=AES256-GCM-SHA384 bits=256 verify=NOT) for ; Tue, 04 Dec 2018 23:12:43 -0500 Received: from localhost by e31.co.us.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Wed, 5 Dec 2018 04:12:42 -0000 Received: from b03cxnp08027.gho.boulder.ibm.com (9.17.130.19) by e31.co.us.ibm.com (192.168.1.131) with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted; (version=TLSv1/SSLv3 cipher=AES256-GCM-SHA384 bits=256/256) Wed, 5 Dec 2018 04:12:39 -0000 Received: from b03ledav006.gho.boulder.ibm.com (b03ledav006.gho.boulder.ibm.com [9.17.130.237]) by b03cxnp08027.gho.boulder.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id wB54Ccjh24051824 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=FAIL); Wed, 5 Dec 2018 04:12:39 GMT Received: from b03ledav006.gho.boulder.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id CFD7FC6057; Wed, 5 Dec 2018 04:12:38 +0000 (GMT) Received: from b03ledav006.gho.boulder.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id C45AAC6055; Wed, 5 Dec 2018 04:12:35 +0000 (GMT) Received: from skywalker.ibmuc.com (unknown [9.85.73.253]) by b03ledav006.gho.boulder.ibm.com (Postfix) with ESMTP; Wed, 5 Dec 2018 04:12:03 +0000 (GMT) From: "Aneesh Kumar K.V" To: npiggin@gmail.com, benh@kernel.crashing.org, paulus@samba.org, mpe@ellerman.id.au, akpm@linux-foundation.org Cc: linuxppc-dev@lists.ozlabs.org, linux-mm@kvack.org, "Aneesh Kumar K.V" Subject: [PATCH V3 updated] arch/powerpc/mm/hugetlb: NestMMU workaround for hugetlb mprotect RW upgrade Date: Wed, 5 Dec 2018 09:41:46 +0530 X-Mailer: git-send-email 2.19.2 In-Reply-To: <20181205030931.12037-6-aneesh.kumar@linux.ibm.com> References: <20181205030931.12037-6-aneesh.kumar@linux.ibm.com> MIME-Version: 1.0 X-TM-AS-GCONF: 00 x-cbid: 18120504-8235-0000-0000-00000E331232 X-IBM-SpamModules-Scores: X-IBM-SpamModules-Versions: BY=3.00010173; HX=3.00000242; KW=3.00000007; PH=3.00000004; SC=3.00000270; SDB=6.01127153; UDB=6.00585437; IPR=6.00907288; MB=3.00024452; MTD=3.00000008; XFM=3.00000015; UTC=2018-12-05 04:12:42 X-IBM-AV-DETECTION: SAVI=unused REMOTE=unused XFE=unused x-cbparentid: 18120504-8236-0000-0000-00004397D7D0 Message-Id: <20181205041146.8481-1-aneesh.kumar@linux.ibm.com> X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10434:,, definitions=2018-12-04_10:,, signatures=0 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 priorityscore=1501 malwarescore=0 suspectscore=0 phishscore=0 bulkscore=0 spamscore=0 clxscore=1015 lowpriorityscore=0 mlxscore=0 impostorscore=0 mlxlogscore=505 adultscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.0.1-1810050000 definitions=main-1812050037 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: X-Virus-Scanned: ClamAV using ClamSMTP NestMMU requires us to mark the pte invalid and flush the tlb when we do a RW upgrade of pte. We fixed a variant of this in the fault path in commit Fixes: bd5050e38aec ("powerpc/mm/radix: Change pte relax sequence to handle nest MMU hang") Signed-off-by: Aneesh Kumar K.V --- arch/powerpc/include/asm/book3s/64/hugetlb.h | 12 +++++++++ arch/powerpc/mm/hugetlbpage-hash64.c | 27 ++++++++++++++++++++ arch/powerpc/mm/hugetlbpage-radix.c | 17 ++++++++++++ 3 files changed, 56 insertions(+) diff --git a/arch/powerpc/include/asm/book3s/64/hugetlb.h b/arch/powerpc/include/asm/book3s/64/hugetlb.h index 5b0177733994..66c1e4f88d65 100644 --- a/arch/powerpc/include/asm/book3s/64/hugetlb.h +++ b/arch/powerpc/include/asm/book3s/64/hugetlb.h @@ -13,6 +13,10 @@ radix__hugetlb_get_unmapped_area(struct file *file, unsigned long addr, unsigned long len, unsigned long pgoff, unsigned long flags); +extern void radix__huge_ptep_modify_prot_commit(struct vm_area_struct *vma, + unsigned long addr, pte_t *ptep, + pte_t old_pte, pte_t pte); + static inline int hstate_get_psize(struct hstate *hstate) { unsigned long shift; @@ -42,4 +46,12 @@ static inline bool gigantic_page_supported(void) /* hugepd entry valid bit */ #define HUGEPD_VAL_BITS (0x8000000000000000UL) +#define huge_ptep_modify_prot_start huge_ptep_modify_prot_start +extern pte_t huge_ptep_modify_prot_start(struct vm_area_struct *vma, + unsigned long addr, pte_t *ptep); + +#define huge_ptep_modify_prot_commit huge_ptep_modify_prot_commit +extern void huge_ptep_modify_prot_commit(struct vm_area_struct *vma, + unsigned long addr, pte_t *ptep, + pte_t old_pte, pte_t new_pte); #endif diff --git a/arch/powerpc/mm/hugetlbpage-hash64.c b/arch/powerpc/mm/hugetlbpage-hash64.c index 2e6a8f9345d3..48fe74bfeab1 100644 --- a/arch/powerpc/mm/hugetlbpage-hash64.c +++ b/arch/powerpc/mm/hugetlbpage-hash64.c @@ -121,3 +121,30 @@ int __hash_page_huge(unsigned long ea, unsigned long access, unsigned long vsid, *ptep = __pte(new_pte & ~H_PAGE_BUSY); return 0; } + +pte_t huge_ptep_modify_prot_start(struct vm_area_struct *vma, + unsigned long addr, pte_t *ptep) +{ + unsigned long pte_val; + /* + * Clear the _PAGE_PRESENT so that no hardware parallel update is + * possible. Also keep the pte_present true so that we don't take + * wrong fault. + */ + pte_val = pte_update(vma->vm_mm, addr, ptep, + _PAGE_PRESENT, _PAGE_INVALID, 1); + + return __pte(pte_val); +} +EXPORT_SYMBOL(huge_ptep_modify_prot_start); + +void huge_ptep_modify_prot_commit(struct vm_area_struct *vma, unsigned long addr, + pte_t *ptep, pte_t old_pte, pte_t pte) +{ + + if (radix_enabled()) + return radix__huge_ptep_modify_prot_commit(vma, addr, ptep, + old_pte, pte); + set_huge_pte_at(vma->vm_mm, addr, ptep, pte); +} +EXPORT_SYMBOL(huge_ptep_modify_prot_commit); diff --git a/arch/powerpc/mm/hugetlbpage-radix.c b/arch/powerpc/mm/hugetlbpage-radix.c index 2486bee0f93e..11d9ea28a816 100644 --- a/arch/powerpc/mm/hugetlbpage-radix.c +++ b/arch/powerpc/mm/hugetlbpage-radix.c @@ -90,3 +90,20 @@ radix__hugetlb_get_unmapped_area(struct file *file, unsigned long addr, return vm_unmapped_area(&info); } + +void radix__huge_ptep_modify_prot_commit(struct vm_area_struct *vma, + unsigned long addr, pte_t *ptep, + pte_t old_pte, pte_t pte) +{ + struct mm_struct *mm = vma->vm_mm; + + /* + * To avoid NMMU hang while relaxing access we need to flush the tlb before + * we set the new value. + */ + if (is_pte_rw_upgrade(pte_val(old_pte), pte_val(pte)) && + (atomic_read(&mm->context.copros) > 0)) + radix__flush_hugetlb_page(vma, addr); + + set_huge_pte_at(vma->vm_mm, addr, ptep, pte); +}