From patchwork Mon Oct 27 15:09:28 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stefano Stabellini X-Patchwork-Id: 39637 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-lb0-f200.google.com (mail-lb0-f200.google.com [209.85.217.200]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 9E74F2118A for ; Mon, 27 Oct 2014 15:14:10 +0000 (UTC) Received: by mail-lb0-f200.google.com with SMTP id f15sf1581866lbj.7 for ; Mon, 27 Oct 2014 08:14:09 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:delivered-to:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:sender:precedence:list-id :x-original-sender:x-original-authentication-results:mailing-list :list-post:list-help:list-archive:list-unsubscribe:content-type; bh=QJ+Q0yrhqd2UB4OYaFh2Yyu11md22Q2lY34ZrjgBCoE=; b=VOPcdUlqwVwpdQYOLSUgjb0UFo3y0Uk35/KLTj86EspBMZ3CXncWz+G5zeA4ewrsUE uy2HsYaGbziWODSeWmGbXiB8CSt9Kp4c7nAFHksFJguLP1vCRHjtYVDz3eD8IeeKJH67 h2/77FmSCwhbmPoU9Atie3KSIdy+hUsxGz01IpEsFIo9MHTNT8R64pRh7JrB6KIQ0ND7 744ZXDicPkIcWn6pdTocybb479os/wCpiZ01ADtcl1Ucml9D25dVrlJexajOdzdsQEwZ AL1wyH6H1ettWZLnj5QTS42T/IAt68W/j6cS4vt11EhzTAzU1MaV1w6/c9s/yu6FIbHq F37A== X-Gm-Message-State: ALoCoQku68DO37PdzElF0vI7pbYLSnPXR6/06FCspXpUVzKcQv5QcCMLAAWdDxkJ4oMCoLg47FQt X-Received: by 10.152.42.171 with SMTP id p11mr1756891lal.4.1414422849181; Mon, 27 Oct 2014 08:14:09 -0700 (PDT) X-BeenThere: patchwork-forward@linaro.org Received: by 10.152.87.100 with SMTP id w4ls666057laz.16.gmail; Mon, 27 Oct 2014 08:14:08 -0700 (PDT) X-Received: by 10.152.234.136 with SMTP id ue8mr17271477lac.21.1414422848851; Mon, 27 Oct 2014 08:14:08 -0700 (PDT) Received: from mail-la0-f42.google.com (mail-la0-f42.google.com. [209.85.215.42]) by mx.google.com with ESMTPS id g9si16214596lbd.134.2014.10.27.08.14.08 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Mon, 27 Oct 2014 08:14:08 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.215.42 as permitted sender) client-ip=209.85.215.42; Received: by mail-la0-f42.google.com with SMTP id gq15so839237lab.29 for ; Mon, 27 Oct 2014 08:14:08 -0700 (PDT) X-Received: by 10.112.77.74 with SMTP id q10mr24184830lbw.66.1414422848749; Mon, 27 Oct 2014 08:14:08 -0700 (PDT) X-Forwarded-To: patchwork-forward@linaro.org X-Forwarded-For: patch@linaro.org patchwork-forward@linaro.org Delivered-To: patch@linaro.org Received: by 10.112.84.229 with SMTP id c5csp310049lbz; Mon, 27 Oct 2014 08:14:07 -0700 (PDT) X-Received: by 10.66.124.136 with SMTP id mi8mr25145865pab.105.1414422846223; Mon, 27 Oct 2014 08:14:06 -0700 (PDT) Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id by2si10647708pbb.197.2014.10.27.08.14.04 for ; Mon, 27 Oct 2014 08:14:06 -0700 (PDT) Received-SPF: none (google.com: linux-kernel-owner@vger.kernel.org does not designate permitted sender hosts) client-ip=209.132.180.67; Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753349AbaJ0POA (ORCPT + 26 others); Mon, 27 Oct 2014 11:14:00 -0400 Received: from smtp.citrix.com ([66.165.176.89]:11947 "EHLO SMTP.CITRIX.COM" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753143AbaJ0PNJ (ORCPT ); Mon, 27 Oct 2014 11:13:09 -0400 X-IronPort-AV: E=Sophos;i="5.04,796,1406592000"; d="scan'208";a="185211239" Received: from ukmail1.uk.xensource.com (10.80.16.128) by smtprelay.citrix.com (10.13.107.80) with Microsoft SMTP Server id 14.3.181.6; Mon, 27 Oct 2014 11:12:05 -0400 Received: from kaball.uk.xensource.com ([10.80.2.59]) by ukmail1.uk.xensource.com with esmtp (Exim 4.69) (envelope-from ) id 1Xilxg-0006cI-EX; Mon, 27 Oct 2014 15:12:00 +0000 From: Stefano Stabellini To: CC: , , , , , , Stefano Stabellini Subject: [PATCH v7 8/8] xen/arm: introduce GNTTABOP_cache_flush Date: Mon, 27 Oct 2014 15:09:28 +0000 Message-ID: <1414422568-19103-8-git-send-email-stefano.stabellini@eu.citrix.com> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: References: MIME-Version: 1.0 X-DLP: MIA1 Sender: linux-kernel-owner@vger.kernel.org Precedence: list List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-Removed-Original-Auth: Dkim didn't pass. X-Original-Sender: stefano.stabellini@eu.citrix.com X-Original-Authentication-Results: mx.google.com; spf=pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.215.42 as permitted sender) smtp.mail=patch+caf_=patchwork-forward=linaro.org@linaro.org Mailing-list: list patchwork-forward@linaro.org; contact patchwork-forward+owners@linaro.org X-Google-Group-Id: 836684582541 List-Post: , List-Help: , List-Archive: List-Unsubscribe: , Introduce support for new hypercall GNTTABOP_cache_flush. Use it to perform cache flashing on pages used for dma when necessary. If GNTTABOP_cache_flush is supported by the hypervisor, we don't need to bounce dma map operations that involve foreign grants and non-coherent devices. Signed-off-by: Stefano Stabellini Acked-by: Ian Campbell --- Changes in v5: - rename hypercall_flush to hypercall_cflush; - remove spurious change. Changes in v4: - add comment; - avoid bouncing dma map operations that involve foreign grants and non-coherent devices if GNTTABOP_cache_flush is provided by Xen. Changes in v3: - fix the cache maintenance op call to match what Linux does natively; - update the hypercall interface to match Xen. Changes in v2: - update the hypercall interface to match Xen; - call the interface on a single page at a time. --- arch/arm/xen/mm.c | 39 ++++++++++++++++++++++++++++++----- include/xen/interface/grant_table.h | 19 +++++++++++++++++ 2 files changed, 53 insertions(+), 5 deletions(-) diff --git a/arch/arm/xen/mm.c b/arch/arm/xen/mm.c index 28396aa..e20a57f 100644 --- a/arch/arm/xen/mm.c +++ b/arch/arm/xen/mm.c @@ -12,6 +12,7 @@ #include #include +#include #include #include @@ -20,6 +21,8 @@ #include #include +static bool hypercall_cflush = false; + #ifdef CONFIG_ARM64 static inline void dmac_map_area(const void *start, size_t size, int dir) @@ -60,17 +63,35 @@ static void dma_cache_maint(dma_addr_t handle, unsigned long offset, do { size_t len = left; void *vaddr; + + /* buffers in highmem or foreign pages cannot cross page + * boundaries */ + if (len + offset > PAGE_SIZE) + len = PAGE_SIZE - offset; if (!pfn_valid(pfn)) { - /* TODO: cache flush */ + struct gnttab_cache_flush cflush; + + cflush.op = 0; + cflush.a.dev_bus_addr = pfn << PAGE_SHIFT; + cflush.offset = offset; + cflush.length = len; + + if (op == dmac_unmap_area && dir != DMA_TO_DEVICE) + cflush.op = GNTTAB_CACHE_INVAL; + if (op == dmac_map_area) { + if (dir == DMA_FROM_DEVICE) + cflush.op = GNTTAB_CACHE_INVAL; + else + cflush.op = GNTTAB_CACHE_CLEAN; + } + if (cflush.op) + HYPERVISOR_grant_table_op(GNTTABOP_cache_flush, &cflush, 1); } else { struct page *page = pfn_to_page(pfn); if (PageHighMem(page)) { - if (len + offset > PAGE_SIZE) - len = PAGE_SIZE - offset; - if (cache_is_vipt_nonaliasing()) { vaddr = kmap_atomic(page); op(vaddr + offset, len, dir); @@ -143,7 +164,7 @@ bool xen_arch_need_swiotlb(struct device *dev, unsigned long pfn, unsigned long mfn) { - return ((pfn != mfn) && !is_device_dma_coherent(dev)); + return (!hypercall_cflush && (pfn != mfn) && !is_device_dma_coherent(dev)); } int xen_create_contiguous_region(phys_addr_t pstart, unsigned int order, @@ -186,10 +207,18 @@ static struct dma_map_ops xen_swiotlb_dma_ops = { int __init xen_mm_init(void) { + struct gnttab_cache_flush cflush; if (!xen_initial_domain()) return 0; xen_swiotlb_init(1, false); xen_dma_ops = &xen_swiotlb_dma_ops; + + cflush.op = 0; + cflush.a.dev_bus_addr = 0; + cflush.offset = 0; + cflush.length = 0; + if (HYPERVISOR_grant_table_op(GNTTABOP_cache_flush, &cflush, 1) != -ENOSYS) + hypercall_cflush = true; return 0; } arch_initcall(xen_mm_init); diff --git a/include/xen/interface/grant_table.h b/include/xen/interface/grant_table.h index e40fae9..bcce564 100644 --- a/include/xen/interface/grant_table.h +++ b/include/xen/interface/grant_table.h @@ -479,6 +479,25 @@ struct gnttab_get_version { DEFINE_GUEST_HANDLE_STRUCT(gnttab_get_version); /* + * Issue one or more cache maintenance operations on a portion of a + * page granted to the calling domain by a foreign domain. + */ +#define GNTTABOP_cache_flush 12 +struct gnttab_cache_flush { + union { + uint64_t dev_bus_addr; + grant_ref_t ref; + } a; + uint16_t offset; /* offset from start of grant */ + uint16_t length; /* size within the grant */ +#define GNTTAB_CACHE_CLEAN (1<<0) +#define GNTTAB_CACHE_INVAL (1<<1) +#define GNTTAB_CACHE_SOURCE_GREF (1<<31) + uint32_t op; +}; +DEFINE_GUEST_HANDLE_STRUCT(gnttab_cache_flush); + +/* * Bitfield values for update_pin_status.flags. */ /* Map the grant entry for access by I/O devices. */