[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 17/17] backends/iommufd: Remove mutex
|
From: |
Cédric Le Goater |
|
Subject: |
[PULL 17/17] backends/iommufd: Remove mutex |
|
Date: |
Mon, 8 Jan 2024 08:32:32 +0100 |
Coverity reports a concurrent data access violation because be->users
is being accessed in iommufd_backend_can_be_deleted() without holding
the mutex.
However, these routines are called from the QEMU main thread when a
device is created. In this case, the code paths should be protected by
the BQL lock and it should be safe to drop the IOMMUFD backend mutex.
Simply remove it.
Fixes: CID 1531550
Fixes: CID 1531549
Reviewed-by: Eric Auger <eric.auger@redhat.com>
Reviewed-by: Zhenzhong Duan <zhenzhong.duan@intel.com>
Signed-off-by: Cédric Le Goater <clg@redhat.com>
---
include/sysemu/iommufd.h | 2 --
backends/iommufd.c | 7 -------
2 files changed, 9 deletions(-)
diff --git a/include/sysemu/iommufd.h b/include/sysemu/iommufd.h
index
9c5524b0ed15ef5f81be159415bc216572a283d8..9af27ebd6ccb78ca8e16aa3c62629aab9f7f31e4
100644
--- a/include/sysemu/iommufd.h
+++ b/include/sysemu/iommufd.h
@@ -2,7 +2,6 @@
#define SYSEMU_IOMMUFD_H
#include "qom/object.h"
-#include "qemu/thread.h"
#include "exec/hwaddr.h"
#include "exec/cpu-common.h"
@@ -19,7 +18,6 @@ struct IOMMUFDBackend {
/*< protected >*/
int fd; /* /dev/iommu file descriptor */
bool owned; /* is the /dev/iommu opened internally */
- QemuMutex lock;
uint32_t users;
/*< public >*/
diff --git a/backends/iommufd.c b/backends/iommufd.c
index
393c0d9a3719e3de1a6b51a8ff2e75e184badc82..1ef683c7b080e688af46c5b98e61eafa73e39895
100644
--- a/backends/iommufd.c
+++ b/backends/iommufd.c
@@ -29,7 +29,6 @@ static void iommufd_backend_init(Object *obj)
be->fd = -1;
be->users = 0;
be->owned = true;
- qemu_mutex_init(&be->lock);
}
static void iommufd_backend_finalize(Object *obj)
@@ -52,10 +51,8 @@ static void iommufd_backend_set_fd(Object *obj, const char
*str, Error **errp)
error_prepend(errp, "Could not parse remote object fd %s:", str);
return;
}
- qemu_mutex_lock(&be->lock);
be->fd = fd;
be->owned = false;
- qemu_mutex_unlock(&be->lock);
trace_iommu_backend_set_fd(be->fd);
}
@@ -79,7 +76,6 @@ int iommufd_backend_connect(IOMMUFDBackend *be, Error **errp)
{
int fd, ret = 0;
- qemu_mutex_lock(&be->lock);
if (be->owned && !be->users) {
fd = qemu_open_old("/dev/iommu", O_RDWR);
if (fd < 0) {
@@ -93,13 +89,11 @@ int iommufd_backend_connect(IOMMUFDBackend *be, Error
**errp)
out:
trace_iommufd_backend_connect(be->fd, be->owned,
be->users, ret);
- qemu_mutex_unlock(&be->lock);
return ret;
}
void iommufd_backend_disconnect(IOMMUFDBackend *be)
{
- qemu_mutex_lock(&be->lock);
if (!be->users) {
goto out;
}
@@ -110,7 +104,6 @@ void iommufd_backend_disconnect(IOMMUFDBackend *be)
}
out:
trace_iommufd_backend_disconnect(be->fd, be->users);
- qemu_mutex_unlock(&be->lock);
}
int iommufd_backend_alloc_ioas(IOMMUFDBackend *be, uint32_t *ioas_id,
--
2.43.0
- [PULL 05/17] vfio/container: Introduce a VFIOIOMMU legacy QOM interface, (continued)
- [PULL 05/17] vfio/container: Introduce a VFIOIOMMU legacy QOM interface, Cédric Le Goater, 2024/01/08
- [PULL 08/17] vfio/iommufd: Introduce a VFIOIOMMU iommufd QOM interface, Cédric Le Goater, 2024/01/08
- [PULL 09/17] vfio/spapr: Only compile sPAPR IOMMU support when needed, Cédric Le Goater, 2024/01/08
- [PULL 11/17] vfio/container: Replace basename with g_path_get_basename, Cédric Le Goater, 2024/01/08
- [PULL 10/17] vfio/iommufd: Remove CONFIG_IOMMUFD usage, Cédric Le Goater, 2024/01/08
- [PULL 12/17] hw/vfio: fix iteration over global VFIODevice list, Cédric Le Goater, 2024/01/08
- [PULL 13/17] vfio/iommufd: Remove the use of stat() to check file existence, Cédric Le Goater, 2024/01/08
- [PULL 14/17] vfio/container: Rename vfio_init_container to vfio_set_iommu, Cédric Le Goater, 2024/01/08
- [PULL 15/17] vfio/migration: Add helper function to set state or reset device, Cédric Le Goater, 2024/01/08
- [PULL 16/17] backends/iommufd: Remove check on number of backend users, Cédric Le Goater, 2024/01/08
- [PULL 17/17] backends/iommufd: Remove mutex,
Cédric Le Goater <=
- Re: [PULL 00/17] vfio queue, Peter Maydell, 2024/01/08