Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.31 as permitted sender) client-ip=23.128.96.31;
Message-ID: <04b3cc65-fcb0-4a33-b012-0085e7886e33@intel.com>
Date:   Wed, 25 Oct 2023 17:02:19 +0800
User-Agent: Mozilla Thunderbird
Subject: Re: [PATCH v7 7/8] iommu/vt-d: Add nested domain allocation
Content-Language: en-US
To:     Jason Gunthorpe <jgg@nvidia.com>
CC:     <joro@8bytes.org>, <alex.williamson@redhat.com>,
        <kevin.tian@intel.com>, <robin.murphy@arm.com>,
        <baolu.lu@linux.intel.com>, <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.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>, <joao.m.martins@oracle.com>
References: <20231024151412.50046-1-yi.l.liu@intel.com>
 <20231024151412.50046-8-yi.l.liu@intel.com>
 <20231024230319.GW3952@nvidia.com>
From:   Yi Liu <yi.l.liu@intel.com>
In-Reply-To: <20231024230319.GW3952@nvidia.com>
Content-Type: text/plain; charset="UTF-8"; format=flowed
Content-Transfer-Encoding: 7bit
MIME-Version: 1.0
X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?B?bW9lNVNBd0xoU0VrakxYQXFBempxa0gxMkJGVU5ZMUtZNlRlbisvSW8xeXFn?=
 =?utf-8?B?Q0VzVmZVT0hnakZmaHlOb1VJckpBeDBmVjBVT21ReUZVQXlhbnUyYzdLcHJ4?=
 =?utf-8?B?b2ZLM2RMK1hCNkFDNnhEM0h2aDFhTUwxOGxZMndKNDl0QnpMcno1ZXNvYVhX?=
 =?utf-8?B?S3RObW82c2JYQUlmTnNXUHlVcS9Ibm1Ma2s1K3NGRGprZzcwdFJ2QVFqNEhj?=
 =?utf-8?B?OWpqRVUxVDQrSTY3YXZpRmVtR0lHK243YjMzcnU4UVo4L1EzQ1ptejNlcHZM?=
 =?utf-8?B?REpha2hRWjUrcnFXN1NIN25RaFBlbEw1RWVDVTlucjBsZ1NNMnNRZWwzTFcx?=
 =?utf-8?B?WDg0b05tSEJ1RnNMcFNQd0ZBOWZYUEc1dHAyOVVtR1BUUkorMFFqNzFzZzlp?=
 =?utf-8?B?aDFHaGo0aXRMcDYycU11bEJHK1RBVVlBOElNNWRGbC9LS0NHN3FWRUlPWlN1?=
 =?utf-8?B?QW8yeWV0MzlLSTNXd2MyUUlCWmcwTkVhOUFUOWE4R3VPL1ovdHFXRzJ3RGl1?=
 =?utf-8?B?MTJnOE4wT3llNWhHOENrYTRIRXpVOThNSEFINWV4RXNKeEcvQzBaOGd1aVg3?=
 =?utf-8?B?WUNsUU9aem9VOVkzYmIvOW5NQ2RYUUxLSXBNRUpvOHNjRGxuOWdvRHdhdmIr?=
 =?utf-8?B?R2creVJtdXowaHpxZUNodkx1NHJUa0RZdzVjb0F2QVhHQlQyVVNGZytKa3pP?=
 =?utf-8?B?N2d2THJtTlUrMzk2a0FEOU1QT2RWanZ0ZmxpVFhjb0h5MnVaZExvZkhGZnJP?=
 =?utf-8?B?dTJXdndjSklPUDRzQlBueDBVZ3N6K0wxSy9PcVNsenRqRUdoOE15RlNJV054?=
 =?utf-8?B?bGxrckZ1RlE3eUg2anFjK0MvM1d5L01ZOVVTWHRQSGFMN0RxcldnRGxRMFdl?=
 =?utf-8?B?MlZqVURpR05GZlpBM3JxSXZhaFI5Mld1Q1d6NTZRSEpDUlppWDZ6cDR2WC9F?=
 =?utf-8?B?a0o5d0VGV0wrMzduK3A5UDQ5Y0U2Tklhbk5nQTBWdDdpTFBxdzNnMnZVQWZS?=
 =?utf-8?B?ZjV2dGxVZTNueDlyN20zQ0ZpdTY2ZXdESkZaanFqdzV6WXVGNXorZlBWRFlu?=
 =?utf-8?B?cVpNSGRQWnFXalFGQXdTUlQ0VzBXS1kxb2pIZG1NZWExZHdjWnpnSXBJS09l?=
 =?utf-8?B?VWI0NkFDNDhVZnZXNkNZZTZ0bG1LQ1orQ2dMUFpuYmVvZVJjQjNxKzRLbGhi?=
 =?utf-8?B?dXlFODdtZEt6cFphbzhRdGU5aUtmL1QrUXV6VVRvOTNTQXZKUHp3eHFTWGk1?=
 =?utf-8?B?QWgyd3N0Y093V0F6WGtrL1U3YWNJR09FcXhDQTJTaFgrcFZ6UyttdXdHeC9X?=
 =?utf-8?B?amFnRlJobGIxWVk2czk1ejlZMzNxKzZOS0hNdXhxNkwzSkwxcmRoaUNKeVoz?=
 =?utf-8?B?THBmLzFuV0tzeURFMWJMdDBwajhnOHVoVU9GNExibFQrTXdPdHdFYVBtbWtv?=
 =?utf-8?B?dGRhaDQ0NnZXMlllbDBpRnJ1RWdWS29heTh4ajk3djUzM1dpNHM0WStJWlM2?=
 =?utf-8?B?bHZvQTN2VDdxa2tCMUdDQWtDenUwNFhhOWhjaUM5K29TUnRaN1V2N3BzUmtO?=
 =?utf-8?B?VDJUdUhpQ0dFbTdGVklRTDdLam5YZy9mU0MveFY3SHJIb2JXcDRwc2xOdzBz?=
 =?utf-8?B?ZE5KYVpYR29TTmFYazFkU05PaGpkQ29OaXZ2aS9PUGUreDUvcmdvbm81SWZn?=
 =?utf-8?B?K2U3UVlFNmVxZzlRWkQweU1hZTVCQURPUVR3ZVlCOWJmNFVqQnRqR2JZcDJQ?=
 =?utf-8?B?eldWKzBaWFU3ejkrQ01Yb3ZCdTJpZ0RpdHJPb2h1UytyM3QrYWk1T0xLelBR?=
 =?utf-8?B?YnJ2S1RNRzZvTGVqOHM3U1JJS0ZSd3F0Z0FDQVZ1aDhMS0VrOEJFRFo4RG5j?=
 =?utf-8?B?OE1wWWdpTWoreFZYZ0dzN3RReDRSWWZ2cXRabEI0T2lweEZkNkRDa0RTNGZS?=
 =?utf-8?B?akUvZGtENllBWERESkcvRXVPdVZCSVBVTzNSQnR3MXZ5a0o2OWZYZEFKSkls?=
 =?utf-8?B?Q1RXRlRDaU1SSW4wN0N0dDZhbEZ2TGpvaHNrVGNXSWcxQVZnSjl3bklrR1hi?=
 =?utf-8?B?Qk5CdDdkUjRTanQyazJiK1hPNEs3ZEt4cWtXQVZnSEhUSnM2eFI5cFc0NFB0?=
 =?utf-8?Q?vzXu78LTFXsYzNi3BdKcdcFYi?=
