Re: [mst-vhost:vhost 26/43] drivers/vhost/vdpa.c:1003:3-9: preceding lock on line 991 (fwd)

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



On Fri, May 20, 2022 at 06:37:01PM +0200, Julia Lawall wrote:
Please check whether an unlock is needed before line 1003.

Yep, I think so. Same also for line 1016.

I just saw that there is already a patch posted to solve this problem:
https://lore.kernel.org/netdev/89ef0ae4c26ac3cfa440c71e97e392dcb328ac1b.1653227924.git.christophe.jaillet@xxxxxxxxxx/

Thanks for the report,
Stefano


julia

---------- Forwarded message ----------
Date: Fri, 20 May 2022 17:35:29 +0800
From: kernel test robot <lkp@xxxxxxxxx>
To: kbuild@xxxxxxxxxxxx
Cc: lkp@xxxxxxxxx, Julia Lawall <julia.lawall@xxxxxxx>
Subject: [mst-vhost:vhost 26/43] drivers/vhost/vdpa.c:1003:3-9: preceding lock
   on line 991

CC: kbuild-all@xxxxxxxxxxxx
BCC: lkp@xxxxxxxxx
CC: kvm@xxxxxxxxxxxxxxx
CC: virtualization@xxxxxxxxxxxxxxxxxxxxxxxxxx
CC: netdev@xxxxxxxxxxxxxxx
TO: Gautam Dawar <gautam.dawar@xxxxxxxxxx>
CC: "Michael S. Tsirkin" <mst@xxxxxxxxxx>
CC: Jason Wang <jasowang@xxxxxxxxxx>

