Received: by 2002:a05:6a10:16a7:0:0:0:0 with SMTP id gp39csp2997315pxb; Mon, 16 Nov 2020 03:04:10 -0800 (PST) X-Google-Smtp-Source: ABdhPJy3acOCaD88XVqOHUjUAwbSsJO/2ycL0k1o8wxMQ2Po6FHk24eMqSGpuOL2dwrX/b9dkYdi X-Received: by 2002:a05:6402:b45:: with SMTP id bx5mr14493108edb.193.1605524650121; Mon, 16 Nov 2020 03:04:10 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1605524650; cv=none; d=google.com; s=arc-20160816; b=D+hpcNYp2WSUv0RdH+HyB2W7nym+bmrRrwXhTQD+qf+zgcIjvnX2dwdSzkFVDjewES vSuY4kRFSuA6EUkkcyDxOePrtYhnCLJLUXtwqojwLPIKTyTEfehXlb0KCMFB0ovJYvdX rb5EEIhPhTSrpO51F7ezBaJJOEFc3f0mLpVYSX14X1i9HoIQtAzNpHuJiGd1+MDplQ0g OykjGC97EGu6xgIVDkHE4IWeqHSMOzT3FHM46Nvk7Rllq4N8dh2LvTcW2qsy3wDCCWHj 4/P1bMX4gXZwuhh9fCjIRmriyFsTGJeu/MztxlovWvyCQHO+jw0P8cCjQe7zRMax2MU0 Gr7w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=INg+bLsiYU9C1vucl39JD+cerJHDcpbNC+/F3Yla0Ho=; b=pAk+1GXmqEJil6DaA+GM3TGpVe620DVXlJZKBX4Jpb2swmdWGNB0P7ya4QOYyU6xzb cnzQGUHRGEm6JWOm9fidvL8h9r4FGx6Wna8GbhDL6zk1U9F77NnGTSmzxaI3NPEvRCzx FFbfLZYnCg6cJLMTCMPRVcqAWwOmuZEpo5NjGQ7TqxS746Gyta64g+6vMV91ZrBufqB/ rwt3FEyDIRpQTo0pgZe0FQThcEUShM4psUtgocrFCySC43w+INvQsojYx8vgzVe9mGoq Wd+99cO4cq2cYHHCNmSV9IP3yX5Xb+hwUNEoyWz8IYvxDEkjyd/YLKbTUW5v7jrtH1wL ek+Q== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=UO7l3KMD; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=redhat.com Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id i22si10928695ejh.318.2020.11.16.03.03.46; Mon, 16 Nov 2020 03:04:10 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=UO7l3KMD; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=redhat.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729357AbgKPLA7 (ORCPT + 99 others); Mon, 16 Nov 2020 06:00:59 -0500 Received: from us-smtp-delivery-124.mimecast.com ([63.128.21.124]:53272 "EHLO us-smtp-delivery-124.mimecast.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729283AbgKPLA6 (ORCPT ); Mon, 16 Nov 2020 06:00:58 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1605524456; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=INg+bLsiYU9C1vucl39JD+cerJHDcpbNC+/F3Yla0Ho=; b=UO7l3KMD5amhjqfN/6LpAwPSqfVqY3uqzzvlG+1oAkDG2H5FTusvRTwc7McBFoKiGOA1YR emArrdDNDYWfNSUi8GjeLiyGBf5cMHQPwkn0HynUhjvttQmp+NwRhuIPhkap8V7SBBppYs zJxsfbQF/trbgUTlkGDzJ5dRdfu9DDo= Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-520-2swPiuBXOXKqstqVjmBTwA-1; Mon, 16 Nov 2020 06:00:54 -0500 X-MC-Unique: 2swPiuBXOXKqstqVjmBTwA-1 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 6221164179; Mon, 16 Nov 2020 11:00:52 +0000 (UTC) Received: from laptop.redhat.com (ovpn-113-230.ams2.redhat.com [10.36.113.230]) by smtp.corp.redhat.com (Postfix) with ESMTP id D15B75C716; Mon, 16 Nov 2020 11:00:47 +0000 (UTC) From: Eric Auger To: eric.auger.pro@gmail.com, eric.auger@redhat.com, iommu@lists.linux-foundation.org, linux-kernel@vger.kernel.org, kvm@vger.kernel.org, kvmarm@lists.cs.columbia.edu, will@kernel.org, joro@8bytes.org, maz@kernel.org, robin.murphy@arm.com, alex.williamson@redhat.com Cc: jean-philippe@linaro.org, zhangfei.gao@linaro.org, zhangfei.gao@gmail.com, vivek.gautam@arm.com, shameerali.kolothum.thodi@huawei.com, jacob.jun.pan@linux.intel.com, yi.l.liu@intel.com, tn@semihalf.com, nicoleotsuka@gmail.com, yuzenghui@huawei.com Subject: [PATCH v11 01/13] vfio: VFIO_IOMMU_SET_PASID_TABLE Date: Mon, 16 Nov 2020 12:00:18 +0100 Message-Id: <20201116110030.32335-2-eric.auger@redhat.com> In-Reply-To: <20201116110030.32335-1-eric.auger@redhat.com> References: <20201116110030.32335-1-eric.auger@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: "Liu, Yi L" This patch adds an VFIO_IOMMU_SET_PASID_TABLE ioctl which aims to pass the virtual iommu guest configuration to the host. This latter takes the form of the so-called PASID table. Signed-off-by: Jacob Pan Signed-off-by: Liu, Yi L Signed-off-by: Eric Auger --- v11 -> v12: - use iommu_uapi_set_pasid_table - check SET and UNSET are not set simultaneously (Zenghui) v8 -> v9: - Merge VFIO_IOMMU_ATTACH/DETACH_PASID_TABLE into a single VFIO_IOMMU_SET_PASID_TABLE ioctl. v6 -> v7: - add a comment related to VFIO_IOMMU_DETACH_PASID_TABLE v3 -> v4: - restore ATTACH/DETACH - add unwind on failure v2 -> v3: - s/BIND_PASID_TABLE/SET_PASID_TABLE v1 -> v2: - s/BIND_GUEST_STAGE/BIND_PASID_TABLE - remove the struct device arg --- drivers/vfio/vfio_iommu_type1.c | 65 +++++++++++++++++++++++++++++++++ include/uapi/linux/vfio.h | 19 ++++++++++ 2 files changed, 84 insertions(+) diff --git a/drivers/vfio/vfio_iommu_type1.c b/drivers/vfio/vfio_iommu_type1.c index 67e827638995..87ddd9e882dc 100644 --- a/drivers/vfio/vfio_iommu_type1.c +++ b/drivers/vfio/vfio_iommu_type1.c @@ -2587,6 +2587,41 @@ static int vfio_iommu_iova_build_caps(struct vfio_iommu *iommu, return ret; } +static void +vfio_detach_pasid_table(struct vfio_iommu *iommu) +{ + struct vfio_domain *d; + + mutex_lock(&iommu->lock); + list_for_each_entry(d, &iommu->domain_list, next) + iommu_detach_pasid_table(d->domain); + + mutex_unlock(&iommu->lock); +} + +static int +vfio_attach_pasid_table(struct vfio_iommu *iommu, unsigned long arg) +{ + struct vfio_domain *d; + int ret = 0; + + mutex_lock(&iommu->lock); + + list_for_each_entry(d, &iommu->domain_list, next) { + ret = iommu_uapi_attach_pasid_table(d->domain, (void __user *)arg); + if (ret) + goto unwind; + } + goto unlock; +unwind: + list_for_each_entry_continue_reverse(d, &iommu->domain_list, next) { + iommu_detach_pasid_table(d->domain); + } +unlock: + mutex_unlock(&iommu->lock); + return ret; +} + static int vfio_iommu_migration_build_caps(struct vfio_iommu *iommu, struct vfio_info_cap *caps) { @@ -2747,6 +2782,34 @@ static int vfio_iommu_type1_unmap_dma(struct vfio_iommu *iommu, -EFAULT : 0; } +static int vfio_iommu_type1_set_pasid_table(struct vfio_iommu *iommu, + unsigned long arg) +{ + struct vfio_iommu_type1_set_pasid_table spt; + unsigned long minsz; + int ret = -EINVAL; + + minsz = offsetofend(struct vfio_iommu_type1_set_pasid_table, flags); + + if (copy_from_user(&spt, (void __user *)arg, minsz)) + return -EFAULT; + + if (spt.argsz < minsz) + return -EINVAL; + + if (spt.flags & VFIO_PASID_TABLE_FLAG_SET && + spt.flags & VFIO_PASID_TABLE_FLAG_UNSET) + return -EINVAL; + + if (spt.flags & VFIO_PASID_TABLE_FLAG_SET) + ret = vfio_attach_pasid_table(iommu, arg + minsz); + else if (spt.flags & VFIO_PASID_TABLE_FLAG_UNSET) { + vfio_detach_pasid_table(iommu); + ret = 0; + } + return ret; +} + static int vfio_iommu_type1_dirty_pages(struct vfio_iommu *iommu, unsigned long arg) { @@ -2867,6 +2930,8 @@ static long vfio_iommu_type1_ioctl(void *iommu_data, return vfio_iommu_type1_unmap_dma(iommu, arg); case VFIO_IOMMU_DIRTY_PAGES: return vfio_iommu_type1_dirty_pages(iommu, arg); + case VFIO_IOMMU_SET_PASID_TABLE: + return vfio_iommu_type1_set_pasid_table(iommu, arg); default: return -ENOTTY; } diff --git a/include/uapi/linux/vfio.h b/include/uapi/linux/vfio.h index 2f313a238a8f..78ce3ce6c331 100644 --- a/include/uapi/linux/vfio.h +++ b/include/uapi/linux/vfio.h @@ -14,6 +14,7 @@ #include #include +#include #define VFIO_API_VERSION 0 @@ -1180,6 +1181,24 @@ struct vfio_iommu_type1_dirty_bitmap_get { #define VFIO_IOMMU_DIRTY_PAGES _IO(VFIO_TYPE, VFIO_BASE + 17) +/* + * VFIO_IOMMU_SET_PASID_TABLE - _IOWR(VFIO_TYPE, VFIO_BASE + 22, + * struct vfio_iommu_type1_set_pasid_table) + * + * The SET operation passes a PASID table to the host while the + * UNSET operation detaches the one currently programmed. Setting + * a table while another is already programmed replaces the old table. + */ +struct vfio_iommu_type1_set_pasid_table { + __u32 argsz; + __u32 flags; +#define VFIO_PASID_TABLE_FLAG_SET (1 << 0) +#define VFIO_PASID_TABLE_FLAG_UNSET (1 << 1) + struct iommu_pasid_table_config config; /* used on SET */ +}; + +#define VFIO_IOMMU_SET_PASID_TABLE _IO(VFIO_TYPE, VFIO_BASE + 22) + /* -------- Additional API for SPAPR TCE (Server POWERPC) IOMMU -------- */ /* -- 2.21.3