From patchwork Mon Jul 24 11:13:32 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yi Liu X-Patchwork-Id: 124852 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:9010:0:b0:3e4:2afc:c1 with SMTP id l16csp1729021vqg; Mon, 24 Jul 2023 04:22:51 -0700 (PDT) X-Google-Smtp-Source: APBJJlFRCtep1wtxBPp55GvSSwndPLRxsKHpyeiZ25psXRfGZ7xYRk48Q7VPfv2/hoRUnk38F3yG X-Received: by 2002:a17:90a:cd:b0:262:fe45:85f6 with SMTP id v13-20020a17090a00cd00b00262fe4585f6mr8261191pjd.0.1690197771565; Mon, 24 Jul 2023 04:22:51 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1690197771; cv=none; d=google.com; s=arc-20160816; b=STCuksTk6f4PDO3L1i32G2VdPkJW1BiC0gK9VyrS+0aRSyXQHjCWu6w8gluGBSaybB cMG5ZHY+2+QNH0bDxjVFMUQDPDqzzzN4gGMhiAyj4U/mIsLJbRetGzm6/PNkLxW+PK8g Z7ktuEgW+S0LcY9ad9pQtdVYV+3/CxKZfOIvTCpzHDu4R9UumLEpm80syINCbmsLRuSb RFUNeYqTr1g8+ygAv+FX87zLe49nKClXoeYbx949cw2809G6hA7CrfIaRwoqlFo4gkHq Lyyqz/N6ZGSDbhogSvd/kEAe5RIzqXIJi77J1cfls+cOU57h19/RmbEjabgAyLavvvNn MWmg== 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=A9GeazDrguYhEjGg7R0Cxyh+gkctwkHcSxBPUEl23pY=; fh=25kVo4cotgMzE250R6E3K5ES7E7C2JawiavlW0h5mKU=; b=U5iqjD2VVsdR0yX6wuQR1D92kOAVLE1sc8g4+Tem1ShPRhs6I2xf4a0nbk9KqPuQeL WUSXQnxW0tOR5FZWGT1wLpfwWsn1gDa6NoU49MO/ri9qC0gcI/8URy2jct5jS/Cpgf8t nrHR7oTHthvFKsE3HcweoOix1nZMwhSN14HmhqZExpKnVT6YrGdsfDVL/9ZIsR3ZUmsG +MQ8M3CttHL6tDOmauOHkvShM5Zfinl/oBrNKFkn5kVYcXDi3zD4PmlpoWxnm0JcOZDx BufAqi+nYG6TOomifNNu/ve1pgoad1Jfu2dFN8TNxQt0smBClS54ugyMg999pwDCEw8k A7yA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=isDVGT36; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=intel.com Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id ng11-20020a17090b1a8b00b0026807ec51b2si3972175pjb.53.2023.07.24.04.22.37; Mon, 24 Jul 2023 04:22:51 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=isDVGT36; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=intel.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232276AbjGXLOk (ORCPT + 99 others); Mon, 24 Jul 2023 07:14:40 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:39220 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231338AbjGXLOR (ORCPT ); Mon, 24 Jul 2023 07:14:17 -0400 Received: from mga12.intel.com (mga12.intel.com [192.55.52.136]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id E209110DF; Mon, 24 Jul 2023 04:13:50 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1690197231; x=1721733231; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=tXRlj9btBIeoEUnM5jIM9VZ+Pcrfyh8ZFvgKt8H4Rkw=; b=isDVGT36hMWHHdknPRkQf17vyrPMGGmFBAGvBpoNzqvjBLDwh44vQFL+ 0RzpAuCW1E1rvrbPoqafJtb4dkqQSWX9UKZNTEBg03zx5FZfZXu4LqUkq acjMaOuawAB+q6d9gEYUVvFZmQc9zYl3mgZ9KR5dUweh8b3F7HmbLxTh0 zcAxOVKINnGh9ymcHxBGjnGfstdyBAM49dWm31rBmIn5eKeZI05k4e1dr RWDJf7OwYbKB0yGYtMFKkd6tEBpyWQ1Zv4CZNN2Xwmq8Q2mhc7CSOXndk 1q+dWcA6VqI7Coewd6BTINxNBgld2am25+7vUkNXMWwjFXrw1q8cpplTV w==; X-IronPort-AV: E=McAfee;i="6600,9927,10780"; a="347015052" X-IronPort-AV: E=Sophos;i="6.01,228,1684825200"; d="scan'208";a="347015052" Received: from fmsmga002.fm.intel.com ([10.253.24.26]) by fmsmga106.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 24 Jul 2023 04:13:49 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10780"; a="839415586" X-IronPort-AV: E=Sophos;i="6.01,228,1684825200"; d="scan'208";a="839415586" Received: from 984fee00a4c6.jf.intel.com ([10.165.58.231]) by fmsmga002.fm.intel.com with ESMTP; 24 Jul 2023 04:13:48 -0700 From: Yi Liu To: joro@8bytes.org, alex.williamson@redhat.com, jgg@nvidia.com, kevin.tian@intel.com, robin.murphy@arm.com, baolu.lu@linux.intel.com Cc: cohuck@redhat.com, eric.auger@redhat.com, nicolinc@nvidia.com, kvm@vger.kernel.org, mjrosato@linux.ibm.com, chao.p.peng@linux.intel.com, yi.l.liu@intel.com, yi.y.sun@linux.intel.com, peterx@redhat.com, jasowang@redhat.com, shameerali.kolothum.thodi@huawei.com, lulu@redhat.com, suravee.suthikulpanit@amd.com, iommu@lists.linux.dev, linux-kernel@vger.kernel.org, linux-kselftest@vger.kernel.org, zhenzhong.duan@intel.com Subject: [PATCH v4 10/12] iommu/vt-d: Add nested domain allocation Date: Mon, 24 Jul 2023 04:13:32 -0700 Message-Id: <20230724111335.107427-11-yi.l.liu@intel.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230724111335.107427-1-yi.l.liu@intel.com> References: <20230724111335.107427-1-yi.l.liu@intel.com> MIME-Version: 1.0 X-Spam-Status: No, score=-4.4 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_MED, SPF_HELO_PASS,SPF_NONE,T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1772300818488555510 X-GMAIL-MSGID: 1772300818488555510 From: Lu Baolu This adds the support for IOMMU_HWPT_TYPE_VTD_S1 type. Signed-off-by: Lu Baolu Signed-off-by: Yi Liu Reviewed-by: Kevin Tian --- drivers/iommu/intel/iommu.c | 20 ++++++++++++++++++++ include/linux/iommu.h | 1 + 2 files changed, 21 insertions(+) diff --git a/drivers/iommu/intel/iommu.c b/drivers/iommu/intel/iommu.c index 3119a79ebc83..6977d320c440 100644 --- a/drivers/iommu/intel/iommu.c +++ b/drivers/iommu/intel/iommu.c @@ -4084,6 +4084,25 @@ static struct iommu_domain *intel_iommu_domain_alloc(unsigned type) return NULL; } +static struct iommu_domain * +intel_iommu_domain_alloc_user(struct device *dev, + enum iommu_hwpt_type hwpt_type, + struct iommu_domain *parent, + const union iommu_domain_user_data *user_data) +{ + if (hwpt_type != IOMMU_HWPT_TYPE_DEFAULT && + hwpt_type != IOMMU_HWPT_TYPE_VTD_S1) + return ERR_PTR(-EINVAL); + + if ((hwpt_type == IOMMU_HWPT_TYPE_DEFAULT) == !!parent) + return ERR_PTR(-EINVAL); + + if (parent) + return intel_nested_domain_alloc(parent, user_data); + else + return iommu_domain_alloc(dev->bus); +} + static void intel_iommu_domain_free(struct iommu_domain *domain) { if (domain != &si_domain->domain && domain != &blocking_domain) @@ -4732,6 +4751,7 @@ static void intel_iommu_remove_dev_pasid(struct device *dev, ioasid_t pasid) const struct iommu_ops intel_iommu_ops = { .capable = intel_iommu_capable, .domain_alloc = intel_iommu_domain_alloc, + .domain_alloc_user = intel_iommu_domain_alloc_user, .probe_device = intel_iommu_probe_device, .probe_finalize = intel_iommu_probe_finalize, .release_device = intel_iommu_release_device, diff --git a/include/linux/iommu.h b/include/linux/iommu.h index 231920efab84..09b8e800b55e 100644 --- a/include/linux/iommu.h +++ b/include/linux/iommu.h @@ -240,6 +240,7 @@ union iommu_domain_user_data { #ifdef CONFIG_IOMMUFD_TEST __u64 test[2]; #endif + struct iommu_hwpt_vtd_s1 vtd; }; /**