From patchwork Thu Jan 10 21:09:45 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Khalid Aziz X-Patchwork-Id: 10756923 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 ACFFE13B5 for ; Thu, 10 Jan 2019 21:11:33 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 9B06729BDC for ; Thu, 10 Jan 2019 21:11:33 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 98A6C29BFF; Thu, 10 Jan 2019 21:11:33 +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 06A3A29BDC for ; Thu, 10 Jan 2019 21:11:33 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 9DDEE8E0012; Thu, 10 Jan 2019 16:11:05 -0500 (EST) Delivered-To: linux-mm-outgoing@kvack.org Received: by kanga.kvack.org (Postfix, from userid 40) id 995738E0008; Thu, 10 Jan 2019 16:11:05 -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 7E1588E0012; Thu, 10 Jan 2019 16:11:05 -0500 (EST) X-Original-To: linux-mm@kvack.org X-Delivered-To: linux-mm@kvack.org Received: from mail-pg1-f197.google.com (mail-pg1-f197.google.com [209.85.215.197]) by kanga.kvack.org (Postfix) with ESMTP id 3BD128E0008 for ; Thu, 10 Jan 2019 16:11:05 -0500 (EST) Received: by mail-pg1-f197.google.com with SMTP id x26so7082947pgc.5 for ; Thu, 10 Jan 2019 13:11:05 -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=UbctwoSk8tN3IcjUiRawhNiiTGCYFxkfE1vdJR34/p4=; b=VM99Gbgvc8yu0p6AIOTraqo92Wpb8anyEWW4XHbSmw+uTO3wViCAXR0uOzeO8tnOGV tZvF9p0We6M/oF+fGZy3utn0eU2ElIGR38CvjkE+rM3Ia2WdPz3pfRZDBrusNBMoSA+7 aUkpD8ZwErw/jtFqz7SmHIAzvqLAS7U416ebMVi8U3pKpGjY6/SEURPcBpViPSWU1Uk9 Z/mu3Jh45KLhasn2vToarVGCPMbD4nzhXUs2vnxlJn1B8krst8aMD59nhzHLbGu7ZPXy vVtb26+zK7XSVpAwaXoUm4Phx/GFUM2/Dt1BE2D+C0PCeIKp+5vlnwdBUqz+CXru4Hzg GuCg== X-Gm-Message-State: AJcUukfXlhi59RFWv6Ic6GE+rYbBJwmLiVhl0yM55HlmzUyvMU4xaE/h eEugDe985WH2tmKJUitJPrtNBksXyp3hY1lQAVAYxPUw8wzLXpeB36RhtS7sdCnTU7KRYO54Q+H 7KyEqYsGBCJD/tBDn4I3bpQivYRLJvd7fez4vL1sTuxU5w/ArPnggcwplPGJOvSMFhg== X-Received: by 2002:a17:902:b282:: with SMTP id u2mr12089691plr.89.1547154664900; Thu, 10 Jan 2019 13:11:04 -0800 (PST) X-Google-Smtp-Source: ALg8bN7eWW/MlNis2T9WqtgSRUcdmsNJsQ4anq5FBDJbzeCxe8MB343rHLOjbNYYyXHRrcg/Kc0Q X-Received: by 2002:a17:902:b282:: with SMTP id u2mr12089662plr.89.1547154664303; Thu, 10 Jan 2019 13:11:04 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1547154664; cv=none; d=google.com; s=arc-20160816; b=wNr9Wj6BZZSGWVq3LrQ7GPlLvvThUw2J3U6NKcMRiAAyTLlsTPaR2t9VnO0zpKdtSU uMsY7vG0xDM5aC+xGXuaQ8rC9kDzkn5oGKn/X6yV8XMdmp8MLziDjioCwm2hbi6YoK59 fgfQlt8gMbhdseMWh+0rR+xXlhiimb5YRwYWiyCtzj8bYPrtO9KZMU02SRpmAfrsuKWQ 9NAO1ynAkMmdBiCFxA/UP74puSbZRSjpO70Pvb0T8fmh4/Zwqvi45VFHvuUMtE9xcb8i fPdj61subgxWy2GqnYyiFXxj6SKGO+oCfg3+bFBjMPfVTDwiQpjeE7jkqRhaT6ZaZoEg gFpw== 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=UbctwoSk8tN3IcjUiRawhNiiTGCYFxkfE1vdJR34/p4=; b=p9DwMHur/sdvvVbW105sSyWjy0RUXpm/ocGX9Wp3u+G7iulyLDNtj5Wkf9D1AS7rnG FRmuboID+83Cjwneu+5cN+Qp6OvZZr+O58KDnc9GmWDmm/j0g+Y7T5HHlXcgxz7D0Ycb R06nYeSysI/ZsdehXPAFN/cRqKg7Awx610bRb6FXlHhOC6J9oBB+89TKPgVFzc1OjZwD fxpMsBofD+a63vk/ZwrokLCMg4y7Aot993QKJsUxZC6ErBUIwBhBjbvTIlkfwafhBqkE Oj853bUpO6u3t/vCz2giq0W76kzZ8JagPKsr+1kFgJMZOpSjjVNVTXWifVESQ939zcDL F5lQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@oracle.com header.s=corp-2018-07-02 header.b=pXlQwsE6; spf=pass (google.com: domain of khalid.aziz@oracle.com designates 141.146.126.79 as permitted sender) smtp.mailfrom=khalid.aziz@oracle.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=oracle.com Received: from aserp2130.oracle.com (aserp2130.oracle.com. [141.146.126.79]) by mx.google.com with ESMTPS id f13si3453629pln.368.2019.01.10.13.11.03 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 10 Jan 2019 13:11:04 -0800 (PST) Received-SPF: pass (google.com: domain of khalid.aziz@oracle.com designates 141.146.126.79 as permitted sender) client-ip=141.146.126.79; Authentication-Results: mx.google.com; dkim=pass header.i=@oracle.com header.s=corp-2018-07-02 header.b=pXlQwsE6; spf=pass (google.com: domain of khalid.aziz@oracle.com designates 141.146.126.79 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 (aserp2130.oracle.com [127.0.0.1]) by aserp2130.oracle.com (8.16.0.22/8.16.0.22) with SMTP id x0AL916A187109; Thu, 10 Jan 2019 21:10:41 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=UbctwoSk8tN3IcjUiRawhNiiTGCYFxkfE1vdJR34/p4=; b=pXlQwsE6eT5Gwd80itwTVz5RN+Ix5BpvxJmBfde1uZygV+Rslofe7x724kOLvkrhuoDm VaufXFJc0x/bhg4csb86xgTa5oRsgGXNUwpk6jBaSYVCOK08HIMLKrRQFFXQuF/ljQLa c9M5nGEttCW3mctUWC2vYB1gn4wLmkHIUFEx/Aw1I+7qiQ3knEVUexcfa2bolqzEyvV3 LmtzvRDDdYXn9ZOKH/gctHRPShqvLWBf/rOrAA8BIVQSKsMuP44bA/KoMe+nCz6XDCkg Fj6Mqgg33kI6zR9S0fSK8spVh3Dy3zDN5Jmnk4/mwptg9ykfT++lnvDkaEVHNpTf9Xm8 jw== Received: from userv0021.oracle.com (userv0021.oracle.com [156.151.31.71]) by aserp2130.oracle.com with ESMTP id 2ptj3e9thr-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Thu, 10 Jan 2019 21:10:41 +0000 Received: from userv0122.oracle.com (userv0122.oracle.com [156.151.31.75]) by userv0021.oracle.com (8.14.4/8.14.4) with ESMTP id x0ALAeA3009832 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Thu, 10 Jan 2019 21:10:40 GMT Received: from abhmp0009.oracle.com (abhmp0009.oracle.com [141.146.116.15]) by userv0122.oracle.com (8.14.4/8.14.4) with ESMTP id x0ALAdwe021399; Thu, 10 Jan 2019 21:10:39 GMT Received: from concerto.internal (/24.9.64.241) by default (Oracle Beehive Gateway v4.0) with ESMTP ; Thu, 10 Jan 2019 13:10:38 -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: 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, x86@kernel.org, "Vasileios P . Kemerlis" , Juerg Haefliger , Tycho Andersen , Marco Benatto , David Woodhouse , Khalid Aziz Subject: [RFC PATCH v7 13/16] xpfo, mm: optimize spinlock usage in xpfo_kunmap Date: Thu, 10 Jan 2019 14:09:45 -0700 Message-Id: <95b6fa40ce6c7afb4a9e58f8d747d86aa7a94177.1547153058.git.khalid.aziz@oracle.com> 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=822 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 From: Julian Stecklina Only the xpfo_kunmap call that needs to actually unmap the page needs to be serialized. We need to be careful to handle the case, where after the atomic decrement of the mapcount, a xpfo_kmap increased the mapcount again. In this case, we can safely skip modifying the page table. Model-checked with up to 4 concurrent callers with Spin. Signed-off-by: Julian Stecklina Cc: x86@kernel.org Cc: kernel-hardening@lists.openwall.com Cc: Vasileios P. Kemerlis Cc: Juerg Haefliger Cc: Tycho Andersen Cc: Marco Benatto Cc: David Woodhouse Signed-off-by: Khalid Aziz --- mm/xpfo.c | 22 ++++++++++++---------- 1 file changed, 12 insertions(+), 10 deletions(-) diff --git a/mm/xpfo.c b/mm/xpfo.c index cbfeafc2f10f..dbf20efb0499 100644 --- a/mm/xpfo.c +++ b/mm/xpfo.c @@ -149,22 +149,24 @@ void xpfo_kunmap(void *kaddr, struct page *page) if (!PageXpfoUser(page)) return; - spin_lock(&page->xpfo_lock); - /* * The page is to be allocated back to user space, so unmap it from the * kernel, flush the TLB and tag it as a user page. */ if (atomic_dec_return(&page->xpfo_mapcount) == 0) { -#ifdef CONFIG_XPFO_DEBUG - BUG_ON(PageXpfoUnmapped(page)); -#endif - SetPageXpfoUnmapped(page); - set_kpte(kaddr, page, __pgprot(0)); - xpfo_cond_flush_kernel_tlb(page, 0); - } + spin_lock(&page->xpfo_lock); - spin_unlock(&page->xpfo_lock); + /* + * In the case, where we raced with kmap after the + * atomic_dec_return, we must not nuke the mapping. + */ + if (atomic_read(&page->xpfo_mapcount) == 0) { + SetPageXpfoUnmapped(page); + set_kpte(kaddr, page, __pgprot(0)); + xpfo_cond_flush_kernel_tlb(page, 0); + } + spin_unlock(&page->xpfo_lock); + } } EXPORT_SYMBOL(xpfo_kunmap);