Commit de5819b9 authored by Jerry Snitselaar's avatar Jerry Snitselaar Committed by Vinod Koul
Browse files

dmaengine: idxd: track enabled workqueues in bitmap 



Now that idxd_wq_disable_cleanup() sets the workqueue state to
IDXD_WQ_DISABLED, use a bitmap to track which workqueues have been
enabled. This will then be used to determine which workqueues
should be re-enabled when attempting a software reset to recover
from a device halt state.

Cc: Fenghua Yu <fenghua.yu@intel.com>
Cc: Dave Jiang <dave.jiang@intel.com>
Cc: Vinod Koul <vkoul@kernel.org>
Signed-off-by: default avatarJerry Snitselaar <jsnitsel@redhat.com>
Reviewed-by: default avatarDave Jiang <dave.jiang@intel.com>
Link: https://lore.kernel.org/r/20220928154856.623545-3-jsnitsel@redhat.com


Signed-off-by: default avatarVinod Koul <vkoul@kernel.org>
parent 8e527aac

drivers/dma/idxd/device.c

+2 −0
Original line number Diff line number Diff line
@@ -196,6 +196,7 @@ int idxd_wq_enable(struct idxd_wq *wq) 
	}



	wq->state = IDXD_WQ_ENABLED;

	set_bit(wq->id, idxd->wq_enable_map);

	dev_dbg(dev, "WQ %d enabled\n", wq->id);

	return 0;

}
@@ -223,6 +224,7 @@ int idxd_wq_disable(struct idxd_wq *wq, bool reset_config) 


	if (reset_config)

		idxd_wq_disable_cleanup(wq);

	clear_bit(wq->id, idxd->wq_enable_map);

	wq->state = IDXD_WQ_DISABLED;

	dev_dbg(dev, "WQ %d disabled\n", wq->id);

	return 0;

drivers/dma/idxd/idxd.h

+2 −0
Original line number Diff line number Diff line
@@ -11,6 +11,7 @@ 
#include <linux/idr.h>

#include <linux/pci.h>

#include <linux/ioasid.h>

#include <linux/bitmap.h>

#include <linux/perf_event.h>

#include <uapi/linux/idxd.h>

#include "registers.h"
@@ -299,6 +300,7 @@ struct idxd_device { 
	int rdbuf_limit;

	int nr_rdbufs;		/* non-reserved read buffers */

	unsigned int wqcfg_size;

	unsigned long *wq_enable_map;



	union sw_err_reg sw_err;

	wait_queue_head_t cmd_waitq;

drivers/dma/idxd/init.c

+6 −0
Original line number Diff line number Diff line
@@ -151,6 +151,12 @@ static int idxd_setup_wqs(struct idxd_device *idxd) 
	if (!idxd->wqs)

		return -ENOMEM;



	idxd->wq_enable_map = bitmap_zalloc_node(idxd->max_wqs, GFP_KERNEL, dev_to_node(dev));

	if (!idxd->wq_enable_map) {

		kfree(idxd->wqs);

		return -ENOMEM;

	}



	for (i = 0; i < idxd->max_wqs; i++) {

		wq = kzalloc_node(sizeof(*wq), GFP_KERNEL, dev_to_node(dev));

		if (!wq) {

drivers/dma/idxd/irq.c

+3 −2
Original line number Diff line number Diff line
@@ -49,11 +49,12 @@ static void idxd_device_reinit(struct work_struct *work) 
		goto out;



	for (i = 0; i < idxd->max_wqs; i++) {

		if (test_bit(i, idxd->wq_enable_map)) {

			struct idxd_wq *wq = idxd->wqs[i];



		if (wq->state == IDXD_WQ_ENABLED) {

			rc = idxd_wq_enable(wq);

			if (rc < 0) {

				clear_bit(i, idxd->wq_enable_map);

				dev_warn(dev, "Unable to re-enable wq %s\n",

					 dev_name(wq_confdev(wq)));

			}

drivers/dma/idxd/sysfs.c

+1 −0
Original line number Diff line number Diff line
@@ -1405,6 +1405,7 @@ static void idxd_conf_device_release(struct device *dev) 
	struct idxd_device *idxd = confdev_to_idxd(dev);



	kfree(idxd->groups);

	bitmap_free(idxd->wq_enable_map);

	kfree(idxd->wqs);

	kfree(idxd->engines);

	ida_free(&idxd_ida, idxd->id);