Re: [PATCH 1/3] hisi_acc_vfio_pci: extract public functions for container_of

[liulongfang]

On 2024/1/26 5:48, Zhi Wang wrote:
> On Thu, 25 Jan 2024 16:10:29 +0800
> Longfang Liu <liulongfang@xxxxxxxxxx> wrote:
> 
>> In the current driver, vdev is obtained from struct
>> hisi_acc_vf_core_device through the container_of function.
>> This method is used in many places in the driver. In order to
>> reduce this repetitive operation, I extracted a public function
>> to replace it.
>>
> It is better to use the passive voice in the patch comment.

OK,

Thanks,
Longfang.
>> Signed-off-by: Longfang Liu <liulongfang@xxxxxxxxxx>
>> ---
>>  .../vfio/pci/hisilicon/hisi_acc_vfio_pci.c    | 21
>> ++++++++++--------- 1 file changed, 11 insertions(+), 10 deletions(-)
>>
>> diff --git a/drivers/vfio/pci/hisilicon/hisi_acc_vfio_pci.c
>> b/drivers/vfio/pci/hisilicon/hisi_acc_vfio_pci.c index
>> f4b38a243aa7..5f6e01571a7b 100644 ---
>> a/drivers/vfio/pci/hisilicon/hisi_acc_vfio_pci.c +++
>> b/drivers/vfio/pci/hisilicon/hisi_acc_vfio_pci.c @@ -641,6 +641,12 @@
>> static void hisi_acc_vf_disable_fds(struct hisi_acc_vf_core_device
>> *hisi_acc_vde } }
>>  
>> +static struct hisi_acc_vf_core_device *hisi_acc_get_vf_dev(struct
>> vfio_device *vdev) +{
>> +	return container_of(vdev, struct hisi_acc_vf_core_device,
>> +			    core_device.vdev);
>> +}
>> +
>>  /*
>>   * This function is called in all state_mutex unlock cases to
>>   * handle a 'deferred_reset' if exists.
>> @@ -1064,8 +1070,7 @@ static struct file *
>>  hisi_acc_vfio_pci_set_device_state(struct vfio_device *vdev,
>>  				   enum vfio_device_mig_state
>> new_state) {
>> -	struct hisi_acc_vf_core_device *hisi_acc_vdev =
>> container_of(vdev,
>> -			struct hisi_acc_vf_core_device,
>> core_device.vdev);
>> +	struct hisi_acc_vf_core_device *hisi_acc_vdev =
>> hisi_acc_get_vf_dev(vdev); enum vfio_device_mig_state next_state;
>>  	struct file *res = NULL;
>>  	int ret;
>> @@ -1106,8 +1111,7 @@ static int
>>  hisi_acc_vfio_pci_get_device_state(struct vfio_device *vdev,
>>  				   enum vfio_device_mig_state
>> *curr_state) {
>> -	struct hisi_acc_vf_core_device *hisi_acc_vdev =
>> container_of(vdev,
>> -			struct hisi_acc_vf_core_device,
>> core_device.vdev);
>> +	struct hisi_acc_vf_core_device *hisi_acc_vdev =
>> hisi_acc_get_vf_dev(vdev); 
>>  	mutex_lock(&hisi_acc_vdev->state_mutex);
>>  	*curr_state = hisi_acc_vdev->mig_state;
>> @@ -1323,8 +1327,7 @@ static long hisi_acc_vfio_pci_ioctl(struct
>> vfio_device *core_vdev, unsigned int 
>>  static int hisi_acc_vfio_pci_open_device(struct vfio_device
>> *core_vdev) {
>> -	struct hisi_acc_vf_core_device *hisi_acc_vdev =
>> container_of(core_vdev,
>> -			struct hisi_acc_vf_core_device,
>> core_device.vdev);
>> +	struct hisi_acc_vf_core_device *hisi_acc_vdev =
>> hisi_acc_get_vf_dev(core_vdev); struct vfio_pci_core_device *vdev =
>> &hisi_acc_vdev->core_device; int ret;
>>  
>> @@ -1347,8 +1350,7 @@ static int hisi_acc_vfio_pci_open_device(struct
>> vfio_device *core_vdev) 
>>  static void hisi_acc_vfio_pci_close_device(struct vfio_device
>> *core_vdev) {
>> -	struct hisi_acc_vf_core_device *hisi_acc_vdev =
>> container_of(core_vdev,
>> -			struct hisi_acc_vf_core_device,
>> core_device.vdev);
>> +	struct hisi_acc_vf_core_device *hisi_acc_vdev =
>> hisi_acc_get_vf_dev(core_vdev); struct hisi_qm *vf_qm =
>> &hisi_acc_vdev->vf_qm; 
>>  	iounmap(vf_qm->io_base);
>> @@ -1363,8 +1365,7 @@ static const struct vfio_migration_ops
>> hisi_acc_vfio_pci_migrn_state_ops = { 
>>  static int hisi_acc_vfio_pci_migrn_init_dev(struct vfio_device
>> *core_vdev) {
>> -	struct hisi_acc_vf_core_device *hisi_acc_vdev =
>> container_of(core_vdev,
>> -			struct hisi_acc_vf_core_device,
>> core_device.vdev);
>> +	struct hisi_acc_vf_core_device *hisi_acc_vdev =
>> hisi_acc_get_vf_dev(core_vdev); struct pci_dev *pdev =
>> to_pci_dev(core_vdev->dev); struct hisi_qm *pf_qm =
>> hisi_acc_get_pf_qm(pdev); 
> 
> .
>