From nobody Fri May 3 20:38:33 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) client-ip=192.237.175.120; envelope-from=xen-devel-bounces@lists.xenproject.org; helo=lists.xenproject.org; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org; dmarc=pass(p=none dis=none) header.from=gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1635264485; cv=none; d=zohomail.com; s=zohoarc; b=Tni4PyYM++xMjjgsqE75Nt/Fvw+zYed+QmKuCqIXn3zrujg9lXOKutCdTMcDWrFeDfOyD5K8KToia3kGwAowkphxXnW4Ui8oQrD/SZLQ93NWqAXdllQYP3WUPn8/VpcE1/tohQY7kXnKg04+v98viKESyzZou4bQIesN15x27hU= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1635264485; h=Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Help:List-Unsubscribe:Message-ID:References:Sender:Subject:To; bh=oU+EeY72Fqxo4fuN88dML4OJjiCHzSRBLySQqfRpU6s=; b=DnOJl9voeM2nIp+sEhTqaonkZBlimg8cXR0bWU+DSsPbr1ukVPBfsb+NcBGZrR4SL1CRpD0rJKL7idX6GUDxmXEi3eF+fjIp9FGGxjCyOP/t1ffDRRHY6+hHYlTW5ufuO9DJNG62Th0HfwVziyL41PiYno2Eo4F1AzgchF/EiHY= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) by mx.zohomail.com with SMTPS id 1635264485262880.0594760022074; Tue, 26 Oct 2021 09:08:05 -0700 (PDT) Received: from list by lists.xenproject.org with outflank-mailman.216513.376140 (Exim 4.92) (envelope-from ) id 1mfOzG-0001pH-Tv; Tue, 26 Oct 2021 16:07:42 +0000 Received: by outflank-mailman (output) from mailman id 216513.376140; Tue, 26 Oct 2021 16:07:42 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mfOzG-0001pA-Q8; Tue, 26 Oct 2021 16:07:42 +0000 Received: by outflank-mailman (input) for mailman id 216513; Tue, 26 Oct 2021 16:07:41 +0000 Received: from us1-rack-iad1.inumbo.com ([172.99.69.81]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mfOzF-0001p4-Dy for xen-devel@lists.xenproject.org; Tue, 26 Oct 2021 16:07:41 +0000 Received: from mail-ed1-x52e.google.com (unknown [2a00:1450:4864:20::52e]) by us1-rack-iad1.inumbo.com (Halon) with ESMTPS id 65c92945-8471-487b-8b58-668d415969e9; Tue, 26 Oct 2021 16:07:40 +0000 (UTC) Received: by mail-ed1-x52e.google.com with SMTP id h7so4688458ede.8 for ; Tue, 26 Oct 2021 09:07:40 -0700 (PDT) Received: from otyshchenko.router ([212.22.223.21]) by smtp.gmail.com with ESMTPSA id eu9sm4025195ejc.14.2021.10.26.09.05.19 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Tue, 26 Oct 2021 09:05:20 -0700 (PDT) X-Outflank-Mailman: Message body and most headers restored to incoming version X-BeenThere: xen-devel@lists.xenproject.org List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xenproject.org Precedence: list Sender: "Xen-devel" X-Inumbo-ID: 65c92945-8471-487b-8b58-668d415969e9 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=oU+EeY72Fqxo4fuN88dML4OJjiCHzSRBLySQqfRpU6s=; b=EpVIsA8GKPo7dk/fZDHOCL8DXg2THekLyD8GvJ1+QSmhCGoRek4kq37MFuWeTXiRpx D1fz2Uxu7u1Jr82GIuHHPi3DZMBcOyePePAP1ibi9T7jyzBIFJ1aWFoaWOjyoWvE0jd7 PMjhtJHVqDl+TlWbjSAWulUT3+fJwS9xZv9WZ0rqS3cKIXcFZA7QruaP6OCF7XDYQR9R SSO1vUiz9NKtvxPAaoKztcSELSAGXAuBs/iVKXwNIhMhxGtT3XKEAN164OBgah0hXQ50 /rSS/COR3zV9a674A1N+TuaMMHk3wqS4qAaGRq97YqtSrG5+U8FHO6UnHvtVHfna5Z1X RJLw== 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=oU+EeY72Fqxo4fuN88dML4OJjiCHzSRBLySQqfRpU6s=; b=rAdBncCT7GBAr1vgXVAt5vpLjg79alkbzKZ3/wLiMgkzjXa4307D0Wo+1/kusoC5Ur fksvhqSnysqyf6NBzjzYFTwdDzTkXNLx0t2UzF3IUCCzuYJ1M+XjLHoLjrZ8hBwDTdb/ 8n4LMdez9/BV0mTmy9/P3VFd+gOqePo+D5yoAjLMVPIT4nfgkzAPEY4/xFbG4b0h2kmF ER/6y/7wGHmwv9kWWK0j3I6vue3ezaNNEoepeVff8qbnW9Cc4Egww6zsDdaJHTHA6uRY h4diBzSkY0jHTt5yxVlqOLWgon3KUKhovVrzy7yUgzrTBkyBwNNm+NqC/pA7bmoQEPs0 yRsg== X-Gm-Message-State: AOAM533cKSDhF4ENbZAozvstNTL2Q0HDlfhwfDPcg3CsXKosANIQL/Am yXhXjs73HqoDH4/8plUEJbfnp6BT8as= X-Google-Smtp-Source: ABdhPJzrbtOvYqLsp3FLdTpT/Amo1B5J4A7Ys4+PXalhb9IOcwydKRsjZqHL2AH62jn9HrKJliqqFw== X-Received: by 2002:a50:ee01:: with SMTP id g1mr22757719eds.79.1635264320421; Tue, 26 Oct 2021 09:05:20 -0700 (PDT) From: Oleksandr Tyshchenko To: xen-devel@lists.xenproject.org, linux-kernel@vger.kernel.org Cc: Oleksandr Tyshchenko , Boris Ostrovsky , Juergen Gross , Stefano Stabellini , Julien Grall Subject: [PATCH V2 1/4] xen/unpopulated-alloc: Drop check for virt_addr_valid() in fill_list() Date: Tue, 26 Oct 2021 19:05:09 +0300 Message-Id: <1635264312-3796-2-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-ZohoMail-DKIM: pass (identity @gmail.com) X-ZM-MESSAGEID: 1635264486469100001 Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" From: Oleksandr Tyshchenko If memremap_pages() succeeds the range is guaranteed to have proper page table, there is no need for an additional virt_addr_valid() check. Signed-off-by: Oleksandr Tyshchenko Reviewed-by: Boris Ostrovsky --- Changes RFC -> V2: - new patch, instead of "[RFC PATCH 1/2] arm64: mm: Make virt_addr_valid to check for pfn_vali= d again" --- drivers/xen/unpopulated-alloc.c | 1 - 1 file changed, 1 deletion(-) diff --git a/drivers/xen/unpopulated-alloc.c b/drivers/xen/unpopulated-allo= c.c index 87e6b7d..a03dc5b 100644 --- a/drivers/xen/unpopulated-alloc.c +++ b/drivers/xen/unpopulated-alloc.c @@ -85,7 +85,6 @@ static int fill_list(unsigned int nr_pages) for (i =3D 0; i < alloc_pages; i++) { struct page *pg =3D virt_to_page(vaddr + PAGE_SIZE * i); =20 - BUG_ON(!virt_addr_valid(vaddr + PAGE_SIZE * i)); pg->zone_device_data =3D page_list; page_list =3D pg; list_count++; --=20 2.7.4 From nobody Fri May 3 20:38:33 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) client-ip=192.237.175.120; envelope-from=xen-devel-bounces@lists.xenproject.org; helo=lists.xenproject.org; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org; dmarc=pass(p=none dis=none) header.from=gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1635264558; cv=none; d=zohomail.com; s=zohoarc; b=oIuJnkJz3aZXUJzx5dkDgeNcR3vu/mZR70QcE+jor54YRY9vH4uCeop8QItsnTM6hcdN1oWM700YkafUnTadOaiz9tXRwxLaLi233jABHgqYQ4SH5PQ1wmTpqYXfMEAmylgESqQLM7FxMg8lVG7+ucF93bTUni36l6eWd7OIqaQ= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1635264558; h=Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Help:List-Unsubscribe:Message-ID:References:Sender:Subject:To; bh=LFIfrPhDzMtnbpEZVPATV5Kch9wCoKpxpC7Ie87gFbI=; b=IjLqMZljfjJ5lSnrtH39oWeiA2YHkJcyvmymod1nmABJsq5YbuvJbspWoFA14Cbn9muYoBvtakB8u/hMEKStU/GBmdWjf+Y1+KIzlQSMDgEwvjJZJCh9HzNe1npekmeVYSlcPPa7WdhsrvcWeryekfBA4Iif5CpmsS/xfoP4CN0= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) by mx.zohomail.com with SMTPS id 1635264558310172.25335679601721; Tue, 26 Oct 2021 09:09:18 -0700 (PDT) Received: from list by lists.xenproject.org with outflank-mailman.216530.376173 (Exim 4.92) (envelope-from ) id 1mfP0X-0003bw-Rn; Tue, 26 Oct 2021 16:09:01 +0000 Received: by outflank-mailman (output) from mailman id 216530.376173; Tue, 26 Oct 2021 16:09:01 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mfP0X-0003bp-Og; Tue, 26 Oct 2021 16:09:01 +0000 Received: by outflank-mailman (input) for mailman id 216530; Tue, 26 Oct 2021 16:09:00 +0000 Received: from us1-rack-iad1.inumbo.com ([172.99.69.81]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mfP0W-0003bh-LI for xen-devel@lists.xenproject.org; Tue, 26 Oct 2021 16:09:00 +0000 Received: from mail-ed1-x52e.google.com (unknown [2a00:1450:4864:20::52e]) by us1-rack-iad1.inumbo.com (Halon) with ESMTPS id 67cf74b4-1946-45ed-bd74-b4d35ecfedcc; Tue, 26 Oct 2021 16:08:59 +0000 (UTC) Received: by mail-ed1-x52e.google.com with SMTP id g8so14517461edb.2 for ; Tue, 26 Oct 2021 09:08:59 -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) X-Outflank-Mailman: Message body and most headers restored to incoming version X-BeenThere: xen-devel@lists.xenproject.org List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xenproject.org Precedence: list Sender: "Xen-devel" X-Inumbo-ID: 67cf74b4-1946-45ed-bd74-b4d35ecfedcc 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=iD7GNzZ9J4CcCOT7uKlTaknL4TGo9QEkv8fHTRCNXlueRUp7b3NYP98zjpcwm8rKqM 7/OQ6N+U+AcOWmjkYaLQtOimo1Vg0q9yJS+UC/A3YPM+83LHdJ5dhKYOVkan9rJ5GLA3 q1rbADx/HvaOypkCZ7GZjJl+iHmDZG0aFiW7iP/s6y2hOXv0Tmq+ifLCLLBWBxNy1drC Oy/Jf93t+hKpqxzouB2Qc7ilkfs4b/DBm1ABNBoiCOzmgAXHyMMJDTJx7DbDSr01RmtN bzIqI3Rq0xuAn6IaJatfea/6/9PZUbAWzm3JW+klCHf4nryFVDhwNUPKdhcETnXC2IYg YZ2g== X-Gm-Message-State: AOAM5324Bq1qG31LYgn8t9hRwJg++0X139thanw3upylCuislM8VHTaS ihg3xdyjPHSLBJPz2moDQWOQkuiHnwQ= 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) 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-ZohoMail-DKIM: pass (identity @gmail.com) X-ZM-MESSAGEID: 1635264560300100001 Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" 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] __initda= ta; =20 static __read_mostly unsigned int xen_events_irq; +static phys_addr_t xen_grant_frames; + +#define GRANT_TABLE_INDEX 0 =20 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; =20 xen_node =3D of_find_compatible_node(NULL, NULL, "xen,xen"); if (!xen_node) { @@ -310,6 +314,12 @@ static void __init xen_dt_guest_init(void) return; } =20 + 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 =3D res.start; + xen_events_irq =3D irq_of_parse_and_map(xen_node, 0); } =20 @@ -317,16 +327,20 @@ static int __init xen_guest_init(void) { struct xen_add_to_physmap xatp; struct shared_info *shared_info_page =3D NULL; - int cpu; + int rc, cpu; =20 if (!xen_domain()) return 0; =20 if (!acpi_disabled) xen_acpi_guest_init(); - else + else { xen_dt_guest_init(); =20 + 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) =3D cpu; =20 - xen_auto_xlat_grant_frames.count =3D 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 =3D gnttab_max_grant_frames(); + rc =3D 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 =3D gnttab_setup_auto_xlat_frames(xen_grant_frames); + if (rc) { free_percpu(xen_vcpu_info); - return -ENOMEM; + return rc; } gnttab_init(); =20 --=20 2.7.4 From nobody Fri May 3 20:38:33 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) client-ip=192.237.175.120; envelope-from=xen-devel-bounces@lists.xenproject.org; helo=lists.xenproject.org; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org; dmarc=pass(p=none dis=none) header.from=gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1635264575; cv=none; d=zohomail.com; s=zohoarc; b=ZnIcqYsWimv5FYs8CiKLziUR+/cntEF8XvMvZV+D7Uaxe8ym9IFfQj/U3XdpXu7EjWQkhp8eHWkPTI8Hyi73ckX/Iy05Z2FCiOD4EvOlViYES0KadteF0gCOHvd+dokLVKDjWTGAsWxJKWbEiFJpj3xXnFfmraIEU2FV3sQl398= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1635264575; h=Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Help:List-Unsubscribe:Message-ID:References:Sender:Subject:To; bh=ajewXwLh6uwl+3oBu0hbZUbC19wx0AYb/I/F6COPjeM=; b=n8kzmS0y+Gb3drBIXijRadNHFkI51fPazzGUtqCsQPqjR8DDSvlYBn0l8ezxMr5YTD1wJU64XkWbx/1eaelCYavm4aEcTSon7j4/At+UM2tLGnyhWIrz4m9nWqHpZJq7uVjHr8aAfqCkqsEofihRjlh0Ot3mU5QX7RsBGRpyGTo= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) by mx.zohomail.com with SMTPS id 1635264575765809.0942654497866; Tue, 26 Oct 2021 09:09:35 -0700 (PDT) Received: from list by lists.xenproject.org with outflank-mailman.216532.376184 (Exim 4.92) (envelope-from ) id 1mfP0r-00046L-4g; Tue, 26 Oct 2021 16:09:21 +0000 Received: by outflank-mailman (output) from mailman id 216532.376184; Tue, 26 Oct 2021 16:09:21 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mfP0r-00046C-1b; Tue, 26 Oct 2021 16:09:21 +0000 Received: by outflank-mailman (input) for mailman id 216532; Tue, 26 Oct 2021 16:09:19 +0000 Received: from us1-rack-iad1.inumbo.com ([172.99.69.81]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mfP0p-00044Y-RE for xen-devel@lists.xenproject.org; Tue, 26 Oct 2021 16:09:19 +0000 Received: from mail-ed1-x52e.google.com (unknown [2a00:1450:4864:20::52e]) by us1-rack-iad1.inumbo.com (Halon) with ESMTPS id 55fdda75-b496-4e7c-a0d1-49ce389de717; Tue, 26 Oct 2021 16:09:18 +0000 (UTC) Received: by mail-ed1-x52e.google.com with SMTP id w15so15349871edc.9 for ; Tue, 26 Oct 2021 09:09:18 -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:21 -0700 (PDT) X-Outflank-Mailman: Message body and most headers restored to incoming version X-BeenThere: xen-devel@lists.xenproject.org List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xenproject.org Precedence: list Sender: "Xen-devel" X-Inumbo-ID: 55fdda75-b496-4e7c-a0d1-49ce389de717 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=ajewXwLh6uwl+3oBu0hbZUbC19wx0AYb/I/F6COPjeM=; b=U3N/q9FFvFCmmrpMt2cjbyrZGTWLI8aYWMuWlxVKon2BNKrVOdefe0pZcid+IOAgdh IHy6lv/3TRCGg/Iqh7kmoF4Fg4rHa+NqfAzaz9wRaL6CVBUvECbpOFAZU6RJESEkB98/ Y5I9Oq4rdHccg0GEvwvD4whjflY43q2BjErpYMUBRbu2Lwf235S4qZ7o16ywxoHfpuxR gx0iLhzdsYDcnbF20A2x+L0EFGx8biMJmfAr6ix03XlJ+JOMk21G6/ZtFcdflkylF4KG uXX49KX7gu0kYMlocuPThS66RnoOFnmwRXxDBNs5db/f6mKW8ocFNgIKUqNmy+spVuvX O8Dg== 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=ajewXwLh6uwl+3oBu0hbZUbC19wx0AYb/I/F6COPjeM=; b=EnLwzEueyJnZ75/e9Jeppm2GSc2emB2/KFKqGKEGMY0q3wFy0n6BgR6P/dOAdb6KdY BFPIVpqvNyahbUwbHnzyZ70EDeoNeFLlHujjhMwzBfsKULPS35+d4/wSclq9M6okwSyv 3U0Yjbzn/FKAas1T8U4Hpm78Vsx1+199XKU1iLLSywndtcRV84xYL3J2CJNw51j/EJYN 8SUUxucipdvH9Q/5m7LUFhDOWx2GeZ9yq3TPLJquzg2DiEVkHH2xOM10+hVpaLene+HN Nxt3I75Lm/mhC6pxdkJ4msE2zbK/jg62rTeNXGUv8whaUartQdXT/2wyC8CcuZQdMKBa 3vkg== X-Gm-Message-State: AOAM531wAKnK39rOE8RNL1qhqkFal5JtI6lLY8+ZTmOW0zFnCeFreAFx P/WqcEuvvfS5ma7gOAu86S1yGghQ36M= X-Google-Smtp-Source: ABdhPJyrh0WP1ZENmH/Ydn3rieWDW8GYW8YWGEy1yCC5roMzqs86ACi1TObo2NcZ97xR3N7TTReTvQ== X-Received: by 2002:a05:6402:2808:: with SMTP id h8mr36760367ede.394.1635264321764; Tue, 26 Oct 2021 09:05:21 -0700 (PDT) From: Oleksandr Tyshchenko To: xen-devel@lists.xenproject.org, linux-kernel@vger.kernel.org Cc: Oleksandr Tyshchenko , Boris Ostrovsky , Juergen Gross , Stefano Stabellini , Julien Grall Subject: [PATCH V2 3/4] xen/unpopulated-alloc: Add mechanism to use Xen resource Date: Tue, 26 Oct 2021 19:05:11 +0300 Message-Id: <1635264312-3796-4-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-ZohoMail-DKIM: pass (identity @gmail.com) X-ZM-MESSAGEID: 1635264577834100001 Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" From: Oleksandr Tyshchenko The main reason of this change is that unpopulated-alloc code cannot be used in its current form on Arm, but there is a desire to reuse it to avoid wasting real RAM pages for the grant/foreign mappings. The problem is that system "iomem_resource" is used for the address space allocation, but the really unallocated space can't be figured out precisely by the domain on Arm without hypervisor involvement. For example, not all device I/O regions are known by the time domain starts creating grant/foreign mappings. And following the advise from "iomem_resource" we might end up reusing these regions by a mistake. So, the hypervisor which maintains the P2M for the domain is in the best position to provide unused regions of guest physical address space which could be safely used to create grant/foreign mappings. Introduce new helper arch_xen_unpopulated_init() which purpose is to create specific Xen resource based on the memory regions provided by the hypervisor to be used as unused space for Xen scratch pages. If arch doesn't implement arch_xen_unpopulated_init() to initialize Xen resource the default "iomem_resource" will be used. So the behavior on x86 won't be changed. Also fall back to allocate xenballooned pages (steal real RAM pages) if we do not have any suitable resource to work with and as the result we won't be able to provide unpopulated pages. Signed-off-by: Oleksandr Tyshchenko --- Changes RFC -> V2: - new patch, instead of "[RFC PATCH 2/2] xen/unpopulated-alloc: Query hypervisor to provide una= llocated space" --- drivers/xen/unpopulated-alloc.c | 89 +++++++++++++++++++++++++++++++++++++= ++-- include/xen/xen.h | 2 + 2 files changed, 88 insertions(+), 3 deletions(-) diff --git a/drivers/xen/unpopulated-alloc.c b/drivers/xen/unpopulated-allo= c.c index a03dc5b..1f1d8d8 100644 --- a/drivers/xen/unpopulated-alloc.c +++ b/drivers/xen/unpopulated-alloc.c @@ -8,6 +8,7 @@ =20 #include =20 +#include #include #include =20 @@ -15,13 +16,29 @@ static DEFINE_MUTEX(list_lock); static struct page *page_list; static unsigned int list_count; =20 +static struct resource *target_resource; +static struct resource xen_resource =3D { + .name =3D "Xen unused space", +}; + +/* + * If arch is not happy with system "iomem_resource" being used for + * the region allocation it can provide it's own view by initializing + * "xen_resource" with unused regions of guest physical address space + * provided by the hypervisor. + */ +int __weak arch_xen_unpopulated_init(struct resource *res) +{ + return -ENOSYS; +} + static int fill_list(unsigned int nr_pages) { struct dev_pagemap *pgmap; - struct resource *res; + struct resource *res, *tmp_res =3D NULL; void *vaddr; unsigned int i, alloc_pages =3D round_up(nr_pages, PAGES_PER_SECTION); - int ret =3D -ENOMEM; + int ret; =20 res =3D kzalloc(sizeof(*res), GFP_KERNEL); if (!res) @@ -30,7 +47,7 @@ static int fill_list(unsigned int nr_pages) res->name =3D "Xen scratch"; res->flags =3D IORESOURCE_MEM | IORESOURCE_BUSY; =20 - ret =3D allocate_resource(&iomem_resource, res, + ret =3D allocate_resource(target_resource, res, alloc_pages * PAGE_SIZE, 0, -1, PAGES_PER_SECTION * PAGE_SIZE, NULL, NULL); if (ret < 0) { @@ -38,6 +55,31 @@ static int fill_list(unsigned int nr_pages) goto err_resource; } =20 + /* + * Reserve the region previously allocated from Xen resource to avoid + * re-using it by someone else. + */ + if (target_resource !=3D &iomem_resource) { + tmp_res =3D kzalloc(sizeof(*tmp_res), GFP_KERNEL); + if (!res) { + ret =3D -ENOMEM; + goto err_insert; + } + + tmp_res->name =3D res->name; + tmp_res->start =3D res->start; + tmp_res->end =3D res->end; + tmp_res->flags =3D res->flags; + + ret =3D insert_resource(&iomem_resource, tmp_res); + if (ret < 0) { + pr_err("Cannot insert IOMEM resource [%llx - %llx]\n", + tmp_res->start, tmp_res->end); + kfree(tmp_res); + goto err_insert; + } + } + pgmap =3D kzalloc(sizeof(*pgmap), GFP_KERNEL); if (!pgmap) { ret =3D -ENOMEM; @@ -95,12 +137,40 @@ static int fill_list(unsigned int nr_pages) err_memremap: kfree(pgmap); err_pgmap: + if (tmp_res) { + release_resource(tmp_res); + kfree(tmp_res); + } +err_insert: release_resource(res); err_resource: kfree(res); return ret; } =20 +static void unpopulated_init(void) +{ + static bool inited =3D false; + int ret; + + if (inited) + return; + + /* + * Try to initialize Xen resource the first and fall back to default + * resource if arch doesn't offer one. + */ + ret =3D arch_xen_unpopulated_init(&xen_resource); + if (!ret) + target_resource =3D &xen_resource; + else if (ret =3D=3D -ENOSYS) + target_resource =3D &iomem_resource; + else + pr_err("Cannot initialize Xen resource\n"); + + inited =3D true; +} + /** * xen_alloc_unpopulated_pages - alloc unpopulated pages * @nr_pages: Number of pages @@ -112,6 +182,16 @@ int xen_alloc_unpopulated_pages(unsigned int nr_pages,= struct page **pages) unsigned int i; int ret =3D 0; =20 + unpopulated_init(); + + /* + * Fall back to default behavior if we do not have any suitable resource + * to allocate required region from and as the result we won't be able to + * construct pages. + */ + if (!target_resource) + return alloc_xenballooned_pages(nr_pages, pages); + mutex_lock(&list_lock); if (list_count < nr_pages) { ret =3D fill_list(nr_pages - list_count); @@ -159,6 +239,9 @@ void xen_free_unpopulated_pages(unsigned int nr_pages, = struct page **pages) { unsigned int i; =20 + if (!target_resource) + return free_xenballooned_pages(nr_pages, pages); + mutex_lock(&list_lock); for (i =3D 0; i < nr_pages; i++) { pages[i]->zone_device_data =3D page_list; diff --git a/include/xen/xen.h b/include/xen/xen.h index 43efba0..55d2ef8 100644 --- a/include/xen/xen.h +++ b/include/xen/xen.h @@ -55,6 +55,8 @@ extern u64 xen_saved_max_mem_size; #ifdef CONFIG_XEN_UNPOPULATED_ALLOC int xen_alloc_unpopulated_pages(unsigned int nr_pages, struct page **pages= ); void xen_free_unpopulated_pages(unsigned int nr_pages, struct page **pages= ); +struct resource; +int arch_xen_unpopulated_init(struct resource *res); #else #define xen_alloc_unpopulated_pages alloc_xenballooned_pages #define xen_free_unpopulated_pages free_xenballooned_pages --=20 2.7.4 From nobody Fri May 3 20:38:33 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) client-ip=192.237.175.120; envelope-from=xen-devel-bounces@lists.xenproject.org; helo=lists.xenproject.org; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org; dmarc=pass(p=none dis=none) header.from=gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1635264486; cv=none; d=zohomail.com; s=zohoarc; b=EFCuOl5WeGTNDQHFydGyZBVzQdCPrWGRspVB4T/Opc97Q6Zwn0CEqOE2jjYWkuLzR35pIR8FtQB4/OVQCxK/MoqK9sMEZAf6T1lRTOQ/37SFFtpvx3pqmuvfsiR0n5gApwNDQRjkXQ/4odZyi81t5PbxGKWPwyEw0SvodCjtUdo= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1635264486; h=Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Help:List-Unsubscribe:Message-ID:References:Sender:Subject:To; bh=wgCQ3QpgBU+9Jo1johQyA8YH17F0xtomZ9AsDb/n0+k=; b=erADtb2z3sBxkzTmZoGz8dzqRufKD/ALxpGLWv+lYW2W+fgN9EGds1NyqMsbgOvNHJilcaX3I+plvZGC0O2WcEDfkTUzd8VDt846fiVLDUlgPchbRPFSVIsfE2SjjDS8fuVDWxMD6ztqaAuDdq8V7TvC8JIfBn6DLlJ9+xMBVmc= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) by mx.zohomail.com with SMTPS id 163526448635071.95030893410956; Tue, 26 Oct 2021 09:08:06 -0700 (PDT) Received: from list by lists.xenproject.org with outflank-mailman.216514.376151 (Exim 4.92) (envelope-from ) id 1mfOzL-00025v-A5; Tue, 26 Oct 2021 16:07:47 +0000 Received: by outflank-mailman (output) from mailman id 216514.376151; Tue, 26 Oct 2021 16:07:47 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mfOzL-00025m-6F; Tue, 26 Oct 2021 16:07:47 +0000 Received: by outflank-mailman (input) for mailman id 216514; Tue, 26 Oct 2021 16:07:46 +0000 Received: from us1-rack-iad1.inumbo.com ([172.99.69.81]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mfOzK-0001p4-8v for xen-devel@lists.xenproject.org; Tue, 26 Oct 2021 16:07:46 +0000 Received: from mail-ed1-x535.google.com (unknown [2a00:1450:4864:20::535]) by us1-rack-iad1.inumbo.com (Halon) with ESMTPS id c03a9faa-4501-4e50-b60a-a149519fe8d0; Tue, 26 Oct 2021 16:07:42 +0000 (UTC) Received: by mail-ed1-x535.google.com with SMTP id h7so4689051ede.8 for ; Tue, 26 Oct 2021 09:07:42 -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) X-Outflank-Mailman: Message body and most headers restored to incoming version X-BeenThere: xen-devel@lists.xenproject.org List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xenproject.org Precedence: list Sender: "Xen-devel" X-Inumbo-ID: c03a9faa-4501-4e50-b60a-a149519fe8d0 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=uY9AiCrvZFyNS1GjmsyuQ0CuDPsyH+5m06uA7s/UHYEVevAD801C8NU352hBe4Oeba 7+5PAhMLIL29L+vT5+DcdpNtT7FXiQWCaG1rEaI9zaSfdB+7owRTMMT8SuXpxfhTz+Gc zpzKQ++3T1jqalGlVqrcRODuzwhrqsdjaBXIhNjSkVOWGS+6onJb8AUWFto7dgn7ZmrX u5goqJXGiBOcIdv6ARKZc5ax8o7khXjw33ch+T+LF9z6DFvDkl1fUppAqbCb3FqiZ5gY 6qzbSDn2pRrUXBYZCI0mOHT+f4kQW6Wc721duDJNgIQyXX+cUe2TNcXWy+XLA6Mxpm54 Noiw== X-Gm-Message-State: AOAM533AtyyNT33ERFcOygFTt6T+UT9NxjheSf5uWwdwjUW/7UfBpsuz iCOfZ+UClyfjRSNq7wcomqZiE471Z3E= 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) 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-ZohoMail-DKIM: pass (identity @gmail.com) X-ZM-MESSAGEID: 1635264488320100003 Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" 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 una= llocated 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; =20 #define GRANT_TABLE_INDEX 0 +#define EXT_REGION_INDEX 1 =20 uint32_t xen_start_flags; EXPORT_SYMBOL(xen_start_flags); @@ -303,6 +304,117 @@ static void __init xen_acpi_guest_init(void) #endif } =20 +#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 =3D -1, max_gpaddr =3D 0; + unsigned int i, nr_reg =3D 0; + struct range mhp_range; + int rc; + + if (!xen_domain()) + return -ENODEV; + + np =3D 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 =3D 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 =3D 0; i < nr_reg; i++) { + rc =3D of_address_to_resource(np, i + EXT_REGION_INDEX, ®s[i]); + if (rc) + goto err; + + if (max_gpaddr < regs[i].end) + max_gpaddr =3D regs[i].end; + if (min_gpaddr > regs[i].start) + min_gpaddr =3D regs[i].start; + } + + /* Check whether the resource range is within the hotpluggable range */ + mhp_range =3D mhp_get_pluggable_range(true); + if (min_gpaddr < mhp_range.start) + min_gpaddr =3D mhp_range.start; + if (max_gpaddr > mhp_range.end) + max_gpaddr =3D mhp_range.end; + + res->start =3D min_gpaddr; + res->end =3D max_gpaddr; + + /* + * Mark holes between extended regions as unavailable. The rest of that + * address space will be available for the allocation. + */ + for (i =3D 1; i < nr_reg; i++) { + resource_size_t start, end; + + start =3D regs[i - 1].end + 1; + end =3D regs[i].start - 1; + + if (start > (end + 1)) { + rc =3D -EINVAL; + goto err; + } + + /* There is no hole between regions */ + if (start =3D=3D (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 =3D res->start; + if (end > res->end) + end =3D res->end; + + if (start >=3D (end + 1)) + continue; + } + + tmp_res =3D kzalloc(sizeof(*tmp_res), GFP_KERNEL); + if (!tmp_res) { + rc =3D -ENOMEM; + goto err; + } + + tmp_res->name =3D "Unavailable space"; + tmp_res->start =3D start; + tmp_res->end =3D end; + + rc =3D 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 =20 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 --=20 2.7.4