From patchwork Thu Oct 12 10:01:11 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jan Beulich X-Patchwork-Id: 10001447 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 1C40560325 for ; Thu, 12 Oct 2017 10:03:15 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 0E38928D4F for ; Thu, 12 Oct 2017 10:03:15 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 0346528D5A; Thu, 12 Oct 2017 10:03:15 +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=-4.2 required=2.0 tests=BAYES_00, RCVD_IN_DNSWL_MED autolearn=ham version=3.3.1 Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) (using TLSv1.2 with cipher AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 9B4EF28D4F for ; Thu, 12 Oct 2017 10:03:14 +0000 (UTC) Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from ) id 1e2aIq-0001k7-AU; Thu, 12 Oct 2017 10:01:20 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from ) id 1e2aIo-0001jg-JT for xen-devel@lists.xenproject.org; Thu, 12 Oct 2017 10:01:18 +0000 Received: from [85.158.137.68] by server-7.bemta-3.messagelabs.com id 33/A4-05651-D6D3FD95; Thu, 12 Oct 2017 10:01:17 +0000 X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFlrDIsWRWlGSWpSXmKPExsXS6fjDSzfb9n6 kwbQOVovvWyYzOTB6HP5whSWAMYo1My8pvyKBNePMuguMBZ85K1bMOMPWwHiTtYuRk0NIIE/i wOYpQDYHB6+AnUTrKy6QsISAocTphTdZQMIsAqoSK654g4TZBNQl2p5tB6sWETCQOHc0CcRkF tCX2LaOBaRCWCBAYt3JLywQs+0knry8wARicwrYS3S8nc0MsUdQ4u8OYZAws4CWxMNft1ggbG 2JZQtfM0NMlJZY/o9jAiPfLISGWUgaZiFpmIXQsICRZRWjenFqUVlqka6hXlJRZnpGSW5iZo6 uoYGxXm5qcXFiempOYlKxXnJ+7iZGYMgxAMEOxuUfnQ4xSnIwKYnyXrt3L1KILyk/pTIjsTgj vqg0J7X4EKMMB4eSBC8DMISFBItS01Mr0jJzgMEPk5bg4FES4d1pA5TmLS5IzC3OTIdInWLU5 ei4efcPkxBLXn5eqpQ470yQIgGQoozSPLgRsEi8xCgrJczLCHSUEE9BalFuZgmq/CtGcQ5GJW HeySBTeDLzSuA2vQI6ggnoCNG0OyBHlCQipKQaGJnnHjy04FnJx8S2AzWB7wSY5fksS5n5fwV sC2xr7TW1XLnSmqX9pfH1LYnZKTdiF0pVCL1dc/Hm0rYrxzUOTeP06nBOYVxncfb805nxsYnH U5x/xtrufRu/qjjswbQVXbcauL0+/dl7s7j3iujlDqYPPU2uT+Rtuf+KiPbecrS9P6tkw5aC4 0osxRmJhlrMRcWJAFV8XdK/AgAA X-Env-Sender: JBeulich@suse.com X-Msg-Ref: server-12.tower-31.messagelabs.com!1507802473!93136389!1 X-Originating-IP: [137.65.248.74] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 9.4.45; banners=-,-,- X-VirusChecked: Checked Received: (qmail 27747 invoked from network); 12 Oct 2017 10:01:14 -0000 Received: from prv-mh.provo.novell.com (HELO prv-mh.provo.novell.com) (137.65.248.74) by server-12.tower-31.messagelabs.com with DHE-RSA-AES256-GCM-SHA384 encrypted SMTP; 12 Oct 2017 10:01:14 -0000 Received: from INET-PRV-MTA by prv-mh.provo.novell.com with Novell_GroupWise; Thu, 12 Oct 2017 04:01:13 -0600 Message-Id: <59DF59870200007800185560@prv-mh.provo.novell.com> X-Mailer: Novell GroupWise Internet Agent 14.2.2 Date: Thu, 12 Oct 2017 04:01:11 -0600 From: "Jan Beulich" To: "xen-devel" References: <59DF54320200007800185513@prv-mh.provo.novell.com> In-Reply-To: <59DF54320200007800185513@prv-mh.provo.novell.com> Mime-Version: 1.0 Content-Disposition: inline Cc: Andrew Cooper Subject: [Xen-devel] [PATCH 3/3] x86: tighten MMU_*PT_UPDATE* check and combine error paths X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xen.org Sender: "Xen-devel" X-Virus-Scanned: ClamAV using ClamSMTP Don't accept anything other than r/w RAM pages and move the paged-out check into the (unlikely) error path following that check. Signed-off-by: Jan Beulich --- a/xen/arch/x86/mm.c +++ b/xen/arch/x86/mm.c @@ -3507,18 +3507,18 @@ long do_mmu_update( gmfn = req.ptr >> PAGE_SHIFT; page = get_page_from_gfn(pt_owner, gmfn, &p2mt, P2M_ALLOC); - if ( p2m_is_paged(p2mt) ) + if ( unlikely(!page) || p2mt != p2m_ram_rw ) { - ASSERT(!page); - p2m_mem_paging_populate(pt_owner, gmfn); - rc = -ENOENT; - break; - } - - if ( unlikely(!page) ) - { - gdprintk(XENLOG_WARNING, - "Could not get page for normal update\n"); + if ( page ) + put_page(page); + if ( p2m_is_paged(p2mt) ) + { + p2m_mem_paging_populate(pt_owner, gmfn); + rc = -ENOENT; + } + else + gdprintk(XENLOG_WARNING, + "Could not get page for normal update\n"); break; }