From patchwork Fri May 11 19:06:37 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jean-Philippe Brucker X-Patchwork-Id: 10395061 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 0ECF960153 for ; Fri, 11 May 2018 19:10:55 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id F3ABC28F8E for ; Fri, 11 May 2018 19:10:54 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id E7E8728F98; Fri, 11 May 2018 19:10:54 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-2.9 required=2.0 tests=BAYES_00, MAILING_LIST_MULTI, RCVD_IN_DNSWL_NONE autolearn=ham version=3.3.1 Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 7901C28F95 for ; Fri, 11 May 2018 19:10:54 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 051CA6B06C6; Fri, 11 May 2018 15:10:53 -0400 (EDT) Delivered-To: linux-mm-outgoing@kvack.org Received: by kanga.kvack.org (Postfix, from userid 40) id 000276B06C8; Fri, 11 May 2018 15:10:52 -0400 (EDT) X-Original-To: int-list-linux-mm@kvack.org X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id E0CBB6B06C9; Fri, 11 May 2018 15:10:52 -0400 (EDT) X-Original-To: linux-mm@kvack.org X-Delivered-To: linux-mm@kvack.org Received: from mail-ot0-f200.google.com (mail-ot0-f200.google.com [74.125.82.200]) by kanga.kvack.org (Postfix) with ESMTP id B40626B06C6 for ; Fri, 11 May 2018 15:10:52 -0400 (EDT) Received: by mail-ot0-f200.google.com with SMTP id l3-v6so4384363otk.4 for ; Fri, 11 May 2018 12:10:52 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-original-authentication-results:x-gm-message-state:from:to:cc :subject:date:message-id:in-reply-to:references; bh=50zsCpUxzTNBQ4i+d4qlLmNecM2eXp+e/xr7XqkBQwU=; b=jC/r7mH+/0z+NP4a3pO5OhtrDeZdgwouPkcK7kRfUuXvV8Y7WKG0U6vYs3wOUmVaYM qQUSVv46yWiqVELwMNHmE7cNl2/J7dyCIpAH9h0b/dopbVRT8bCRzlKClG251J4zvjZK gIatMR3sieXoLgFCxgaXHfQgm9LDSwc+/d/Ch2yTo1KvCrlJsjtJoMZYp9q0IuOT2xPl cl+DWvJiBHJZfgX/CsstfbEOTVWv9QX3WokjbH0UFAxiZOVLS1TXoaj9hN5q1yWLBt+z +MSVHqnqBubR8AsT0vgM0YWGxyGBglOT5jfdCusoD2lUYWOnEDA9AV7Vlfa4qIR+cgKY qpvg== X-Original-Authentication-Results: mx.google.com; spf=pass (google.com: domain of jean-philippe.brucker@arm.com designates 217.140.101.70 as permitted sender) smtp.mailfrom=jean-philippe.brucker@arm.com X-Gm-Message-State: ALKqPwcdzBd66oK0YLQcGX2FKGuByHm0rnu51e4qopzoaTjEdsJjV5vi ZgZ+YK5k/UfiXPINE4LueDPYEPw2kJ75/0sd5oH17oSwCUtV7Erssjee2SrvFBTnzJA89l4XB/z w02ezu1tDhTN22RigBra1It//EUlcVbJLqeJKOxfkblsDk9/mDYH9NAL4TOKGHQ4kRg== X-Received: by 2002:a9d:1444:: with SMTP id h62-v6mr5083702oth.90.1526065852547; Fri, 11 May 2018 12:10:52 -0700 (PDT) X-Google-Smtp-Source: AB8JxZr9jWqqS4TKZVNjuLzwgYhT302bPy04kSGNLYwjYvjsLy9xKBnMt8ZpieB8wXSbZADdC5MC X-Received: by 2002:a9d:1444:: with SMTP id h62-v6mr5083658oth.90.1526065851904; Fri, 11 May 2018 12:10:51 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1526065851; cv=none; d=google.com; s=arc-20160816; b=LrCq0aGvvSMW5IoHtKP/xL4Fhanb/zDHhHk06sOoQ1te2nmHLD/KGooYwrOZrvIGIL 13IETPGQwks2aQVqDXlIMUxSxdRT3Iobbl+YnC/bAny6xKIUcleGbA2/HQCH++v6ZrYC f2PmSzIUINWi7KEdWTTNg9HrfNlS1BbaBrU6+wxK3IV0M3ogMjn8A+1lozSg3AvVwM0h AHGlhwD4CPkInq0p3i2tKLBsAAobsykquEVBAVXFmQn+pTseb83dFoMJVXyYyBXIEqDb dVWn2C9WeJNEDzUL9mmrHxdK/UL6mmIDJKCJwawsqklT8blYgbs0ghGLHcQxWB2DGm21 gfxw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=references:in-reply-to:message-id:date:subject:cc:to:from :arc-authentication-results; bh=50zsCpUxzTNBQ4i+d4qlLmNecM2eXp+e/xr7XqkBQwU=; b=PLaJ5xkxmiyTJ+T4itlDgZ9R+edNiD4gcTBkuwjyEmlX3Er6vgKDEuT+Eq7dqNs2/m Zx6tT1sorA7tQsvdZh5+FUO1pM60y4vkMDS/dS10t14JXCMI+FQSoAUzVciEO1lBqBQW WrepKV6FB330z0QFMIHNjMQOj3E/YzDkd91sc2GBPJJP+ycNgeN3FsizZgOWJ56i3+D5 KBox4x9eVNvMY/BB2UVjnO/raBlHh34V6MOVuWtzRJKotG8PlpxTyGVn2hNsXpBw4hnh sEch8lJmopKEvScNC9/1ER2+LpumyDU2GebGtaGNjInLqNbMUFAN0Qn1OUOXp9oh/wBB 5zHA== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of jean-philippe.brucker@arm.com designates 217.140.101.70 as permitted sender) smtp.mailfrom=jean-philippe.brucker@arm.com Received: from foss.arm.com (foss.arm.com. [217.140.101.70]) by mx.google.com with ESMTP id i5-v6si1185043oif.408.2018.05.11.12.10.51 for ; Fri, 11 May 2018 12:10:51 -0700 (PDT) Received-SPF: pass (google.com: domain of jean-philippe.brucker@arm.com designates 217.140.101.70 as permitted sender) client-ip=217.140.101.70; Authentication-Results: mx.google.com; spf=pass (google.com: domain of jean-philippe.brucker@arm.com designates 217.140.101.70 as permitted sender) smtp.mailfrom=jean-philippe.brucker@arm.com Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.72.51.249]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id 854871993; Fri, 11 May 2018 12:10:51 -0700 (PDT) Received: from ostrya.cambridge.arm.com (ostrya.cambridge.arm.com [10.1.210.33]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPA id 484D43F23C; Fri, 11 May 2018 12:10:46 -0700 (PDT) From: Jean-Philippe Brucker To: linux-arm-kernel@lists.infradead.org, linux-pci@vger.kernel.org, linux-acpi@vger.kernel.org, devicetree@vger.kernel.org, iommu@lists.linux-foundation.org, kvm@vger.kernel.org, linux-mm@kvack.org Cc: joro@8bytes.org, will.deacon@arm.com, robin.murphy@arm.com, alex.williamson@redhat.com, tn@semihalf.com, liubo95@huawei.com, thunder.leizhen@huawei.com, xieyisheng1@huawei.com, xuzaibo@huawei.com, ilias.apalodimas@linaro.org, jonathan.cameron@huawei.com, liudongdong3@huawei.com, shunyong.yang@hxt-semitech.com, nwatters@codeaurora.org, okaya@codeaurora.org, jcrouse@codeaurora.org, rfranz@cavium.com, dwmw2@infradead.org, jacob.jun.pan@linux.intel.com, yi.l.liu@intel.com, ashok.raj@intel.com, kevin.tian@intel.com, baolu.lu@linux.intel.com, robdclark@gmail.com, christian.koenig@amd.com, bharatku@xilinx.com, rgummal@xilinx.com Subject: [PATCH v2 36/40] iommu/arm-smmu-v3: Hook up ATC invalidation to mm ops Date: Fri, 11 May 2018 20:06:37 +0100 Message-Id: <20180511190641.23008-37-jean-philippe.brucker@arm.com> X-Mailer: git-send-email 2.17.0 In-Reply-To: <20180511190641.23008-1-jean-philippe.brucker@arm.com> References: <20180511190641.23008-1-jean-philippe.brucker@arm.com> X-Bogosity: Ham, tests=bogofilter, spamicity=0.000027, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: X-Virus-Scanned: ClamAV using ClamSMTP The core calls us when an mm is modified. Perform the required ATC invalidations. Signed-off-by: Jean-Philippe Brucker --- drivers/iommu/arm-smmu-v3.c | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) diff --git a/drivers/iommu/arm-smmu-v3.c b/drivers/iommu/arm-smmu-v3.c index 7034b0bdcbdf..6cb69ace371b 100644 --- a/drivers/iommu/arm-smmu-v3.c +++ b/drivers/iommu/arm-smmu-v3.c @@ -1735,6 +1735,15 @@ static int arm_smmu_atc_inv_master_all(struct arm_smmu_master_data *master, return arm_smmu_atc_inv_master(master, &cmd); } +static int arm_smmu_atc_inv_master_range(struct arm_smmu_master_data *master, + int ssid, unsigned long iova, size_t size) +{ + struct arm_smmu_cmdq_ent cmd; + + arm_smmu_atc_inv_to_cmd(ssid, iova, size, &cmd); + return arm_smmu_atc_inv_master(master, &cmd); +} + static size_t arm_smmu_atc_inv_domain(struct arm_smmu_domain *smmu_domain, int ssid, unsigned long iova, size_t size) @@ -2389,11 +2398,12 @@ static void arm_smmu_mm_detach(struct iommu_domain *domain, struct device *dev, struct arm_smmu_mm *smmu_mm = to_smmu_mm(io_mm); struct arm_smmu_domain *smmu_domain = to_smmu_domain(domain); struct iommu_pasid_table_ops *ops = smmu_domain->s1_cfg.ops; + struct arm_smmu_master_data *master = dev->iommu_fwspec->iommu_priv; if (detach_domain) ops->clear_entry(ops, io_mm->pasid, smmu_mm->cd); - /* TODO: Invalidate ATC. */ + arm_smmu_atc_inv_master_all(master, io_mm->pasid); /* TODO: Invalidate all mappings if last and not DVM. */ } @@ -2401,8 +2411,10 @@ static void arm_smmu_mm_invalidate(struct iommu_domain *domain, struct device *dev, struct io_mm *io_mm, unsigned long iova, size_t size) { + struct arm_smmu_master_data *master = dev->iommu_fwspec->iommu_priv; + + arm_smmu_atc_inv_master_range(master, io_mm->pasid, iova, size); /* - * TODO: Invalidate ATC. * TODO: Invalidate mapping if not DVM */ }