From patchwork Mon Aug 28 17:32:26 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Oleksandr Tyshchenko X-Patchwork-Id: 9925923 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 F2ABB60380 for ; Mon, 28 Aug 2017 17:34:47 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id E3AC62876C for ; Mon, 28 Aug 2017 17:34:47 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id D89CD28774; Mon, 28 Aug 2017 17:34:47 +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.6 required=2.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, RCVD_IN_DNSWL_MED, RCVD_IN_SORBS_SPAM, T_DKIM_INVALID 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 1462F2876C for ; Mon, 28 Aug 2017 17:34:45 +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 1dmNu3-0007NO-A3; Mon, 28 Aug 2017 17:32:47 +0000 Received: from mail6.bemta6.messagelabs.com ([193.109.254.103]) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from ) id 1dmNu2-0007Mq-6n for xen-devel@lists.xenproject.org; Mon, 28 Aug 2017 17:32:46 +0000 Received: from [193.109.254.147] by server-2.bemta-6.messagelabs.com id B8/D9-11743-DB354A95; Mon, 28 Aug 2017 17:32:45 +0000 X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFlrOIsWRWlGSWpSXmKPExsVyMfS6s+6e4CW RBpvOqll83zKZyYHR4/CHKywBjFGsmXlJ+RUJrBlHd/9gKnjPU7FtxSL2BsY5XF2MXBxCAtMZ Je7fXMoK4rAIvGSR2Ll8JhuIIyHQzyqxYed69i5GTiAnTuL2373MEHa5xIZpExhBbCEBJYnXO zczQYyaySTxu3U9WIJNwEBi/7snYM0iQEX3Vk1mArGZBTIkjq+ZxwZiCwPZH96vZQWxWQRUJb 43fABbwCvgLDH7/G42iGVyEjfPdYLFOQVcJB6v7YFa7Czxa1Mn8wRGgQWMDKsYNYpTi8pSi3Q NTfSSijLTM0pyEzNzdA0NzPRyU4uLE9NTcxKTivWS83M3MQKDiwEIdjBe3xhwiFGSg0lJlHdn xeJIIb6k/JTKjMTijPii0pzU4kOMMhwcShK8xUFLIoUEi1LTUyvSMnOAYQ6TluDgURLhXQyS5 i0uSMwtzkyHSJ1iNOa4cmXdFyaOKQe2f2ESYsnLz0uVEufdCVIqAFKaUZoHNwgWf5cYZaWEeR mBThPiKUgtys0sQZV/xSjOwagkzKsKMoUnM68Ebt8roFOYgE5RFFwIckpJIkJKqoFRL/Dank3 KyScTnxXqmAhcYtvluPzvd8nqJjcXw57nPm32zGmFc40Dj2yJXRLyKmX1rBot2abYCwuU1nAc juo7c/Xd1+1zzpw4X8hy0nFvT2OGUuxDTvezM6LZt3276Lr0sHuPMuPZ/sYiby0LWetFT7Tyz BjqDxzVnCzPptwYn/ZpLvtdyUIlluKMREMt5qLiRACxo7B1ugIAAA== X-Env-Sender: olekstysh@gmail.com X-Msg-Ref: server-6.tower-27.messagelabs.com!1503941564!114010545!1 X-Originating-IP: [209.85.215.67] 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 48602 invoked from network); 28 Aug 2017 17:32:44 -0000 Received: from mail-lf0-f67.google.com (HELO mail-lf0-f67.google.com) (209.85.215.67) by server-6.tower-27.messagelabs.com with AES128-GCM-SHA256 encrypted SMTP; 28 Aug 2017 17:32:44 -0000 Received: by mail-lf0-f67.google.com with SMTP id o124so772285lfo.1 for ; Mon, 28 Aug 2017 10:32:44 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=JQlcDL4hfPqFefFiuIeADoHOQJLCE4GaFH9Y0sIsd+c=; b=Mj+3bivqg1FfkmeG+T98dQ8rPJ2bs11EKZsxYiN2E4atUN76bNGwtyqlaIuCh5b0N0 fleYxFzgQ3lZ9qOR+/3o0EmiD0rw/RPZDcwTaiOZxZ3CzwFBitZCNS80GSNsBjRZuEIR QVyF4u7+HMkEOwpEJTvf+QMteY7fSOhYsi1qim9/34PUHQG0L2lLx6DzOANAtkkZBUWq XgZCBq1zfxDOfssmpZfqNCpdbXGdm5z9jwBiPKoq+eKey7IV/WRn3YcUV211Uw+tZZRC bTqSqhcz4ENiMg3FJXbxOjgohQeTicCv1ExotRp9kxWbJ10d7J1QGee8aHgmRv4sxkoI P0jg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=JQlcDL4hfPqFefFiuIeADoHOQJLCE4GaFH9Y0sIsd+c=; b=SBfDCDFflml3lhh4hmFZsyL4YIQC56P8md22xprUFJi2O91ayKXXOeg764vRmB7f9X nXz9opW5CSlYbhw7KDohg78GmiCRYiw8gt8TRtFGNrjxdfAXU2pEAQMP4oyZOHCJykaf uYChw/OJgoMoPWPU/uyJ31VoxerNY7nva37duoHQ49mjKDovvbaMnF/EWQx0B0T8xpGC KRZKLYf69SmFRLt6jvb9yuDVn4yRMBLBpIA3o3/pdl3OdwxS1m36V5iRb0C+RZgAFhkg 83XDV54fNjZTRfx2gF8FTfW9dzcCaSRMfU5yHh2lU/Cpd48oFzVGVZqD0bKtNbXMz7vM JFQQ== X-Gm-Message-State: AHYfb5gPDEkbCcQF5aHwZ8gqTuO4gXY7Sq4MIzlzF0b6zg/Wu8n1ThMX j/wN4Pse8LpXXwwV X-Received: by 10.46.84.77 with SMTP id y13mr480404ljd.147.1503941563625; Mon, 28 Aug 2017 10:32:43 -0700 (PDT) Received: from otyshchenko.kyiv.epam.com (ll-53.209.223.85.sovam.net.ua. [85.223.209.53]) by smtp.gmail.com with ESMTPSA id u6sm156754lfk.56.2017.08.28.10.32.40 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 28 Aug 2017 10:32:41 -0700 (PDT) From: Oleksandr Tyshchenko To: xen-devel@lists.xenproject.org Date: Mon, 28 Aug 2017 20:32:26 +0300 Message-Id: <1503941546-24716-3-git-send-email-olekstysh@gmail.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1503941546-24716-1-git-send-email-olekstysh@gmail.com> References: <1503941546-24716-1-git-send-email-olekstysh@gmail.com> Cc: Oleksandr Tyshchenko , julien.grall@arm.com, sstabellini@kernel.org Subject: [Xen-devel] [PATCH v1 2/2] xen/arm: p2m: Check for p2m->domain to be initialized before releasing resources 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 From: Oleksandr Tyshchenko Since p2m_teardown() can be called when p2m_init() haven't executed yet we might deal with unitialized list "p2m->pages" which leads to crash. To avoid this use back pointer to domain as end-of-initialization indicator. Signed-off-by: Oleksandr Tyshchenko Reviewed-by: Stefano Stabellini --- xen/arch/arm/p2m.c | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/xen/arch/arm/p2m.c b/xen/arch/arm/p2m.c index c484469..141ae7e 100644 --- a/xen/arch/arm/p2m.c +++ b/xen/arch/arm/p2m.c @@ -1219,6 +1219,9 @@ void p2m_teardown(struct domain *d) struct p2m_domain *p2m = p2m_get_hostp2m(d); struct page_info *pg; + if ( !p2m->domain ) + return; + while ( (pg = page_list_remove_head(&p2m->pages)) ) free_domheap_page(pg); @@ -1230,6 +1233,8 @@ void p2m_teardown(struct domain *d) p2m_free_vmid(d); radix_tree_destroy(&p2m->mem_access_settings, NULL); + + p2m->domain = NULL; } int p2m_init(struct domain *d) @@ -1247,7 +1252,6 @@ int p2m_init(struct domain *d) if ( rc != 0 ) return rc; - p2m->domain = d; p2m->max_mapped_gfn = _gfn(0); p2m->lowest_mapped_gfn = _gfn(ULONG_MAX); @@ -1276,6 +1280,13 @@ int p2m_init(struct domain *d) for_each_possible_cpu(cpu) p2m->last_vcpu_ran[cpu] = INVALID_VCPU_ID; + /* + * Besides getting a domain when we only have the p2m in hand, + * the back pointer to domain is also used in p2m_teardown() + * as an end-of-initialization indicator. + */ + p2m->domain = d; + return rc; }