Commit e276e258 authored by Jason Gunthorpe's avatar Jason Gunthorpe Committed by Alex Williamson
Browse files

vfio: Move vfio_spapr_iommu_eeh_ioctl into vfio_iommu_spapr_tce.c 



As with the previous patch EEH is always enabled if SPAPR_TCE_IOMMU, so
move this last bit of code into the main module.

Now that this function only processes VFIO_EEH_PE_OP remove a level of
indenting as well, it is only called by a case statement that already
checked VFIO_EEH_PE_OP.

This eliminates an unnecessary module and SPAPR code in a global header.

Reviewed-by: default avatarChristoph Hellwig <hch@lst.de>
Reviewed-by: default avatarCornelia Huck <cohuck@redhat.com>
Signed-off-by: default avatarJason Gunthorpe <jgg@nvidia.com>
Link: https://lore.kernel.org/r/3-v5-fc5346cacfd4+4c482-vfio_modules_jgg@nvidia.com


Signed-off-by: default avatarAlex Williamson <alex.williamson@redhat.com>
parent e5c38a20

drivers/vfio/Makefile

+0 −1
Original line number Diff line number Diff line
@@ -10,7 +10,6 @@ vfio-y += vfio_main.o \ 
obj-$(CONFIG_VFIO_VIRQFD) += vfio_virqfd.o

obj-$(CONFIG_VFIO_IOMMU_TYPE1) += vfio_iommu_type1.o

obj-$(CONFIG_VFIO_IOMMU_SPAPR_TCE) += vfio_iommu_spapr_tce.o

obj-$(CONFIG_VFIO_SPAPR_EEH) += vfio_spapr_eeh.o

obj-$(CONFIG_VFIO_PCI) += pci/

obj-$(CONFIG_VFIO_PLATFORM) += platform/

obj-$(CONFIG_VFIO_MDEV) += mdev/

drivers/vfio/vfio_iommu_spapr_tce.c

+53 −2
Original line number Diff line number Diff line
@@ -4,6 +4,7 @@ 
 *

 * Copyright (C) 2013 IBM Corp.  All rights reserved.

 *     Author: Alexey Kardashevskiy <aik@ozlabs.ru>

 * Copyright Gavin Shan, IBM Corporation 2014.

 *

 * Derived from original vfio_iommu_type1.c:

 * Copyright (C) 2012 Red Hat, Inc.  All rights reserved.
@@ -773,6 +774,57 @@ static long tce_iommu_create_default_window(struct tce_container *container) 
	return ret;

}



static long vfio_spapr_ioctl_eeh_pe_op(struct iommu_group *group,

				       unsigned long arg)

{

	struct eeh_pe *pe;

	struct vfio_eeh_pe_op op;

	unsigned long minsz;



	pe = eeh_iommu_group_to_pe(group);

	if (!pe)

		return -ENODEV;



	minsz = offsetofend(struct vfio_eeh_pe_op, op);

	if (copy_from_user(&op, (void __user *)arg, minsz))

		return -EFAULT;

	if (op.argsz < minsz || op.flags)

		return -EINVAL;



	switch (op.op) {

	case VFIO_EEH_PE_DISABLE:

		return eeh_pe_set_option(pe, EEH_OPT_DISABLE);

	case VFIO_EEH_PE_ENABLE:

		return eeh_pe_set_option(pe, EEH_OPT_ENABLE);

	case VFIO_EEH_PE_UNFREEZE_IO:

		return eeh_pe_set_option(pe, EEH_OPT_THAW_MMIO);

	case VFIO_EEH_PE_UNFREEZE_DMA:

		return eeh_pe_set_option(pe, EEH_OPT_THAW_DMA);

	case VFIO_EEH_PE_GET_STATE:

		return eeh_pe_get_state(pe);

		break;

	case VFIO_EEH_PE_RESET_DEACTIVATE:

		return eeh_pe_reset(pe, EEH_RESET_DEACTIVATE, true);

	case VFIO_EEH_PE_RESET_HOT:

		return eeh_pe_reset(pe, EEH_RESET_HOT, true);

	case VFIO_EEH_PE_RESET_FUNDAMENTAL:

		return eeh_pe_reset(pe, EEH_RESET_FUNDAMENTAL, true);

	case VFIO_EEH_PE_CONFIGURE:

		return eeh_pe_configure(pe);

	case VFIO_EEH_PE_INJECT_ERR:

		minsz = offsetofend(struct vfio_eeh_pe_op, err.mask);

		if (op.argsz < minsz)

			return -EINVAL;

		if (copy_from_user(&op, (void __user *)arg, minsz))

			return -EFAULT;



		return eeh_pe_inject_err(pe, op.err.type, op.err.func,

					 op.err.addr, op.err.mask);

	default:

		return -EINVAL;

	}

}



static long tce_iommu_ioctl(void *iommu_data,

				 unsigned int cmd, unsigned long arg)

