@@ -243,6 +243,14 @@ int idxd_wq_disable(struct idxd_wq *wq)
dev_dbg(dev, "Disabling WQ %d\n", wq->id);
+ /*
+ * When the wq is in LOCKED state, it means it is disabled but
+ * also at the same time is "enabled" as far as the user is
+ * concerned. So a call to disable the hardware can be skipped.
+ */
+ if (wq->state == IDXD_WQ_LOCKED)
+ return 0;
+
if (wq->state != IDXD_WQ_ENABLED) {
dev_dbg(dev, "WQ %d in wrong state: %d\n", wq->id, wq->state);
return 0;
@@ -285,6 +293,14 @@ void idxd_wq_reset(struct idxd_wq *wq)
struct device *dev = &idxd->pdev->dev;
u32 operand;
+ /*
+ * When the wq is in LOCKED state, it means it is disabled but
+ * also at the same time is "enabled" as far as the user is
+ * concerned. So a call to reset the hardware can be skipped.
+ */
+ if (wq->state == IDXD_WQ_LOCKED)
+ return;
+
if (wq->state != IDXD_WQ_ENABLED) {
dev_dbg(dev, "WQ %d in wrong state: %d\n", wq->id, wq->state);
return;
@@ -120,6 +120,7 @@ struct idxd_pmu {
enum idxd_wq_state {
IDXD_WQ_DISABLED = 0,
IDXD_WQ_ENABLED,
+ IDXD_WQ_LOCKED,
};
enum idxd_wq_flag {
@@ -584,6 +584,8 @@ static ssize_t wq_state_show(struct device *dev,
return sysfs_emit(buf, "disabled\n");
case IDXD_WQ_ENABLED:
return sysfs_emit(buf, "enabled\n");
+ case IDXD_WQ_LOCKED:
+ return sysfs_emit(buf, "locked\n");
}
return sysfs_emit(buf, "unknown\n");
@@ -894,6 +894,11 @@ static void idxd_mdev_drv_remove(struct device *dev)
struct idxd_device *idxd = wq->idxd;
drv_disable_wq(wq);
+ mutex_lock(&wq->wq_lock);
+ if (wq->state == IDXD_WQ_LOCKED)
+ wq->state = IDXD_WQ_DISABLED;
+ mutex_unlock(&wq->wq_lock);
+
dev_info(dev, "wq %s disabled\n", dev_name(dev));
kref_put_mutex(&idxd->mdev_kref, idxd_mdev_host_release, &idxd->kref_lock);
put_device(dev);
@@ -75,8 +75,10 @@ void vidxd_init(struct vdcm_idxd *vidxd)
vidxd_mmio_init(vidxd);
- if (wq_dedicated(wq) && wq->state == IDXD_WQ_ENABLED)
+ if (wq_dedicated(wq) && wq->state == IDXD_WQ_ENABLED) {
idxd_wq_disable(wq);
+ wq->state = IDXD_WQ_LOCKED;
+ }
}
void vidxd_send_interrupt(struct vdcm_idxd *vidxd, int vector)
When a dedicated wq is enabled as mdev, we must disable the wq on the device in order to program the pasid to the wq. Introduce a wq state IDXD_WQ_LOCKED that is software state only in order to prevent the user from modifying the configuration while mdev wq is in this state. While in this state, the wq is not in DISABLED state and will prevent any modifications to the configuration. It is also not in the ENABLED state and therefore prevents any actions allowed in the ENABLED state. For mdev, the dwq is disabled and set to LOCKED state upon the mdev creation. When ->open() is called on the mdev and a pasid is programmed to the WQCFG, the dwq is enabled again and goes to the ENABLED state. Signed-off-by: Dave Jiang <dave.jiang@intel.com> --- drivers/dma/idxd/device.c | 16 ++++++++++++++++ drivers/dma/idxd/idxd.h | 1 + drivers/dma/idxd/sysfs.c | 2 ++ drivers/vfio/mdev/idxd/mdev.c | 5 +++++ drivers/vfio/mdev/idxd/vdev.c | 4 +++- 5 files changed, 27 insertions(+), 1 deletion(-)