lkml.org 
[lkml]   [2022]   [Dec]   [19]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH v8 12/28] gunyah: vm_mgr: Introduce basic VM Manager
    Date
    Gunyah VM manager is a kernel moduel which exposes an interface to
    Gunyah userspace to load, run, and interact with other Gunyah virtual
    machines. The interface is a character device at /dev/gunyah.

    Add a basic VM manager driver. Upcoming patches will add more ioctls
    into this driver.

    Co-developed-by: Prakruthi Deepak Heragu <quic_pheragu@quicinc.com>
    Signed-off-by: Prakruthi Deepak Heragu <quic_pheragu@quicinc.com>
    Signed-off-by: Elliot Berman <quic_eberman@quicinc.com>
    ---
    .../userspace-api/ioctl/ioctl-number.rst | 1 +
    drivers/virt/gunyah/Kconfig | 11 ++
    drivers/virt/gunyah/Makefile | 1 +
    drivers/virt/gunyah/rsc_mgr.c | 47 ++++++-
    drivers/virt/gunyah/vm_mgr.c | 115 ++++++++++++++++++
    drivers/virt/gunyah/vm_mgr.h | 25 ++++
    include/linux/gunyah_rsc_mgr.h | 3 +
    include/uapi/linux/gunyah.h | 23 ++++
    8 files changed, 225 insertions(+), 1 deletion(-)
    create mode 100644 drivers/virt/gunyah/vm_mgr.c
    create mode 100644 drivers/virt/gunyah/vm_mgr.h
    create mode 100644 include/uapi/linux/gunyah.h

    diff --git a/Documentation/userspace-api/ioctl/ioctl-number.rst b/Documentation/userspace-api/ioctl/ioctl-number.rst
    index 5f81e2a24a5c..81456c34c85d 100644
    --- a/Documentation/userspace-api/ioctl/ioctl-number.rst
    +++ b/Documentation/userspace-api/ioctl/ioctl-number.rst
    @@ -136,6 +136,7 @@ Code Seq# Include File Comments
    'F' DD video/sstfb.h conflict!
    'G' 00-3F drivers/misc/sgi-gru/grulib.h conflict!
    'G' 00-0F xen/gntalloc.h, xen/gntdev.h conflict!
    +'G' 00-0f linux/gunyah.h conflict!
    'H' 00-7F linux/hiddev.h conflict!
    'H' 00-0F linux/hidraw.h conflict!
    'H' 01 linux/mei.h conflict!
    diff --git a/drivers/virt/gunyah/Kconfig b/drivers/virt/gunyah/Kconfig
    index 4a6189dedab2..5e5a329c9866 100644
    --- a/drivers/virt/gunyah/Kconfig
    +++ b/drivers/virt/gunyah/Kconfig
    @@ -23,4 +23,15 @@ config GUNYAH_RESOURCE_MANAGER
    Gunyah wanting to have Gunyah-awareness.

    Say Y/M here if unsure.
    +
    +config GUNYAH_VM_MANAGER
    + bool "Manage Gunyah Virtual Machines"
    + depends on MAILBOX
    + depends on GUNYAH_RESOURCE_MANAGER
    + help
    + Gunyah VM manager exposes an interface to Gunyah userspace to load,
    + run, and interact with other Gunyah virtual machines. This option is
    + required to launch other virtual machines.
    +
    + Say Y here if unsure and you want to support Gunyah VMMs.
    endif
    diff --git a/drivers/virt/gunyah/Makefile b/drivers/virt/gunyah/Makefile
    index 5caa05267a58..e817ae6deddc 100644
    --- a/drivers/virt/gunyah/Makefile
    +++ b/drivers/virt/gunyah/Makefile
    @@ -1,4 +1,5 @@
    obj-$(CONFIG_GUNYAH) += gunyah.o

    gunyah_rsc_mgr-y += rsc_mgr.o rsc_mgr_rpc.o
    +gunyah_rsc_mgr-$(CONFIG_GUNYAH_VM_MANAGER) += vm_mgr.o
    obj-$(CONFIG_GUNYAH_RESOURCE_MANAGER) += gunyah_rsc_mgr.o
    diff --git a/drivers/virt/gunyah/rsc_mgr.c b/drivers/virt/gunyah/rsc_mgr.c
    index 6b281576f5af..49d7939bbe36 100644
    --- a/drivers/virt/gunyah/rsc_mgr.c
    +++ b/drivers/virt/gunyah/rsc_mgr.c
    @@ -16,8 +16,10 @@
    #include <linux/completion.h>
    #include <linux/gunyah_rsc_mgr.h>
    #include <linux/platform_device.h>
    +#include <linux/miscdevice.h>

    #include "rsc_mgr.h"
    +#include "vm_mgr.h"

    /* Resource Manager Header */
    struct gh_rm_rpc_hdr {
    @@ -96,6 +98,7 @@ struct gh_rm_rpc {

    struct mutex send_lock;

    + struct miscdevice miscdev;
    struct work_struct recv_work;
    };

    @@ -496,6 +499,33 @@ int gh_rm_call(struct gh_rm_rpc *rsc_mgr, u32 message_id, void *req_buff, size_t
    return ret;
    }

    +void get_gh_rm(struct gh_rm_rpc *rm)
    +{
    + get_device(rm->dev);
    +}
    +EXPORT_SYMBOL_GPL(get_gh_rm);
    +
    +void put_gh_rm(struct gh_rm_rpc *rm)
    +{
    + put_device(rm->dev);
    +}
    +EXPORT_SYMBOL_GPL(put_gh_rm);
    +
    +static long gh_dev_ioctl(struct file *filp, unsigned int cmd, unsigned long arg)
    +{
    + struct miscdevice *miscdev = filp->private_data;
    + struct gh_rm_rpc *rm = container_of(miscdev, struct gh_rm_rpc, miscdev);
    +
    + return gh_dev_vm_mgr_ioctl(rm, cmd, arg);
    +}
    +
    +static const struct file_operations gh_dev_fops = {
    + .owner = THIS_MODULE,
    + .unlocked_ioctl = gh_dev_ioctl,
    + .compat_ioctl = compat_ptr_ioctl,
    + .llseek = noop_llseek,
    +};
    +
    static int gh_msgq_platform_probe_direction(struct platform_device *pdev,
    u8 gh_type, int idx, struct gunyah_resource *ghrsc)
    {
    @@ -550,14 +580,29 @@ static int gh_rm_drv_probe(struct platform_device *pdev)
    rsc_mgr->msgq_client.rx_callback = gh_rm_msgq_rx_data;
    rsc_mgr->msgq_client.tx_done = gh_rm_msgq_tx_done;

    - return gh_msgq_init(&pdev->dev, &rsc_mgr->msgq, &rsc_mgr->msgq_client,
    + ret = gh_msgq_init(&pdev->dev, &rsc_mgr->msgq, &rsc_mgr->msgq_client,
    &rsc_mgr->tx_ghrsc, &rsc_mgr->rx_ghrsc);
    +
    + rsc_mgr->miscdev.name = "gunyah";
    + rsc_mgr->miscdev.minor = MISC_DYNAMIC_MINOR;
    + rsc_mgr->miscdev.fops = &gh_dev_fops;
    +
    + ret = misc_register(&rsc_mgr->miscdev);
    + if (ret)
    + goto err_msgq;
    +
    + return 0;
    +err_msgq:
    + mbox_free_channel(gh_msgq_chan(&rsc_mgr->msgq));
    + gh_msgq_remove(&rsc_mgr->msgq);
    + return ret;
    }

    static int gh_rm_drv_remove(struct platform_device *pdev)
    {
    struct gh_rm_rpc *rm = platform_get_drvdata(pdev);

    + misc_deregister(&rm->miscdev);
    mbox_free_channel(gh_msgq_chan(&rm->msgq));
    gh_msgq_remove(&rm->msgq);

    diff --git a/drivers/virt/gunyah/vm_mgr.c b/drivers/virt/gunyah/vm_mgr.c
    new file mode 100644
    index 000000000000..9c796e5edcf1
    --- /dev/null
    +++ b/drivers/virt/gunyah/vm_mgr.c
    @@ -0,0 +1,115 @@
    +// SPDX-License-Identifier: GPL-2.0-only
    +/*
    + * Copyright (c) 2022 Qualcomm Innovation Center, Inc. All rights reserved.
    + */
    +
    +#define pr_fmt(fmt) "gh_vm_mgr: " fmt
    +
    +#include <linux/anon_inodes.h>
    +#include <linux/file.h>
    +#include <linux/gunyah_rsc_mgr.h>
    +#include <linux/miscdevice.h>
    +#include <linux/module.h>
    +
    +#include <uapi/linux/gunyah.h>
    +
    +#include "vm_mgr.h"
    +
    +static __must_check struct gunyah_vm *gunyah_vm_alloc(struct gh_rm_rpc *rm)
    +{
    + struct gunyah_vm *ghvm;
    + int vmid;
    +
    + vmid = gh_rm_alloc_vmid(rm, 0);
    + if (vmid < 0)
    + return ERR_PTR(vmid);
    +
    + ghvm = kzalloc(sizeof(*ghvm), GFP_KERNEL);
    + if (!ghvm)
    + return ghvm;
    +
    + get_gh_rm(rm);
    +
    + ghvm->vmid = vmid;
    + ghvm->rm = rm;
    +
    + return ghvm;
    +}
    +
    +static long gh_vm_ioctl(struct file *filp, unsigned int cmd, unsigned long arg)
    +{
    + long r;
    +
    + switch (cmd) {
    + default:
    + r = -ENOTTY;
    + break;
    + }
    +
    + return r;
    +}
    +
    +static int gh_vm_release(struct inode *inode, struct file *filp)
    +{
    + struct gunyah_vm *ghvm = filp->private_data;
    +
    + put_gh_rm(ghvm->rm);
    + kfree(ghvm);
    + return 0;
    +}
    +
    +static const struct file_operations gh_vm_fops = {
    + .unlocked_ioctl = gh_vm_ioctl,
    + .release = gh_vm_release,
    + .compat_ioctl = compat_ptr_ioctl,
    + .llseek = noop_llseek,
    +};
    +
    +static long gh_dev_ioctl_create_vm(struct gh_rm_rpc *rm, unsigned long arg)
    +{
    + struct gunyah_vm *ghvm;
    + struct file *file;
    + int fd, err;
    +
    + /* arg reserved for future use. */
    + if (arg)
    + return -EINVAL;
    +
    + ghvm = gunyah_vm_alloc(rm);
    + if (IS_ERR_OR_NULL(ghvm))
    + return PTR_ERR(ghvm) ? : -ENOMEM;
    +
    + fd = get_unused_fd_flags(O_CLOEXEC);
    + if (fd < 0) {
    + err = fd;
    + goto err_destroy_vm;
    + }
    +
    + file = anon_inode_getfile("gunyah-vm", &gh_vm_fops, ghvm, O_RDWR);
    + if (IS_ERR(file)) {
    + err = PTR_ERR(file);
    + goto err_put_fd;
    + }
    +
    + fd_install(fd, file);
    +
    + return fd;
    +
    +err_put_fd:
    + put_unused_fd(fd);
    +err_destroy_vm:
    + kfree(ghvm);
    + return err;
    +}
    +
    +long gh_dev_vm_mgr_ioctl(struct gh_rm_rpc *rm, unsigned int cmd, unsigned long arg)
    +{
    + switch (cmd) {
    + case GH_CREATE_VM:
    + return gh_dev_ioctl_create_vm(rm, arg);
    + default:
    + return -ENOIOCTLCMD;
    + }
    +}
    +EXPORT_SYMBOL_GPL(gh_dev_vm_mgr_ioctl);
    +
    diff --git a/drivers/virt/gunyah/vm_mgr.h b/drivers/virt/gunyah/vm_mgr.h
    new file mode 100644
    index 000000000000..84e3d1a8571d
    --- /dev/null
    +++ b/drivers/virt/gunyah/vm_mgr.h
    @@ -0,0 +1,25 @@
    +/* SPDX-License-Identifier: GPL-2.0-only */
    +/*
    + * Copyright (c) 2022 Qualcomm Innovation Center, Inc. All rights reserved.
    + */
    +
    +#ifndef _GH_PRIV_VM_MGR_H
    +#define _GH_PRIV_VM_MGR_H
    +
    +#include <linux/gunyah_rsc_mgr.h>
    +
    +#include <uapi/linux/gunyah.h>
    +
    +#if IS_ENABLED(CONFIG_GUNYAH_VM_MANAGER)
    +long gh_dev_vm_mgr_ioctl(struct gh_rm_rpc *rm, unsigned int cmd, unsigned long arg);
    +#else
    +static inline long gh_dev_vm_mgr_ioctl(struct gh_rm_rpc *rm, unsigned int cmd, unsigned long arg)
    + { return -ENOIOCTLCMD; }
    +#endif
    +
    +struct gunyah_vm {
    + u16 vmid;
    + struct gh_rm_rpc *rm;
    +};
    +
    +#endif
    diff --git a/include/linux/gunyah_rsc_mgr.h b/include/linux/gunyah_rsc_mgr.h
    index eb94b48c41de..9c566436687d 100644
    --- a/include/linux/gunyah_rsc_mgr.h
    +++ b/include/linux/gunyah_rsc_mgr.h
    @@ -17,6 +17,9 @@

    struct gh_rm_rpc;

    +void get_gh_rm(struct gh_rm_rpc *rm);
    +void put_gh_rm(struct gh_rm_rpc *rm);
    +
    enum gh_rm_vm_status {
    GH_RM_VM_STATUS_NO_STATE = 0,
    GH_RM_VM_STATUS_INIT = 1,
    diff --git a/include/uapi/linux/gunyah.h b/include/uapi/linux/gunyah.h
    new file mode 100644
    index 000000000000..88a40d6e0b96
    --- /dev/null
    +++ b/include/uapi/linux/gunyah.h
    @@ -0,0 +1,23 @@
    +/* SPDX-License-Identifier: GPL-2.0-only WITH Linux-syscall-note */
    +/*
    + * Copyright (c) 2022 Qualcomm Innovation Center, Inc. All rights reserved.
    + */
    +
    +#ifndef _UAPI_LINUX_GUNYAH
    +#define _UAPI_LINUX_GUNYAH
    +
    +/*
    + * Userspace interface for /dev/gunyah - gunyah based virtual machine
    + */
    +
    +#include <linux/types.h>
    +#include <linux/ioctl.h>
    +
    +#define GH_IOCTL_TYPE 'G'
    +
    +/*
    + * ioctls for /dev/gunyah fds:
    + */
    +#define GH_CREATE_VM _IO(GH_IOCTL_TYPE, 0x0) /* Returns a Gunyah VM fd */
    +
    +#endif
    --
    2.25.1
    \
     
     \ /
      Last update: 2023-03-26 23:15    [W:6.113 / U:0.028 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site