Commit 8e50d392 authored by Dave Jiang's avatar Dave Jiang Committed by Vinod Koul
Browse files

dmaengine: idxd: Add shared workqueue support 



Add shared workqueue support that includes the support of Shared Virtual
memory (SVM) or in similar terms On Demand Paging (ODP). The shared
workqueue uses the enqcmds command in kernel and will respond with retry if
the workqueue is full. Shared workqueue only works when there is PASID
support from the IOMMU.

Signed-off-by: default avatarDave Jiang <dave.jiang@intel.com>
Reviewed-by: default avatarTony Luck <tony.luck@intel.com>
Reviewed-by: default avatarDan Williams <dan.j.williams@intel.com>
Link: https://lore.kernel.org/r/160382007499.3911367.26043087963708134.stgit@djiang5-desk3.ch.intel.com


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

drivers/dma/Kconfig

+10 −0
Original line number Diff line number Diff line
@@ -296,6 +296,16 @@ config INTEL_IDXD 


	  If unsure, say N.



# Config symbol that collects all the dependencies that's necessary to

# support shared virtual memory for the devices supported by idxd.

config INTEL_IDXD_SVM

	bool "Accelerator Shared Virtual Memory Support"

	depends on INTEL_IDXD

	depends on INTEL_IOMMU_SVM

	depends on PCI_PRI

	depends on PCI_PASID

	depends on PCI_IOV



config INTEL_IOATDMA

	tristate "Intel I/OAT DMA support"

	depends on PCI && X86_64

drivers/dma/idxd/cdev.c

+48 −1
Original line number Diff line number Diff line
@@ -11,6 +11,7 @@ 
#include <linux/cdev.h>

#include <linux/fs.h>

#include <linux/poll.h>

#include <linux/iommu.h>

#include <uapi/linux/idxd.h>

#include "registers.h"

