From patchwork Sun Jul 9 08:10:56 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kai Huang X-Patchwork-Id: 9831697 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 0661D60318 for ; Sun, 9 Jul 2017 08:13:18 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id EDBEE24151 for ; Sun, 9 Jul 2017 08:13:17 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id DE7DF27F85; Sun, 9 Jul 2017 08:13:17 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-3.6 required=2.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, RCVD_IN_DNSWL_MED, RCVD_IN_SORBS_SPAM, T_DKIM_INVALID autolearn=ham version=3.3.1 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.wl.linuxfoundation.org (Postfix) with ESMTPS id 430A424151 for ; Sun, 9 Jul 2017 08:13:17 +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 1dU7JF-0005k3-H0; Sun, 09 Jul 2017 08:11:17 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from ) id 1dU7JD-0005jX-R8 for xen-devel@lists.xen.org; Sun, 09 Jul 2017 08:11:15 +0000 Received: from [85.158.139.211] by server-16.bemta-5.messagelabs.com id C0/0F-01712-325E1695; Sun, 09 Jul 2017 08:11:15 +0000 X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFtrAIsWRWlGSWpSXmKPExsXiVRvsqKv0NDH S4OcnZYslHxezODB6HN39mymAMYo1My8pvyKBNWPV2u1MBTsEKl7PXMzWwDiPt4uRi0NIYAKj xOq3V5hAHBaBlywSzTfugzkSAv2sEpOXtrN3MXICOXESpye8Zuti5ACyKyVO3rQHCQsJKEt0f TvKDjFpEZPEm7mvmEESbAJqEluXtLNA9NpKLDj3BSwuIiAtce3zZUYQm1nAUGLL/U2sILYwkH 311FGwOIuAqsT8Tw/YQXbxCsRLrP6TBTFGXmJX20Wwck6gkV/2L2CGuMFG4tex9UwTGAUXMDK sYlQvTi0qSy3SNdNLKspMzyjJTczM0TU0MNXLTS0uTkxPzUlMKtZLzs/dxAgMNwYg2ME4tcH5 EKMkB5OSKK9Yb0KkEF9SfkplRmJxRnxRaU5q8SFGGQ4OJQneyY8TI4UEi1LTUyvSMnOAgQ+Tl uDgURLhdZ4OlOYtLkjMLc5Mh0idYjTmmHRg+xcmjlcT/n9jEmLJy89LlRLnvQ0ySQCkNKM0D2 4QLCIvMcpKCfMyAp0mxFOQWpSbWYIq/4pRnINRSZi3H2QKT2ZeCdy+V0CnMAGdwlaXAHJKSSJ CSqqBcbuZfEpgrKfdjlN9K58orQp69Pm9vq70eY/JFwTDPr774KFT2qlt90Myhqm0n/3Ql6tv XZ1FpvwJ6ilmjXD5vGBbeoXZminZRzpDfnc4rSs5wvetIP2FYN63myk1V04ma5476uuUcfxtv KjHLKuFN/eytG4Qqlp793co7/kZf9T3dzP8yPrIpsRSnJFoqMVcVJwIADzkcqzDAgAA X-Env-Sender: kaih.linux@gmail.com X-Msg-Ref: server-16.tower-206.messagelabs.com!1499587873!86171366!1 X-Originating-IP: [74.125.83.65] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 9.4.25; banners=-,-,- X-VirusChecked: Checked Received: (qmail 18008 invoked from network); 9 Jul 2017 08:11:14 -0000 Received: from mail-pg0-f65.google.com (HELO mail-pg0-f65.google.com) (74.125.83.65) by server-16.tower-206.messagelabs.com with AES128-GCM-SHA256 encrypted SMTP; 9 Jul 2017 08:11:14 -0000 Received: by mail-pg0-f65.google.com with SMTP id u36so9084632pgn.3 for ; Sun, 09 Jul 2017 01:11:14 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=T5/gJIKx9PZk0fWd2VEtFpzsu6J6PaX7khvwJHwEJzA=; b=V4+v2+1/QWXNAdZoWf8gG9QiD0NPWov03Sdu+jvYuGYY9S3Vocu0XBTY6JSAGp3tyh eT2nTK/P3+8OLIDYccm9d7VhUW6COaKEwZJkt1aWYHGor2mgqm+I0UtHGAeO8JZa9m5/ VIU6MUeQCfN9Hyh4T1FFMDdmMandWUF6NrrKJ8UKCj6CJsIINNq7OgrpGEWMcvBRkjqb u7fhkIU71MgdiKNXg2RJyR4OJ94jnCLAym6a3f+qc9oFP1kMFacKaQ6zeSZblCvDUdIo Ygrlo4VEOz/e5SRznQl226jTliYl6MdfaqL9iTaFO3aPc6m/RTEI/abuAtNwCJvGkNwT C3mQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=T5/gJIKx9PZk0fWd2VEtFpzsu6J6PaX7khvwJHwEJzA=; b=NESuHRzrKx39Lz87K6XSyoYxMZCn7MqDJI3zzgvkg6VENXAODtYT+/BoNp4qnEwyiz lGVw3oUGJ3ogrvbujozhq5pj741WQVvt2kaHeT0E+A1YC9LZJiWLWnCWUmbYiCy+PVqi M2gfdfJhasv04M81wMU6dnlN4mV7k873Gy9OoFSqbbEfUzMBB2UmZHiQOrsH9TcgVRwW K8hFjYsziIYV5aColb5uNW381Kfwe0iwTjUSacMXSYOdCTSd5JPsKXfcCYmzLRfKHmAA CW8squwUSgGfqgq87N2YgxB6qYDyFRcsnPJCh7ILh4nxPtO8W0mEGF84hhI2GUAZbwEw dKVQ== X-Gm-Message-State: AIVw110b0UIMN/MOGsgVmRd6aqlUPFN2pTMTgTkbkzb+TK69OkHWTyYE EvKUldOhmjmczxNq X-Received: by 10.99.104.10 with SMTP id d10mr9164876pgc.186.1499587872818; Sun, 09 Jul 2017 01:11:12 -0700 (PDT) Received: from localhost.localdomain (118-92-234-57.dsl.dyn.ihug.co.nz. [118.92.234.57]) by smtp.gmail.com with ESMTPSA id c22sm17795634pfl.97.2017.07.09.01.11.10 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 09 Jul 2017 01:11:12 -0700 (PDT) From: Kai Huang X-Google-Original-From: Kai Huang To: xen-devel@lists.xen.org Date: Sun, 9 Jul 2017 20:10:56 +1200 Message-Id: <418c69fb675136a4768c3ef45521ad70131645c1.1499586046.git.kai.huang@linux.intel.com> X-Mailer: git-send-email 2.11.0 In-Reply-To: References: Cc: andrew.cooper3@citrix.com, jbeulich@suse.com Subject: [Xen-devel] [PATCH 04/15] xen: mm: add ioremap_cache 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-Virus-Scanned: ClamAV using ClamSMTP Currently Xen only has non-cacheable version of ioremap. Although EPC is reported as reserved memory in e820 but it can be mapped as cacheable. This patch adds ioremap_cache (cacheable version of ioremap). Signed-off-by: Kai Huang --- xen/arch/x86/mm.c | 15 +++++++++++++-- xen/include/xen/vmap.h | 1 + 2 files changed, 14 insertions(+), 2 deletions(-) diff --git a/xen/arch/x86/mm.c b/xen/arch/x86/mm.c index 101ab33193..d0b6b3a247 100644 --- a/xen/arch/x86/mm.c +++ b/xen/arch/x86/mm.c @@ -6284,9 +6284,10 @@ void *__init arch_vmap_virt_end(void) return (void *)fix_to_virt(__end_of_fixed_addresses); } -void __iomem *ioremap(paddr_t pa, size_t len) +static void __iomem *__ioremap(paddr_t pa, size_t len, bool_t cache) { mfn_t mfn = _mfn(PFN_DOWN(pa)); + unsigned int flags = cache ? PAGE_HYPERVISOR : PAGE_HYPERVISOR_NOCACHE; void *va; WARN_ON(page_is_ram_type(mfn_x(mfn), RAM_TYPE_CONVENTIONAL)); @@ -6299,12 +6300,22 @@ void __iomem *ioremap(paddr_t pa, size_t len) unsigned int offs = pa & (PAGE_SIZE - 1); unsigned int nr = PFN_UP(offs + len); - va = __vmap(&mfn, nr, 1, 1, PAGE_HYPERVISOR_NOCACHE, VMAP_DEFAULT) + offs; + va = __vmap(&mfn, nr, 1, 1, flags, VMAP_DEFAULT) + offs; } return (void __force __iomem *)va; } +void __iomem *ioremap(paddr_t pa, size_t len) +{ + return __ioremap(pa, len, false); +} + +void __iomem *ioremap_cache(paddr_t pa, size_t len) +{ + return __ioremap(pa, len, true); +} + int create_perdomain_mapping(struct domain *d, unsigned long va, unsigned int nr, l1_pgentry_t **pl1tab, struct page_info **ppg) diff --git a/xen/include/xen/vmap.h b/xen/include/xen/vmap.h index 369560e620..f6037e368c 100644 --- a/xen/include/xen/vmap.h +++ b/xen/include/xen/vmap.h @@ -24,6 +24,7 @@ void *vzalloc(size_t size); void vfree(void *va); void __iomem *ioremap(paddr_t, size_t); +void __iomem *ioremap_cache(paddr_t, size_t); static inline void iounmap(void __iomem *va) {