From patchwork Thu Dec 9 20:05:32 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Oleksandr Tyshchenko X-Patchwork-Id: 12695513 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 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 smtp.lore.kernel.org (Postfix) with ESMTPS id 2AB1BC433EF for ; Thu, 9 Dec 2021 20:07:25 +0000 (UTC) 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=92T24p6NytptmLuB5OnjT1gVp7cQTdnnYXHEI0tARR8=; b=QfIa+mZLBM9D17 /wYL28vNBvmabIuh4PFZwN1neja3ISNZ9isrSsiMbFOEIpzfyEcIVSsmOm2hFVj64dmEW7lJ+M7Cr DAgbYYue57Lu/UQPz8VNkIOJ6AIJ7dbrdjh0C4wc9jLnIjcXc0oNziRooouGcKhxfyU/yWpdnaFAg ghuT/dqvn4DPG9HKWHcKyYeQjz3oCmer22i6thF6LpuRs8y4EFRlweoPNz7RGGwlAWVTi7c6w50Hn zuRBQRoi0Ts7qbAbrAuzqL9Xt2H5FawSo9tvMmNWzCWKPWmorMRrjlTaZSXO+wXJoV5PSyD/JfIqr 7abPq7+ovRBylNykBumg==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1mvPg0-00HQkc-7k; Thu, 09 Dec 2021 20:06:00 +0000 Received: from mail-lj1-x230.google.com ([2a00:1450:4864:20::230]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1mvPfl-00HQfw-Ml for linux-arm-kernel@lists.infradead.org; Thu, 09 Dec 2021 20:05:47 +0000 Received: by mail-lj1-x230.google.com with SMTP id l7so10726042lja.2 for ; Thu, 09 Dec 2021 12:05:45 -0800 (PST) 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=XoEU3DaXUqalCs6jzwcHq5Z2kR7REX3RsrqKMfGCo2w=; b=GlM2t+eQRjThRQMjBZpSdxLnDWzEbjJWVwRDusOaEx3MeX4FketF3biTqFzeEnAVU0 VhfKGEcuQp52HiEpPpvacBbuQwd87JvMTehJYvdAXf7KeOioUXb3WO3fCLID1qKZ7UBZ UTgdjk7vrs0SFE8l7HuLKFHyLrmDTcAD9cNMgKBWyA2U3xnLfBw1azVxQh+7gf79/OoO 1dQ4RbzOz6pbkTfeB0WK3PC7JrQpMMkPLByBqimCV2s9g1epLNijcmYesEuTP320tf69 StZYm2luPMAgllAQQSpglOUobSo4Wx1O+YEknSkfIltx1nSkiZfvAJ+J+cQWzBjsQ1vZ FzVg== 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=XoEU3DaXUqalCs6jzwcHq5Z2kR7REX3RsrqKMfGCo2w=; b=acwnaxlPEFA1p+c4OWOZoqbshyvFzwTQBR2SdNp2gCYwX/LUNV+xgcb4rrBHaa91Vz CyVo4OSPr1RdxuwQXCUoyalHQTmqCp1+3HQDnVKNet2AMci4vevzmDNATWDP+OMo88UD KUtjFDy++ct3Fwb72Qa2eJpsmAaF9MixY3Cvujm9G+Uf4XmuzgPZ0Gvkv8mIUXR8OUBw 4jTW5ojNlfQkBUUlTB4AKBhlBHrnRc3wXr5JPOT23ivXqepNa+kKgEOeB6PI0MUQGI3e DJAqIoWBlDe22pmGNeIL1KMNfG0bNIpG+Nic6e8uxLZUo//bzpbWJRDca0wDsYeRuk0i HbrA== X-Gm-Message-State: AOAM530z4nCJLb1JEGpCQyQZIqNsjZroBmXyaYLj3Kce/i8QqvO8DdVO 0nIttnVK7c6CjGypP9+KSsk= X-Google-Smtp-Source: ABdhPJwRwGnN2HYDLn4/ya4vANtMy2LFN1OiYbe33DChi+j/uEDELzNOeHtrWCUSzf5Mr+Zxr7NNrA== X-Received: by 2002:a2e:8ec7:: with SMTP id e7mr8517097ljl.430.1639080343851; Thu, 09 Dec 2021 12:05:43 -0800 (PST) Received: from otyshchenko.router ([212.22.223.21]) by smtp.gmail.com with ESMTPSA id o12sm87371lft.134.2021.12.09.12.05.42 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Thu, 09 Dec 2021 12:05:42 -0800 (PST) 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 V4 2/6] arm/xen: Switch to use gnttab_setup_auto_xlat_frames() for DT Date: Thu, 9 Dec 2021 22:05:32 +0200 Message-Id: <1639080336-26573-3-git-send-email-olekstysh@gmail.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1639080336-26573-1-git-send-email-olekstysh@gmail.com> References: <1639080336-26573-1-git-send-email-olekstysh@gmail.com> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20211209_120545_803346_1AF37003 X-CRM114-Status: GOOD ( 21.13 ) 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(). Also in order to make a code more resilient use a fallback to xen_xlate_map_ballooned_pages() if grant table region wasn't found. 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 Reviewed-by: Stefano Stabellini --- Changes RFC -> V2: - new patch Changes V2 -> V3: - add __read_mostly specifier to xen_grant_frames - retain a fallback to xen_xlate_map_ballooned_pages() if xen_grant_frames is invalid - process xen_events_irq before xen_grant_frames in xen_dt_guest_init() - update patch description Changes V3 -> V4: - add Stefano's R-b - remove first condition in "if (!acpi_disabled || !xen_grant_frames)" --- arch/arm/xen/enlighten.c | 26 ++++++++++++++++++++------ 1 file changed, 20 insertions(+), 6 deletions(-) diff --git a/arch/arm/xen/enlighten.c b/arch/arm/xen/enlighten.c index 7619fbf..49bb675 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 __read_mostly 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) { @@ -311,13 +315,19 @@ static void __init xen_dt_guest_init(void) } xen_events_irq = irq_of_parse_and_map(xen_node, 0); + + 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; } 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; @@ -370,12 +380,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 (!xen_grant_frames) { + 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();