Commit beb6c832 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'uml-for-linux-6.17-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/uml/linux 

Pull uml updates from Johannes Berg:
 "Mostly cleanups, except:

   - dynamic addition of vfio passthrough devices

   - implementation of HAVE_SYSCALL_TRACEPOINTS"

* tag 'uml-for-linux-6.17-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/uml/linux:
  um: Replace __ASSEMBLY__ with __ASSEMBLER__ in the usermode headers
  um: Stop tracking stub's PID via userspace_pid[]
  um: Remove the pid parameter of handle_trap()
  um: Use err consistently in userspace()
  um: vfio: Support adding devices via mconsole
  um: rtc: Avoid shadowing err in uml_rtc_start()
  um: Avoid redefining ARCH_HAS_CACHE_LINE_SIZE
  um: Make mm_list and mm_list_lock static
  um: Make unscheduled_userspace_iterations static
  um: Re-evaluate thread flags repeatedly
  um: simplify syscall header files
  um/ptrace: Implement HAVE_SYSCALL_TRACEPOINTS
  um/x86: Add system call table to header file
  um: virt-pci: Switch to msi_create_parent_irq_domain()
  um: virtio_pcidev: Rename UM_PCI_STAT_WAITING
parents 5f5c9952 fc9ed2f6

arch/um/Kconfig

+2 −3
Original line number Diff line number Diff line
@@ -6,6 +6,7 @@ config UML 
	bool

	default y

	select ARCH_WANTS_DYNAMIC_TASK_STRUCT

	select ARCH_HAS_CACHE_LINE_SIZE

	select ARCH_HAS_CPU_FINALIZE_INIT

	select ARCH_HAS_FORTIFY_SOURCE

	select ARCH_HAS_GCOV_PROFILE_ALL
@@ -35,6 +36,7 @@ config UML 
	select HAVE_RUST

	select ARCH_HAS_UBSAN

	select HAVE_ARCH_TRACEHOOK

	select HAVE_SYSCALL_TRACEPOINTS

	select THREAD_INFO_IN_TASK



config MMU
@@ -82,9 +84,6 @@ config NR_CPUS 
	range 1 1

	default 1



config ARCH_HAS_CACHE_LINE_SIZE

	def_bool y



source "arch/$(HEADER_ARCH)/um/Kconfig"



config MAY_HAVE_RUNTIME_DEPS

arch/um/drivers/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -160,6 +160,7 @@ config UML_RTC 
config UML_PCI

	bool

	select FORCE_PCI

	select IRQ_MSI_LIB

	select UML_IOMEM_EMULATION

	select UML_DMA_EMULATION

	select PCI_MSI

arch/um/drivers/rtc_user.c