X-MS-Exchange-CrossTenant-Network-Message-Id: 4817d645-46af-483a-5c89-08dbd538c107
X-MS-Exchange-CrossTenant-AuthSource: DS0PR11MB7529.namprd11.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 25 Oct 2023 08:59:54.7959
 (UTC)
X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted
X-MS-Exchange-CrossTenant-Id: 46c98d88-e344-4ed4-8496-4ed7712e255d
X-MS-Exchange-CrossTenant-MailboxType: HOSTED
X-MS-Exchange-CrossTenant-UserPrincipalName: VSrE3ijMFFMinbae4RJpr3ycWClF/mmGDn8nlDBhNw4E1cMLRIe2CmTljiQJo8X7T1j8vTWbkSyRH/k5Hj9NKw==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: PH7PR11MB6427
X-OriginatorOrg: intel.com
X-Spam-Status: No, score=-0.9 required=5.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED,
	DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,
	MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS autolearn=unavailable
	autolearn_force=no version=3.4.6
X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on morse.vger.email
Precedence: bulk
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org
X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (morse.vger.email [0.0.0.0]); Wed, 25 Oct 2023 02:01:30 -0700 (PDT)

On 2023/10/25 07:03, Jason Gunthorpe wrote:
> On Tue, Oct 24, 2023 at 08:14:11AM -0700, Yi Liu wrote:
>> From: Lu Baolu <baolu.lu@linux.intel.com>
>>
>> This adds the support for IOMMU_HWPT_DATA_VTD_S1 type. And 'nested_parent'
>> is added to mark the nested parent domain to sanitize the input parent domain.
>>
>> Signed-off-by: Lu Baolu <baolu.lu@linux.intel.com>
>> Signed-off-by: Yi Liu <yi.l.liu@intel.com>
>> ---
>>   drivers/iommu/intel/iommu.c | 67 +++++++++++++++++++++++++------------
>>   drivers/iommu/intel/iommu.h |  1 +
>>   2 files changed, 46 insertions(+), 22 deletions(-)
> 
> I think it should be written like this:
> 
> @@ -4077,38 +4082,39 @@ intel_iommu_domain_alloc_user(struct device *dev, u32 flags,
>   			      struct iommu_domain *parent,
>   			      const struct iommu_user_data *user_data)
>   {
> +	struct device_domain_info *info = dev_iommu_priv_get(dev);
> +	bool dirty_tracking = flags & IOMMU_HWPT_ALLOC_DIRTY_TRACKING;
> +	bool nested_parent = flags & IOMMU_HWPT_ALLOC_NEST_PARENT;
> +	struct intel_iommu *iommu = info->iommu;
>   	struct iommu_domain *domain;
> -	struct intel_iommu *iommu;
> -	bool dirty_tracking;
> +
> +	/* Must be NESTING domain */
> +	if (parent) {
> +		if (!nested_supported(iommu) || flags)
> +			return ERR_PTR(-EOPNOTSUPP);
> +		return intel_nested_domain_alloc(parent, user_data);
> +	}
>   
>   	if (flags &
>   	    (~(IOMMU_HWPT_ALLOC_NEST_PARENT | IOMMU_HWPT_ALLOC_DIRTY_TRACKING)))
>   		return ERR_PTR(-EOPNOTSUPP);
> -
> -	if (parent || user_data)
> +	if (nested_parent && !nested_supported(iommu))
>   		return ERR_PTR(-EOPNOTSUPP);
> -
> -	iommu = device_to_iommu(dev, NULL, NULL);
> -	if (!iommu)
> -		return ERR_PTR(-ENODEV);
> -
> -	if ((flags & IOMMU_HWPT_ALLOC_NEST_PARENT) && !nested_supported(iommu))
> -		return ERR_PTR(-EOPNOTSUPP);
> -
> -	dirty_tracking = (flags & IOMMU_HWPT_ALLOC_DIRTY_TRACKING);
> -	if (dirty_tracking && !ssads_supported(iommu))
> +	if (user_data || (dirty_tracking && !ssads_supported(iommu)))
>   		return ERR_PTR(-EOPNOTSUPP);
>   
>   	/*
> -	 * domain_alloc_user op needs to fully initialize a domain
> -	 * before return, so uses iommu_domain_alloc() here for
> -	 * simple.
> +	 * domain_alloc_user op needs to fully initialize a domain before
> +	 * return, so uses iommu_domain_alloc() here for simple.
>   	 */
>   	domain = iommu_domain_alloc(dev->bus);
>   	if (!domain)
> -		domain = ERR_PTR(-ENOMEM);
> +		return ERR_PTR(-ENOMEM);
>   
> -	if (!IS_ERR(domain) && dirty_tracking) {
> +	if (nested_parent)
> +		to_dmar_domain(domain)->nested_parent = true;
> +
> +	if (dirty_tracking) {
>   		if (to_dmar_domain(domain)->use_first_level) {
>   			iommu_domain_free(domain);
>   			return ERR_PTR(-EOPNOTSUPP);
> @@ -4849,6 +4855,7 @@ static void *intel_iommu_hw_info(struct device *dev, u32 *length, u32 *type)
>   	if (!vtd)
>   		return ERR_PTR(-ENOMEM);
>   
> +	vtd->flags = IOMMU_HW_INFO_VTD_ERRATA_772415_SPR17;

this flag is introduced in [8/8]. still make sense to keep it there?

>   	vtd->cap_reg = iommu->cap;
>   	vtd->ecap_reg = iommu->ecap;
>   	*length = sizeof(*vtd);
> diff --git a/drivers/iommu/intel/nested.c b/drivers/iommu/intel/nested.c
> index d9197dd72748b1..b5a5563ab32c6b 100644
> --- a/drivers/iommu/intel/nested.c
> +++ b/drivers/iommu/intel/nested.c
> @@ -78,13 +78,21 @@ static const struct iommu_domain_ops intel_nested_domain_ops = {
>   	.free			= intel_nested_domain_free,
>   };
>   
> -struct iommu_domain *intel_nested_domain_alloc(struct iommu_domain *s2_domain,
> +struct iommu_domain *intel_nested_domain_alloc(struct iommu_domain *parent,
>   					       const struct iommu_user_data *user_data)
>   {
> +	struct dmar_domain *s2_domain = to_dmar_domain(parent);
>   	struct iommu_hwpt_vtd_s1 vtd;
>   	struct dmar_domain *domain;
>   	int ret;
>   
> +	/* Must be nested domain */
> +	if (user_data->type != IOMMU_HWPT_DATA_VTD_S1)
> +		return ERR_PTR(-EOPNOTSUPP);
> +	if (parent->ops != intel_iommu_ops.default_domain_ops ||
> +	    !s2_domain->nested_parent)
> +		return ERR_PTR(-EINVAL);
> +
>   	ret = iommu_copy_struct_from_user(&vtd, user_data,
>   					  IOMMU_HWPT_DATA_VTD_S1, __reserved);
>   	if (ret)
> @@ -95,7 +103,7 @@ struct iommu_domain *intel_nested_domain_alloc(struct iommu_domain *s2_domain,
>   		return ERR_PTR(-ENOMEM);
>   
>   	domain->use_first_level = true;
> -	domain->s2_domain = to_dmar_domain(s2_domain);
> +	domain->s2_domain = s2_domain;
>   	domain->s1_pgtbl = vtd.pgtbl_addr;
>   	domain->s1_cfg = vtd;
>   	domain->domain.ops = &intel_nested_domain_ops;

-- 
Regards,
Yi Liu