From patchwork Wed Aug 23 22:27:04 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Boris Ostrovsky X-Patchwork-Id: 9918543 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 7A09A602CB for ; Wed, 23 Aug 2017 22:27:02 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 6CE1928A98 for ; Wed, 23 Aug 2017 22:27:02 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 6075428AA1; Wed, 23 Aug 2017 22:27:02 +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, UNPARSEABLE_RELAY 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 F054628A98 for ; Wed, 23 Aug 2017 22:27:01 +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 1dke4W-00018r-Mg; Wed, 23 Aug 2017 22:24:24 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from ) id 1dke4V-00018l-Lg for xen-devel@lists.xenproject.org; Wed, 23 Aug 2017 22:24:23 +0000 Received: from [85.158.139.211] by server-13.bemta-5.messagelabs.com id E3/80-01732-6900E995; Wed, 23 Aug 2017 22:24:22 +0000 X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFnrPLMWRWlGSWpSXmKPExsXSO6nOVXcaw7x Ig48zuS2+b5nM5MDocfjDFZYAxijWzLyk/IoE1oyPJ3YwFqzjrNjfGdjA+IG9i5GLQ0hgIpPE 3o4lUM5fRolNrW2sEM4GRomjJ2GcHkaJ1TNWsHUxcnKwCRhJnD06nRHEFhEQljh+dBsziM0sU CYx8eUsMFtYIFyitfsMC4jNIqAqcXbKCnYQm1fAS+LRtydgtoSAgsSUh++ZIWxDidMPtzFOYO RZwMiwilG9OLWoLLVI11AvqSgzPaMkNzEzR9fQwFQvN7W4ODE9NScxqVgvOT93EyPQ8/UMDIw 7GJt6nQ8xSnIwKYnyrlsxN1KILyk/pTIjsTgjvqg0J7X4EKMMB4eSBK//f6CcYFFqempFWmYO MARh0hIcPEoivNUgad7igsTc4sx0iNQpRl2ODavXf2ESYsnLz0uVEudVAikSACnKKM2DGwGLh 0uMslLCvIwMDAxCPAWpRbmZJajyrxjFORiVhHlTQabwZOaVwG16BXQEE9ARk07MATmiJBEhJd XAyO6w5K8sy/n2OfmXrvZ/dGb/K372dv9SlXD/peVn5O7Oaz/zTflPOlPj18dxXlt6jl+z4lg h0xiWpPnDMno9l3XdVLeKAzvEGP1Fn0+/4S7dYLRJPIitfqu4+ezggmsPuw29ohqsDTh/zv/v s26+vo6F8dyZ87/FLvialTtlwYaPC/RnVvWVKLEUZyQaajEXFScCAC+JCgSCAgAA X-Env-Sender: boris.ostrovsky@oracle.com X-Msg-Ref: server-9.tower-206.messagelabs.com!1503527059!108684738!1 X-Originating-IP: [141.146.126.69] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogMTQxLjE0Ni4xMjYuNjkgPT4gMjc3MjE4\n X-StarScan-Received: X-StarScan-Version: 9.4.45; banners=-,-,- X-VirusChecked: Checked Received: (qmail 51062 invoked from network); 23 Aug 2017 22:24:21 -0000 Received: from aserp1040.oracle.com (HELO aserp1040.oracle.com) (141.146.126.69) by server-9.tower-206.messagelabs.com with DHE-RSA-AES256-GCM-SHA384 encrypted SMTP; 23 Aug 2017 22:24:21 -0000 Received: from userv0021.oracle.com (userv0021.oracle.com [156.151.31.71]) by aserp1040.oracle.com (Sentrion-MTA-4.3.2/Sentrion-MTA-4.3.2) with ESMTP id v7NMOI5X020915 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Wed, 23 Aug 2017 22:24:19 GMT Received: from aserv0122.oracle.com (aserv0122.oracle.com [141.146.126.236]) by userv0021.oracle.com (8.14.4/8.14.4) with ESMTP id v7NMOHwY009652 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Wed, 23 Aug 2017 22:24:18 GMT Received: from abhmp0003.oracle.com (abhmp0003.oracle.com [141.146.116.9]) by aserv0122.oracle.com (8.14.4/8.14.4) with ESMTP id v7NMOH8M016153; Wed, 23 Aug 2017 22:24:17 GMT Received: from ovs104.us.oracle.com (/10.149.76.204) by default (Oracle Beehive Gateway v4.0) with ESMTP ; Wed, 23 Aug 2017 15:24:17 -0700 From: Boris Ostrovsky To: jgross@suse.com Date: Wed, 23 Aug 2017 18:27:04 -0400 Message-Id: <1503527224-12390-1-git-send-email-boris.ostrovsky@oracle.com> X-Mailer: git-send-email 1.8.3.1 X-Source-IP: userv0021.oracle.com [156.151.31.71] Cc: xen-devel@lists.xenproject.org, Boris Ostrovsky , linux-kernel@vger.kernel.org Subject: [Xen-devel] [PATCH] xen: Don't try to call xen_alloc_p2m_entry() on autotranslating guests 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: , MIME-Version: 1.0 Errors-To: xen-devel-bounces@lists.xen.org Sender: "Xen-devel" X-Virus-Scanned: ClamAV using ClamSMTP Commit aba831a69632 ("xen: remove tests for pvh mode in pure pv paths") removed XENFEAT_auto_translated_physmap test in xen_alloc_p2m_entry() since it is assumed that the routine is never called by non-PV guests. However, alloc_xenballooned_pages() may make this call on a PVH guest. Prevent this from happening by adding XENFEAT_auto_translated_physmap check there. Signed-off-by: Boris Ostrovsky Fixes: aba831a69632 ("xen: remove tests for pvh mode in pure pv paths") Reviewed-by: Juergen Gross --- drivers/xen/balloon.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/drivers/xen/balloon.c b/drivers/xen/balloon.c index ab60925..f77e499 100644 --- a/drivers/xen/balloon.c +++ b/drivers/xen/balloon.c @@ -664,9 +664,11 @@ int alloc_xenballooned_pages(int nr_pages, struct page **pages) */ BUILD_BUG_ON(XEN_PAGE_SIZE != PAGE_SIZE); - ret = xen_alloc_p2m_entry(page_to_pfn(page)); - if (ret < 0) - goto out_undo; + if (!xen_feature(XENFEAT_auto_translated_physmap)) { + ret = xen_alloc_p2m_entry(page_to_pfn(page)); + if (ret < 0) + goto out_undo; + } #endif } else { ret = add_ballooned_pages(nr_pages - pgno);