From patchwork Mon May 10 14:17:21 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: John Garry X-Patchwork-Id: 433146 Delivered-To: patch@linaro.org Received: by 2002:a02:c901:0:0:0:0:0 with SMTP id t1csp2895346jao; Mon, 10 May 2021 07:25:52 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzsg0iQbQIuLdDTP9kAgWduuILDT9MjGFnKWSRUScPbnhysm5edTaQ6drVA7OlQpuijOPZt X-Received: by 2002:a6b:dc06:: with SMTP id s6mr18649045ioc.130.1620656752536; Mon, 10 May 2021 07:25:52 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1620656752; cv=none; d=google.com; s=arc-20160816; b=tmYcpcV4rwPlBxfGBcP7JNDzw8WqjO5s7XOWiVgWTFX6rp7HhZ6mPyxFfZMOakSl9v XTIytY/4Clq8H9LWqCymoa5FikBB8rne32RJ/xURxSvBJiz1HDkfyNYJcBQOwTbtpDPd sHbFxvfj4Ak4M7OOFLXTyF3ctjJNffYnuG8SlmP6UE5iYSHmOTfIInunf0BJUTsM45/v CVLHjHHDtUAx/ZJHl0Z+vi7NeCnEgMLYxPZJyAG67mWbAn5qhqnnWQivaxTlqIhCNKXy 5W0UDmmM7PRIoHgibdtSDJbgcU9YahxVBe7kNI8nC33yvYymJdEkyTA3s99vWNM98mkl 3RKw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:mime-version:references:in-reply-to:message-id :date:subject:cc:to:from; bh=0lVFVstcQT500R1DyMTnIY1sv7V5pgeYjvvC2I1feIY=; b=d6R6LP7Ri2tt/pUN1oMN2Pv3rACDLilsIS92yXoHc/iMjOLIJ284dENogRl6EPRaw7 3mUEQSlFxeIwbvgh41NuemKNrZftoUIngPMoC4AsJsaFuj2mqhhmF+bysO2B5wnVk8H+ jX7bhLGPD2cgALUc8azCKB+vqzkwvlGOtoGUc+W49P9Ebm3OruwEL1Yy0hTbIW9KLCaB rbH3Tlm5icgnlPJwHu4hZJ/DEto4i9C3AFXKMi4G+DVO/xNjmnwVa7vCdf4I7o6bKrbG vcn9wLSjP/Ce26WQSmJ9nUdatKajPk52zC+s5jk4nf63aQHoQzItC3Ml38CUBNqTsLuK IC+g== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-scsi-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-scsi-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=huawei.com Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id g19si19729924jat.91.2021.05.10.07.25.52 for ; Mon, 10 May 2021 07:25:52 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-scsi-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-scsi-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-scsi-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=huawei.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233719AbhEJO0v (ORCPT ); Mon, 10 May 2021 10:26:51 -0400 Received: from szxga04-in.huawei.com ([45.249.212.190]:2676 "EHLO szxga04-in.huawei.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235354AbhEJOXq (ORCPT ); Mon, 10 May 2021 10:23:46 -0400 Received: from DGGEMS413-HUB.china.huawei.com (unknown [172.30.72.58]) by szxga04-in.huawei.com (SkyGuard) with ESMTP id 4Ff39B4WTgz1BKvs; Mon, 10 May 2021 22:19:58 +0800 (CST) Received: from localhost.localdomain (10.69.192.58) by DGGEMS413-HUB.china.huawei.com (10.3.19.213) with Microsoft SMTP Server id 14.3.498.0; Mon, 10 May 2021 22:22:26 +0800 From: John Garry To: , , , , CC: , , , , , , John Garry Subject: [PATCH v2 07/15] iommu: Add iommu_realloc_dev_group() Date: Mon, 10 May 2021 22:17:21 +0800 Message-ID: <1620656249-68890-8-git-send-email-john.garry@huawei.com> X-Mailer: git-send-email 2.8.1 In-Reply-To: <1620656249-68890-1-git-send-email-john.garry@huawei.com> References: <1620656249-68890-1-git-send-email-john.garry@huawei.com> MIME-Version: 1.0 X-Originating-IP: [10.69.192.58] X-CFilter-Loop: Reflected Precedence: bulk List-ID: X-Mailing-List: linux-scsi@vger.kernel.org Add a function to re-alloc IOMMU group default domain. Signed-off-by: John Garry --- drivers/iommu/iommu.c | 12 ++++++++++++ include/linux/iommu.h | 6 ++++++ 2 files changed, 18 insertions(+) -- 2.26.2 diff --git a/drivers/iommu/iommu.c b/drivers/iommu/iommu.c index f7253a973ab9..bdb9aa47dfca 100644 --- a/drivers/iommu/iommu.c +++ b/drivers/iommu/iommu.c @@ -3191,6 +3191,18 @@ static int iommu_change_dev_def_domain(struct iommu_group *group, return ret; } +int iommu_realloc_dev_group(struct device *dev) +{ + struct iommu_group *group; + int ret; + + group = iommu_group_get(dev); + ret = iommu_change_dev_def_domain(group, dev, 0, true); + iommu_group_put(group); + + return ret; +} + /* * Changing the default domain or any other IOMMU group attribute through sysfs * requires the users to unbind the drivers from the devices in the IOMMU group. diff --git a/include/linux/iommu.h b/include/linux/iommu.h index e26abda94792..6e187746af0f 100644 --- a/include/linux/iommu.h +++ b/include/linux/iommu.h @@ -482,6 +482,7 @@ bool iommu_get_dma_strict(struct iommu_domain *domain); extern int report_iommu_fault(struct iommu_domain *domain, struct device *dev, unsigned long iova, int flags); +extern int iommu_realloc_dev_group(struct device *dev); static inline void iommu_flush_iotlb_all(struct iommu_domain *domain) { @@ -699,6 +700,11 @@ static inline size_t iommu_map_sg_atomic(struct iommu_domain *domain, return 0; } +static inline int iommu_realloc_dev_group(struct device *dev) +{ + return -ENODEV; +} + static inline void iommu_flush_iotlb_all(struct iommu_domain *domain) { }