tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

vdpa/mlx5: Clarify meaning thorough function rename

setup_driver()/teardown_driver() are a bit vague. These functions are
used for virtqueue resources.

Same for alloc_resources()/teardown_resources(): they represent fixed
resources that are meant to exist during the device lifetime.

Reviewed-by: Cosmin Ratiu <cratiu@nvidia.com>
Acked-by: Eugenio Pérez <eperezma@redhat.com>
Signed-off-by: Dragos Tatulea <dtatulea@nvidia.com>
Message-Id: <20240626-stage-vdpa-vq-precreate-v2-1-560c491078df@nvidia.com>
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>

authored by

Dragos Tatulea and committed by
Michael S. Tsirkin 1f5d6476 106e4df1

+14 -14
+14 -14
drivers/vdpa/mlx5/net/mlx5_vnet.c
··· 144 144 return idx <= mvdev->max_idx; 145 145 } 146 146 147 - static void free_resources(struct mlx5_vdpa_net *ndev); 147 + static void free_fixed_resources(struct mlx5_vdpa_net *ndev); 148 148 static void init_mvqs(struct mlx5_vdpa_net *ndev); 149 - static int setup_driver(struct mlx5_vdpa_dev *mvdev); 150 - static void teardown_driver(struct mlx5_vdpa_net *ndev); 149 + static int setup_vq_resources(struct mlx5_vdpa_dev *mvdev); 150 + static void teardown_vq_resources(struct mlx5_vdpa_net *ndev); 151 151 152 152 static bool mlx5_vdpa_debug; 153 153 ··· 2848 2848 if (err) 2849 2849 return err; 2850 2850 2851 - teardown_driver(ndev); 2851 + teardown_vq_resources(ndev); 2852 2852 } 2853 2853 2854 2854 mlx5_vdpa_update_mr(mvdev, new_mr, asid); ··· 2862 2862 2863 2863 if (teardown) { 2864 2864 restore_channels_info(ndev); 2865 - err = setup_driver(mvdev); 2865 + err = setup_vq_resources(mvdev); 2866 2866 if (err) 2867 2867 return err; 2868 2868 } ··· 2873 2873 } 2874 2874 2875 2875 /* reslock must be held for this function */ 2876 - static int setup_driver(struct mlx5_vdpa_dev *mvdev) 2876 + static int setup_vq_resources(struct mlx5_vdpa_dev *mvdev) 2877 2877 { 2878 2878 struct mlx5_vdpa_net *ndev = to_mlx5_vdpa_ndev(mvdev); 2879 2879 int err; ··· 2931 2931 } 2932 2932 2933 2933 /* reslock must be held for this function */ 2934 - static void teardown_driver(struct mlx5_vdpa_net *ndev) 2934 + static void teardown_vq_resources(struct mlx5_vdpa_net *ndev) 2935 2935 { 2936 2936 2937 2937 WARN_ON(!rwsem_is_locked(&ndev->reslock)); ··· 2997 2997 goto err_setup; 2998 2998 } 2999 2999 register_link_notifier(ndev); 3000 - err = setup_driver(mvdev); 3000 + err = setup_vq_resources(mvdev); 3001 3001 if (err) { 3002 3002 mlx5_vdpa_warn(mvdev, "failed to setup driver\n"); 3003 3003 goto err_driver; ··· 3040 3040 3041 3041 down_write(&ndev->reslock); 3042 3042 unregister_link_notifier(ndev); 3043 - teardown_driver(ndev); 3043 + teardown_vq_resources(ndev); 3044 3044 clear_vqs_ready(ndev); 3045 3045 if (flags & VDPA_RESET_F_CLEAN_MAP) 3046 3046 mlx5_vdpa_destroy_mr_resources(&ndev->mvdev); ··· 3197 3197 3198 3198 ndev = to_mlx5_vdpa_ndev(mvdev); 3199 3199 3200 - free_resources(ndev); 3200 + free_fixed_resources(ndev); 3201 3201 mlx5_vdpa_destroy_mr_resources(mvdev); 3202 3202 if (!is_zero_ether_addr(ndev->config.mac)) { 3203 3203 pfmdev = pci_get_drvdata(pci_physfn(mvdev->mdev->pdev)); ··· 3467 3467 return 0; 3468 3468 } 3469 3469 3470 - static int alloc_resources(struct mlx5_vdpa_net *ndev) 3470 + static int alloc_fixed_resources(struct mlx5_vdpa_net *ndev) 3471 3471 { 3472 3472 struct mlx5_vdpa_net_resources *res = &ndev->res; 3473 3473 int err; ··· 3494 3494 return err; 3495 3495 } 3496 3496 3497 - static void free_resources(struct mlx5_vdpa_net *ndev) 3497 + static void free_fixed_resources(struct mlx5_vdpa_net *ndev) 3498 3498 { 3499 3499 struct mlx5_vdpa_net_resources *res = &ndev->res; 3500 3500 ··· 3735 3735 goto err_res; 3736 3736 } 3737 3737 3738 - err = alloc_resources(ndev); 3738 + err = alloc_fixed_resources(ndev); 3739 3739 if (err) 3740 3740 goto err_mr; 3741 3741 ··· 3758 3758 err_reg: 3759 3759 destroy_workqueue(mvdev->wq); 3760 3760 err_res2: 3761 - free_resources(ndev); 3761 + free_fixed_resources(ndev); 3762 3762 err_mr: 3763 3763 mlx5_vdpa_destroy_mr_resources(mvdev); 3764 3764 err_res: