Received: by 2002:a25:824b:0:0:0:0:0 with SMTP id d11csp830700ybn; Tue, 24 Sep 2019 10:08:57 -0700 (PDT) X-Google-Smtp-Source: APXvYqyX54G+kHjxzkO5w5Rjr+w3N/cinJAGpNOjHusw7pVVddnZckqiXFHqYMZP7sK1gyw95T7I X-Received: by 2002:a5d:6411:: with SMTP id z17mr3638034wru.274.1569344937482; Tue, 24 Sep 2019 10:08:57 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1569344937; cv=none; d=google.com; s=arc-20160816; b=LKV4iLrkqR81WIzegV9IW6UYzJ+YNLprvuXt8RwbopGrf7bVX4osffgvryci4Wr3uV XdEJCfY55CNw/X6R6wjQ9HK+fG2eBME0MtZT3Ci4rqyDeVuTxcPS0XEqsC9Pd3W9h0Hn UaILEMLRtLH/ixcNiMep0jUWoR8yHAIX1eQrpuZGP/OJeR1V5EnrwQc499pBQcQxzM0U Poqui574o1ggHL07sOLLo4eYSv66Xc0v76GUcL6cB3xeDJaxnJ0BGb/otLmkMWwmrGRl kkYkz9y9L+x+BOlM1DTvciFSpUW622kZUd7N07xbWsCCYF7GULDT+vLEzmqnof7IbjbT guow== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from; bh=Ii6nFe4uc3OZ7j5u/7ctcl0jdUdl0K6Vxlm++srqYAI=; b=kgMMhBWeyhzPx7dRU8IOTWvRSmlMIVe5OdOxN7xW+bfqEXDF4W0jpzvFQcSIVcjDhm WLXtRnPH+Fu2oyYtJeLZPTk9frCZznDARsIwP42PR8FMz+W2/rhIInG0rDT871I3NlKr Rg3TdVrCtbV4ZnoB2S4WsRYfh3CsAnmLNba9OoAKdWa/CZlFTL5QEj8nZER/dMDP31JK fU6RKd2bR9SmdJiDp9bRA/tD9OOlUdIZVlHBsltDDnRWlZrIVA7bseIVhaDWDcNR5RqX 2KcsILbvOgfz1QP35HRzEPiMuBp3FkeSXXUW5B/UdOBwtAG9VqNAJSBHeq1SnANlB5p+ 7hqg== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=redhat.com Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id g8si1534562edb.335.2019.09.24.10.08.34; Tue, 24 Sep 2019 10:08:57 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=redhat.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2395321AbfIWNFI (ORCPT + 99 others); Mon, 23 Sep 2019 09:05:08 -0400 Received: from mx1.redhat.com ([209.132.183.28]:50980 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726107AbfIWNFH (ORCPT ); Mon, 23 Sep 2019 09:05:07 -0400 Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com [10.5.11.22]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 815C23680A; Mon, 23 Sep 2019 13:05:06 +0000 (UTC) Received: from jason-ThinkPad-X1-Carbon-6th.redhat.com (ovpn-12-93.pek2.redhat.com [10.72.12.93]) by smtp.corp.redhat.com (Postfix) with ESMTP id C72D410013D9; Mon, 23 Sep 2019 13:04:45 +0000 (UTC) From: Jason Wang To: kvm@vger.kernel.org, linux-s390@vger.kernel.org, linux-kernel@vger.kernel.org, dri-devel@lists.freedesktop.org, intel-gfx@lists.freedesktop.org, intel-gvt-dev@lists.freedesktop.org, kwankhede@nvidia.com, alex.williamson@redhat.com, mst@redhat.com, tiwei.bie@intel.com Cc: virtualization@lists.linux-foundation.org, netdev@vger.kernel.org, cohuck@redhat.com, maxime.coquelin@redhat.com, cunming.liang@intel.com, zhihong.wang@intel.com, rob.miller@broadcom.com, xiao.w.wang@intel.com, haotian.wang@sifive.com, zhenyuw@linux.intel.com, zhi.a.wang@intel.com, jani.nikula@linux.intel.com, joonas.lahtinen@linux.intel.com, rodrigo.vivi@intel.com, airlied@linux.ie, daniel@ffwll.ch, farman@linux.ibm.com, pasic@linux.ibm.com, sebott@linux.ibm.com, oberpar@linux.ibm.com, heiko.carstens@de.ibm.com, gor@linux.ibm.com, borntraeger@de.ibm.com, akrowiak@linux.ibm.com, freude@linux.ibm.com, lingshan.zhu@intel.com, idos@mellanox.com, eperezma@redhat.com, lulu@redhat.com, parav@mellanox.com, Jason Wang Subject: [PATCH 3/6] mdev: introduce virtio device and its device ops Date: Mon, 23 Sep 2019 21:03:28 +0800 Message-Id: <20190923130331.29324-4-jasowang@redhat.com> In-Reply-To: <20190923130331.29324-1-jasowang@redhat.com> References: <20190923130331.29324-1-jasowang@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Scanned-By: MIMEDefang 2.84 on 10.5.11.22 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.30]); Mon, 23 Sep 2019 13:05:07 +0000 (UTC) Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org This patch implements basic support for mdev driver that supports virtio transport for kernel virtio driver. Signed-off-by: Jason Wang --- drivers/vfio/mdev/mdev_core.c | 7 ++ include/linux/mdev.h | 4 + include/linux/virtio_mdev.h | 144 ++++++++++++++++++++++++++++++++++ 3 files changed, 155 insertions(+) create mode 100644 include/linux/virtio_mdev.h diff --git a/drivers/vfio/mdev/mdev_core.c b/drivers/vfio/mdev/mdev_core.c index a02c256a3514..6d39caf96222 100644 --- a/drivers/vfio/mdev/mdev_core.c +++ b/drivers/vfio/mdev/mdev_core.c @@ -220,6 +220,13 @@ int mdev_register_vfio_device(struct device *dev, } EXPORT_SYMBOL(mdev_register_vfio_device); +int mdev_register_virtio_device(struct device *dev, + const struct mdev_parent_ops *ops) +{ + return mdev_register_device(dev, ops, MDEV_ID_VIRTIO); +} +EXPORT_SYMBOL(mdev_register_virtio_device); + /* * mdev_unregister_device : Unregister a parent device * @dev: device structure representing parent device. diff --git a/include/linux/mdev.h b/include/linux/mdev.h index fa167bcb81e1..1d061739021e 100644 --- a/include/linux/mdev.h +++ b/include/linux/mdev.h @@ -109,6 +109,8 @@ extern struct bus_type mdev_bus_type; int mdev_register_vfio_device(struct device *dev, const struct mdev_parent_ops *ops); +int mdev_register_virtio_device(struct device *dev, + const struct mdev_parent_ops *ops); void mdev_unregister_device(struct device *dev); int mdev_register_driver(struct mdev_driver *drv, struct module *owner); @@ -119,5 +121,7 @@ struct device *mdev_dev(struct mdev_device *mdev); struct mdev_device *mdev_from_dev(struct device *dev); #define MDEV_ID_VFIO 1 /* VFIO device */ +#define MDEV_ID_VIRTIO 2 /* Virtio Device */ +#define MDEV_ID_VHOST 3 /* Vhost Device */ #endif /* MDEV_H */ diff --git a/include/linux/virtio_mdev.h b/include/linux/virtio_mdev.h new file mode 100644 index 000000000000..f8db03c93d36 --- /dev/null +++ b/include/linux/virtio_mdev.h @@ -0,0 +1,144 @@ +/* SPDX-License-Identifier: GPL-2.0-only */ +/* + * Virtio mediated device driver + * + * Copyright 2019, Red Hat Corp. + * Author: Jason Wang + */ +#ifndef _LINUX_VIRTIO_MDEV_H +#define _LINUX_VIRTIO_MDEV_H + +#include +#include + +#define VIRTIO_MDEV_DEVICE_API_STRING "virtio-mdev" +#define VIRTIO_MDEV_VERSION 0x1 + +struct virtio_mdev_callback { + irqreturn_t (*callback)(void *data); + void *private; +}; + +/** + * struct vfio_mdev_parent_ops - Structure to be registered for each + * parent device to register the device to virtio-mdev module. + * + * @set_vq_address: Set the address of virtqueue + * @mdev: mediated device + * @idx: virtqueue index + * @desc_area: address of desc area + * @driver_area: address of driver area + * @device_area: address of device area + * Returns integer: success (0) or error (< 0) + * @set_vq_num: Set the size of virtqueue + * @mdev: mediated device + * @idx: virtqueue index + * @num: the size of virtqueue + * @kick_vq: Kick the virtqueue + * @mdev: mediated device + * @idx: virtqueue index + * @set_vq_cb: Set the interrut calback function for + * a virtqueue + * @mdev: mediated device + * @idx: virtqueue index + * @cb: virtio-mdev interrupt callback structure + * @set_vq_ready: Set ready status for a virtqueue + * @mdev: mediated device + * @idx: virtqueue index + * @ready: ready (true) not ready(false) + * @get_vq_ready: Get ready status for a virtqueue + * @mdev: mediated device + * @idx: virtqueue index + * Returns boolean: ready (true) or not (false) + * @set_vq_state: Set the state for a virtqueue + * @mdev: mediated device + * @idx: virtqueue index + * @state: virtqueue state (last_avail_idx) + * Returns integer: success (0) or error (< 0) + * @get_vq_state: Get the state for a virtqueue + * @mdev: mediated device + * @idx: virtqueue index + * Returns virtqueue state (last_avail_idx) + * @get_vq_align: Get the virtqueue align requirement + * for the device + * @mdev: mediated device + * Returns virtqueue algin requirement + * @get_features: Get virtio features supported by the device + * @mdev: mediated device + * Returns the features support by the + * device + * @get_features: Set virtio features supported by the driver + * @mdev: mediated device + * @features: feature support by the driver + * Returns integer: success (0) or error (< 0) + * @set_config_cb: Set the config interrupt callback + * @mdev: mediated device + * @cb: virtio-mdev interrupt callback structure + * @get_device_id: Get virtio device id + * @mdev: mediated device + * Returns u32: virtio device id + * @get_vendor_id: Get virtio vendor id + * @mdev: mediated device + * Returns u32: virtio vendor id + * @get_status: Get the device status + * @mdev: mediated device + * Returns u8: virtio device status + * @set_status: Set the device status + * @mdev: mediated device + * @status: virtio device status + * @get_config: Read from device specific confiugration space + * @mdev: mediated device + * @offset: offset from the beginning of + * configuration space + * @buf: buffer used to read to + * @len: the length to read from + * configration space + * @set_config: Write to device specific confiugration space + * @mdev: mediated device + * @offset: offset from the beginning of + * configuration space + * @buf: buffer used to write from + * @len: the length to write to + * configration space + * @get_version: Get the version of virtio mdev device + * @mdev: mediated device + * Returns integer: version of the device + * @get_generation: Get device generaton + * @mdev: mediated device + * Returns u32: device generation + */ +struct virtio_mdev_parent_ops { + /* Virtqueue ops */ + int (*set_vq_address)(struct mdev_device *mdev, + u16 idx, u64 desc_area, u64 driver_area, + u64 device_area); + void (*set_vq_num)(struct mdev_device *mdev, u16 idx, u32 num); + void (*kick_vq)(struct mdev_device *mdev, u16 idx); + void (*set_vq_cb)(struct mdev_device *mdev, u16 idx, + struct virtio_mdev_callback *cb); + void (*set_vq_ready)(struct mdev_device *mdev, u16 idx, bool ready); + bool (*get_vq_ready)(struct mdev_device *mdev, u16 idx); + int (*set_vq_state)(struct mdev_device *mdev, u16 idx, u64 state); + u64 (*get_vq_state)(struct mdev_device *mdev, u16 idx); + + /* Device ops */ + u16 (*get_vq_align)(struct mdev_device *mdev); + u64 (*get_features)(struct mdev_device *mdev); + int (*set_features)(struct mdev_device *mdev, u64 features); + void (*set_config_cb)(struct mdev_device *mdev, + struct virtio_mdev_callback *cb); + u16 (*get_queue_max)(struct mdev_device *mdev); + u32 (*get_device_id)(struct mdev_device *mdev); + u32 (*get_vendor_id)(struct mdev_device *mdev); + u8 (*get_status)(struct mdev_device *mdev); + void (*set_status)(struct mdev_device *mdev, u8 status); + void (*get_config)(struct mdev_device *mdev, unsigned int offset, + void *buf, unsigned int len); + void (*set_config)(struct mdev_device *mdev, unsigned int offset, + const void *buf, unsigned int len); + int (*get_version)(struct mdev_device *mdev); + u32 (*get_generation)(struct mdev_device *mdev); +}; + +#endif + -- 2.19.1