{
@@ -1044,8 +1096,7 @@ static long tce_iommu_ioctl(void *iommu_data, 


		ret = 0;

		list_for_each_entry(tcegrp, &container->group_list, next) {

			ret = vfio_spapr_iommu_eeh_ioctl(tcegrp->grp,

					cmd, arg);

			ret = vfio_spapr_ioctl_eeh_pe_op(tcegrp->grp, arg);

			if (ret)

				return ret;

		}

drivers/vfio/vfio_spapr_eeh.c

deleted100644 → 0
+0 −88
Original line number Diff line number Diff line 
// SPDX-License-Identifier: GPL-2.0-only

/*

 * EEH functionality support for VFIO devices. The feature is only

 * available on sPAPR compatible platforms.

 *

 * Copyright Gavin Shan, IBM Corporation 2014.

 */



#include <linux/module.h>

#include <linux/uaccess.h>

#include <linux/vfio.h>

#include <asm/eeh.h>



#define DRIVER_VERSION	"0.1"

#define DRIVER_AUTHOR	"Gavin Shan, IBM Corporation"

#define DRIVER_DESC	"VFIO IOMMU SPAPR EEH"



long vfio_spapr_iommu_eeh_ioctl(struct iommu_group *group,

				unsigned int cmd, unsigned long arg)

{

	struct eeh_pe *pe;

	struct vfio_eeh_pe_op op;

	unsigned long minsz;

	long ret = -EINVAL;



	switch (cmd) {

	case VFIO_EEH_PE_OP:

		pe = eeh_iommu_group_to_pe(group);

		if (!pe)

			return -ENODEV;



		minsz = offsetofend(struct vfio_eeh_pe_op, op);

		if (copy_from_user(&op, (void __user *)arg, minsz))

			return -EFAULT;

		if (op.argsz < minsz || op.flags)

			return -EINVAL;



		switch (op.op) {

		case VFIO_EEH_PE_DISABLE:

			ret = eeh_pe_set_option(pe, EEH_OPT_DISABLE);

			break;

		case VFIO_EEH_PE_ENABLE:

			ret = eeh_pe_set_option(pe, EEH_OPT_ENABLE);

			break;

		case VFIO_EEH_PE_UNFREEZE_IO:

			ret = eeh_pe_set_option(pe, EEH_OPT_THAW_MMIO);

			break;

		case VFIO_EEH_PE_UNFREEZE_DMA:

			ret = eeh_pe_set_option(pe, EEH_OPT_THAW_DMA);

			break;

		case VFIO_EEH_PE_GET_STATE:

			ret = eeh_pe_get_state(pe);

			break;

		case VFIO_EEH_PE_RESET_DEACTIVATE:

			ret = eeh_pe_reset(pe, EEH_RESET_DEACTIVATE, true);

			break;

		case VFIO_EEH_PE_RESET_HOT:

			ret = eeh_pe_reset(pe, EEH_RESET_HOT, true);

			break;

		case VFIO_EEH_PE_RESET_FUNDAMENTAL:

			ret = eeh_pe_reset(pe, EEH_RESET_FUNDAMENTAL, true);

			break;

		case VFIO_EEH_PE_CONFIGURE:

			ret = eeh_pe_configure(pe);

			break;

		case VFIO_EEH_PE_INJECT_ERR:

			minsz = offsetofend(struct vfio_eeh_pe_op, err.mask);

			if (op.argsz < minsz)

				return -EINVAL;

			if (copy_from_user(&op, (void __user *)arg, minsz))

				return -EFAULT;



			ret = eeh_pe_inject_err(pe, op.err.type, op.err.func,

						op.err.addr, op.err.mask);

			break;

		default:

			ret = -EINVAL;

		}

	}



	return ret;

}

EXPORT_SYMBOL_GPL(vfio_spapr_iommu_eeh_ioctl);



MODULE_VERSION(DRIVER_VERSION);

MODULE_LICENSE("GPL v2");

MODULE_AUTHOR(DRIVER_AUTHOR);

MODULE_DESCRIPTION(DRIVER_DESC);

include/linux/vfio.h

+0 −12
Original line number Diff line number Diff line
@@ -233,18 +233,6 @@ int vfio_set_irqs_validate_and_prepare(struct vfio_irq_set *hdr, 
				       int num_irqs, int max_irq_type,

				       size_t *data_size);



#if IS_ENABLED(CONFIG_VFIO_SPAPR_EEH)

long vfio_spapr_iommu_eeh_ioctl(struct iommu_group *group, unsigned int cmd,

				unsigned long arg);

#else

static inline long vfio_spapr_iommu_eeh_ioctl(struct iommu_group *group,

					      unsigned int cmd,

					      unsigned long arg)

{

	return -ENOTTY;

}

#endif /* CONFIG_VFIO_SPAPR_EEH */



/*

 * IRQfd - generic

 */