From patchwork Tue Oct 26 16:05:10 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Oleksandr Tyshchenko X-Patchwork-Id: 12585099 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 0BD34C433EF for ; Tue, 26 Oct 2021 16:11:09 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id CEE1C60EB9 for ; Tue, 26 Oct 2021 16:11:08 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.1 mail.kernel.org CEE1C60EB9 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:MIME-Version:List-Subscribe:List-Help: List-Post:List-Archive:List-Unsubscribe:List-Id:References:In-Reply-To: Message-Id:Date:Subject:Cc:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=4R0F2YQAO57orqHPOrWK2MSqIaDnaI3n6LfBNr2wgfE=; b=FH0HXxBwV4FXTO zrf9cFQHA62OXGI6GsLlbKNDoB3ni2I4SgcAL2dJLRhsfQK0T/c7yw83SQBhV5XXeQntA3byu9l4C VuEv+flECr3A6Y21AvQ/qAz+oDEQ/O9kgA/+6/CwWM2F+B1T9/M45oWSqiZxnY5tfiah0dRN7Cpgw OF1h4pjE5bkwvz8YT9d5cekZOOu38oJLrgeyeXDpu2KNURhAcR2VjIjNxrsQ5w9PRFffo93SUqCUG 6JuQnoUsD8FPZP4dLAKi8r+2YYZuJr5l4BJj5JU1yPrzH0mSp5YborTqiaG3m0GGadYcM6fbnyCNi MdxfU4GKQHQqqRcU5RyQ==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1mfP0e-002LiG-AY; Tue, 26 Oct 2021 16:09:09 +0000 Received: from mail-ed1-x531.google.com ([2a00:1450:4864:20::531]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1mfOzt-002LPi-IN for linux-arm-kernel@lists.infradead.org; Tue, 26 Oct 2021 16:08:23 +0000 Received: by mail-ed1-x531.google.com with SMTP id r12so16422887edt.6 for ; Tue, 26 Oct 2021 09:08:20 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=LFIfrPhDzMtnbpEZVPATV5Kch9wCoKpxpC7Ie87gFbI=; b=bs16QmQOkeJH5M96StGB5D0kKi6yFSOn6Bb9Z1JxuWPs8n7m9DKoVvOrnj02v/zFzP xDOoHIzz+zeajJzCemByRC4cUhlUVLJVjRbHpcKMUnYABP7tE+tsTgFM1I0SHu8abRc8 ODiLRcwwLBdfek+yo1znmX1Q9TEwfSC5fNtbn5wv1OaBbxTqRsgloUZ+TK0SbXmiGJc6 G1GHBYDlnnzrXk8efngJ4GTPAToixurpJzxE7zWSYia37K7y1+/QPLPRYdE4AahOmGMH lbGNyaSdDwcEo4G2rc2sREnoAaA4RLoLBKyH/sIz8xNUN6PVFS8Z3UgSMF4X9vhzAjci 1gnw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=LFIfrPhDzMtnbpEZVPATV5Kch9wCoKpxpC7Ie87gFbI=; b=i48jbtoKm9aSeukvo2FSlVijIHC9EdkwmpOVur2feMkwi6/OTWzsWYAwCrcps+u24r MBq4dbv1esWMJNkr1AFPiPZbZC6H71yuk+52l/Bo+o86RLgIZYCBu7FYVlSp7RwYdM33 5Go+hLbcGDJ2xql43bYQTeU8ahlrB4Hi6lqYTfSiE9Ow+aYs6iSHCYG0BmH24/40sFe8 8HNIzSjDZ0cCEzuhpz3iMxfwI40qioi7wkz5XJEpcf1YvDsGOcM/rOEPj0RGMwVX9l62 9L7pNhkp965Q2yUazDgPo1rsPZJdU6Zw5vnQn3ZM+8RzHgo3T3A2yuq5T4/IiDiixdVx 7YGQ== X-Gm-Message-State: AOAM5313AJuxo2ui2GY34XIO2ybIhQHEC7plQsJXLh+e0e/s3lYPK6tK 2Hky9nojTMt71ob649P2G5alHe1WSGI= X-Google-Smtp-Source: ABdhPJyDWvPDbHKN80B2wI0HUdKZkTQtxYSe3AhrmMT52rr89emWm0qnYTKAFM1mwoDlbefou8hA/Q== X-Received: by 2002:a05:6402:486:: with SMTP id k6mr11970130edv.315.1635264321080; Tue, 26 Oct 2021 09:05:21 -0700 (PDT) Received: from otyshchenko.router ([212.22.223.21]) by smtp.gmail.com with ESMTPSA id eu9sm4025195ejc.14.2021.10.26.09.05.20 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Tue, 26 Oct 2021 09:05:20 -0700 (PDT) From: Oleksandr Tyshchenko To: xen-devel@lists.xenproject.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org Cc: Oleksandr Tyshchenko , Stefano Stabellini , Russell King , Julien Grall Subject: [PATCH V2 2/4] arm/xen: Switch to use gnttab_setup_auto_xlat_frames() for DT Date: Tue, 26 Oct 2021 19:05:10 +0300 Message-Id: <1635264312-3796-3-git-send-email-olekstysh@gmail.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1635264312-3796-1-git-send-email-olekstysh@gmail.com> References: <1635264312-3796-1-git-send-email-olekstysh@gmail.com> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20211026_090821_659612_D2704356 X-CRM114-Status: GOOD ( 21.20 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org From: Oleksandr Tyshchenko Read the start address of the grant table space from DT (region 0). This patch mostly restores behaviour before commit 3cf4095d7446 ("arm/xen: Use xen_xlate_map_ballooned_pages to setup grant table") but trying not to break the ACPI support added after that commit. So the patch touches DT part only and leaves the ACPI part with xen_xlate_map_ballooned_pages(). This is a preparation for using Xen extended region feature where unused regions of guest physical address space (provided by the hypervisor) will be used to create grant/foreign/whatever mappings instead of wasting real RAM pages from the domain memory for establishing these mappings. The immediate benefit of this change: - Avoid superpage shattering in Xen P2M when establishing stage-2 mapping (GFN <-> MFN) for the grant table space - Avoid wasting real RAM pages (reducing the amount of memory usuable) for mapping grant table space - The grant table space is always mapped at the exact same place (region 0 is reserved for the grant table) Signed-off-by: Oleksandr Tyshchenko --- Changes RFC -> V2: - new patch --- arch/arm/xen/enlighten.c | 32 +++++++++++++++++++++++++------- 1 file changed, 25 insertions(+), 7 deletions(-) diff --git a/arch/arm/xen/enlighten.c b/arch/arm/xen/enlighten.c index 7f1c106b..dea46ec 100644 --- a/arch/arm/xen/enlighten.c +++ b/arch/arm/xen/enlighten.c @@ -59,6 +59,9 @@ unsigned long xen_released_pages; struct xen_memory_region xen_extra_mem[XEN_EXTRA_MEM_MAX_REGIONS] __initdata; static __read_mostly unsigned int xen_events_irq; +static phys_addr_t xen_grant_frames; + +#define GRANT_TABLE_INDEX 0 uint32_t xen_start_flags; EXPORT_SYMBOL(xen_start_flags); @@ -303,6 +306,7 @@ static void __init xen_acpi_guest_init(void) static void __init xen_dt_guest_init(void) { struct device_node *xen_node; + struct resource res; xen_node = of_find_compatible_node(NULL, NULL, "xen,xen"); if (!xen_node) { @@ -310,6 +314,12 @@ static void __init xen_dt_guest_init(void) return; } + if (of_address_to_resource(xen_node, GRANT_TABLE_INDEX, &res)) { + pr_err("Xen grant table region is not found\n"); + return; + } + xen_grant_frames = res.start; + xen_events_irq = irq_of_parse_and_map(xen_node, 0); } @@ -317,16 +327,20 @@ static int __init xen_guest_init(void) { struct xen_add_to_physmap xatp; struct shared_info *shared_info_page = NULL; - int cpu; + int rc, cpu; if (!xen_domain()) return 0; if (!acpi_disabled) xen_acpi_guest_init(); - else + else { xen_dt_guest_init(); + if (!xen_grant_frames) + return -ENODEV; + } + if (!xen_events_irq) { pr_err("Xen event channel interrupt not found\n"); return -ENODEV; @@ -370,12 +384,16 @@ static int __init xen_guest_init(void) for_each_possible_cpu(cpu) per_cpu(xen_vcpu_id, cpu) = cpu; - xen_auto_xlat_grant_frames.count = gnttab_max_grant_frames(); - if (xen_xlate_map_ballooned_pages(&xen_auto_xlat_grant_frames.pfn, - &xen_auto_xlat_grant_frames.vaddr, - xen_auto_xlat_grant_frames.count)) { + if (!acpi_disabled) { + xen_auto_xlat_grant_frames.count = gnttab_max_grant_frames(); + rc = xen_xlate_map_ballooned_pages(&xen_auto_xlat_grant_frames.pfn, + &xen_auto_xlat_grant_frames.vaddr, + xen_auto_xlat_grant_frames.count); + } else + rc = gnttab_setup_auto_xlat_frames(xen_grant_frames); + if (rc) { free_percpu(xen_vcpu_info); - return -ENOMEM; + return rc; } gnttab_init(); From patchwork Tue Oct 26 16:05:12 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Oleksandr Tyshchenko X-Patchwork-Id: 12585097 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id A1406C433EF for ; Tue, 26 Oct 2021 16:10:37 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 6F64A60EFE for ; Tue, 26 Oct 2021 16:10:37 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.1 mail.kernel.org 6F64A60EFE Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:MIME-Version:List-Subscribe:List-Help: List-Post:List-Archive:List-Unsubscribe:List-Id:References:In-Reply-To: Message-Id:Date:Subject:Cc:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=MfbyH2du6TXCm/+u+Pi+OtNhJxgpI7/ftOVsKOOLGR8=; b=hOWXtKqmG0q7V9 RqFul02/BUjeaklJF4IMek5eG63140s61fyWPvLv7zR/FBZJgnLfRN6I81JVt3x3yoC+oJkOhpRaH WhmhoR/FqgRVBNvw3rY49QVb+qxpnE15M5gh356f8djXp8sAyZ9OFiT25gPjEu0VcGPF4X0Z0Ql8Y 67R8SWOHr1aMS4kU/pbLb9kuelHIFBBXgrf/GmSgcgG0FoHLORWlE6DFg4zT8CyP8tQMlP4B8MbJn 4AjCqgWUHsVl/u1fBiZUrItwhoHdFHtkcmuPvLV5ieJUC7A2WYqWtrvsOL9qolZPQryJNxu2oVVNp fC/voa5q2wTz6Dh7McIg==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1mfP09-002LVK-JN; Tue, 26 Oct 2021 16:08:38 +0000 Received: from mail-ed1-x533.google.com ([2a00:1450:4864:20::533]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1mfOzd-002LLJ-3S for linux-arm-kernel@lists.infradead.org; Tue, 26 Oct 2021 16:08:07 +0000 Received: by mail-ed1-x533.google.com with SMTP id s1so15671797edd.3 for ; Tue, 26 Oct 2021 09:08:04 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=wgCQ3QpgBU+9Jo1johQyA8YH17F0xtomZ9AsDb/n0+k=; b=ErjQU0xF7MucZPckHXbirk+HxNHRkSp0ftkyRu6h2iwOhEb1+8lpFeakKm96+M1vrt vbgqEK316lrbPhq56wyunZz1slXFzySXAHjpl7l2X1RylcVS5UjbXcavz+df5VluZeo5 rhqg08YnA4j2D0jcYNVpA0/aT3jPn+lsaOITDNiwlSeIGHChg+T/kdFrahVXgd0v5QnV b/7SP50ygKAhav42t9BKm78sXv9KGYT1kZ6ZI3AN/0kEHd2F7FnWdty0PGISoNyIfYQW 1GEU778jvDLC9NnLu992kgqal847kKCrc3m3R2RYsoFeXGhbY9qA+qG+EkMzLsJsrCVR lVJQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=wgCQ3QpgBU+9Jo1johQyA8YH17F0xtomZ9AsDb/n0+k=; b=oaNM5wnpUWvRoLoVNqewLhSAMsLvcKlcizluYuTs7n9125zW1huo17u3tGHXQnlaHk Jeo09b2UzVOpxpKuDXLXj6xgOfYsuoxxlwU+Ho5xKH5R3z86yjtxeFBr9e1nkY1Ny+Ps j+TVWAx0UBHSHfSridK8dSP+x+wDPLzJEX62lEELFJklV7ubdH5nEx7XUBeeUN8HoSRU AqnA3Z0J8O2H4soNyAaPdCKJ5Cqz1B2iNHZ8pnmO9aiBuGw2fW4Z57S/SjJb6UBH2HAX rRK5BvGbNbBEgzrG4/A/ka2IqFDBh5w6hV/KtfPJYOtcIlXOImOgSh/Oddz+xklM7wUc zxmA== X-Gm-Message-State: AOAM533lXM6gCL/PwWAly1FAIUugGLG4QVrXEHHY9OwzmMfg7GdGM7j6 QTP5r7Z5g2K+l96h3P8naAU= X-Google-Smtp-Source: ABdhPJxHzSGaUiizFl6ReNX7rAoYCSY51GxR2/K5Ko9EJMbZTxjP/iW8YNrB1UrUQguQ3zP8KNzhvg== X-Received: by 2002:a05:6402:190e:: with SMTP id e14mr37063692edz.20.1635264322584; Tue, 26 Oct 2021 09:05:22 -0700 (PDT) Received: from otyshchenko.router ([212.22.223.21]) by smtp.gmail.com with ESMTPSA id eu9sm4025195ejc.14.2021.10.26.09.05.21 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Tue, 26 Oct 2021 09:05:22 -0700 (PDT) From: Oleksandr Tyshchenko To: xen-devel@lists.xenproject.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org Cc: Oleksandr Tyshchenko , Stefano Stabellini , Russell King , Boris Ostrovsky , Juergen Gross , Julien Grall Subject: [PATCH V2 4/4] arm/xen: Read extended regions from DT and init Xen resource Date: Tue, 26 Oct 2021 19:05:12 +0300 Message-Id: <1635264312-3796-5-git-send-email-olekstysh@gmail.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1635264312-3796-1-git-send-email-olekstysh@gmail.com> References: <1635264312-3796-1-git-send-email-olekstysh@gmail.com> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20211026_090805_191603_3F6A6528 X-CRM114-Status: GOOD ( 25.47 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org From: Oleksandr Tyshchenko This patch implements arch_xen_unpopulated_init() on Arm where the extended regions (if any) are gathered from DT and inserted into passed Xen resource to be used as unused address space for Xen scratch pages by unpopulated-alloc code. The extended region (safe range) is a region of guest physical address space which is unused and could be safely used to create grant/foreign mappings instead of wasting real RAM pages from the domain memory for establishing these mappings. The extended regions are chosen by the hypervisor at the domain creation time and advertised to it via "reg" property under hypervisor node in the guest device-tree. As region 0 is reserved for grant table space (always present), the indexes for extended regions are 1...N. If arch_xen_unpopulated_init() fails for some reason the default behaviour will be restored (allocate xenballooned pages). This patch also removes XEN_UNPOPULATED_ALLOC dependency on x86. Signed-off-by: Oleksandr Tyshchenko --- Changes RFC -> V2: - new patch, instead of "[RFC PATCH 2/2] xen/unpopulated-alloc: Query hypervisor to provide unallocated space" --- arch/arm/xen/enlighten.c | 112 +++++++++++++++++++++++++++++++++++++++++++++++ drivers/xen/Kconfig | 2 +- 2 files changed, 113 insertions(+), 1 deletion(-) diff --git a/arch/arm/xen/enlighten.c b/arch/arm/xen/enlighten.c index dea46ec..1a1e0d3 100644 --- a/arch/arm/xen/enlighten.c +++ b/arch/arm/xen/enlighten.c @@ -62,6 +62,7 @@ static __read_mostly unsigned int xen_events_irq; static phys_addr_t xen_grant_frames; #define GRANT_TABLE_INDEX 0 +#define EXT_REGION_INDEX 1 uint32_t xen_start_flags; EXPORT_SYMBOL(xen_start_flags); @@ -303,6 +304,117 @@ static void __init xen_acpi_guest_init(void) #endif } +#ifdef CONFIG_XEN_UNPOPULATED_ALLOC +int arch_xen_unpopulated_init(struct resource *res) +{ + struct device_node *np; + struct resource *regs, *tmp_res; + uint64_t min_gpaddr = -1, max_gpaddr = 0; + unsigned int i, nr_reg = 0; + struct range mhp_range; + int rc; + + if (!xen_domain()) + return -ENODEV; + + np = of_find_compatible_node(NULL, NULL, "xen,xen"); + if (WARN_ON(!np)) + return -ENODEV; + + /* Skip region 0 which is reserved for grant table space */ + while (of_get_address(np, nr_reg + EXT_REGION_INDEX, NULL, NULL)) + nr_reg++; + + if (!nr_reg) { + pr_err("No extended regions are found\n"); + return -EINVAL; + } + + regs = kcalloc(nr_reg, sizeof(*regs), GFP_KERNEL); + if (!regs) + return -ENOMEM; + + /* + * Create resource from extended regions provided by the hypervisor to be + * used as unused address space for Xen scratch pages. + */ + for (i = 0; i < nr_reg; i++) { + rc = of_address_to_resource(np, i + EXT_REGION_INDEX, ®s[i]); + if (rc) + goto err; + + if (max_gpaddr < regs[i].end) + max_gpaddr = regs[i].end; + if (min_gpaddr > regs[i].start) + min_gpaddr = regs[i].start; + } + + /* Check whether the resource range is within the hotpluggable range */ + mhp_range = mhp_get_pluggable_range(true); + if (min_gpaddr < mhp_range.start) + min_gpaddr = mhp_range.start; + if (max_gpaddr > mhp_range.end) + max_gpaddr = mhp_range.end; + + res->start = min_gpaddr; + res->end = max_gpaddr; + + /* + * Mark holes between extended regions as unavailable. The rest of that + * address space will be available for the allocation. + */ + for (i = 1; i < nr_reg; i++) { + resource_size_t start, end; + + start = regs[i - 1].end + 1; + end = regs[i].start - 1; + + if (start > (end + 1)) { + rc = -EINVAL; + goto err; + } + + /* There is no hole between regions */ + if (start == (end + 1)) + continue; + + /* Check whether the hole range is within the resource range */ + if (start < res->start || end > res->end) { + if (start < res->start) + start = res->start; + if (end > res->end) + end = res->end; + + if (start >= (end + 1)) + continue; + } + + tmp_res = kzalloc(sizeof(*tmp_res), GFP_KERNEL); + if (!tmp_res) { + rc = -ENOMEM; + goto err; + } + + tmp_res->name = "Unavailable space"; + tmp_res->start = start; + tmp_res->end = end; + + rc = insert_resource(res, tmp_res); + if (rc) { + pr_err("Cannot insert resource [%llx - %llx] %d\n", + tmp_res->start, tmp_res->end, rc); + kfree(tmp_res); + goto err; + } + } + +err: + kfree(regs); + + return rc; +} +#endif + static void __init xen_dt_guest_init(void) { struct device_node *xen_node; diff --git a/drivers/xen/Kconfig b/drivers/xen/Kconfig index 1b2c3ac..e6031fc 100644 --- a/drivers/xen/Kconfig +++ b/drivers/xen/Kconfig @@ -297,7 +297,7 @@ config XEN_FRONT_PGDIR_SHBUF config XEN_UNPOPULATED_ALLOC bool "Use unpopulated memory ranges for guest mappings" - depends on X86 && ZONE_DEVICE + depends on ZONE_DEVICE default XEN_BACKEND || XEN_GNTDEV || XEN_DOM0 help Use unpopulated memory ranges in order to create mappings for guest