From patchwork Fri Oct 3 14:53:26 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stefano Stabellini X-Patchwork-Id: 38329 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-wi0-f199.google.com (mail-wi0-f199.google.com [209.85.212.199]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 21F812057C for ; Fri, 3 Oct 2014 14:56:06 +0000 (UTC) Received: by mail-wi0-f199.google.com with SMTP id d1sf918191wiv.6 for ; Fri, 03 Oct 2014 07:56:05 -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=D6D8dQuaQ68NKSeKiagkKS3Mk/4aSqCf6QZ4hJE2xv0=; b=QNfQlFZXCaqnKs067IUXT/DaFQr8N1ltWEHy2ve9QtzsE07tEF6KZfyBoWQq2o9jDH YwJbk2lV6hhMJzzLvT5gIiUoiwhfuOK5IlZkkxDIlcebM73xfAfV3HohD3ID3XPvcXxm 65xFAK1kqzwx0ujxMSZ9IB53iHL6zH0tzSyE1tP3RNRKFu/WnxN/stk0v5I6mzgKT0hW 2JKAmw+LjlNhQTGkA8aCug4wNBLK8XmK5GrPBByNDhi6WCqattrumFkwlwodEWY5H90b LdeNmAFGPu4sSI3JTmNFoj+FIgZ2AdDLf+zzf0Qz0LURjbuBmeauqkXEwhR7dYM8DMk7 VotA== X-Gm-Message-State: ALoCoQlWrIhItISSReod2d2dLacFmIIYIyeBWMCfnDecwM1y2bBrF4Jlz7X90/AcwxWEhteBtY/9 X-Received: by 10.180.38.11 with SMTP id c11mr1910162wik.5.1412348165367; Fri, 03 Oct 2014 07:56:05 -0700 (PDT) X-BeenThere: patchwork-forward@linaro.org Received: by 10.152.10.173 with SMTP id j13ls390160lab.82.gmail; Fri, 03 Oct 2014 07:56:05 -0700 (PDT) X-Received: by 10.152.205.9 with SMTP id lc9mr6324709lac.37.1412348165145; Fri, 03 Oct 2014 07:56:05 -0700 (PDT) Received: from mail-la0-f47.google.com (mail-la0-f47.google.com [209.85.215.47]) by mx.google.com with ESMTPS id jt17si11636366lab.33.2014.10.03.07.56.05 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Fri, 03 Oct 2014 07:56:05 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.215.47 as permitted sender) client-ip=209.85.215.47; Received: by mail-la0-f47.google.com with SMTP id pv20so1203846lab.34 for ; Fri, 03 Oct 2014 07:56:05 -0700 (PDT) X-Received: by 10.153.7.73 with SMTP id da9mr5143749lad.56.1412348165035; Fri, 03 Oct 2014 07:56:05 -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.130.169 with SMTP id of9csp242472lbb; Fri, 3 Oct 2014 07:56:04 -0700 (PDT) X-Received: by 10.70.102.138 with SMTP id fo10mr1288348pdb.168.1412348163568; Fri, 03 Oct 2014 07:56:03 -0700 (PDT) Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id d7si4810969pds.56.2014.10.03.07.56.02 for ; Fri, 03 Oct 2014 07:56:03 -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 S1753438AbaJCOz7 (ORCPT + 27 others); Fri, 3 Oct 2014 10:55:59 -0400 Received: from smtp02.citrix.com ([66.165.176.63]:45946 "EHLO SMTP02.CITRIX.COM" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752006AbaJCOzq (ORCPT ); Fri, 3 Oct 2014 10:55:46 -0400 X-IronPort-AV: E=Sophos;i="5.04,647,1406592000"; d="scan'208";a="178979922" 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; Fri, 3 Oct 2014 10:55:42 -0400 Received: from kaball.uk.xensource.com ([10.80.2.59]) by ukmail1.uk.xensource.com with esmtp (Exim 4.69) (envelope-from ) id 1Xa4Gf-0000He-7T; Fri, 03 Oct 2014 15:55:37 +0100 From: Stefano Stabellini To: CC: , , , , , , Stefano Stabellini Subject: [PATCH v2 2/2] xen/arm: introduce GNTTABOP_cache_flush Date: Fri, 3 Oct 2014 15:53:26 +0100 Message-ID: <1412348006-27884-2-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.215.47 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. Signed-off-by: Stefano Stabellini Reviewed-by: David Vrabel --- Changes in v2: - update the hypercall interface to match Xen; - call the interface on a single page at a time. --- arch/arm/xen/mm32.c | 26 ++++++++++++++++++++++---- include/xen/interface/grant_table.h | 18 ++++++++++++++++++ 2 files changed, 40 insertions(+), 4 deletions(-) diff --git a/arch/arm/xen/mm32.c b/arch/arm/xen/mm32.c index a5a93fc..6ca09c2 100644 --- a/arch/arm/xen/mm32.c +++ b/arch/arm/xen/mm32.c @@ -4,6 +4,9 @@ #include #include +#include + +#include /* functions called by SWIOTLB */ @@ -22,16 +25,31 @@ static void dma_cache_maint(dma_addr_t handle, unsigned long offset, size_t len = left; void *vaddr; + 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.size = len; + + if (op == dmac_unmap_area && dir != DMA_TO_DEVICE) + cflush.op = GNTTAB_CACHE_INVAL; + if (op == dmac_map_area) { + cflush.op = GNTTAB_CACHE_CLEAN; + if (dir == DMA_FROM_DEVICE) + cflush.op |= GNTTAB_CACHE_INVAL; + } + 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); diff --git a/include/xen/interface/grant_table.h b/include/xen/interface/grant_table.h index e40fae9..28ff207 100644 --- a/include/xen/interface/grant_table.h +++ b/include/xen/interface/grant_table.h @@ -479,6 +479,24 @@ 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; + uint32_t offset; /* offset from start of grant */ + uint32_t size; /* size within the grant */ +#define GNTTAB_CACHE_CLEAN (1<<0) +#define GNTTAB_CACHE_INVAL (1<<1) + 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. */