From patchwork Wed Oct 8 13:04:56 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stefano Stabellini X-Patchwork-Id: 38477 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-lb0-f197.google.com (mail-lb0-f197.google.com [209.85.217.197]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id E5650202E7 for ; Wed, 8 Oct 2014 13:07:39 +0000 (UTC) Received: by mail-lb0-f197.google.com with SMTP id p9sf5248295lbv.4 for ; Wed, 08 Oct 2014 06:07:38 -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=eTtADULEuxZYMYu4hnL3XSDBYGdLbKxNdZmtG7iclrI=; b=ZfIJ/O33GXWNViAIAbLUhkUXNkyIhFUccKImp1zPHcZ9PTmn3f9KkS9xeO9aqwWuzi /eluyk7dD7AYqO2EeWGbc03Gxx5kAQshQvR4Hz4dD1WihshXOM4iBnhllkttKXlBrfKJ h4q+57s1ExO0eLVdniTJf8zooGt5Qivdp5Fa7LVizKkpI2TMmwTAE4FEKe26qczTDfeM BEUq3Ptv1yvusNClvf9FVjJGBiNI9q52/MZ4zRFEqJnZJEzeTuWYIXFO92I4hxEjW/79 cucBIXiq166EsfkXlVZH+EYGb1eu3SElDClJkg9ohbJXWsV6FbKDnTi23dIHtVtV++Qh n37Q== X-Gm-Message-State: ALoCoQm+rS9ilXMUBhDbLDo8yPwgt2xLb8rL/+SxgYiBOGaEY3aoStxXczmXwjhO8q4shww1w+st X-Received: by 10.112.145.136 with SMTP id su8mr449559lbb.9.1412773658724; Wed, 08 Oct 2014 06:07:38 -0700 (PDT) X-BeenThere: patchwork-forward@linaro.org Received: by 10.152.206.72 with SMTP id lm8ls57379lac.9.gmail; Wed, 08 Oct 2014 06:07:38 -0700 (PDT) X-Received: by 10.152.43.69 with SMTP id u5mr11403894lal.90.1412773658445; Wed, 08 Oct 2014 06:07:38 -0700 (PDT) Received: from mail-lb0-f170.google.com (mail-lb0-f170.google.com [209.85.217.170]) by mx.google.com with ESMTPS id 1si32989569lal.89.2014.10.08.06.07.38 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Wed, 08 Oct 2014 06:07:38 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.217.170 as permitted sender) client-ip=209.85.217.170; Received: by mail-lb0-f170.google.com with SMTP id u10so8186756lbd.29 for ; Wed, 08 Oct 2014 06:07:38 -0700 (PDT) X-Received: by 10.112.134.229 with SMTP id pn5mr10783390lbb.22.1412773658012; Wed, 08 Oct 2014 06:07:38 -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 c5csp58108lbz; Wed, 8 Oct 2014 06:07:37 -0700 (PDT) X-Received: by 10.70.55.42 with SMTP id o10mr10693141pdp.100.1412773656396; Wed, 08 Oct 2014 06:07:36 -0700 (PDT) Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id gn1si45761pac.8.2014.10.08.06.07.35 for ; Wed, 08 Oct 2014 06:07:36 -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 S932541AbaJHNHc (ORCPT + 27 others); Wed, 8 Oct 2014 09:07:32 -0400 Received: from smtp.citrix.com ([66.165.176.89]:43631 "EHLO SMTP.CITRIX.COM" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932397AbaJHNHa (ORCPT ); Wed, 8 Oct 2014 09:07:30 -0400 X-IronPort-AV: E=Sophos;i="5.04,677,1406592000"; d="scan'208";a="179348840" 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, 8 Oct 2014 09:07:16 -0400 Received: from kaball.uk.xensource.com ([10.80.2.59]) by ukmail1.uk.xensource.com with esmtp (Exim 4.69) (envelope-from ) id 1XbqxS-0003t3-GJ; Wed, 08 Oct 2014 14:07:10 +0100 From: Stefano Stabellini To: CC: , , , , , , Stefano Stabellini Subject: [PATCH v3 2/2] xen/arm: introduce GNTTABOP_cache_flush Date: Wed, 8 Oct 2014 14:04:56 +0100 Message-ID: <1412773496-15364-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: 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.170 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 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/mm32.c | 27 +++++++++++++++++++++++---- include/xen/interface/grant_table.h | 19 +++++++++++++++++++ 2 files changed, 42 insertions(+), 4 deletions(-) diff --git a/arch/arm/xen/mm32.c b/arch/arm/xen/mm32.c index a5a93fc..ec2eb02 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,32 @@ 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.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); 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. */