From patchwork Mon Nov 10 16:14:03 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stefano Stabellini X-Patchwork-Id: 40513 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-lb0-f198.google.com (mail-lb0-f198.google.com [209.85.217.198]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id A1048218DE for ; Mon, 10 Nov 2014 16:19:35 +0000 (UTC) Received: by mail-lb0-f198.google.com with SMTP id 10sf4262072lbg.9 for ; Mon, 10 Nov 2014 08:19:34 -0800 (PST) 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=WjA5slTDp3/rkQkzvfihYAO1xhbe3lNdcXiRRj9uZlM=; b=AJ2nuJqR3sLEghPXWVpfCY5GtuA57u0h/pK9RSAHyYdPwkePW4vR1N+qGYIRzldSIc IIqh5Az9ZGI+fDuza3X8XYfIuXYjd9AYe1ZwFNy+s7YtU+ugYTiDHAXE0pbIEH5Qw/dU /Fys14JFCBCGzzS8Kc9Td/qAXisUmOqBQaZuv2bHLM7YvixkaUu4e7kZEiLv7ecrf6cr xhklUUxHP+vOCnkZmcqd6GEv0amP2mBGwSpw5nU46NLDNvBvOhZNOgjCbVoqzxqa+Ayk dIv4c1naD5y6IuEagL/ycEW6t6+SzysOup9ELpAb2hEg3f2EdtpqoKbEx0/bwoTIlqZO gtrA== X-Gm-Message-State: ALoCoQmrE5KbbPXTf11afU2ZaoOsd+N034iz67qF2odiTpVi0qSPR3CBe/Ex74Og8Sxei+vXjEnx X-Received: by 10.112.247.74 with SMTP id yc10mr5424814lbc.8.1415636374628; Mon, 10 Nov 2014 08:19:34 -0800 (PST) X-BeenThere: patchwork-forward@linaro.org Received: by 10.152.87.146 with SMTP id ay18ls84880lab.51.gmail; Mon, 10 Nov 2014 08:19:34 -0800 (PST) X-Received: by 10.112.247.43 with SMTP id yb11mr30305689lbc.51.1415636374164; Mon, 10 Nov 2014 08:19:34 -0800 (PST) Received: from mail-lb0-f178.google.com (mail-lb0-f178.google.com. [209.85.217.178]) by mx.google.com with ESMTPS id ap3si27717498lbc.33.2014.11.10.08.19.34 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Mon, 10 Nov 2014 08:19:34 -0800 (PST) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.217.178 as permitted sender) client-ip=209.85.217.178; Received: by mail-lb0-f178.google.com with SMTP id f15so6736860lbj.37 for ; Mon, 10 Nov 2014 08:19:34 -0800 (PST) X-Received: by 10.152.5.38 with SMTP id p6mr30076986lap.44.1415636374045; Mon, 10 Nov 2014 08:19:34 -0800 (PST) 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.184.201 with SMTP id ew9csp116875lbc; Mon, 10 Nov 2014 08:19:32 -0800 (PST) X-Received: by 10.66.138.101 with SMTP id qp5mr10903520pab.90.1415636367891; Mon, 10 Nov 2014 08:19:27 -0800 (PST) Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id ph6si1942707pdb.16.2014.11.10.08.19.17 for ; Mon, 10 Nov 2014 08:19:27 -0800 (PST) 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 S1753715AbaKJQS5 (ORCPT + 25 others); Mon, 10 Nov 2014 11:18:57 -0500 Received: from smtp02.citrix.com ([66.165.176.63]:47922 "EHLO SMTP02.CITRIX.COM" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753667AbaKJQSz (ORCPT ); Mon, 10 Nov 2014 11:18:55 -0500 X-IronPort-AV: E=Sophos;i="5.07,353,1413244800"; d="scan'208";a="191239752" Received: from ukmail1.uk.xensource.com (10.80.16.128) by smtprelay.citrix.com (10.13.107.79) with Microsoft SMTP Server id 14.3.181.6; Mon, 10 Nov 2014 11:17:52 -0500 Received: from kaball.uk.xensource.com ([10.80.2.59]) by ukmail1.uk.xensource.com with esmtp (Exim 4.69) (envelope-from ) id 1Xnrbe-0000Mx-5P; Mon, 10 Nov 2014 16:14:18 +0000 From: Stefano Stabellini To: CC: , , , , , , , Stefano Stabellini Subject: [PATCH v8 11/13] xen/arm: introduce GNTTABOP_cache_flush Date: Mon, 10 Nov 2014 16:14:03 +0000 Message-ID: <1415636045-24669-11-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: MIA2 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.217.178 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 | 34 ++++++++++++++++++++++++++++++++-- include/xen/interface/grant_table.h | 19 +++++++++++++++++++ 2 files changed, 51 insertions(+), 2 deletions(-) diff --git a/arch/arm/xen/mm.c b/arch/arm/xen/mm.c index 1b087cd..49bfec9 100644 --- a/arch/arm/xen/mm.c +++ b/arch/arm/xen/mm.c @@ -12,6 +12,7 @@ #include #include +#include #include #include @@ -24,12 +25,14 @@ enum dma_cache_op { DMA_UNMAP, DMA_MAP, }; +static bool hypercall_cflush = false; /* functions called by SWIOTLB */ static void dma_cache_maint(dma_addr_t handle, unsigned long offset, size_t size, enum dma_data_direction dir, enum dma_cache_op op) { + struct gnttab_cache_flush cflush; unsigned long pfn; size_t left = size; @@ -41,7 +44,26 @@ static void dma_cache_maint(dma_addr_t handle, unsigned long offset, BUG_ON(pfn_valid(pfn)); - /* TODO: cache flush */ + /* buffers in highmem or foreign pages cannot cross page + * boundaries */ + if (len + offset > PAGE_SIZE) + len = PAGE_SIZE - offset; + + cflush.op = 0; + cflush.a.dev_bus_addr = pfn << PAGE_SHIFT; + cflush.offset = offset; + cflush.length = len; + + if (op == DMA_UNMAP && dir != DMA_TO_DEVICE) + cflush.op = GNTTAB_CACHE_INVAL; + if (op == DMA_MAP) { + 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); offset = 0; pfn++; @@ -106,7 +128,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, @@ -149,10 +171,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. */