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: 64865 Delivered-To: patch@linaro.org Received: by 10.112.199.169 with SMTP id jl9csp810878lbc; Fri, 1 Apr 2016 08:50:29 -0700 (PDT) X-Received: by 10.182.131.194 with SMTP id oo2mr3941054obb.84.1459525823267; Fri, 01 Apr 2016 08:50:23 -0700 (PDT) Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id r3si7821820oig.7.2016.04.01.08.50.22; Fri, 01 Apr 2016 08:50:23 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE dis=NONE) header.from=linaro.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932354AbcDAPuK (ORCPT + 29 others); Fri, 1 Apr 2016 11:50:10 -0400 Received: from mail-pa0-f49.google.com ([209.85.220.49]:34480 "EHLO mail-pa0-f49.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1759307AbcDAPuH (ORCPT ); Fri, 1 Apr 2016 11:50:07 -0400 Received: by mail-pa0-f49.google.com with SMTP id fe3so93882433pab.1 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=hMXfIy9+23A+xJKHFkj3/uZG4fgEtLquEvC31Z9ADnaozUiiMYwve5XQYBHUA6PvBL 1sGQdAn5+mtij+XtisiCGItDtuD26AHqSXBSFpNFNlPyPRwzegOCSQ9opUT9voQUUEBj Q/JWovpHxuDvVoazyiDKI8KxswZ3widpjWdua2LifCfI/PAzqhBWoNMUGK2MvbuP0der BhvLwEmNNLIUJo3QBeUvkn6RSpEgo/YaFR2VK+c7+rBq1cBzJB6ouwIC+1OtPKRXGAbJ OhAdL4doHfcRcVjMmeyLo4vy/DUilFsea4lyIOTl9CNNtXzTEG51I4ie/v+mWQp+q2si nsow== X-Gm-Message-State: AD7BkJJgiCG6otSa+io4/RJXb46a8i3jXtmggXS2t7ZacoEXCp244l258dbZsz1c/98lJYwZ 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 Cc: david.vrabel@citrix.com, devicetree@vger.kernel.org, linux-efi@vger.kernel.org, linux-kernel@vger.kernel.org, catalin.marinas@arm.com, will.deacon@arm.com, julien.grall@arm.com, peter.huangpeng@huawei.com, xen-devel@lists.xen.org, zhaoshenglong@huawei.com, shannon.zhao@linaro.org 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> Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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 --- drivers/xen/xlate_mmu.c | 38 +++++++++++++++++++++++++++----------- 1 file changed, 27 insertions(+), 11 deletions(-) -- 2.1.4 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;