On Sun, 7 Jul 2024 at 18:06, Mikhail Krasheninnikov <krashmisha@xxxxxxxxx> wrote: > > Introduce a new virtio MMC driver to enable virtio SD/MMC card > emulation with QEMU. This driver allows emulating MMC cards in > virtual environments, enhancing functionality and testing > capabilities within QEMU. > > Link to the QEMU patch: > https://lists.nongnu.org/archive/html/qemu-block/2024-07/msg00221.html > > No changes to existing dependencies or documentation. > > Signed-off-by: Mikhail Krasheninnikov <krashmisha@xxxxxxxxx> > CC: Matwey Kornilov <matwey.kornilov@xxxxxxxxx> > CC: Ulf Hansson <ulf.hansson@xxxxxxxxxx> > CC: linux-mmc@xxxxxxxxxxxxxxx > CC: "Michael S. Tsirkin" <mst@xxxxxxxxxx> > CC: Jason Wang <jasowang@xxxxxxxxxx> > CC: Paolo Bonzini <pbonzini@xxxxxxxxxx> > CC: Stefan Hajnoczi <stefanha@xxxxxxxxxx> > CC: Xuan Zhuo <xuanzhuo@xxxxxxxxxxxxxxxxx> > CC: virtualization@xxxxxxxxxxxxxxxxxxxxxxxxxx Sorry for the delay. Can you please re-spin/post this to add Adrian Hunter, the sdhci maintainer. Moreover, it would be nice to get some from the virtio folkz to review this too. My comments at this point are mostly nitpicks. Please see below. > > --- > Changes from v1: > - Add MAINTAINERS entry > - Refactor includes > - Change CPU endian format to little endian for device communication > - Move structs that belonged to uapi > - Validate multiple fields > - Introduce mutexes for safe request handling > - Call virtio_device_ready before adding host > - Fix removal of the device > > MAINTAINERS | 15 ++ > drivers/mmc/host/Kconfig | 14 ++ > drivers/mmc/host/Makefile | 2 + > drivers/mmc/host/virtio-sdhci.c | 258 ++++++++++++++++++++++++++++++ > drivers/mmc/host/virtio-sdhci.h | 40 +++++ > include/uapi/linux/virtio-sdhci.h | 39 +++++ Please rename to sdhci-virtio.* and update the corresponding prefix of the function names accordingly. > include/uapi/linux/virtio_ids.h | 1 + > 7 files changed, 369 insertions(+) > create mode 100644 drivers/mmc/host/virtio-sdhci.c > create mode 100644 drivers/mmc/host/virtio-sdhci.h > create mode 100644 include/uapi/linux/virtio-sdhci.h > > diff --git a/MAINTAINERS b/MAINTAINERS > index dd5de540ec0b..be86156cd66c 100644 > --- a/MAINTAINERS > +++ b/MAINTAINERS > @@ -22907,6 +22907,21 @@ S: Maintained > F: drivers/nvdimm/nd_virtio.c > F: drivers/nvdimm/virtio_pmem.c > > +VIRTIO SDHCI DRIVER > +M: Mikhail Krasheninnikov <krashmisha@xxxxxxxxx> > +M: "Michael S. Tsirkin" <mst@xxxxxxxxxx> > +M: Jason Wang <jasowang@xxxxxxxxxx> > +M: Paolo Bonzini <pbonzini@xxxxxxxxxx> > +M: Stefan Hajnoczi <stefanha@xxxxxxxxxx> > +M: Xuan Zhuo <xuanzhuo@xxxxxxxxxxxxxxxxx> > +L: virtualization@xxxxxxxxxxxxxxxxxxxxxxxxxx > +L: linux-mmc@xxxxxxxxxxxxxxx > +L: OASIS-virtio@xxxxxxxxxxxxxxxxxxxxxx > +S: Maintained > +F: drivers/mmc/host/virtio-sdhci.c > +F: drivers/mmc/host/virtio-sdhci.h > +F: include/uapi/linux/virtio-sdhci.h > + > VIRTIO SOUND DRIVER > M: Anton Yakovlev <anton.yakovlev@xxxxxxxxxxxxxxx> > M: "Michael S. Tsirkin" <mst@xxxxxxxxxx> > diff --git a/drivers/mmc/host/Kconfig b/drivers/mmc/host/Kconfig > index 554e67103c1a..d62d669ee117 100644 > --- a/drivers/mmc/host/Kconfig > +++ b/drivers/mmc/host/Kconfig > @@ -1069,3 +1069,17 @@ config MMC_LITEX > module will be called litex_mmc. > > If unsure, say N. > + > +config SDHCI_VIRTIO > + tristate "VirtIO SDHCI Host Controller support" > + depends on VIRTIO > + help > + This enables support for the Virtio SDHCI driver, which allows the > + kernel to interact with SD/MMC devices over Virtio. Virtio is a > + virtualization standard for network and disk device drivers, > + providing a common API for virtualized environments. > + > + Enable this option if you are running the kernel in a virtualized > + environment and need SD/MMC support via Virtio. > + > + If unsure, say N. > \ No newline at end of file > diff --git a/drivers/mmc/host/Makefile b/drivers/mmc/host/Makefile > index a693fa3d3f1c..f9b05a07c6db 100644 > --- a/drivers/mmc/host/Makefile > +++ b/drivers/mmc/host/Makefile > @@ -108,3 +108,5 @@ endif > > obj-$(CONFIG_MMC_SDHCI_XENON) += sdhci-xenon-driver.o > sdhci-xenon-driver-y += sdhci-xenon.o sdhci-xenon-phy.o > + > +obj-$(CONFIG_SDHCI_VIRTIO) += virtio-sdhci.o > \ No newline at end of file > diff --git a/drivers/mmc/host/virtio-sdhci.c b/drivers/mmc/host/virtio-sdhci.c > new file mode 100644 > index 000000000000..1a637ab5e010 > --- /dev/null > +++ b/drivers/mmc/host/virtio-sdhci.c > @@ -0,0 +1,258 @@ > +// SPDX-License-Identifier: GPL-2.0-or-later > +/* > + * VirtIO SD/MMC driver > + * > + * Author: Mikhail Krasheninnikov <krashmisha@xxxxxxxxx> > + */ > + > +#include "virtio-sdhci.h" > +#include "linux/mmc/host.h" > +#include "linux/virtio.h" > +#include "linux/virtio_config.h" > +#include "linux/completion.h" > +#include "uapi/linux/virtio-sdhci.h" > + > +struct virtio_sdhci_host { > + struct virtio_device *vdev; > + struct mmc_host *mmc; > + struct virtqueue *vq; > + struct mmc_request *current_request; > + > + struct virtio_mmc_request virtio_request; > + struct virtio_mmc_response virtio_response; > + > + struct completion request_handled; > + spinlock_t handling_request; > +}; > + > +static void virtio_sdhci_vq_callback(struct virtqueue *vq) > +{ > + unsigned int len; > + struct mmc_host *mmc; > + struct virtio_sdhci_host *host; > + struct virtio_mmc_request *virtio_request; > + struct virtio_mmc_response *virtio_response; > + struct mmc_request *mrq; > + > + mmc = vq->vdev->priv; > + host = mmc_priv(mmc); > + mrq = host->current_request; > + virtio_request = &host->virtio_request; > + > + virtio_response = virtqueue_get_buf(vq, &len); > + > + if (!virtio_response) > + return; > + > + memcpy(mrq->cmd->resp, virtio_response->cmd_resp, > + min(4 * (int)sizeof(u32), virtio_response->cmd_resp_len)); > + > + if (virtio_request->flags & VIRTIO_MMC_REQUEST_DATA) { > + mrq->data->bytes_xfered = > + min((unsigned int)virtio_request->buf_len, > + mmc->max_blk_size); > + > + if (!(virtio_request->flags & VIRTIO_MMC_REQUEST_WRITE)) { > + sg_copy_from_buffer(mrq->data->sg, mrq->data->sg_len, > + virtio_response->buf, > + mrq->data->bytes_xfered); > + } > + } > + > + complete(&host->request_handled); > +} > + > +static void virtio_sdhci_send_and_recv_request_from_qemu(struct virtio_sdhci_host *data) > +{ > + struct scatterlist sg_out_linux, sg_in_linux; > + > + sg_init_one(&sg_out_linux, &data->virtio_request, > + sizeof(struct virtio_mmc_request)); > + sg_init_one(&sg_in_linux, &data->virtio_response, > + sizeof(struct virtio_mmc_response)); > + > + struct scatterlist *request[] = { &sg_out_linux, &sg_in_linux }; > + > + if (virtqueue_add_sgs(data->vq, request, 1, 1, &data->virtio_response, > + GFP_KERNEL) < 0) { > + dev_crit(&data->vdev->dev, "Failed to add sg\n"); > + return; > + } > + > + virtqueue_kick(data->vq); > + wait_for_completion(&data->request_handled); > +} > + > +static inline size_t __calculate_len(struct mmc_data *data) Please keep the prefix of the function names. This applies to the remaining functions too. > +{ > + size_t len = 0; > + > + for (int i = 0; i < data->sg_len; i++) > + len += data->sg[i].length; > + return len; > +} [...] > +static int create_host(struct virtio_device *vdev) > +{ > + int err; > + struct mmc_host *mmc; > + struct virtio_sdhci_host *host; > + > + mmc = mmc_alloc_host(sizeof(struct virtio_sdhci_host), &vdev->dev); > + if (!mmc) { > + pr_err("virtio_mmc: Failed to allocate host\n"); > + return -ENOMEM; > + } > + > + __fill_host_attr(mmc); > + > + vdev->priv = mmc; > + > + host = mmc_priv(mmc); > + host->vdev = vdev; > + > + spin_lock_init(&host->handling_request); > + init_completion(&host->request_handled); > + > + host->vq = > + virtio_find_single_vq(vdev, virtio_sdhci_vq_callback, "vq_name"); > + if (!host->vq) { > + pr_err("virtio_mmc: Failed to find virtqueue\n"); > + mmc_free_host(mmc); > + return -ENODEV; > + } > + > + virtio_device_ready(vdev); > + > + err = mmc_add_host(mmc); > + if (err) { > + pr_err("virtio_mmc: Failed to add host\n"); > + mmc_free_host(mmc); > + return err; > + } sdhci provides various library functions to add/allocate and free/remove a host. Please try to use them. > + > + return 0; > +} [...] > diff --git a/drivers/mmc/host/virtio-sdhci.h b/drivers/mmc/host/virtio-sdhci.h > new file mode 100644 > index 000000000000..db35268e7b64 > --- /dev/null > +++ b/drivers/mmc/host/virtio-sdhci.h > @@ -0,0 +1,40 @@ > +/* SPDX-License-Identifier: GPL-2.0-or-later > + * > + * VirtIO SD/MMC driver > + * > + * Author: Mikhail Krasheninnikov <krashmisha@xxxxxxxxx> > + */ > + > +#ifndef _VIRTIO_MMC_H > +#define _VIRTIO_MMC_H > + > +#include <linux/virtio.h> > +#include <linux/virtio_ids.h> > + > +static int virtio_sdhci_probe(struct virtio_device *vdev); > + > +static void virtio_sdhci_remove(struct virtio_device *vdev); > + > +static const struct virtio_device_id id_table[] = { > + { VIRTIO_ID_SDHCI, VIRTIO_DEV_ANY_ID }, > + { 0 }, > +}; > + > +static struct virtio_driver virtio_sdhci_driver = { > + .driver = { > + .name = KBUILD_MODNAME, > + .owner = THIS_MODULE, > + }, > + .id_table = id_table, > + .probe = virtio_sdhci_probe, > + .remove = virtio_sdhci_remove, > +}; > + > +module_virtio_driver(virtio_sdhci_driver); > +MODULE_DEVICE_TABLE(virtio, id_table); > + > +MODULE_AUTHOR("Mikhail Krasheninnikov"); > +MODULE_DESCRIPTION("VirtIO SD/MMC driver"); > +MODULE_LICENSE("GPL"); Looks like all the code in the header file above belongs in the c-file instead, along with the other static declarations. > + > +#endif > diff --git a/include/uapi/linux/virtio-sdhci.h b/include/uapi/linux/virtio-sdhci.h > new file mode 100644 > index 000000000000..751ed215bc61 > --- /dev/null > +++ b/include/uapi/linux/virtio-sdhci.h > @@ -0,0 +1,39 @@ > +/* SPDX-License-Identifier: GPL-2.0-or-later > + * > + * VirtIO SD/MMC driver > + * > + * Author: Mikhail Krasheninnikov <krashmisha@xxxxxxxxx> > + */ > +#ifndef _LINUX_VIRTIO_MMC_H > +#define _LINUX_VIRTIO_MMC_H > +#include <linux/types.h> > + > +struct mmc_req { > + __le32 opcode; > + __le32 arg; > +}; > + > +struct virtio_mmc_request { > + u8 flags; > + > +#define VIRTIO_MMC_REQUEST_DATA BIT(1) > +#define VIRTIO_MMC_REQUEST_WRITE BIT(2) > +#define VIRTIO_MMC_REQUEST_STOP BIT(3) > +#define VIRTIO_MMC_REQUEST_SBC BIT(4) > + > + struct mmc_req request; > + > + u8 buf[4096]; > + __le32 buf_len; > + > + struct mmc_req stop_req; > + struct mmc_req sbc_req; > +}; > + > +struct virtio_mmc_response { > + __le32 cmd_resp[4]; > + int cmd_resp_len; > + u8 buf[4096]; > +}; Without a more in-depth review, I can't judge whether the above user-space interface makes sense. As I also said earlier, it would be nice to get some more virtio people involved in the review process, especially to have a closer look at the user-space interface above. > + > +#endif /* _LINUX_VIRTIO_MMC_H */ > diff --git a/include/uapi/linux/virtio_ids.h b/include/uapi/linux/virtio_ids.h > index 7aa2eb766205..6de8d432db7f 100644 > --- a/include/uapi/linux/virtio_ids.h > +++ b/include/uapi/linux/virtio_ids.h > @@ -68,6 +68,7 @@ > #define VIRTIO_ID_AUDIO_POLICY 39 /* virtio audio policy */ > #define VIRTIO_ID_BT 40 /* virtio bluetooth */ > #define VIRTIO_ID_GPIO 41 /* virtio gpio */ > +#define VIRTIO_ID_SDHCI 42 /* virtio mmc */ > > /* > * Virtio Transitional IDs > -- > 2.34.1 > Kind regards Uffe
