Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.35 as permitted sender) client-ip=23.128.96.35;
Message-ID: <5938157a-dfd4-43de-9e63-7669fc727a7f@intel.com>
Date:   Wed, 25 Oct 2023 18:19:46 +0800
User-Agent: Mozilla Thunderbird
Subject: Re: [PATCH v6 07/10] iommufd: Add a nested HW pagetable object
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: <20231024150609.46884-1-yi.l.liu@intel.com>
 <20231024150609.46884-8-yi.l.liu@intel.com>
 <20231024171810.GO3952@nvidia.com> <20231024173009.GQ3952@nvidia.com>
Content-Language: en-US
From:   Yi Liu <yi.l.liu@intel.com>
In-Reply-To: <20231024173009.GQ3952@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?eDVLRVF1VW4xSTQwSVJFMGxiTmlzMVdweFg3Um5TMDNKNy9zOGJ0aXFJYjhx?=
 =?utf-8?B?WXllcjE1Ri9PVWgyOThobkxjYjZXZXRycXpMWngxbXhkTFlwMVVITmVPR0p4?=
 =?utf-8?B?ZmNFcEhqRWx1UnllZkNXNDM1WE5aNjlndjQvc2FoQ0xMZndtcm9FSXJIS1Iw?=
 =?utf-8?B?UTBnWXBwZzgrNUJQUnVaNXZsRk9tYmlpbjZObzdEaG1DQ1EvSnAzSjM4VFRh?=
 =?utf-8?B?bUZSdWZSV3RjT1FGaGxjMmIxZDRQdU1od3ZDSWpqR0tFK245a3VrYXdIUEdF?=
 =?utf-8?B?NVBMaG5WOUhKTGlENnZUZTBXaTJNWEN6K1NlU1V2ekpEdkV3QTJNV05XazZY?=
 =?utf-8?B?V1cyTUxhOG14SlpJTGplQXlER3dXZWdTNFIvRzJYalVLSHlmWmQ1eDBrWEZ1?=
 =?utf-8?B?ZkZGdFdTVzFSWEFhVnEwRzBMZTF2d2d0R3g1SmVoV3dwSGkyangvZXZ5NzFZ?=
 =?utf-8?B?VGFlamNtV2FIdFFQYkl0MEtWalc5ZTBpelFFVEtrNndaL1pWblpETHk4aVdz?=
 =?utf-8?B?ZmZxTjBiTjM2WDBkV0NCamR0Z0tHREp5eU5xb3NsY0pUS2pwS3BidGU3QW1k?=
 =?utf-8?B?VEtnNTNxOW1GcWM5L1hlMnExbSttZFEzUjhaSmtEd29uVk1LKzJQZW1Ta0pX?=
 =?utf-8?B?M0RSUWt2ckJiSTVPL2hCcGhMd0tCRFNTL0c3QW52VXVrcVl1bkRDbnVVYzdQ?=
 =?utf-8?B?b0lEU1ZTODV0UjhqbTIxZkwrcnU0cDRtbnVSSXRtNWhaUXdIRSs1Z0ZpYm5Q?=
 =?utf-8?B?OCtxLzZ3Ym9BTnVveWdabkI2a1RDYSt2VDIrKzl0ZEZVTWt5clh5WEhidmFO?=
 =?utf-8?B?aW5ZWkVsYlVNSlV4Y0lRdUhVUmVIMEVNcFJXWWNhdWFvN0oxWTMvYkg0R3dl?=
 =?utf-8?B?cnE4VEJPUlZ4NjZ6V2Yzd1M0UkE3cEI1T0t5VTdFTk1vSzlOa3AxcWZMNHZX?=
 =?utf-8?B?SFhGN0RuMGpvUisySGFWYXlBeDVKeno0VWhZb0tNcVFKVndBUWZlVnpLMU5Z?=
 =?utf-8?B?SGFBOEpzS2tVQkxVR3hEaUZKR1NMM3poZG1DaVAzejFTY2tMVldFRUlaQndX?=
 =?utf-8?B?aVRLQmt0RTYrb3Q1Yk1ubS9uQ3VuVG1Ua2t1MTBMRjhGZm1WMU1hUVUxRld3?=
 =?utf-8?B?SW5ITkpGQ2RYWnpPME4vNTJJZE5sb2xuamZ5eTZlcVR0Q3BUUnJ1eVZhbjZi?=
 =?utf-8?B?MGRmOVFyaS9GcHBnUEV3VWdQdWVjMWJEbnRWMWlEY3M1bGlyNVVtbis2NkRr?=
 =?utf-8?B?bVVDcEhlNzRmcTRLbEtDeWx4Zjg5VHlGYzlBTFNENDlBMmpyelRsY3ZBWUtl?=
 =?utf-8?B?dDU1bXovZ1puTE9DZXVnVWxKQ2tkczhJSnJqSUtjNy85VWxUYWxaTkp2clI1?=
 =?utf-8?B?SDVsN1I2NDI1dVJHcEJzcndhWXlSQUVoZ2lGV2VZaTFIT2dhMWdRWmZhT0xy?=
 =?utf-8?B?dnBDUjEwL2gvcHU5WWZJNFlPT2hkRjFHajBOdmRvbnRqcUtOT0VPVTUwVjBW?=
 =?utf-8?B?ZDFPSVB0WTZrS1UzYlVuNkZuY0h1SXpFa2I5RHIyUHpiVExvaDdMSGJEMXFF?=
 =?utf-8?B?cTA2T3dBdkxuc1NOaVdxdWNJM3lUZE1wb3hISFJiUjZTTGNxaE5xN3JvTXdR?=
 =?utf-8?B?eDZ6R0x6dk8rQUdRNFFRSFEvZGRTQ3paU25VNk93ajlWZnAyWCtGSkF6VlJ0?=
 =?utf-8?B?UkptV2NCcnlBcnRoSGN4emVsU3ByZ2FuQzNNV2lxY0R5NGZyMWdnL0hMSzlx?=
 =?utf-8?B?TTJxd3FwcWY5SzZxYmE3MTZ5SlU3ZS9LbW11SC9JYlBMOWxzeEZ4M1VlWWVq?=
 =?utf-8?B?dVJqdklkdStxU1RpSDVQNmptMFZjNndRUFR4Y1JFcTRjN2FjdjJ2N3QxZmRJ?=
 =?utf-8?B?QndxQUFGZUx1eVJHZUlqS3MvQVFGWU1UcExCTnlVbnp3QXdhOFRWQXZUMjlR?=
 =?utf-8?B?ZHI3d2U5OUh4d1FDR1RZekgvb2lmU0c5ZUNTb3k2eVcwaysySE11VEErSmFB?=
 =?utf-8?B?LzJqRC9sYzE3WG5ESWZEUFRmSGNZaFBwQzIwaDZwZHR1MGY0eGJ3QmVuQmdZ?=
 =?utf-8?B?WG1vWnBxa2Z3bU9pY0ZyZnp4WDNsRUlieVRzc2hKaVJ5STlLSEswSkNQWFRp?=
 =?utf-8?Q?ef2NtRi/qJoNABNro5MN1Rdmy?=
