From patchwork Fri Apr 1 15:49:01 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Shannon Zhao X-Patchwork-Id: 8726051 Return-Path: X-Original-To: patchwork-xen-devel@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 4ACE3C0553 for ; Fri, 1 Apr 2016 15:52:37 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 3EDD1202EC for ; Fri, 1 Apr 2016 15:52:36 +0000 (UTC) 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.kernel.org (Postfix) with ESMTPS id E7FA5203E6 for ; Fri, 1 Apr 2016 15:52:34 +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 1am1Ks-00048O-AL; Fri, 01 Apr 2016 15:50:10 +0000 Received: from mail6.bemta6.messagelabs.com ([85.158.143.247]) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from ) id 1am1Kr-000485-9e for xen-devel@lists.xen.org; Fri, 01 Apr 2016 15:50:09 +0000 Received: from [85.158.143.35] by server-3.bemta-6.messagelabs.com id E3/5F-07120-0B89EF65; Fri, 01 Apr 2016 15:50:08 +0000 X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFlrGIsWRWlGSWpSXmKPExsVyMfSOie6GGf/ CDLo3slgs+biYxYHR4+ju30wBjFGsmXlJ+RUJrBl9Tx6wF5wXqTj//DVjA+MxwS5GLg4hgYmM Ejc2P2YBcVgE5jFL3Jj4jQnEkRDoZ5Vo7mwHynACOTESc6d0M0HYFRKtzzvB4kICahLLDi9kh hj1hFHi/bQuZpAEm4COxItJO9m6GDk4RAQ8JPZ8rAWpYRZYxiQxb9MkRpAaYYFAiX893WCDWA RUJf4+OwUW5xVwl7jxZis7xDI5ifPHf4LN5ASaM/nfK6jF7hIPZ81in8AosICRYRWjenFqUVl qka6xXlJRZnpGSW5iZo6uoYGZXm5qcXFiempOYlKxXnJ+7iZGYGgxAMEOxo5/TocYJTmYlER5 Daf9CxPiS8pPqcxILM6ILyrNSS0+xCjDwaEkwVs0HSgnWJSanlqRlpkDDHKYtAQHj5IIby1Im re4IDG3ODMdInWK0Zhjy+9ra5k4tk29t5ZJiCUvPy9VSpw3FKRUAKQ0ozQPbhAs+i4xykoJ8z ICnSbEU5BalJtZgir/ilGcg1FJGOIensy8Erh9r4BOYQI6pUMa7JSSRISUVAOjSP17iSipe7P OeW1Pc110oJfvweHQ//mfU3oO7XL+6PyjcPMax6wl99eziq8V7WpT//54m8VymbsXd6zgL3F5 svnsvhVXLK65Nt4zWm8lK/T7+rl/pSzv0ixv+MzJPHvI7X75PDZz9neBWvacgtGvlHLeTz4U9 d3pj7+xRHNus+GtIq/olWGvlViKMxINtZiLihMByChPNLkCAAA= X-Env-Sender: shannon.zhao@linaro.org X-Msg-Ref: server-3.tower-21.messagelabs.com!1459525806!6567696!1 X-Originating-IP: [209.85.220.52] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 8.28; banners=-,-,- X-VirusChecked: Checked Received: (qmail 55067 invoked from network); 1 Apr 2016 15:50:07 -0000 Received: from mail-pa0-f52.google.com (HELO mail-pa0-f52.google.com) (209.85.220.52) by server-3.tower-21.messagelabs.com with AES128-GCM-SHA256 encrypted SMTP; 1 Apr 2016 15:50:07 -0000 Received: by mail-pa0-f52.google.com with SMTP id fe3so93882437pab.1 for ; Fri, 01 Apr 2016 08:50:07 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=d8+mRp80WyAhxAXlm3E+1oYEOoVXmMYYP4ZYIETj9Mw=; b=ALpS0WlRpIj0jktd/wySeUU4IRrYSTsdmi1nBQDVJk1JP/h6fMG7zcgG7zUURStHph tyDpB8dTyZx6chgjIn8++Fle9stjzAn1zeJ8CIZVqsE9HCjLVw7woEwl/WQ6jwv7muRo 18HR1dqm3H7zkmo6Kf9wN2xCrRAwyAGjR16Nw= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=d8+mRp80WyAhxAXlm3E+1oYEOoVXmMYYP4ZYIETj9Mw=; b=BWs2IFLNaQS8+AAUR0G1AI4ns51RW57RgXNCh+saIvFVZ0P8pEV4nE9BHh6GX5Td36 FvP8ZBdVRrct58ylvTZrbJbRjOFAGQVFHFNeZLdY6eJebGa3v7TYmNQII+20Ol+97mw1 Oo4yXDLVeXz8C/vo2ifsESbFzNmY6aM671x4Os0tgbybCVtpSspokIemgRCaMpmPzhJ9 uBQbeELnobRKRR+ilZoF91zHKTcFVHginS0xRJ1F1lcsQ9KaFlZ80SBflxQrRfCJups3 SUiPsWaESbsbCXvYBNOeUEKt6P890IF1/YzCvGl5b4V0bERAAgMAj00F9iiHNcl458Ir XCpw== X-Gm-Message-State: AD7BkJJn9/1Vpqc0Kf0MKF/HQ7KnAytz/wx5B900ro/aaYUWeXi07iZtWxVmIzkp0v3G49iU X-Received: by 10.66.55.70 with SMTP id q6mr31360093pap.126.1459525806412; Fri, 01 Apr 2016 08:50:06 -0700 (PDT) Received: from localhost.localdomain ([167.160.116.218]) by smtp.gmail.com with ESMTPSA id yj1sm22536791pac.16.2016.04.01.08.49.59 (version=TLSv1/SSLv3 cipher=OTHER); Fri, 01 Apr 2016 08:50:05 -0700 (PDT) From: Shannon Zhao To: linux-arm-kernel@lists.infradead.org, stefano.stabellini@citrix.com Date: Fri, 1 Apr 2016 23:49:01 +0800 Message-Id: <1459525755-36968-4-git-send-email-shannon.zhao@linaro.org> X-Mailer: git-send-email 2.1.4 In-Reply-To: <1459525755-36968-1-git-send-email-shannon.zhao@linaro.org> References: <1459525755-36968-1-git-send-email-shannon.zhao@linaro.org> Cc: devicetree@vger.kernel.org, linux-efi@vger.kernel.org, catalin.marinas@arm.com, will.deacon@arm.com, linux-kernel@vger.kernel.org, peter.huangpeng@huawei.com, julien.grall@arm.com, david.vrabel@citrix.com, zhaoshenglong@huawei.com, xen-devel@lists.xen.org, shannon.zhao@linaro.org Subject: [Xen-devel] [PATCH v10 03/17] Xen: xlate: Use page_to_xen_pfn instead of page_to_pfn 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-Spam-Status: No, score=-4.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_MED, T_DKIM_INVALID, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Make xen_xlate_map_ballooned_pages work with 64K pages. In that case Kernel pages are 64K in size but Xen pages remain 4K in size. Xen pfns refer to 4K pages. Signed-off-by: Shannon Zhao Reviewed-by: Stefano Stabellini Reviewed-by: Julien Grall --- drivers/xen/xlate_mmu.c | 38 +++++++++++++++++++++++++++----------- 1 file changed, 27 insertions(+), 11 deletions(-) diff --git a/drivers/xen/xlate_mmu.c b/drivers/xen/xlate_mmu.c index 9692656..23f1387 100644 --- a/drivers/xen/xlate_mmu.c +++ b/drivers/xen/xlate_mmu.c @@ -189,6 +189,18 @@ int xen_xlate_unmap_gfn_range(struct vm_area_struct *vma, } EXPORT_SYMBOL_GPL(xen_xlate_unmap_gfn_range); +struct map_balloon_pages { + xen_pfn_t *pfns; + unsigned int idx; +}; + +static void setup_balloon_gfn(unsigned long gfn, void *data) +{ + struct map_balloon_pages *info = data; + + info->pfns[info->idx++] = gfn; +} + /** * xen_xlate_map_ballooned_pages - map a new set of ballooned pages * @gfns: returns the array of corresponding GFNs @@ -205,11 +217,13 @@ int __init xen_xlate_map_ballooned_pages(xen_pfn_t **gfns, void **virt, struct page **pages; xen_pfn_t *pfns; void *vaddr; + struct map_balloon_pages data; int rc; - unsigned int i; + unsigned long nr_pages; BUG_ON(nr_grant_frames == 0); - pages = kcalloc(nr_grant_frames, sizeof(pages[0]), GFP_KERNEL); + nr_pages = DIV_ROUND_UP(nr_grant_frames, XEN_PFN_PER_PAGE); + pages = kcalloc(nr_pages, sizeof(pages[0]), GFP_KERNEL); if (!pages) return -ENOMEM; @@ -218,22 +232,24 @@ int __init xen_xlate_map_ballooned_pages(xen_pfn_t **gfns, void **virt, kfree(pages); return -ENOMEM; } - rc = alloc_xenballooned_pages(nr_grant_frames, pages); + rc = alloc_xenballooned_pages(nr_pages, pages); if (rc) { - pr_warn("%s Couldn't balloon alloc %ld pfns rc:%d\n", __func__, - nr_grant_frames, rc); + pr_warn("%s Couldn't balloon alloc %ld pages rc:%d\n", __func__, + nr_pages, rc); kfree(pages); kfree(pfns); return rc; } - for (i = 0; i < nr_grant_frames; i++) - pfns[i] = page_to_pfn(pages[i]); - vaddr = vmap(pages, nr_grant_frames, 0, PAGE_KERNEL); + data.pfns = pfns; + data.idx = 0; + xen_for_each_gfn(pages, nr_grant_frames, setup_balloon_gfn, &data); + + vaddr = vmap(pages, nr_pages, 0, PAGE_KERNEL); if (!vaddr) { - pr_warn("%s Couldn't map %ld pfns rc:%d\n", __func__, - nr_grant_frames, rc); - free_xenballooned_pages(nr_grant_frames, pages); + pr_warn("%s Couldn't map %ld pages rc:%d\n", __func__, + nr_pages, rc); + free_xenballooned_pages(nr_pages, pages); kfree(pages); kfree(pfns); return -ENOMEM;