#include "idxd.h"
@@ -32,7 +33,9 @@ static struct idxd_cdev_context ictx[IDXD_TYPE_MAX] = { 
struct idxd_user_context {

	struct idxd_wq *wq;

	struct task_struct *task;

	unsigned int pasid;

	unsigned int flags;

	struct iommu_sva *sva;

};



enum idxd_cdev_cleanup {
@@ -75,6 +78,8 @@ static int idxd_cdev_open(struct inode *inode, struct file *filp) 
	struct idxd_wq *wq;

	struct device *dev;

	int rc = 0;

	struct iommu_sva *sva;

	unsigned int pasid;



	wq = inode_wq(inode);

	idxd = wq->idxd;
@@ -95,6 +100,34 @@ static int idxd_cdev_open(struct inode *inode, struct file *filp) 


	ctx->wq = wq;

	filp->private_data = ctx;



	if (device_pasid_enabled(idxd)) {

		sva = iommu_sva_bind_device(dev, current->mm, NULL);

		if (IS_ERR(sva)) {

			rc = PTR_ERR(sva);

			dev_err(dev, "pasid allocation failed: %d\n", rc);

			goto failed;

		}



		pasid = iommu_sva_get_pasid(sva);

		if (pasid == IOMMU_PASID_INVALID) {

			iommu_sva_unbind_device(sva);

			goto failed;

		}



		ctx->sva = sva;

		ctx->pasid = pasid;



		if (wq_dedicated(wq)) {

			rc = idxd_wq_set_pasid(wq, pasid);

			if (rc < 0) {

				iommu_sva_unbind_device(sva);

				dev_err(dev, "wq set pasid failed: %d\n", rc);

				goto failed;

			}

		}

	}



	idxd_wq_get(wq);

	mutex_unlock(&wq->wq_lock);

	return 0;
@@ -111,13 +144,27 @@ static int idxd_cdev_release(struct inode *node, struct file *filep) 
	struct idxd_wq *wq = ctx->wq;

	struct idxd_device *idxd = wq->idxd;

	struct device *dev = &idxd->pdev->dev;

	int rc;



	dev_dbg(dev, "%s called\n", __func__);

	filep->private_data = NULL;



	/* Wait for in-flight operations to complete. */

	if (wq_shared(wq)) {

		idxd_device_drain_pasid(idxd, ctx->pasid);

	} else {

		if (device_pasid_enabled(idxd)) {

			/* The wq disable in the disable pasid function will drain the wq */

			rc = idxd_wq_disable_pasid(wq);

			if (rc < 0)

				dev_err(dev, "wq disable pasid failed.\n");

		} else {

			idxd_wq_drain(wq);

		}

	}



	if (ctx->sva)

		iommu_sva_unbind_device(ctx->sva);

	kfree(ctx);

	mutex_lock(&wq->wq_lock);

	idxd_wq_put(wq);

drivers/dma/idxd/device.c

+83 −7
Original line number Diff line number Diff line
@@ -273,10 +273,9 @@ int idxd_wq_map_portal(struct idxd_wq *wq) 
	start = pci_resource_start(pdev, IDXD_WQ_BAR);

	start = start + wq->id * IDXD_PORTAL_SIZE;



	wq->dportal = devm_ioremap(dev, start, IDXD_PORTAL_SIZE);

	if (!wq->dportal)

	wq->portal = devm_ioremap(dev, start, IDXD_PORTAL_SIZE);

	if (!wq->portal)

		return -ENOMEM;

	dev_dbg(dev, "wq %d portal mapped at %p\n", wq->id, wq->dportal);



	return 0;

}
@@ -285,7 +284,61 @@ void idxd_wq_unmap_portal(struct idxd_wq *wq) 
{

	struct device *dev = &wq->idxd->pdev->dev;



	devm_iounmap(dev, wq->dportal);

	devm_iounmap(dev, wq->portal);

}



int idxd_wq_set_pasid(struct idxd_wq *wq, int pasid)

{

	struct idxd_device *idxd = wq->idxd;

	int rc;

	union wqcfg wqcfg;

	unsigned int offset;

	unsigned long flags;



	rc = idxd_wq_disable(wq);

	if (rc < 0)

		return rc;



	offset = WQCFG_OFFSET(idxd, wq->id, WQCFG_PASID_IDX);

	spin_lock_irqsave(&idxd->dev_lock, flags);

	wqcfg.bits[WQCFG_PASID_IDX] = ioread32(idxd->reg_base + offset);

	wqcfg.pasid_en = 1;

	wqcfg.pasid = pasid;

	iowrite32(wqcfg.bits[WQCFG_PASID_IDX], idxd->reg_base + offset);

	spin_unlock_irqrestore(&idxd->dev_lock, flags);



	rc = idxd_wq_enable(wq);

	if (rc < 0)

		return rc;



	return 0;

}



int idxd_wq_disable_pasid(struct idxd_wq *wq)

{

	struct idxd_device *idxd = wq->idxd;

	int rc;

	union wqcfg wqcfg;

	unsigned int offset;

	unsigned long flags;



	rc = idxd_wq_disable(wq);

	if (rc < 0)

		return rc;



	offset = WQCFG_OFFSET(idxd, wq->id, WQCFG_PASID_IDX);

	spin_lock_irqsave(&idxd->dev_lock, flags);

	wqcfg.bits[WQCFG_PASID_IDX] = ioread32(idxd->reg_base + offset);

	wqcfg.pasid_en = 0;

	wqcfg.pasid = 0;

	iowrite32(wqcfg.bits[WQCFG_PASID_IDX], idxd->reg_base + offset);

	spin_unlock_irqrestore(&idxd->dev_lock, flags);



	rc = idxd_wq_enable(wq);

	if (rc < 0)

		return rc;



	return 0;

}



void idxd_wq_disable_cleanup(struct idxd_wq *wq)
@@ -468,6 +521,17 @@ void idxd_device_reset(struct idxd_device *idxd) 
	spin_unlock_irqrestore(&idxd->dev_lock, flags);

}



void idxd_device_drain_pasid(struct idxd_device *idxd, int pasid)

{

	struct device *dev = &idxd->pdev->dev;

	u32 operand;



	operand = pasid;

	dev_dbg(dev, "cmd: %u operand: %#x\n", IDXD_CMD_DRAIN_PASID, operand);

	idxd_cmd_exec(idxd, IDXD_CMD_DRAIN_PASID, operand, NULL);

	dev_dbg(dev, "pasid %d drained\n", pasid);

}



/* Device configuration bits */

static void idxd_group_config_write(struct idxd_group *group)

