Received: by 2002:ab2:784b:0:b0:1fd:adc2:8405 with SMTP id m11csp226583lqp; Mon, 10 Jun 2024 02:00:24 -0700 (PDT) X-Forwarded-Encrypted: i=3; AJvYcCWV1JKRqBUEGs274ftHBQ9yJ9C6ODcM9sPQGhhBkjRAo3kFyLWA1NFrneEBgYEi7SR6Lywi68ay1j0RcY7J9dlsVokmKArmzXqaSBU/aQ== X-Google-Smtp-Source: AGHT+IF1Pt5kouuPrqiVWKUYNiR3ET5EvrdsfRNDrXsX7fbK/iOUjOQZ1J5BxuCR/QZ+Fv3Q8SlF X-Received: by 2002:a05:6a00:a8b:b0:704:31ae:4fe2 with SMTP id d2e1a72fcca58-70431ae6176mr4640086b3a.28.1718010024114; Mon, 10 Jun 2024 02:00:24 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1718010024; cv=pass; d=google.com; s=arc-20160816; b=xuxwIYbTZH1wnRF+QEqpWzkOGbj3LMJ+hPyVh+CZzOGFGNyo/8N+ITHljTKTrmZCll WKr7Jti8BCuqCKbBJCXpGe/DVqCtcuqnRH+lkUBdWUQ5wEgSV5ekLGIri9uslllLXAkt jdJVliTnJLI39ra8nNzR/KhywwHFom+NbP3iHpvk3JX8edUb0ZIbBdU62B6XuVflKV+P 7lLKkkOi8Eb9FN4OlHyCcxodv85r7leKm7gOVd/5SGxSuVqr6mhSiqkJt8KsqsXOWxsP 9TienSrsSQouY2ePi6O9L5NqsxOLEg2xb/ROXtTNTI7mGwWrW2DBjoPsFbk2k0GbzWtP bsWw== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:list-unsubscribe :list-subscribe:list-id:precedence:references:in-reply-to:message-id :date:subject:cc:to:from:dkim-signature; bh=3RVIGexN1QEWlp04qJ5r/Sc6XYG5nucX3DQOszMb49c=; fh=oMfgzkEw/ooUXqvARCgNaSZrpwGw5y27+DEhhPidNdU=; b=pNmGwF0BYx5R+6Hv0ljEcss6ABQIhnXh67wc7ba/OAwv177XJvYbyRCZ/3porrbWgE dBJk2inJn7sqX9z8DojtDHn8D/nyztNAYX4kXC4kjjxNiCvZxf9mgr7hyFwo04efWXKY zF4B6X6KOt4n6YgHPgrTCZTPiHVxj7TmTC5L5XE1fq/Hgzd0hSPwixul3r5MjuSoJeBo CIzdTCChZGDs8/RSfsTT7FCa5N4PDAu7i3LOjrON1H3gSUWjR633wLZ9qXS0EQtGEgBu Fo/Ma124vsx40N4ifefE+JRIk2j0zfIxTCLKwpwm59dmU3pZutiB4aFETQwr/s4GrA6d 356g==; dara=google.com ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b="n/x4UhIk"; arc=pass (i=1 dkim=pass dkdomain=intel.com dmarc=pass fromdomain=linux.intel.com); spf=pass (google.com: domain of linux-kernel+bounces-207889-linux.lists.archive=gmail.com@vger.kernel.org designates 2604:1380:45e3:2400::1 as permitted sender) smtp.mailfrom="linux-kernel+bounces-207889-linux.lists.archive=gmail.com@vger.kernel.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=intel.com Return-Path: Received: from sv.mirrors.kernel.org (sv.mirrors.kernel.org. [2604:1380:45e3:2400::1]) by mx.google.com with ESMTPS id 41be03b00d2f7-6de28f34b0dsi3437845a12.653.2024.06.10.02.00.23 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 10 Jun 2024 02:00:24 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel+bounces-207889-linux.lists.archive=gmail.com@vger.kernel.org designates 2604:1380:45e3:2400::1 as permitted sender) client-ip=2604:1380:45e3:2400::1; Authentication-Results: mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b="n/x4UhIk"; arc=pass (i=1 dkim=pass dkdomain=intel.com dmarc=pass fromdomain=linux.intel.com); spf=pass (google.com: domain of linux-kernel+bounces-207889-linux.lists.archive=gmail.com@vger.kernel.org designates 2604:1380:45e3:2400::1 as permitted sender) smtp.mailfrom="linux-kernel+bounces-207889-linux.lists.archive=gmail.com@vger.kernel.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=intel.com Received: from smtp.subspace.kernel.org (wormhole.subspace.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by sv.mirrors.kernel.org (Postfix) with ESMTPS id 57A062814B1 for ; Mon, 10 Jun 2024 09:00:21 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id BCADC7443E; Mon, 10 Jun 2024 08:58:24 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=intel.com header.i=@intel.com header.b="n/x4UhIk" Received: from mgamail.intel.com (mgamail.intel.com [192.198.163.13]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 45B157407D for ; Mon, 10 Jun 2024 08:58:22 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=192.198.163.13 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1718009903; cv=none; b=q0EgPEzUxzwAmY5hG1TGwlB29TPY4G1rMHdJklyp6nrgnTHJQaGZrz6XfdFz5qAW04q3QisbridsZl/U60wr6zagTz/0r/JmkRltN3kcddMZIq2xDvu+au9nx8QAYdFjkg37CVAGvaosDy+X7yntwTVMmSLeGi7MfflqaUlqCKc= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1718009903; c=relaxed/simple; bh=lO/IPmdUqOg04lYCYxFPmCNa0L0veD8icxIpi6zQo+o=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=EDeIxZMrg/sFVPqPWXu2iYqkBxXQKkYiaOcAEAKBGzqL8YDUblf0KYhECUXgy3jb++uEmuNftzAVYDWxnLaj5OHX6p7Bo+1tnv7y/JXcbMx+49djEytiW7TPCBzVuqb14mpstRSbc13HW1n6MUYLWAyR6HmDUB0PV7BmxO97YpA= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.intel.com; spf=none smtp.mailfrom=linux.intel.com; dkim=pass (2048-bit key) header.d=intel.com header.i=@intel.com header.b=n/x4UhIk; arc=none smtp.client-ip=192.198.163.13 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.intel.com Authentication-Results: smtp.subspace.kernel.org; spf=none smtp.mailfrom=linux.intel.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1718009902; x=1749545902; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=lO/IPmdUqOg04lYCYxFPmCNa0L0veD8icxIpi6zQo+o=; b=n/x4UhIkTof5w+ZRw3FF9zNsx63ILD9bUj7OyYFGIpgAcXlpDTP5ggfC xx+loFAlgnRKwZUAtDeftb0Nw3gdpk/WcBSp2ZiQcvZXHYqFs3brctiUq XkRLgv11ruYxARBww1WQYbeGw0RFQeNl1HszogRPROWWCHhmb17scACm/ vVVJApdGC57GrhgmCnNnJSySKqNrhTWe0aBUuG8+2Qsf8XvIpjCX2PZ7d C74DJPnYkghpthJUGq3WpNSPPKp51nhZOYWORJGJgZ/QXeR6ObXYTsglS SuiuDdqlyqnI5Z8j7p/0C8zuERvD0wb93BYomhljl3lpqZZT4p6lmZdpL A==; X-CSE-ConnectionGUID: JFKgE6VGQ1yZR+JDKxXdQQ== X-CSE-MsgGUID: nqDsovd1RJ+6Xu0cX8LRig== X-IronPort-AV: E=McAfee;i="6600,9927,11098"; a="17581510" X-IronPort-AV: E=Sophos;i="6.08,227,1712646000"; d="scan'208";a="17581510" Received: from fmviesa003.fm.intel.com ([10.60.135.143]) by fmvoesa107.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 10 Jun 2024 01:58:22 -0700 X-CSE-ConnectionGUID: T7ftFoB4QDSGxVb/F3iHkQ== X-CSE-MsgGUID: ImRDR5fxSxuM0OMEzjzIVA== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.08,227,1712646000"; d="scan'208";a="43432409" Received: from unknown (HELO allen-box.sh.intel.com) ([10.239.159.127]) by fmviesa003.fm.intel.com with ESMTP; 10 Jun 2024 01:58:17 -0700 From: Lu Baolu To: Joerg Roedel , Will Deacon , Robin Murphy , Jason Gunthorpe , Kevin Tian Cc: Yi Liu , David Airlie , Daniel Vetter , Kalle Valo , Bjorn Andersson , Mathieu Poirier , Alex Williamson , mst@redhat.com, Jason Wang , Thierry Reding , Jonathan Hunter , Mikko Perttunen , Jeff Johnson , ath10k@lists.infradead.org, ath11k@lists.infradead.org, iommu@lists.linux.dev, dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org, Lu Baolu Subject: [PATCH v3 01/21] iommu: Add iommu_paging_domain_alloc() interface Date: Mon, 10 Jun 2024 16:55:35 +0800 Message-Id: <20240610085555.88197-2-baolu.lu@linux.intel.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20240610085555.88197-1-baolu.lu@linux.intel.com> References: <20240610085555.88197-1-baolu.lu@linux.intel.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Commit <17de3f5fdd35> ("iommu: Retire bus ops") removes iommu ops from bus. The iommu subsystem no longer relies on bus for operations. So the bus parameter in iommu_domain_alloc() is no longer relevant. Add a new interface named iommu_paging_domain_alloc(), which explicitly indicates the allocation of a paging domain for DMA managed by a kernel driver. The new interface takes a device pointer as its parameter, that better aligns with the current iommu subsystem. Signed-off-by: Lu Baolu --- include/linux/iommu.h | 6 ++++++ drivers/iommu/iommu.c | 20 ++++++++++++++++++++ 2 files changed, 26 insertions(+) diff --git a/include/linux/iommu.h b/include/linux/iommu.h index 7bc8dff7cf6d..46f1348f1f0a 100644 --- a/include/linux/iommu.h +++ b/include/linux/iommu.h @@ -780,6 +780,7 @@ extern bool iommu_present(const struct bus_type *bus); extern bool device_iommu_capable(struct device *dev, enum iommu_cap cap); extern bool iommu_group_has_isolated_msi(struct iommu_group *group); extern struct iommu_domain *iommu_domain_alloc(const struct bus_type *bus); +struct iommu_domain *iommu_paging_domain_alloc(struct device *dev); extern void iommu_domain_free(struct iommu_domain *domain); extern int iommu_attach_device(struct iommu_domain *domain, struct device *dev); @@ -1086,6 +1087,11 @@ static inline struct iommu_domain *iommu_domain_alloc(const struct bus_type *bus return NULL; } +static inline struct iommu_domain *iommu_paging_domain_alloc(struct device *dev) +{ + return ERR_PTR(-ENODEV); +} + static inline void iommu_domain_free(struct iommu_domain *domain) { } diff --git a/drivers/iommu/iommu.c b/drivers/iommu/iommu.c index 9df7cc75c1bc..e03c71a34347 100644 --- a/drivers/iommu/iommu.c +++ b/drivers/iommu/iommu.c @@ -2016,6 +2016,10 @@ static int __iommu_domain_alloc_dev(struct device *dev, void *data) return 0; } +/* + * The iommu ops in bus has been retired. Do not use this interface in + * new drivers. + */ struct iommu_domain *iommu_domain_alloc(const struct bus_type *bus) { const struct iommu_ops *ops = NULL; @@ -2032,6 +2036,22 @@ struct iommu_domain *iommu_domain_alloc(const struct bus_type *bus) } EXPORT_SYMBOL_GPL(iommu_domain_alloc); +/** + * iommu_paging_domain_alloc() - Allocate a paging domain + * @dev: device for which the domain is allocated + * + * Allocate a paging domain which will be managed by a kernel driver. Return + * allocated domain if successful, or a ERR pointer for failure. + */ +struct iommu_domain *iommu_paging_domain_alloc(struct device *dev) +{ + if (!dev_has_iommu(dev)) + return ERR_PTR(-ENODEV); + + return __iommu_domain_alloc(dev_iommu_ops(dev), dev, IOMMU_DOMAIN_UNMANAGED); +} +EXPORT_SYMBOL_GPL(iommu_paging_domain_alloc); + void iommu_domain_free(struct iommu_domain *domain) { if (domain->type == IOMMU_DOMAIN_SVA) -- 2.34.1