+1 −1
Original line number Diff line number Diff line
@@ -28,7 +28,7 @@ int uml_rtc_start(bool timetravel) 
	int err;



	if (timetravel) {

		int err = os_pipe(uml_rtc_irq_fds, 1, 1);

		err = os_pipe(uml_rtc_irq_fds, 1, 1);

		if (err)

			goto fail;

	} else {

arch/um/drivers/vfio_kern.c

+57 −5
Original line number Diff line number Diff line
@@ -16,6 +16,7 @@ 
#include <init.h>

#include <os.h>



#include "mconsole_kern.h"

#include "virt-pci.h"

#include "vfio_user.h"
@@ -60,6 +61,7 @@ static LIST_HEAD(uml_vfio_groups); 
static DEFINE_MUTEX(uml_vfio_groups_mtx);



static LIST_HEAD(uml_vfio_devices);

static DEFINE_MUTEX(uml_vfio_devices_mtx);



static int uml_vfio_set_container(int group_fd)

{
@@ -581,32 +583,44 @@ static struct uml_vfio_device *uml_vfio_find_device(const char *device) 
	return NULL;

}



static int uml_vfio_cmdline_set(const char *device, const struct kernel_param *kp)

static struct uml_vfio_device *uml_vfio_add_device(const char *device)

{

	struct uml_vfio_device *dev;

	int fd;



	guard(mutex)(&uml_vfio_devices_mtx);



	if (uml_vfio_container.fd < 0) {

		fd = uml_vfio_user_open_container();

		if (fd < 0)

			return fd;

			return ERR_PTR(fd);

		uml_vfio_container.fd = fd;

	}



	if (uml_vfio_find_device(device))

		return -EEXIST;

		return ERR_PTR(-EEXIST);



	dev = kzalloc(sizeof(*dev), GFP_KERNEL);

	if (!dev)

		return -ENOMEM;

		return ERR_PTR(-ENOMEM);



	dev->name = kstrdup(device, GFP_KERNEL);

	if (!dev->name) {

		kfree(dev);

		return -ENOMEM;

		return ERR_PTR(-ENOMEM);

	}



	list_add_tail(&dev->list, &uml_vfio_devices);

	return dev;

}



static int uml_vfio_cmdline_set(const char *device, const struct kernel_param *kp)

{

	struct uml_vfio_device *dev;



	dev = uml_vfio_add_device(device);

	if (IS_ERR(dev))

		return PTR_ERR(dev);

	return 0;

}
@@ -629,6 +643,42 @@ __uml_help(uml_vfio_cmdline_param_ops, 
"    through multiple PCI devices to UML.\n\n"

);



static int uml_vfio_mc_config(char *str, char **error_out)

{

	struct uml_vfio_device *dev;



	if (*str != '=') {

		*error_out = "Invalid config";

		return -EINVAL;

	}

	str += 1;



	dev = uml_vfio_add_device(str);

	if (IS_ERR(dev))

		return PTR_ERR(dev);

	uml_vfio_open_device(dev);

	return 0;

}



static int uml_vfio_mc_id(char **str, int *start_out, int *end_out)

{

	return -EOPNOTSUPP;

}



static int uml_vfio_mc_remove(int n, char **error_out)

{

	return -EOPNOTSUPP;

}



static struct mc_device uml_vfio_mc = {

	.list           = LIST_HEAD_INIT(uml_vfio_mc.list),

	.name           = "vfio_uml.device",

	.config         = uml_vfio_mc_config,

	.get_config     = NULL,

	.id             = uml_vfio_mc_id,

	.remove         = uml_vfio_mc_remove,

};



static int __init uml_vfio_init(void)

{

	struct uml_vfio_device *dev, *n;
@@ -639,6 +689,8 @@ static int __init uml_vfio_init(void) 
	list_for_each_entry_safe(dev, n, &uml_vfio_devices, list)

		uml_vfio_open_device(dev);



	mconsole_register_dev(&uml_vfio_mc);



	return 0;

}

late_initcall(uml_vfio_init);

arch/um/drivers/virt-pci.c

+22 −23
Original line number Diff line number Diff line
@@ -7,6 +7,7 @@ 
#include <linux/pci.h>

#include <linux/logic_iomem.h>

#include <linux/of_platform.h>

#include <linux/irqchip/irq-msi-lib.h>

#include <linux/irqdomain.h>

#include <linux/msi.h>

#include <linux/unaligned.h>
@@ -29,7 +30,6 @@ static struct um_pci_device *um_pci_platform_device; 
static struct um_pci_device_reg um_pci_devices[MAX_DEVICES];

static struct fwnode_handle *um_pci_fwnode;

static struct irq_domain *um_pci_inner_domain;

static struct irq_domain *um_pci_msi_domain;

static unsigned long um_pci_msi_used[BITS_TO_LONGS(MAX_MSI_VECTORS)];



static unsigned long um_pci_cfgspace_read(void *priv, unsigned int offset,
@@ -400,21 +400,24 @@ static void um_pci_inner_domain_free(struct irq_domain *domain, 
}



static const struct irq_domain_ops um_pci_inner_domain_ops = {

	.select = msi_lib_irq_domain_select,

	.alloc = um_pci_inner_domain_alloc,

	.free = um_pci_inner_domain_free,

};



static struct irq_chip um_pci_msi_irq_chip = {

	.name = "UM virtual PCIe MSI",

	.irq_mask = pci_msi_mask_irq,

	.irq_unmask = pci_msi_unmask_irq,

};



static struct msi_domain_info um_pci_msi_domain_info = {

	.flags	= MSI_FLAG_USE_DEF_DOM_OPS |

		  MSI_FLAG_USE_DEF_CHIP_OPS |

		  MSI_FLAG_PCI_MSIX,

	.chip	= &um_pci_msi_irq_chip,

#define UM_PCI_MSI_FLAGS_REQUIRED (MSI_FLAG_USE_DEF_DOM_OPS		| \

				   MSI_FLAG_USE_DEF_CHIP_OPS		| \

				   MSI_FLAG_NO_AFFINITY)

#define UM_PCI_MSI_FLAGS_SUPPORTED (MSI_GENERIC_FLAGS_MASK		| \

				    MSI_FLAG_PCI_MSIX)



static const struct msi_parent_ops um_pci_msi_parent_ops = {

	.required_flags		= UM_PCI_MSI_FLAGS_REQUIRED,

	.supported_flags	= UM_PCI_MSI_FLAGS_SUPPORTED,

	.bus_select_token	= DOMAIN_BUS_NEXUS,

	.bus_select_mask	= MATCH_PCI_MSI,

	.prefix			= "UM-virtual-",

	.init_dev_msi_info	= msi_lib_init_dev_msi_info,

};



static struct resource busn_resource = {
@@ -559,17 +562,14 @@ static int __init um_pci_init(void) 
		goto free;

	}



	um_pci_inner_domain = irq_domain_create_linear(um_pci_fwnode, MAX_MSI_VECTORS,

						       &um_pci_inner_domain_ops, NULL);

	if (!um_pci_inner_domain) {

		err = -ENOMEM;

		goto free;

	}

	struct irq_domain_info info = {

		.fwnode		= um_pci_fwnode,

		.ops		= &um_pci_inner_domain_ops,

		.size		= MAX_MSI_VECTORS,

	};



	um_pci_msi_domain = pci_msi_create_irq_domain(um_pci_fwnode,

						      &um_pci_msi_domain_info,

						      um_pci_inner_domain);

	if (!um_pci_msi_domain) {

	um_pci_inner_domain = msi_create_parent_irq_domain(&info, &um_pci_msi_parent_ops);

	if (!um_pci_inner_domain) {

		err = -ENOMEM;

		goto free;

	}
@@ -611,7 +611,6 @@ device_initcall(um_pci_init); 


static void __exit um_pci_exit(void)

{

	irq_domain_remove(um_pci_msi_domain);

	irq_domain_remove(um_pci_inner_domain);

	pci_free_resource_list(&bridge->windows);

	pci_free_host_bridge(bridge);