{
@@ -554,9 +618,21 @@ static int idxd_wq_config_write(struct idxd_wq *wq) 


	/* byte 8-11 */

	wq->wqcfg->priv = !!(wq->type == IDXD_WQT_KERNEL);

	if (wq_dedicated(wq))

		wq->wqcfg->mode = 1;



	if (device_pasid_enabled(idxd)) {

		wq->wqcfg->pasid_en = 1;

		if (wq->type == IDXD_WQT_KERNEL && wq_dedicated(wq))

			wq->wqcfg->pasid = idxd->pasid;

	}



	wq->wqcfg->priority = wq->priority;



	if (idxd->hw.gen_cap.block_on_fault &&

	    test_bit(WQ_FLAG_BLOCK_ON_FAULT, &wq->flags))

		wq->wqcfg->bof = 1;



	/* bytes 12-15 */

	wq->wqcfg->max_xfer_shift = ilog2(wq->max_xfer_bytes);

	wq->wqcfg->max_batch_shift = ilog2(wq->max_batch_size);
@@ -664,8 +740,8 @@ static int idxd_wqs_setup(struct idxd_device *idxd) 
		if (!wq->size)

			continue;



		if (!wq_dedicated(wq)) {

			dev_warn(dev, "No shared workqueue support.\n");

		if (wq_shared(wq) && !device_swq_supported(idxd)) {

			dev_warn(dev, "No shared wq support but configured.\n");

			return -EINVAL;

		}

drivers/dma/idxd/dma.c

+0 −9
Original line number Diff line number Diff line
@@ -61,8 +61,6 @@ static inline void idxd_prep_desc_common(struct idxd_wq *wq, 
					 u64 addr_f1, u64 addr_f2, u64 len,

					 u64 compl, u32 flags)

{

	struct idxd_device *idxd = wq->idxd;



	hw->flags = flags;

	hw->opcode = opcode;

	hw->src_addr = addr_f1;
@@ -70,13 +68,6 @@ static inline void idxd_prep_desc_common(struct idxd_wq *wq, 
	hw->xfer_size = len;

	hw->priv = !!(wq->type == IDXD_WQT_KERNEL);

	hw->completion_addr = compl;



	/*

	 * Descriptor completion vectors are 1-8 for MSIX. We will round

	 * robin through the 8 vectors.

	 */

	wq->vec_ptr = (wq->vec_ptr % idxd->num_wq_irqs) + 1;

	hw->int_handle =  wq->vec_ptr;

}



static struct dma_async_tx_descriptor *

drivers/dma/idxd/idxd.h

+27 −1
Original line number Diff line number Diff line
@@ -59,6 +59,7 @@ enum idxd_wq_state { 


enum idxd_wq_flag {

	WQ_FLAG_DEDICATED = 0,

	WQ_FLAG_BLOCK_ON_FAULT,

};



enum idxd_wq_type {
@@ -86,10 +87,11 @@ enum idxd_op_type { 
enum idxd_complete_type {

	IDXD_COMPLETE_NORMAL = 0,

	IDXD_COMPLETE_ABORT,

	IDXD_COMPLETE_DEV_FAIL,

};



struct idxd_wq {

	void __iomem *dportal;

	void __iomem *portal;

	struct device conf_dev;

	struct idxd_cdev idxd_cdev;

	struct idxd_device *idxd;
@@ -145,6 +147,7 @@ enum idxd_device_state { 
enum idxd_device_flag {

	IDXD_FLAG_CONFIGURABLE = 0,

	IDXD_FLAG_CMD_RUNNING,

	IDXD_FLAG_PASID_ENABLED,

};



struct idxd_device {
@@ -167,6 +170,9 @@ struct idxd_device { 
	struct idxd_wq *wqs;

	struct idxd_engine *engines;



	struct iommu_sva *sva;

	unsigned int pasid;



	int num_groups;



	u32 msix_perm_offset;
@@ -215,11 +221,28 @@ struct idxd_desc { 


extern struct bus_type dsa_bus_type;



extern bool support_enqcmd;



static inline bool wq_dedicated(struct idxd_wq *wq)

{

	return test_bit(WQ_FLAG_DEDICATED, &wq->flags);

}



static inline bool wq_shared(struct idxd_wq *wq)

{

	return !test_bit(WQ_FLAG_DEDICATED, &wq->flags);

}



static inline bool device_pasid_enabled(struct idxd_device *idxd)

{

	return test_bit(IDXD_FLAG_PASID_ENABLED, &idxd->flags);

}



static inline bool device_swq_supported(struct idxd_device *idxd)

{

	return (support_enqcmd && device_pasid_enabled(idxd));

}



enum idxd_portal_prot {

	IDXD_PORTAL_UNLIMITED = 0,

	IDXD_PORTAL_LIMITED,
@@ -288,6 +311,7 @@ void idxd_device_reset(struct idxd_device *idxd); 
void idxd_device_cleanup(struct idxd_device *idxd);

int idxd_device_config(struct idxd_device *idxd);

void idxd_device_wqs_clear_state(struct idxd_device *idxd);

void idxd_device_drain_pasid(struct idxd_device *idxd, int pasid);



/* work queue control */

int idxd_wq_alloc_resources(struct idxd_wq *wq);
@@ -298,6 +322,8 @@ void idxd_wq_drain(struct idxd_wq *wq); 
int idxd_wq_map_portal(struct idxd_wq *wq);

void idxd_wq_unmap_portal(struct idxd_wq *wq);

void idxd_wq_disable_cleanup(struct idxd_wq *wq);

int idxd_wq_set_pasid(struct idxd_wq *wq, int pasid);

int idxd_wq_disable_pasid(struct idxd_wq *wq);



/* submission */

int idxd_submit_desc(struct idxd_wq *wq, struct idxd_desc *desc);