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: 8726101 Return-Path: X-Original-To: patchwork-linux-arm@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 882E2C0553 for ; Fri, 1 Apr 2016 15:52:44 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 9D03A20145 for ; Fri, 1 Apr 2016 15:52:43 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.9]) (using TLSv1.2 with cipher AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 6E0FB202EC for ; Fri, 1 Apr 2016 15:52:42 +0000 (UTC) Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1am1Lf-0003E9-4r; Fri, 01 Apr 2016 15:50:59 +0000 Received: from mail-pa0-x234.google.com ([2607:f8b0:400e:c03::234]) by bombadil.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1am1L8-0001fU-S6 for linux-arm-kernel@lists.infradead.org; Fri, 01 Apr 2016 15:50:31 +0000 Received: by mail-pa0-x234.google.com with SMTP id zm5so93970826pac.0 for ; Fri, 01 Apr 2016 08:50:06 -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=a+XMkQdcJkZO4FOWRQsM1Ez0Ufej4YozsrJBPBSrwWGHQGwnLzM2iSKloi6CpghPE+ TkteBZNOPkCah20+kTGBwO2FXISY+MBfTZxPJos4ZY1DJUj/GyqnweP37GFuGyBPr257 MCoaTm8r6te031i1gp+RBArn4myffVraX7tXXPgzR+AaC/comyhi7WxFQH/HcQuEdaBD 7Wz6ApWjRUx6XWnxAK9v3kx05Y0CXDbvKo0NxKhfSNK6z5M7mkgC/ST2lSeQMw2iKkKl +XZJBWJyuIGIFEPr3L+veuvFL4DgPuqu59tMRvyu4yFyQ1cRLxxHQlm7ZLyUfn3l/T91 ONHw== X-Gm-Message-State: AD7BkJKeZdP76NSEzCrEU/TEUyxDaPY1NOUIii7bvAb919L4YF+ClIctBGSAeK3n+EuyWhfb 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 Subject: [PATCH v10 03/17] Xen: xlate: Use page_to_xen_pfn instead of page_to_pfn 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> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20160401_085027_514794_F7974816 X-CRM114-Status: GOOD ( 13.74 ) X-Spam-Score: -2.7 (--) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , 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 MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Spam-Status: No, score=-5.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_MED,RP_MATCHES_RCVD,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;