From patchwork Mon May 10 14:17:26 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: John Garry X-Patchwork-Id: 433148 Delivered-To: patch@linaro.org Received: by 2002:a02:c901:0:0:0:0:0 with SMTP id t1csp2895365jao; Mon, 10 May 2021 07:25:53 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwtUDl0MJRgI8Mgx+XWA5ZHmfob2taeviXshLU8DfaMeaI6HhZPdH+gp2jnf5GUgqdULZJY X-Received: by 2002:a05:6e02:1a49:: with SMTP id u9mr23475861ilv.306.1620656753703; Mon, 10 May 2021 07:25:53 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1620656753; cv=none; d=google.com; s=arc-20160816; b=o7h8P5hRmFsgUpWBh//VNXioxUd4Dzigdq5FL9Aa0tjVD42AzRIjMJWpGcpv8ES+H0 L9enHh+SFHutX7gvZ99om1+QrEC8yHAVRi0LpR3u+jphdJWYET6AF7RCl35Trw21yCBL phazVybqFeK3ju3SGS2avqitx682vR2rFEqVlK9wuDkGvmRlKHO40Ra5HLOzg55Tso4X Z+tw3z9AijqODMoXfRD6tOfGu3H8MZg30WtIR4qGQ/Xb0QvVhEvn7rTO1Kl5X9txNa11 TyX0ubNAu/3+lvntcimU3fjNPGmSr12lwDkTlEHaUem2uHuYVlF4+nHW+VQveIKLryNT cNBA== 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=JPJ83FhwamrjcZOdepavjxeI4Bkw8WDG5Uy4q7hEA5Y=; b=Exj7oXT8VCDwaD6+Yp0zS+cz+C9tTIJ/Kv17u42/iY+hwgjupLEj2R6lXoccVcEFGb 2quxdHH9NVOWi19H5CPrtEAHgm4HEmd99EDPmQ9gLNVPaLXsWDfNw0lAiRaIYiTawgG0 Rteh4cCxg4R3Nq++eFaA2tm+6v613k5c1xYwRmdiUccDtFn0nxcWFFD0mzr8VB/XBc5M LouB+Do5tA5OONZkYa4qm3CighYZEeoeBd5ckFh2XCGqV00ehXmg8MXP/awVPTUeJE8Q vgDtNzd4jpItdKbAYiTVQTrvpHEj4nTQalyoYeBfmybeMevl8Uu6IuzgsLfa+p9Jd7g+ E6+A== 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.53 for ; Mon, 10 May 2021 07:25:53 -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 S235100AbhEJO04 (ORCPT ); Mon, 10 May 2021 10:26:56 -0400 Received: from szxga04-in.huawei.com ([45.249.212.190]:2677 "EHLO szxga04-in.huawei.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235260AbhEJOXq (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 4Ff39B4pCWz1BKvy; 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:28 +0800 From: John Garry To: , , , , CC: , , , , , , John Garry Subject: [PATCH v2 12/15] iommu: Add iommu_set_dev_dma_opt_size() Date: Mon, 10 May 2021 22:17:26 +0800 Message-ID: <1620656249-68890-13-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 which allows the max optimised IOMMU DMA size to be set. When set successfully, return -EPROBE_DEFER to inform the caller that the device driver needs to be reprobed to take effect. Signed-off-by: John Garry --- drivers/iommu/iommu.c | 47 +++++++++++++++++++++++++++++++++++++++++++ include/linux/iommu.h | 7 +++++++ 2 files changed, 54 insertions(+) -- 2.26.2 diff --git a/drivers/iommu/iommu.c b/drivers/iommu/iommu.c index bdb9aa47dfca..263d78e26c48 100644 --- a/drivers/iommu/iommu.c +++ b/drivers/iommu/iommu.c @@ -3058,6 +3058,53 @@ u32 iommu_sva_get_pasid(struct iommu_sva *handle) } EXPORT_SYMBOL_GPL(iommu_sva_get_pasid); +int iommu_set_dev_dma_opt_size(struct device *dev, size_t size) +{ + struct iommu_group *group = iommu_group_get(dev); + struct group_device *grp_dev; + struct device *_dev; + int ret, group_count; + + if (!group) + return 0; + + mutex_lock(&group->mutex); + + /* + * If already set, then ignore. We may have been set via sysfs, so + * honour that. + */ + if (group->max_opt_dma_size) { + ret = 0; + goto out; + } + + group_count = iommu_group_device_count(group); + if (group_count != 1) { + dev_err_ratelimited(dev, "Cannot change DMA opt size: Group has more than one device group_count=%d\n", + group_count); + ret = -EINVAL; + goto out; + } + + /* Since group has only one device */ + grp_dev = list_first_entry(&group->devices, struct group_device, list); + _dev = grp_dev->dev; + + if (_dev != dev) { + dev_err_ratelimited(dev, "Cannot set DMA max opt size - device has changed\n"); + ret = -EBUSY; + goto out; + } + + group->max_opt_dma_size = size; + ret = -EPROBE_DEFER; +out: + mutex_unlock(&group->mutex); + iommu_group_put(group); + return ret; +} + /* * Changes the default domain of an iommu group that has *only* one device * diff --git a/include/linux/iommu.h b/include/linux/iommu.h index 6e187746af0f..36871e8ae636 100644 --- a/include/linux/iommu.h +++ b/include/linux/iommu.h @@ -428,6 +428,7 @@ extern void iommu_get_resv_regions(struct device *dev, struct list_head *list); extern void iommu_put_resv_regions(struct device *dev, struct list_head *list); extern void generic_iommu_put_resv_regions(struct device *dev, struct list_head *list); +extern int iommu_set_dev_dma_opt_size(struct device *dev, size_t size); extern void iommu_set_default_passthrough(bool cmd_line); extern void iommu_set_default_translated(bool cmd_line); extern bool iommu_default_passthrough(void); @@ -740,6 +741,12 @@ static inline int iommu_get_group_resv_regions(struct iommu_group *group, return -ENODEV; } +static inline int iommu_set_dev_dma_opt_size(struct device *dev, + size_t size) +{ + return -ENODEV; +} + static inline void iommu_set_default_passthrough(bool cmd_line) { }