From patchwork Thu Jan 10 21:09:47 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Khalid Aziz X-Patchwork-Id: 10756911 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 CA65017E1 for ; Thu, 10 Jan 2019 21:11:13 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id B9BAF29BFD for ; Thu, 10 Jan 2019 21:11:13 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id ACAF629B8A; Thu, 10 Jan 2019 21:11:13 +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=-3.0 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,MAILING_LIST_MULTI,RCVD_IN_DNSWL_NONE, UNPARSEABLE_RELAY 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 4516829BE9 for ; Thu, 10 Jan 2019 21:11:13 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id D3E388E000E; Thu, 10 Jan 2019 16:10:49 -0500 (EST) Delivered-To: linux-mm-outgoing@kvack.org Received: by kanga.kvack.org (Postfix, from userid 40) id CC4D38E0008; Thu, 10 Jan 2019 16:10:49 -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 B40838E000E; Thu, 10 Jan 2019 16:10:49 -0500 (EST) X-Original-To: linux-mm@kvack.org X-Delivered-To: linux-mm@kvack.org Received: from mail-pf1-f197.google.com (mail-pf1-f197.google.com [209.85.210.197]) by kanga.kvack.org (Postfix) with ESMTP id 6DE7B8E0008 for ; Thu, 10 Jan 2019 16:10:49 -0500 (EST) Received: by mail-pf1-f197.google.com with SMTP id x67so8649005pfk.16 for ; Thu, 10 Jan 2019 13:10:49 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:dkim-signature:from:to:cc:subject:date :message-id:in-reply-to:references:in-reply-to:references; bh=un0wieK7yWFodUoPf/TbQJCMffDoPehxHgZRzLFUW2o=; b=WrF7v2eNfARtykes1uc87lWV0xfR+3gDm7HhZH+agYjn+OKF03+Ywei3OQ+XFjSr4Q zvsCnduHh+dtgqdndNIcjZJKhLBBfyaaTCxvJUtscOLVUpHT/pbBcd1K7SyFVvZnn82h WCXD6v+RN7dzQ69NK/WxAz2EdB39JNwoPqTQG7TWZVIQ6EUktjJZLbaLb4YmeLwXes3v 7ObO7AM/v1OAwAGrc1lZ99rUr+JfDGkPmdzPgZ9iZA/oyyN+iNvd0GwYN85dDBsQUbNO AWKyRe/4WBxk8DF+HIa0pgWcl880v0+oRDiIABSKFYGlU2syfYRlvmQYknKVAfv5tgVt 2r9g== X-Gm-Message-State: AJcUukf/wJaUJQ8W4uGRff6Ou3HJAFTAgGXGDmjigJYAodV9Kcm4Pshx p/I7/t8ydPeCsZBRy785RFOUDP61h9lQBwxXyghrXQKrBIOWc8uIRzufYRlje3u/sv1GmVdrZQx TslzmCoeezbG6ThIaLt3vXemQu5QqgiUKLHl6QgjJOpVs/q+K/BE6F+r6JKtXqBhuYA== X-Received: by 2002:a62:3141:: with SMTP id x62mr11693563pfx.12.1547154649004; Thu, 10 Jan 2019 13:10:49 -0800 (PST) X-Google-Smtp-Source: ALg8bN5od++iHcMordyMUs0+PYE9HWEVqVSWeiMbdMB0VVrEGj/SBvhyYGj7/0nMdtXBdLaEXeZs X-Received: by 2002:a62:3141:: with SMTP id x62mr11693527pfx.12.1547154648356; Thu, 10 Jan 2019 13:10:48 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1547154648; cv=none; d=google.com; s=arc-20160816; b=jUepWDyagll6Bm5JQbctoKG34SvgSdmg3xC4TL53SkwCpVkmBMupz3AjlQRorfSKt4 fklSHIN0devCQeWy8e9DtqXZ3jI8h7FLtvcpOaigYh9fmWMSBTiistx5Xr3K0JQqupAw HM1rsARxtrcrDqgvT9j+OXmfQWlyakNXApIdUvfpVgX/QzdFh8vzUodcAvV6UdIvF+xv yYFpFw2O4DPbYneLUlEZxKiAzZXUxBDILP2N0kUgj5+AaAQXdN9uUR0LweiGCSRzBpAy kI14tBZo7ssLby/cZr5+6GjyvwD8Re4w1sDbETBhReBEaLKMCskMJdCII/CTqV0jqhb7 c1pQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=references:in-reply-to:references:in-reply-to:message-id:date :subject:cc:to:from:dkim-signature; bh=un0wieK7yWFodUoPf/TbQJCMffDoPehxHgZRzLFUW2o=; b=jeceRZdBS/W861g8K20cCn5b7E5nNBNW/MT/qCYFOAu331JACQ4I6ZRI5gv8CVfkRj l7Tj0ALdjnv2Z7u9ipZFf6z61uVufk5BnJYdnQPqxyNgEuHevxtI08u3cdduypKWtGFY ppSBCfLk2nCrMRQPjYcNR+ocsXYyAynAvnv1YUJsPiG0nYOnisrpyRbd71801LLfQtWe 4K8tjdeeceeF7qdLH1VO0BS5DAbh0WkUXcEVa7CJ8oiBH7nPkSpHno9VelkvYa2VDGoh MKtFFIwuQy0C5x0I+6bbSsunwwVack8HiVJEnBEnO6TRCsHB56LGJcujmdcQLSVevNmw 7lhA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@oracle.com header.s=corp-2018-07-02 header.b=chPszpAi; spf=pass (google.com: domain of khalid.aziz@oracle.com designates 156.151.31.85 as permitted sender) smtp.mailfrom=khalid.aziz@oracle.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=oracle.com Received: from userp2120.oracle.com (userp2120.oracle.com. [156.151.31.85]) by mx.google.com with ESMTPS id 31si7655786plz.263.2019.01.10.13.10.48 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 10 Jan 2019 13:10:48 -0800 (PST) Received-SPF: pass (google.com: domain of khalid.aziz@oracle.com designates 156.151.31.85 as permitted sender) client-ip=156.151.31.85; Authentication-Results: mx.google.com; dkim=pass header.i=@oracle.com header.s=corp-2018-07-02 header.b=chPszpAi; spf=pass (google.com: domain of khalid.aziz@oracle.com designates 156.151.31.85 as permitted sender) smtp.mailfrom=khalid.aziz@oracle.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=oracle.com Received: from pps.filterd (userp2120.oracle.com [127.0.0.1]) by userp2120.oracle.com (8.16.0.22/8.16.0.22) with SMTP id x0AL8qFJ192900; Thu, 10 Jan 2019 21:10:44 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oracle.com; h=from : to : cc : subject : date : message-id : in-reply-to : references : in-reply-to : references; s=corp-2018-07-02; bh=un0wieK7yWFodUoPf/TbQJCMffDoPehxHgZRzLFUW2o=; b=chPszpAiJAbkg+zkadcOBGkMBvHUigW7P3J5U9kXh/4WR4WaTdIqSIJKmzOC/NYFDsyM MrFViq/HYuHukuzNxvfAtgv5S+929Mdu9AdazByjvd+OPJMDXYmo8iFtHbKf7joRxxl/ QVImhgrAo9iB2tmKxcqYcyE2n9GTsgn+pHOsq5kbq0i5OjnVPX2uEIwCk/3vgDm7ck2L gdt2Jf6KBycEqmPAG9bKtRrQvpN6O6xgeHZxhQyKMbbVoWzO9mVK92OnrDy3zK7hhBVl 4ErVypdkvqQImbKrKUjb7pLwtF16Ii9FhyFfMXHHcbV30+4FHsmkdvwuL+W2nUMEn+cL gQ== Received: from userv0022.oracle.com (userv0022.oracle.com [156.151.31.74]) by userp2120.oracle.com with ESMTP id 2ptn7r9f50-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Thu, 10 Jan 2019 21:10:44 +0000 Received: from aserv0121.oracle.com (aserv0121.oracle.com [141.146.126.235]) by userv0022.oracle.com (8.14.4/8.14.4) with ESMTP id x0ALAh5k029012 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Thu, 10 Jan 2019 21:10:43 GMT Received: from abhmp0009.oracle.com (abhmp0009.oracle.com [141.146.116.15]) by aserv0121.oracle.com (8.14.4/8.13.8) with ESMTP id x0ALAhqP023547; Thu, 10 Jan 2019 21:10:43 GMT Received: from concerto.internal (/24.9.64.241) by default (Oracle Beehive Gateway v4.0) with ESMTP ; Thu, 10 Jan 2019 13:10:42 -0800 From: Khalid Aziz To: juergh@gmail.com, tycho@tycho.ws, jsteckli@amazon.de, ak@linux.intel.com, torvalds@linux-foundation.org, liran.alon@oracle.com, keescook@google.com, konrad.wilk@oracle.com Cc: Khalid Aziz , deepa.srinivasan@oracle.com, chris.hyser@oracle.com, tyhicks@canonical.com, dwmw@amazon.co.uk, andrew.cooper3@citrix.com, jcm@redhat.com, boris.ostrovsky@oracle.com, kanth.ghatraju@oracle.com, joao.m.martins@oracle.com, jmattson@google.com, pradeep.vincent@oracle.com, john.haxby@oracle.com, tglx@linutronix.de, kirill.shutemov@linux.intel.com, hch@lst.de, steven.sistare@oracle.com, kernel-hardening@lists.openwall.com, linux-mm@kvack.org, linux-kernel@vger.kernel.org Subject: [RFC PATCH v7 15/16] xpfo, mm: Fix hang when booting with "xpfotlbflush" Date: Thu, 10 Jan 2019 14:09:47 -0700 Message-Id: X-Mailer: git-send-email 2.17.1 In-Reply-To: References: In-Reply-To: References: X-Proofpoint-Virus-Version: vendor=nai engine=5900 definitions=9132 signatures=668680 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 suspectscore=0 malwarescore=0 phishscore=0 bulkscore=0 spamscore=0 mlxscore=0 mlxlogscore=999 adultscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.0.1-1810050000 definitions=main-1901100164 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 Kernel hangs when booted up with "xpfotlbflush" option. This is caused by xpfo_kunmap() fliushing TLB while holding xpfo lock starving other tasks waiting for the lock. This patch moves tlb flush outside of the code holding xpfo lock. Signed-off-by: Khalid Aziz --- mm/xpfo.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/mm/xpfo.c b/mm/xpfo.c index 85079377c91d..79ffdba6af69 100644 --- a/mm/xpfo.c +++ b/mm/xpfo.c @@ -148,6 +148,8 @@ EXPORT_SYMBOL(xpfo_kmap); void xpfo_kunmap(void *kaddr, struct page *page) { + bool flush_tlb = false; + if (!static_branch_unlikely(&xpfo_inited)) return; @@ -168,10 +170,13 @@ void xpfo_kunmap(void *kaddr, struct page *page) if (atomic_read(&page->xpfo_mapcount) == 0) { SetPageXpfoUnmapped(page); set_kpte(kaddr, page, __pgprot(0)); - xpfo_cond_flush_kernel_tlb(page, 0); + flush_tlb = true; } spin_unlock(&page->xpfo_lock); } + + if (flush_tlb) + xpfo_cond_flush_kernel_tlb(page, 0); } EXPORT_SYMBOL(xpfo_kunmap);