X-MS-Exchange-CrossTenant-Network-Message-Id: a378a077-52ca-4e2e-a501-08dbd5439277
X-MS-Exchange-CrossTenant-AuthSource: DS0PR11MB7529.namprd11.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 25 Oct 2023 10:17:20.7191
 (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: 2DoZ6SQ1g6QucR+uioUfrh/qmF72IjRUVL4uUNwDn18Eu3t331Wfr/+zoEgJPzqvxM4uWyJxhBspO14Q0sSEuA==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: SN7PR11MB6774
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 groat.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 (groat.vger.email [0.0.0.0]); Wed, 25 Oct 2023 03:18:13 -0700 (PDT)

On 2023/10/25 01:30, Jason Gunthorpe wrote:
> On Tue, Oct 24, 2023 at 02:18:10PM -0300, Jason Gunthorpe wrote:
>> On Tue, Oct 24, 2023 at 08:06:06AM -0700, Yi Liu wrote:
>>> @@ -195,6 +279,10 @@ int iommufd_hwpt_alloc(struct iommufd_ucmd *ucmd)
>>>   	if (pt_obj->type == IOMMUFD_OBJ_IOAS) {
>>>   		struct iommufd_hwpt_paging *hwpt_paging;
>>>   
>>> +		if (cmd->data_type != IOMMU_HWPT_DATA_NONE) {
>>> +			rc = -EINVAL;
>>> +			goto out_put_pt;
>>> +		}
>>>   		ioas = container_of(pt_obj, struct iommufd_ioas, obj);
>>>   		mutex_lock(&ioas->mutex);
>>>   		hwpt_paging = iommufd_hwpt_paging_alloc(ucmd->ictx, ioas, idev,
>>
>> ?? What is this?
>>
>> Ah something went wrong earlier in "iommu: Pass in parent domain with
>> user_data to domain_alloc_user op"
> 
> Bah, I got confused because that had half the uapi, so in this pathc
>   
>> Once we added the user_data we should flow it through to the op
>> always.
> 
> Like this:

ack.

> diff --git a/drivers/iommu/iommufd/device.c b/drivers/iommu/iommufd/device.c
> index 92859b907bb93c..a3382811af8a81 100644
> --- a/drivers/iommu/iommufd/device.c
> +++ b/drivers/iommu/iommufd/device.c
> @@ -586,8 +586,8 @@ iommufd_device_auto_get_domain(struct iommufd_device *idev,
>   		goto out_unlock;
>   	}
>   
> -	hwpt_paging = iommufd_hwpt_paging_alloc(idev->ictx, ioas, idev,
> -						 0, immediate_attach);
> +	hwpt_paging = iommufd_hwpt_paging_alloc(idev->ictx, ioas, idev, 0,
> +						immediate_attach, NULL);
>   	if (IS_ERR(hwpt_paging)) {
>   		destroy_hwpt = ERR_CAST(hwpt_paging);
>   		goto out_unlock;
> diff --git a/drivers/iommu/iommufd/hw_pagetable.c b/drivers/iommu/iommufd/hw_pagetable.c
> index cfd85df693d7b2..324a6d73f032ee 100644
> --- a/drivers/iommu/iommufd/hw_pagetable.c
> +++ b/drivers/iommu/iommufd/hw_pagetable.c
> @@ -96,7 +96,8 @@ iommufd_hwpt_paging_enforce_cc(struct iommufd_hwpt_paging *hwpt_paging)
>   struct iommufd_hwpt_paging *
>   iommufd_hwpt_paging_alloc(struct iommufd_ctx *ictx, struct iommufd_ioas *ioas,
>   			  struct iommufd_device *idev, u32 flags,
> -			  bool immediate_attach)
> +			  bool immediate_attach,
> +			  const struct iommu_user_data *user_data)
>   {
>   	const u32 valid_flags = IOMMU_HWPT_ALLOC_NEST_PARENT |
>   				IOMMU_HWPT_ALLOC_DIRTY_TRACKING;
> @@ -107,7 +108,7 @@ iommufd_hwpt_paging_alloc(struct iommufd_ctx *ictx, struct iommufd_ioas *ioas,
>   
>   	lockdep_assert_held(&ioas->mutex);
>   
> -	if (flags && !ops->domain_alloc_user)
> +	if ((flags || user_data) && !ops->domain_alloc_user)
>   		return ERR_PTR(-EOPNOTSUPP);
>   	if (flags & ~valid_flags)
>   		return ERR_PTR(-EOPNOTSUPP);
> @@ -127,7 +128,7 @@ iommufd_hwpt_paging_alloc(struct iommufd_ctx *ictx, struct iommufd_ioas *ioas,
>   
>   	if (ops->domain_alloc_user) {
>   		hwpt->domain = ops->domain_alloc_user(idev->dev, flags,
> -						      NULL, NULL);
> +						      NULL, user_data);
>   		if (IS_ERR(hwpt->domain)) {
>   			rc = PTR_ERR(hwpt->domain);
>   			hwpt->domain = NULL;
> @@ -210,8 +211,7 @@ iommufd_hwpt_nested_alloc(struct iommufd_ctx *ictx,
>   	struct iommufd_hw_pagetable *hwpt;
>   	int rc;
>   
> -	if (flags || user_data->type == IOMMU_HWPT_DATA_NONE ||
> -	    !ops->domain_alloc_user)
> +	if (flags || !user_data->len || !ops->domain_alloc_user)
>   		return ERR_PTR(-EOPNOTSUPP);
>   	if (parent->auto_domain || !parent->nest_parent)
>   		return ERR_PTR(-EINVAL);
> @@ -249,6 +249,11 @@ iommufd_hwpt_nested_alloc(struct iommufd_ctx *ictx,
>   int iommufd_hwpt_alloc(struct iommufd_ucmd *ucmd)
>   {
>   	struct iommu_hwpt_alloc *cmd = ucmd->cmd;
> +	const struct iommu_user_data user_data = {
> +		.type = cmd->data_type,
> +		.uptr = u64_to_user_ptr(cmd->data_uptr),
> +		.len = cmd->data_len,
> +	};
>   	struct iommufd_hw_pagetable *hwpt;
>   	struct iommufd_ioas *ioas = NULL;
>   	struct iommufd_object *pt_obj;
> @@ -273,25 +278,17 @@ int iommufd_hwpt_alloc(struct iommufd_ucmd *ucmd)
>   	if (pt_obj->type == IOMMUFD_OBJ_IOAS) {
>   		struct iommufd_hwpt_paging *hwpt_paging;
>   
> -		if (cmd->data_type != IOMMU_HWPT_DATA_NONE) {
> -			rc = -EINVAL;
> -			goto out_put_pt;
> -		}

it can be covered by iommu driver when checking user data pointer. hence
remove above if.

>   		ioas = container_of(pt_obj, struct iommufd_ioas, obj);
>   		mutex_lock(&ioas->mutex);
> -		hwpt_paging = iommufd_hwpt_paging_alloc(ucmd->ictx, ioas, idev,
> -							cmd->flags, false);
> +		hwpt_paging = iommufd_hwpt_paging_alloc(
> +			ucmd->ictx, ioas, idev, cmd->flags, false,
> +			user_data.len ? &user_data : NULL);
>   		if (IS_ERR(hwpt_paging)) {
>   			rc = PTR_ERR(hwpt_paging);
>   			goto out_unlock;
>   		}
>   		hwpt = &hwpt_paging->common;
>   	} else if (pt_obj->type == IOMMUFD_OBJ_HWPT_PAGING) {
> -		const struct iommu_user_data user_data = {
> -			.type = cmd->data_type,
> -			.uptr = u64_to_user_ptr(cmd->data_uptr),
> -			.len = cmd->data_len,
> -		};
>   		struct iommufd_hwpt_nested *hwpt_nested;
>   		struct iommufd_hwpt_paging *parent;
>   
> diff --git a/drivers/iommu/iommufd/iommufd_private.h b/drivers/iommu/iommufd/iommufd_private.h
> index 6fdad56893af4d..24e5a36fc875e0 100644
> --- a/drivers/iommu/iommufd/iommufd_private.h
> +++ b/drivers/iommu/iommufd/iommufd_private.h
> @@ -290,7 +290,8 @@ int iommufd_hwpt_get_dirty_bitmap(struct iommufd_ucmd *ucmd);
>   struct iommufd_hwpt_paging *
>   iommufd_hwpt_paging_alloc(struct iommufd_ctx *ictx, struct iommufd_ioas *ioas,
>   			  struct iommufd_device *idev, u32 flags,
> -			  bool immediate_attach);
> +			  bool immediate_attach,
> +			  const struct iommu_user_data *user_data);
>   int iommufd_hw_pagetable_attach(struct iommufd_hw_pagetable *hwpt,
>   				struct iommufd_device *idev);
>   struct iommufd_hw_pagetable *

-- 
Regards,
Yi Liu