From patchwork Fri May 11 19:06:20 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: 10394951 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 C700160153 for ; Fri, 11 May 2018 19:09:21 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id B334D28F95 for ; Fri, 11 May 2018 19:09:21 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id A78FF28FAA; Fri, 11 May 2018 19:09:21 +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 BED6728F95 for ; Fri, 11 May 2018 19:09:20 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 5AC056B06A4; Fri, 11 May 2018 15:09:19 -0400 (EDT) Delivered-To: linux-mm-outgoing@kvack.org Received: by kanga.kvack.org (Postfix, from userid 40) id 531CC6B06A6; Fri, 11 May 2018 15:09:19 -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 3FAE96B06A7; Fri, 11 May 2018 15:09:19 -0400 (EDT) X-Original-To: linux-mm@kvack.org X-Delivered-To: linux-mm@kvack.org Received: from mail-ot0-f197.google.com (mail-ot0-f197.google.com [74.125.82.197]) by kanga.kvack.org (Postfix) with ESMTP id 109D36B06A4 for ; Fri, 11 May 2018 15:09:19 -0400 (EDT) Received: by mail-ot0-f197.google.com with SMTP id d61-v6so4277335otb.21 for ; Fri, 11 May 2018 12:09:19 -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=rPtK10K+TizlW6R2sj0rlIlnxYtE6irDnkOj0s81ewM=; b=HOPd+Tn7es8twMH2yjZ37hv078qsHDkZiWmRbwSWWcwfFTrXo5nHP1Dqtuu9e6oKEZ jiykiD8NacF1mZOYvf1u2CXQydFEHg2sN4Izi3gSWXsHZdPDBHOsYmKbOZYUcs+49Mnm j2K484v1YE7b9fzSkCfnH7/kyOLTKg6p/L9Lhqd3EAz2EJvfm/6B8M2w+o+JUv3VZTbw YNvuU/EZcLqLGhurWEQs5nCYLqzPUo30iQMP4V875QuP0tXY8INEYMDK/BtwZ+uWQsSw Iw9B5DHgxMCS6CUkFW6SaXa8c725vJ1XHew4rzbpCPLvtcJ8lvPoNcMba2uJR+r2PVZG hKFw== 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: ALKqPwfhUjdPVt3aYWhHQ0o/kuO2eR2qC0My3obWVikcRnTDzakh08dJ czxBHrjTcMPOLGtulywlljqRNsaR/wTYzIjVKWKe5GJ2OwyKOj+cq3TJDs5su60FNNfJEc9lmA9 rngncvrxQ78liDk/qMVC/Xsrnuz7JGG8ROEIC1UoT8Gb1ODQeBFMv/DiojT1b6fDH7Q== X-Received: by 2002:a9d:4389:: with SMTP id t9-v6mr4837396ote.189.1526065758829; Fri, 11 May 2018 12:09:18 -0700 (PDT) X-Google-Smtp-Source: AB8JxZp6l16NWKuaymrIXNQkPJWPnwv+5sUNfZ/UyW4Czs26UeKoEunC2wNil6QwFCPQCEpdMTxx X-Received: by 2002:a9d:4389:: with SMTP id t9-v6mr4837342ote.189.1526065757981; Fri, 11 May 2018 12:09:17 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1526065757; cv=none; d=google.com; s=arc-20160816; b=CTKKwYd/2oXrLxOef6MpmMTWJjQyiSOebKQUSJGY/EhTex06KAfvQ6fV7DsRcU6oFv 0YOXcevdFhnemACZSURCjmGcZ4HrJko6kyq8PFmUBjU4LYLlCr/wZjKXeNL5cKTAEIdV SV2hYCyHFApDnsRBjufBG/5G5fXBJwpENN4OzTHjSroe0Lvm07eA8LmXVDDbWW1Lu/et /BjrUP1uJZ9xHkOe8MFsxYvnO1kzuhjdWcQxXFGh1KQhah3PLJATxLigRPfpabU+8Yaj Hpc0/XBmAxdwQhJGjUr24+/qJBTbz0Um35TthA/peXqT9o8k2yfrZ28LpQW+VMbEZLX7 Dwvw== 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=rPtK10K+TizlW6R2sj0rlIlnxYtE6irDnkOj0s81ewM=; b=F+E0jAyqlIMiEjU53lv/qJO16frxK3dzqjcxhp8On7JQu3lIXjWh1ivYTqfO41ocsA OieGyYyxvbp6DkgsagMFpumuXcxjLjiTOWtCv/tKc1FutsU2ywRiyB+d4uKm3gbeITHK 402oHqj12ZUf3oqA1z7uSz4/uUQ/yzNlOVFFKosi51GiFLbMvGPP3Nsx9CzoNnXAYpu0 AfRsC3ncymm6xc+wi60/0W+dENABMXmGpHhlk6lbca7+qQ1QzEbZoR9q/Outrocmf6nf 80Bm7RCGeAATQEP/Sb8Vx4rLp8n0uLUMeJO9OV7BcGrLcnDPHacDQMtRnpzkCtlgEBMV D99Q== 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 u88-v6si1279751otb.285.2018.05.11.12.09.17 for ; Fri, 11 May 2018 12:09:17 -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 88AB119BF; Fri, 11 May 2018 12:09:17 -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 4AA503F23C; Fri, 11 May 2018 12:09:12 -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 19/40] iommu: Add generic PASID table library Date: Fri, 11 May 2018 20:06:20 +0100 Message-Id: <20180511190641.23008-20-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.000000, 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 Add a small API within the IOMMU subsystem to handle different formats of PASID tables. It uses the same principle as io-pgtable: * The IOMMU driver registers a PASID table with some invalidation callbacks. * The pasid-table lib allocates a set of tables of the right format, and returns an iommu_pasid_table_ops structure. * The IOMMU driver allocates entries and writes them using the provided ops. * The pasid-table lib calls the IOMMU driver back for invalidation when necessary. * The IOMMU driver unregisters the ops which frees the tables when finished. An example user will be Arm SMMU in a subsequent patch. Other IOMMU drivers (e.g. paravirtualized ones) will be able to use the same PASID table code. Signed-off-by: Jean-Philippe Brucker --- v1->v2: remove free_entry from the ops. The table driver now registers a standalone release callback to each entry, because it may be freed after the tables. --- drivers/iommu/Kconfig | 7 ++ drivers/iommu/Makefile | 1 + drivers/iommu/iommu-pasid-table.c | 51 +++++++++++ drivers/iommu/iommu-pasid-table.h | 146 ++++++++++++++++++++++++++++++ 4 files changed, 205 insertions(+) create mode 100644 drivers/iommu/iommu-pasid-table.c create mode 100644 drivers/iommu/iommu-pasid-table.h diff --git a/drivers/iommu/Kconfig b/drivers/iommu/Kconfig index 09f13a7c4b60..fae34d6a522d 100644 --- a/drivers/iommu/Kconfig +++ b/drivers/iommu/Kconfig @@ -60,6 +60,13 @@ config IOMMU_IO_PGTABLE_ARMV7S_SELFTEST endmenu +menu "Generic PASID table support" + +config IOMMU_PASID_TABLE + bool + +endmenu + config IOMMU_IOVA tristate diff --git a/drivers/iommu/Makefile b/drivers/iommu/Makefile index 4b744e399a1b..8e335a7f10aa 100644 --- a/drivers/iommu/Makefile +++ b/drivers/iommu/Makefile @@ -8,6 +8,7 @@ obj-$(CONFIG_IOMMU_PAGE_FAULT) += io-pgfault.o obj-$(CONFIG_IOMMU_IO_PGTABLE) += io-pgtable.o obj-$(CONFIG_IOMMU_IO_PGTABLE_ARMV7S) += io-pgtable-arm-v7s.o obj-$(CONFIG_IOMMU_IO_PGTABLE_LPAE) += io-pgtable-arm.o +obj-$(CONFIG_IOMMU_PASID_TABLE) += iommu-pasid-table.o obj-$(CONFIG_IOMMU_IOVA) += iova.o obj-$(CONFIG_OF_IOMMU) += of_iommu.o obj-$(CONFIG_MSM_IOMMU) += msm_iommu.o diff --git a/drivers/iommu/iommu-pasid-table.c b/drivers/iommu/iommu-pasid-table.c new file mode 100644 index 000000000000..ed62591dcc26 --- /dev/null +++ b/drivers/iommu/iommu-pasid-table.c @@ -0,0 +1,51 @@ +// SPDX-License-Identifier: GPL-2.0 +/* + * PASID table management for the IOMMU + * + * Copyright (C) 2018 ARM Ltd. + */ + +#include + +#include "iommu-pasid-table.h" + +static const struct iommu_pasid_init_fns * +pasid_table_init_fns[PASID_TABLE_NUM_FMTS] = { +}; + +struct iommu_pasid_table_ops * +iommu_alloc_pasid_ops(enum iommu_pasid_table_fmt fmt, + struct iommu_pasid_table_cfg *cfg, void *cookie) +{ + struct iommu_pasid_table *table; + const struct iommu_pasid_init_fns *fns; + + if (fmt >= PASID_TABLE_NUM_FMTS) + return NULL; + + fns = pasid_table_init_fns[fmt]; + if (!fns) + return NULL; + + table = fns->alloc(cfg, cookie); + if (!table) + return NULL; + + table->fmt = fmt; + table->cookie = cookie; + table->cfg = *cfg; + + return &table->ops; +} + +void iommu_free_pasid_ops(struct iommu_pasid_table_ops *ops) +{ + struct iommu_pasid_table *table; + + if (!ops) + return; + + table = container_of(ops, struct iommu_pasid_table, ops); + iommu_pasid_flush_all(table); + pasid_table_init_fns[table->fmt]->free(table); +} diff --git a/drivers/iommu/iommu-pasid-table.h b/drivers/iommu/iommu-pasid-table.h new file mode 100644 index 000000000000..d5bd098fef19 --- /dev/null +++ b/drivers/iommu/iommu-pasid-table.h @@ -0,0 +1,146 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +/* + * PASID table management for the IOMMU + * + * Copyright (C) 2018 ARM Ltd. + */ +#ifndef __IOMMU_PASID_TABLE_H +#define __IOMMU_PASID_TABLE_H + +#include +#include +#include "io-pgtable.h" + +struct mm_struct; + +enum iommu_pasid_table_fmt { + PASID_TABLE_NUM_FMTS, +}; + +/** + * iommu_pasid_entry - Entry of a PASID table + * + * @tag: architecture-specific data needed to uniquely identify the entry. Most + * notably used for TLB invalidation + * @release: function that frees the entry and its content. PASID entries may be + * freed well after the PASID table ops are released, and may be shared between + * different PASID tables, so the release method has to be standalone. + */ +struct iommu_pasid_entry { + u64 tag; + void (*release)(struct iommu_pasid_entry *); +}; + +/** + * iommu_pasid_table_ops - Operations on a PASID table + * + * @alloc_shared_entry: allocate an entry for sharing an mm (SVA). Returns the + * pointer to a new entry or an error. + * @alloc_priv_entry: allocate an entry for map/unmap operations. Returns the + * pointer to a new entry or an error. + * @set_entry: write PASID table entry + * @clear_entry: clear PASID table entry + */ +struct iommu_pasid_table_ops { + struct iommu_pasid_entry * + (*alloc_shared_entry)(struct iommu_pasid_table_ops *ops, + struct mm_struct *mm); + struct iommu_pasid_entry * + (*alloc_priv_entry)(struct iommu_pasid_table_ops *ops, + enum io_pgtable_fmt fmt, + struct io_pgtable_cfg *cfg); + int (*set_entry)(struct iommu_pasid_table_ops *ops, int pasid, + struct iommu_pasid_entry *entry); + void (*clear_entry)(struct iommu_pasid_table_ops *ops, int pasid, + struct iommu_pasid_entry *entry); +}; + +/** + * iommu_pasid_sync_ops - Callbacks into the IOMMU driver + * + * @cfg_flush: flush cached configuration for one entry. For a multi-level PASID + * table, 'leaf' tells whether to only flush cached leaf entries or intermediate + * levels as well. + * @cfg_flush_all: flush cached configuration for all entries of the PASID table + * @tlb_flush: flush TLB entries for one entry + */ +struct iommu_pasid_sync_ops { + void (*cfg_flush)(void *cookie, int pasid, bool leaf); + void (*cfg_flush_all)(void *cookie); + void (*tlb_flush)(void *cookie, int pasid, + struct iommu_pasid_entry *entry); +}; + +/** + * struct iommu_pasid_table_cfg - Configuration data for a set of PASID tables. + * + * @iommu_dev device performing the DMA table walks + * @order: number of PASID bits, set by IOMMU driver + * @flush: TLB management callbacks for this set of tables. + * + * @base: DMA address of the allocated table, set by the allocator. + */ +struct iommu_pasid_table_cfg { + struct device *iommu_dev; + size_t order; + const struct iommu_pasid_sync_ops *sync; + dma_addr_t base; +}; + +struct iommu_pasid_table_ops * +iommu_alloc_pasid_ops(enum iommu_pasid_table_fmt fmt, + struct iommu_pasid_table_cfg *cfg, + void *cookie); +void iommu_free_pasid_ops(struct iommu_pasid_table_ops *ops); + +static inline void iommu_free_pasid_entry(struct iommu_pasid_entry *entry) +{ + if (WARN_ON(!entry->release)) + return; + entry->release(entry); +} + +/** + * struct iommu_pasid_table - describes a set of PASID tables + * + * @fmt: The PASID table format. + * @cookie: An opaque token provided by the IOMMU driver and passed back to any + * callback routine. + * @cfg: A copy of the PASID table configuration. + * @ops: The PASID table operations in use for this set of page tables. + */ +struct iommu_pasid_table { + enum iommu_pasid_table_fmt fmt; + void *cookie; + struct iommu_pasid_table_cfg cfg; + struct iommu_pasid_table_ops ops; +}; + +#define iommu_pasid_table_ops_to_table(ops) \ + container_of((ops), struct iommu_pasid_table, ops) + +struct iommu_pasid_init_fns { + struct iommu_pasid_table *(*alloc)(struct iommu_pasid_table_cfg *cfg, + void *cookie); + void (*free)(struct iommu_pasid_table *table); +}; + +static inline void iommu_pasid_flush_all(struct iommu_pasid_table *table) +{ + table->cfg.sync->cfg_flush_all(table->cookie); +} + +static inline void iommu_pasid_flush(struct iommu_pasid_table *table, + int pasid, bool leaf) +{ + table->cfg.sync->cfg_flush(table->cookie, pasid, leaf); +} + +static inline void iommu_pasid_flush_tlbs(struct iommu_pasid_table *table, + int pasid, + struct iommu_pasid_entry *entry) +{ + table->cfg.sync->tlb_flush(table->cookie, pasid, entry); +} + +#endif /* __IOMMU_PASID_TABLE_H */