From patchwork Wed Nov 12 11:40:52 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stefano Stabellini X-Patchwork-Id: 40662 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 7A9DD206A5 for ; Wed, 12 Nov 2014 11:48:15 +0000 (UTC) Received: by mail-lb0-f198.google.com with SMTP id 10sf6518610lbg.1 for ; Wed, 12 Nov 2014 03:48:14 -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=glM7nFKs8tX9GpV+aG/z3DL0cu2F2x2JU9qEOvfNfhQ=; b=e5TWZbSE8EybMTIAuCaoluDmRprGfncyebiZbsdZF6aKczLkWxYULBJIkFoOFIY8Zd 8nh8jvjTUDm7yrEeveWPTtZphz9mZyKlg3QgpLaVfuFQjYSsDvYfn0zaQQxhWnvs+fmX lwL9DMmCC9IMDGYYz02rEDSyVWntSYGksy0ag6Rv2xnibTqP92fu0P1TMwZ1rz58Qmx/ VDM4uHGISTn5mApAWKvz7NRcwvYlcaLhAIDcsWjNYeNmf4F0y95UP3wpudifvMrCK9of jT7CiPVRUG/GQe/ofCQv0ksqiD4gXb1OIdsa7ye/cZoSBPupuYLvxvIRZrH/ee80pkrz IbaA== X-Gm-Message-State: ALoCoQkTg7YjeE/Aok0Wl2sFElO/MpIIeZRxxYeizl3h3YvhwfetlyrQdlJlYpaONpO2Vnma/ICf X-Received: by 10.180.219.40 with SMTP id pl8mr6530311wic.3.1415792894147; Wed, 12 Nov 2014 03:48:14 -0800 (PST) X-BeenThere: patchwork-forward@linaro.org Received: by 10.152.6.227 with SMTP id e3ls719346laa.69.gmail; Wed, 12 Nov 2014 03:48:13 -0800 (PST) X-Received: by 10.112.45.228 with SMTP id q4mr42216361lbm.35.1415792893628; Wed, 12 Nov 2014 03:48:13 -0800 (PST) Received: from mail-lb0-f181.google.com (mail-lb0-f181.google.com. [209.85.217.181]) by mx.google.com with ESMTPS id be15si5857200lab.113.2014.11.12.03.48.13 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Wed, 12 Nov 2014 03:48:13 -0800 (PST) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.217.181 as permitted sender) client-ip=209.85.217.181; Received: by mail-lb0-f181.google.com with SMTP id l4so9077461lbv.40 for ; Wed, 12 Nov 2014 03:48:13 -0800 (PST) X-Received: by 10.112.14.69 with SMTP id n5mr41748928lbc.34.1415792893303; Wed, 12 Nov 2014 03:48:13 -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 ew9csp408844lbc; Wed, 12 Nov 2014 03:48:12 -0800 (PST) X-Received: by 10.66.65.169 with SMTP id y9mr23687850pas.102.1415792890719; Wed, 12 Nov 2014 03:48:10 -0800 (PST) Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id ba2si22520873pdb.239.2014.11.12.03.48.09 for ; Wed, 12 Nov 2014 03:48:10 -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 S1752653AbaKLLsF (ORCPT + 25 others); Wed, 12 Nov 2014 06:48:05 -0500 Received: from smtp02.citrix.com ([66.165.176.63]:62772 "EHLO SMTP02.CITRIX.COM" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752697AbaKLLsC (ORCPT ); Wed, 12 Nov 2014 06:48:02 -0500 X-IronPort-AV: E=Sophos;i="5.07,368,1413244800"; d="scan'208";a="191922247" Received: from ukmail1.uk.xensource.com (10.80.16.128) by smtprelay.citrix.com (10.13.107.78) with Microsoft SMTP Server id 14.3.181.6; Wed, 12 Nov 2014 06:48:01 -0500 Received: from kaball.uk.xensource.com ([10.80.2.59]) by ukmail1.uk.xensource.com with esmtp (Exim 4.69) (envelope-from ) id 1XoWIP-0003Gl-4R; Wed, 12 Nov 2014 11:41:09 +0000 From: Stefano Stabellini To: CC: , , , , , , , Stefano Stabellini Subject: [PATCH v9 11/13] xen/arm: introduce GNTTABOP_cache_flush Date: Wed, 12 Nov 2014 11:40:52 +0000 Message-ID: <1415792454-23161-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: 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.217.181 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 Reviewed-by: Catalin Marinas 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 28ebf3e..351b24a 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; @@ -39,7 +42,26 @@ static void dma_cache_maint(dma_addr_t handle, unsigned long offset, do { size_t len = left; - /* 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++; @@ -104,7 +126,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, @@ -147,10 +169,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. */