tree:   https://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost.git vhost
head:   73211bf1bc3ac0a3c544225e270401c1fe5d395d
commit: a1468175bb17ca5e477147de5d886e7a22d93527 [26/43] vhost-vdpa: support ASID based IOTLB API
:::::: branch date: 10 hours ago
:::::: commit date: 10 hours ago
config: arc-allmodconfig (https://download.01.org/0day-ci/archive/20220520/202205201721.rGqusahl-lkp@xxxxxxxxx/config)
compiler: arceb-elf-gcc (GCC) 11.3.0

If you fix the issue, kindly add following tag as appropriate
Reported-by: kernel test robot <lkp@xxxxxxxxx>
Reported-by: Julia Lawall <julia.lawall@xxxxxxx>


cocci warnings: (new ones prefixed by >>)
drivers/vhost/vdpa.c:1003:3-9: preceding lock on line 991
  drivers/vhost/vdpa.c:1016:2-8: preceding lock on line 991

vim +1003 drivers/vhost/vdpa.c

4c8cf31885f69e Tiwei Bie    2020-03-26   980
0f05062453fb51 Gautam Dawar 2022-03-30   981  static int vhost_vdpa_process_iotlb_msg(struct vhost_dev *dev, u32 asid,
4c8cf31885f69e Tiwei Bie    2020-03-26   982  					struct vhost_iotlb_msg *msg)
4c8cf31885f69e Tiwei Bie    2020-03-26   983  {
4c8cf31885f69e Tiwei Bie    2020-03-26   984  	struct vhost_vdpa *v = container_of(dev, struct vhost_vdpa, vdev);
25abc060d28213 Jason Wang   2020-08-04   985  	struct vdpa_device *vdpa = v->vdpa;
25abc060d28213 Jason Wang   2020-08-04   986  	const struct vdpa_config_ops *ops = vdpa->config;
a1468175bb17ca Gautam Dawar 2022-03-30   987  	struct vhost_iotlb *iotlb = NULL;
a1468175bb17ca Gautam Dawar 2022-03-30   988  	struct vhost_vdpa_as *as = NULL;
4c8cf31885f69e Tiwei Bie    2020-03-26   989  	int r = 0;
4c8cf31885f69e Tiwei Bie    2020-03-26   990
a9d064524fc3cf Xie Yongji   2021-04-12  @991  	mutex_lock(&dev->mutex);
a9d064524fc3cf Xie Yongji   2021-04-12   992
4c8cf31885f69e Tiwei Bie    2020-03-26   993  	r = vhost_dev_check_owner(dev);
4c8cf31885f69e Tiwei Bie    2020-03-26   994  	if (r)
a9d064524fc3cf Xie Yongji   2021-04-12   995  		goto unlock;
4c8cf31885f69e Tiwei Bie    2020-03-26   996
a1468175bb17ca Gautam Dawar 2022-03-30   997  	if (msg->type == VHOST_IOTLB_UPDATE ||
a1468175bb17ca Gautam Dawar 2022-03-30   998  	    msg->type == VHOST_IOTLB_BATCH_BEGIN) {
a1468175bb17ca Gautam Dawar 2022-03-30   999  		as = vhost_vdpa_find_alloc_as(v, asid);
a1468175bb17ca Gautam Dawar 2022-03-30  1000  		if (!as) {
a1468175bb17ca Gautam Dawar 2022-03-30  1001  			dev_err(&v->dev, "can't find and alloc asid %d\n",
a1468175bb17ca Gautam Dawar 2022-03-30  1002  				asid);
a1468175bb17ca Gautam Dawar 2022-03-30 @1003  			return -EINVAL;
a1468175bb17ca Gautam Dawar 2022-03-30  1004  		}
a1468175bb17ca Gautam Dawar 2022-03-30  1005  		iotlb = &as->iotlb;
a1468175bb17ca Gautam Dawar 2022-03-30  1006  	} else
a1468175bb17ca Gautam Dawar 2022-03-30  1007  		iotlb = asid_to_iotlb(v, asid);
a1468175bb17ca Gautam Dawar 2022-03-30  1008
a1468175bb17ca Gautam Dawar 2022-03-30  1009  	if ((v->in_batch && v->batch_asid != asid) || !iotlb) {
a1468175bb17ca Gautam Dawar 2022-03-30 1010 if (v->in_batch && v->batch_asid != asid) {
a1468175bb17ca Gautam Dawar 2022-03-30  1011  			dev_info(&v->dev, "batch id %d asid %d\n",
a1468175bb17ca Gautam Dawar 2022-03-30  1012  				 v->batch_asid, asid);
a1468175bb17ca Gautam Dawar 2022-03-30  1013  		}
a1468175bb17ca Gautam Dawar 2022-03-30  1014  		if (!iotlb)
a1468175bb17ca Gautam Dawar 2022-03-30  1015  			dev_err(&v->dev, "no iotlb for asid %d\n", asid);
a1468175bb17ca Gautam Dawar 2022-03-30  1016  		return -EINVAL;
a1468175bb17ca Gautam Dawar 2022-03-30  1017  	}
a1468175bb17ca Gautam Dawar 2022-03-30  1018
4c8cf31885f69e Tiwei Bie    2020-03-26  1019  	switch (msg->type) {
4c8cf31885f69e Tiwei Bie    2020-03-26  1020  	case VHOST_IOTLB_UPDATE:
3111cb7283065a Gautam Dawar 2022-03-30  1021  		r = vhost_vdpa_process_iotlb_update(v, iotlb, msg);
4c8cf31885f69e Tiwei Bie    2020-03-26  1022  		break;
4c8cf31885f69e Tiwei Bie    2020-03-26  1023  	case VHOST_IOTLB_INVALIDATE:
3111cb7283065a Gautam Dawar 2022-03-30  1024  		vhost_vdpa_unmap(v, iotlb, msg->iova, msg->size);
4c8cf31885f69e Tiwei Bie    2020-03-26  1025  		break;
25abc060d28213 Jason Wang   2020-08-04  1026  	case VHOST_IOTLB_BATCH_BEGIN:
a1468175bb17ca Gautam Dawar 2022-03-30  1027  		v->batch_asid = asid;
25abc060d28213 Jason Wang   2020-08-04  1028  		v->in_batch = true;
25abc060d28213 Jason Wang   2020-08-04  1029  		break;
25abc060d28213 Jason Wang   2020-08-04  1030  	case VHOST_IOTLB_BATCH_END:
25abc060d28213 Jason Wang   2020-08-04  1031  		if (v->in_batch && ops->set_map)
a1468175bb17ca Gautam Dawar 2022-03-30  1032  			ops->set_map(vdpa, asid, iotlb);
25abc060d28213 Jason Wang   2020-08-04  1033  		v->in_batch = false;
a1468175bb17ca Gautam Dawar 2022-03-30  1034  		if (!iotlb->nmaps)
a1468175bb17ca Gautam Dawar 2022-03-30  1035  			vhost_vdpa_remove_as(v, asid);
25abc060d28213 Jason Wang   2020-08-04  1036  		break;
4c8cf31885f69e Tiwei Bie    2020-03-26  1037  	default:
4c8cf31885f69e Tiwei Bie    2020-03-26  1038  		r = -EINVAL;
4c8cf31885f69e Tiwei Bie    2020-03-26  1039  		break;
4c8cf31885f69e Tiwei Bie    2020-03-26  1040  	}
a9d064524fc3cf Xie Yongji   2021-04-12  1041  unlock:
a9d064524fc3cf Xie Yongji   2021-04-12  1042  	mutex_unlock(&dev->mutex);
4c8cf31885f69e Tiwei Bie    2020-03-26  1043
4c8cf31885f69e Tiwei Bie    2020-03-26  1044  	return r;
4c8cf31885f69e Tiwei Bie    2020-03-26  1045  }
4c8cf31885f69e Tiwei Bie    2020-03-26  1046

--
0-DAY CI Kernel Test Service
https://01.org/lkp





[Index of Archives]     [KVM ARM]     [KVM ia64]     [KVM ppc]     [Virtualization Tools]     [Spice Development]     [Libvirt]     [Libvirt Users]     [Linux USB Devel]     [Linux Audio Users]     [Yosemite Questions]     [Linux Kernel]     [Linux SCSI]     [XFree86]

  Powered by Linux