From patchwork Sun Sep 4 14:39:00 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Namhyung Kim X-Patchwork-Id: 9312625 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id D7CA5600CA for ; Sun, 4 Sep 2016 14:51:41 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id BBAE0288A3 for ; Sun, 4 Sep 2016 14:51:41 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id AE4AD288AB; Sun, 4 Sep 2016 14:51:41 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.8 required=2.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_HI,T_DKIM_INVALID autolearn=unavailable version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id A9929288A3 for ; Sun, 4 Sep 2016 14:51:40 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753391AbcIDOvX (ORCPT ); Sun, 4 Sep 2016 10:51:23 -0400 Received: from mail-pa0-f67.google.com ([209.85.220.67]:34685 "EHLO mail-pa0-f67.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752147AbcIDOvU (ORCPT ); Sun, 4 Sep 2016 10:51:20 -0400 Received: by mail-pa0-f67.google.com with SMTP id hm5so3487815pac.1; Sun, 04 Sep 2016 07:51:20 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references; bh=M6QrJR6br6d+RYU7Pnfv5r+sFhBj/6kB+zihRoru/uo=; b=gtJu48G7Twt7crR7Hyg6AHN99sk2MLW63aHS387IiVjUzHUtKz11uO/ds2nJKX71BL zUK2gIq7onVGALSWaK+pV+txDVUE4p2/875a5Hbd4Xc1dBFx8r5gFhyR/FGs8VKaGklW 7TC5wQkmIuo1FsCvOdebg/2jc3SX8nYWRyaBOVPK9wtAA2ZcUoiOWctXQDRrpcMEv6kJ sTRrsJQ73kFj3K/QjisZu7b8aypDxRMMeu8ypyFHfqBgCW80rpqduPJijA+fpV4XgGzX cu/f8uPYzb1eXObZ4fgQBiKWvDAn7UsUjOJXFWkRXe5nTP2vkjGEtNrAMhUfkZwZ+JSO iwRA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references; bh=M6QrJR6br6d+RYU7Pnfv5r+sFhBj/6kB+zihRoru/uo=; b=THZIUKSewGpjE1lvbjflrthqEyCCznk+xuPMCBOOE5sLRRWk4sXfoPTfmQf27Qt9nB LqvT5LiPQigyMuSBZXp650A6QvwqXRUAFVDvdRBhiNeWoxmttDBzUlS0KC6P7/OAefCZ K7imSLrB2yMqpRkz/loszzpXSUyx6Hi62FFZrJkCsOlkfcazCmtKLw7MLK1b7EfbL5b7 QBp9xmiH20W95Z4gbmjItD/I1iIBpwL6izbtb9FlXoUvxbA+uE1eq5vndr/88qFHvVqu 9ddHtuwn6DcxyY6X+QoVCDEA8xe6xzrxNJmJTKZOUmWg6/prdK7W44A/t2MzzQEOD26V suWQ== X-Gm-Message-State: AE9vXwNruurNazxovK0ZZX/prYcvxCxJIk1YujJ+A0rDrwlrxFEhH00qQrw9S6SNUWQAeg== X-Received: by 10.66.90.7 with SMTP id bs7mr4038451pab.49.1472999961304; Sun, 04 Sep 2016 07:39:21 -0700 (PDT) Received: from danjae.aot.lge.com ([59.11.205.59]) by smtp.gmail.com with ESMTPSA id d72sm27722773pfj.15.2016.09.04.07.39.18 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 04 Sep 2016 07:39:20 -0700 (PDT) From: Namhyung Kim To: virtio-dev@lists.oasis-open.org Cc: LKML , qemu-devel@nongnu.org, kvm@vger.kernel.org, virtualization@lists.linux-foundation.org, Namhyung Kim , Will Deacon Subject: [PATCH 3/3] kvmtool: Implement virtio-pstore device Date: Sun, 4 Sep 2016 23:39:00 +0900 Message-Id: <20160904143900.14850-4-namhyung@kernel.org> X-Mailer: git-send-email 2.9.3 In-Reply-To: <20160904143900.14850-1-namhyung@kernel.org> References: <20160904143900.14850-1-namhyung@kernel.org> Sender: kvm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: kvm@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP From: Namhyung Kim Add virtio pstore device to allow kernel log messages saved on the host. With this patch, it will save the log files under directory given by --pstore option. $ lkvm run --pstore=dir-xx (guest) # echo c > /proc/sysrq-trigger $ ls dir-xx dmesg-1.enc.z dmesg-2.enc.z The log files are usually compressed using zlib. User can easily see the messages on the host or on the guest (using pstore filesystem). Cc: Will Deacon Signed-off-by: Namhyung Kim --- Makefile | 1 + builtin-run.c | 2 + include/kvm/kvm-config.h | 1 + include/kvm/virtio-pci-dev.h | 2 + include/kvm/virtio-pstore.h | 53 +++++ include/linux/virtio_ids.h | 1 + virtio/pstore.c | 447 +++++++++++++++++++++++++++++++++++++++++++ 7 files changed, 507 insertions(+) create mode 100644 include/kvm/virtio-pstore.h create mode 100644 virtio/pstore.c diff --git a/Makefile b/Makefile index 1f0196f..d7462b9 100644 --- a/Makefile +++ b/Makefile @@ -67,6 +67,7 @@ OBJS += virtio/net.o OBJS += virtio/rng.o OBJS += virtio/balloon.o OBJS += virtio/pci.o +OBJS += virtio/pstore.o OBJS += disk/blk.o OBJS += disk/qcow.o OBJS += disk/raw.o diff --git a/builtin-run.c b/builtin-run.c index 72b878d..08c12dd 100644 --- a/builtin-run.c +++ b/builtin-run.c @@ -128,6 +128,8 @@ void kvm_run_set_wrapper_sandbox(void) " rootfs"), \ OPT_STRING('\0', "hugetlbfs", &(cfg)->hugetlbfs_path, "path", \ "Hugetlbfs path"), \ + OPT_STRING('\0', "pstore", &(cfg)->pstore_path, "path", \ + "pstore data path"), \ \ OPT_GROUP("Kernel options:"), \ OPT_STRING('k', "kernel", &(cfg)->kernel_filename, "kernel", \ diff --git a/include/kvm/kvm-config.h b/include/kvm/kvm-config.h index 386fa8c..42b7651 100644 --- a/include/kvm/kvm-config.h +++ b/include/kvm/kvm-config.h @@ -45,6 +45,7 @@ struct kvm_config { const char *hugetlbfs_path; const char *custom_rootfs_name; const char *real_cmdline; + const char *pstore_path; struct virtio_net_params *net_params; bool single_step; bool vnc; diff --git a/include/kvm/virtio-pci-dev.h b/include/kvm/virtio-pci-dev.h index 48ae018..4339d94 100644 --- a/include/kvm/virtio-pci-dev.h +++ b/include/kvm/virtio-pci-dev.h @@ -15,6 +15,7 @@ #define PCI_DEVICE_ID_VIRTIO_BLN 0x1005 #define PCI_DEVICE_ID_VIRTIO_SCSI 0x1008 #define PCI_DEVICE_ID_VIRTIO_9P 0x1009 +#define PCI_DEVICE_ID_VIRTIO_PSTORE 0x100a #define PCI_DEVICE_ID_VESA 0x2000 #define PCI_DEVICE_ID_PCI_SHMEM 0x0001 @@ -34,5 +35,6 @@ #define PCI_CLASS_RNG 0xff0000 #define PCI_CLASS_BLN 0xff0000 #define PCI_CLASS_9P 0xff0000 +#define PCI_CLASS_PSTORE 0xff0000 #endif /* VIRTIO_PCI_DEV_H_ */ diff --git a/include/kvm/virtio-pstore.h b/include/kvm/virtio-pstore.h new file mode 100644 index 0000000..9f52ffd --- /dev/null +++ b/include/kvm/virtio-pstore.h @@ -0,0 +1,53 @@ +#ifndef KVM__PSTORE_VIRTIO_H +#define KVM__PSTORE_VIRTIO_H + +#include +#include + +#define VIRTIO_PSTORE_CMD_NULL 0 +#define VIRTIO_PSTORE_CMD_OPEN 1 +#define VIRTIO_PSTORE_CMD_READ 2 +#define VIRTIO_PSTORE_CMD_WRITE 3 +#define VIRTIO_PSTORE_CMD_ERASE 4 +#define VIRTIO_PSTORE_CMD_CLOSE 5 + +#define VIRTIO_PSTORE_TYPE_UNKNOWN 0 +#define VIRTIO_PSTORE_TYPE_DMESG 1 + +#define VIRTIO_PSTORE_FL_COMPRESSED 1 + +struct virtio_pstore_req { + __virtio16 cmd; + __virtio16 type; + __virtio32 flags; + __virtio64 id; + __virtio32 count; + __virtio32 reserved; +}; + +struct virtio_pstore_res { + __virtio16 cmd; + __virtio16 type; + __virtio32 ret; +}; + +struct virtio_pstore_fileinfo { + __virtio64 id; + __virtio32 count; + __virtio16 type; + __virtio16 unused; + __virtio32 flags; + __virtio32 len; + __virtio64 time_sec; + __virtio32 time_nsec; + __virtio32 reserved; +}; + +struct virtio_pstore_config { + __virtio32 bufsize; +}; + +int virtio_pstore__init(struct kvm *kvm); +int virtio_pstore__exit(struct kvm *kvm); + +#endif /* KVM__PSTORE_VIRTIO_H */ diff --git a/include/linux/virtio_ids.h b/include/linux/virtio_ids.h index 5f60aa4..40eabf7 100644 --- a/include/linux/virtio_ids.h +++ b/include/linux/virtio_ids.h @@ -40,5 +40,6 @@ #define VIRTIO_ID_RPROC_SERIAL 11 /* virtio remoteproc serial link */ #define VIRTIO_ID_CAIF 12 /* Virtio caif */ #define VIRTIO_ID_INPUT 18 /* virtio input */ +#define VIRTIO_ID_PSTORE 22 /* virtio pstore */ #endif /* _LINUX_VIRTIO_IDS_H */ diff --git a/virtio/pstore.c b/virtio/pstore.c new file mode 100644 index 0000000..fb9806f --- /dev/null +++ b/virtio/pstore.c @@ -0,0 +1,447 @@ +#include "kvm/virtio-pstore.h" + +#include "kvm/virtio-pci-dev.h" + +#include "kvm/virtio.h" +#include "kvm/util.h" +#include "kvm/kvm.h" +#include "kvm/threadpool.h" +#include "kvm/guest_compat.h" + +#include + +#include +#include +#include +#include +#include +#include +#include +#include + +#define NUM_VIRT_QUEUES 2 +#define VIRTIO_PSTORE_QUEUE_SIZE 128 + +struct io_thread_arg { + struct kvm *kvm; + struct pstore_dev *pdev; +}; + +struct pstore_dev { + struct list_head list; + struct virtio_device vdev; + pthread_t io_thread; + int io_efd; + int done; + + struct virtio_pstore_config *config; + + int fd; + DIR *dir; + u64 id; + + /* virtio queue */ + struct virt_queue vqs[NUM_VIRT_QUEUES]; +}; + +static LIST_HEAD(pdevs); +static int compat_id = -1; + +static u8 *get_config(struct kvm *kvm, void *dev) +{ + struct pstore_dev *pdev = dev; + + return (u8*)pdev->config; +} + +static u32 get_host_features(struct kvm *kvm, void *dev) +{ + /* Unused */ + return 0; +} + +static void set_guest_features(struct kvm *kvm, void *dev, u32 features) +{ + /* Unused */ +} + +static void virtio_pstore_to_filename(struct kvm *kvm, struct pstore_dev *pdev, + char *buf, size_t sz, + struct virtio_pstore_req *req) +{ + const char *basename; + unsigned long long id = 0; + unsigned int flags = virtio_host_to_guest_u64(pdev->vqs, req->flags); + + switch (req->type) { + case VIRTIO_PSTORE_TYPE_DMESG: + basename = "dmesg"; + id = pdev->id++; + break; + default: + basename = "unknown"; + break; + } + + snprintf(buf, sz, "%s/%s-%llu%s", kvm->cfg.pstore_path, basename, id, + flags & VIRTIO_PSTORE_FL_COMPRESSED ? ".enc.z" : ""); +} + +static void virtio_pstore_from_filename(struct kvm *kvm, char *name, + char *buf, size_t sz, + struct virtio_pstore_fileinfo *info) +{ + size_t len = strlen(name); + + snprintf(buf, sz, "%s/%s", kvm->cfg.pstore_path, name); + + info->flags = 0; + if (len > 6 && !strncmp(name + len - 6, ".enc.z", 6)) + info->flags |= VIRTIO_PSTORE_FL_COMPRESSED; + + if (!strncmp(name, "dmesg-", 6)) { + info->type = VIRTIO_PSTORE_TYPE_DMESG; + name += strlen("dmesg-"); + } else if (!strncmp(name, "unknown-", 8)) { + info->type = VIRTIO_PSTORE_TYPE_UNKNOWN; + name += strlen("unknown-"); + } + + info->id = strtoul(name, NULL, 0); +} + +static int virtio_pstore_do_open(struct kvm *kvm, struct pstore_dev *pdev, + struct virtio_pstore_req *req, + struct iovec *iov) +{ + pdev->dir = opendir(kvm->cfg.pstore_path); + if (pdev->dir == NULL) + return -errno; + + return 0; +} + +static int virtio_pstore_do_close(struct kvm *kvm, struct pstore_dev *pdev, + struct virtio_pstore_req *req, + struct iovec *iov) +{ + if (pdev->dir == NULL) + return -1; + + closedir(pdev->dir); + pdev->dir = NULL; + + return 0; +} + +static ssize_t virtio_pstore_do_read(struct kvm *kvm, struct pstore_dev *pdev, + struct virtio_pstore_req *req, + struct iovec *iov, + struct virtio_pstore_fileinfo *info) +{ + char path[PATH_MAX]; + FILE *fp; + ssize_t len = 0; + struct stat stbuf; + struct dirent *dent; + + if (pdev->dir == NULL) + return 0; + + dent = readdir(pdev->dir); + while (dent) { + if (dent->d_name[0] != '.') + break; + dent = readdir(pdev->dir); + } + + if (dent == NULL) + return 0; + + virtio_pstore_from_filename(kvm, dent->d_name, path, sizeof(path), info); + fp = fopen(path, "r"); + if (fp == NULL) + return -1; + + if (fstat(fileno(fp), &stbuf) < 0) + return -1; + + len = fread(iov[3].iov_base, 1, iov[3].iov_len, fp); + if (len < 0 && errno == EAGAIN) { + len = 0; + goto out; + } + + info->id = virtio_host_to_guest_u64(pdev->vqs, info->id); + info->type = virtio_host_to_guest_u64(pdev->vqs, info->type); + info->flags = virtio_host_to_guest_u32(pdev->vqs, info->flags); + info->len = virtio_host_to_guest_u32(pdev->vqs, len); + + info->time_sec = virtio_host_to_guest_u64(pdev->vqs, stbuf.st_ctim.tv_sec); + info->time_nsec = virtio_host_to_guest_u32(pdev->vqs, stbuf.st_ctim.tv_nsec); + + len += sizeof(*info); + +out: + fclose(fp); + return len; +} + +static ssize_t virtio_pstore_do_write(struct kvm *kvm, struct pstore_dev *pdev, + struct virtio_pstore_req *req, + struct iovec *iov) +{ + char path[PATH_MAX]; + FILE *fp; + ssize_t len = 0; + + virtio_pstore_to_filename(kvm, pdev, path, sizeof(path), req); + + fp = fopen(path, "a"); + if (fp == NULL) + return -1; + + len = fwrite(iov[1].iov_base, 1, iov[1].iov_len, fp); + if (len < 0 && errno == EAGAIN) + len = 0; + + fclose(fp); + return 0; +} + +static ssize_t virtio_pstore_do_erase(struct kvm *kvm, struct pstore_dev *pdev, + struct virtio_pstore_req *req, + struct iovec *iov) +{ + char path[PATH_MAX]; + + virtio_pstore_to_filename(kvm, pdev, path, sizeof(path), req); + + return unlink(path); +} + +static bool virtio_pstore_do_io_request(struct kvm *kvm, struct pstore_dev *pdev, + struct virt_queue *vq) +{ + struct iovec iov[VIRTIO_PSTORE_QUEUE_SIZE]; + struct virtio_pstore_req *req; + struct virtio_pstore_res *res; + struct virtio_pstore_fileinfo *info; + ssize_t len = 0; + u16 out, in, head; + int ret = 0; + + head = virt_queue__get_iov(vq, iov, &out, &in, kvm); + + if (iov[0].iov_len != sizeof(*req) || iov[out].iov_len != sizeof(*res)) { + return false; + } + + req = iov[0].iov_base; + res = iov[out].iov_base; + + switch (virtio_guest_to_host_u16(vq, req->cmd)) { + case VIRTIO_PSTORE_CMD_OPEN: + ret = virtio_pstore_do_open(kvm, pdev, req, iov); + break; + case VIRTIO_PSTORE_CMD_READ: + info = iov[out + 1].iov_base; + ret = virtio_pstore_do_read(kvm, pdev, req, iov, info); + if (ret > 0) { + len = ret; + ret = 0; + } + break; + case VIRTIO_PSTORE_CMD_WRITE: + ret = virtio_pstore_do_write(kvm, pdev, req, iov); + break; + case VIRTIO_PSTORE_CMD_CLOSE: + ret = virtio_pstore_do_close(kvm, pdev, req, iov); + break; + case VIRTIO_PSTORE_CMD_ERASE: + ret = virtio_pstore_do_erase(kvm, pdev, req, iov); + break; + default: + return false; + } + + res->cmd = req->cmd; + res->type = req->type; + res->ret = virtio_host_to_guest_u32(vq, ret); + + virt_queue__set_used_elem(vq, head, sizeof(*res) + len); + + return ret == 0; +} + +static void virtio_pstore_do_io(struct kvm *kvm, struct pstore_dev *pdev, + struct virt_queue *vq) +{ + bool done = false; + + while (virt_queue__available(vq)) { + virtio_pstore_do_io_request(kvm, pdev, vq); + done = true; + } + + if (done) + pdev->vdev.ops->signal_vq(kvm, &pdev->vdev, vq - pdev->vqs); +} + +static void *virtio_pstore_io_thread(void *arg) +{ + struct io_thread_arg *io_arg = arg; + struct pstore_dev *pdev = io_arg->pdev; + struct kvm *kvm = io_arg->kvm; + u64 data; + int r; + + kvm__set_thread_name("virtio-pstore-io"); + + while (!pdev->done) { + r = read(pdev->io_efd, &data, sizeof(u64)); + if (r < 0) + continue; + + virtio_pstore_do_io(kvm, pdev, &pdev->vqs[0]); + virtio_pstore_do_io(kvm, pdev, &pdev->vqs[1]); + } + free(io_arg); + + pthread_exit(NULL); + return NULL; +} + +static int init_vq(struct kvm *kvm, void *dev, u32 vq, u32 page_size, u32 align, + u32 pfn) +{ + struct pstore_dev *pdev = dev; + struct virt_queue *queue; + void *p; + + compat__remove_message(compat_id); + + queue = &pdev->vqs[vq]; + queue->pfn = pfn; + p = virtio_get_vq(kvm, queue->pfn, page_size); + + vring_init(&queue->vring, VIRTIO_PSTORE_QUEUE_SIZE, p, align); + + return 0; +} + +static int notify_vq(struct kvm *kvm, void *dev, u32 vq) +{ + struct pstore_dev *pdev = dev; + u64 data = 1; + int r; + + r = write(pdev->io_efd, &data, sizeof(data)); + if (r < 0) + return r; + + return 0; +} + +static int get_pfn_vq(struct kvm *kvm, void *dev, u32 vq) +{ + struct pstore_dev *pdev = dev; + + return pdev->vqs[vq].pfn; +} + +static int get_size_vq(struct kvm *kvm, void *dev, u32 vq) +{ + return VIRTIO_PSTORE_QUEUE_SIZE; +} + +static int set_size_vq(struct kvm *kvm, void *dev, u32 vq, int size) +{ + /* FIXME: dynamic */ + return size; +} + +static struct virtio_ops pstore_dev_virtio_ops = { + .get_config = get_config, + .get_host_features = get_host_features, + .set_guest_features = set_guest_features, + .init_vq = init_vq, + .notify_vq = notify_vq, + .get_pfn_vq = get_pfn_vq, + .get_size_vq = get_size_vq, + .set_size_vq = set_size_vq, +}; + +int virtio_pstore__init(struct kvm *kvm) +{ + struct pstore_dev *pdev; + struct io_thread_arg *io_arg = NULL; + int r; + + if (!kvm->cfg.pstore_path) + return 0; + + pdev = calloc(1, sizeof(*pdev)); + if (pdev == NULL) + return -ENOMEM; + + pdev->config = calloc(1, sizeof(*pdev->config)); + if (pdev->config == NULL) { + r = -ENOMEM; + goto cleanup; + } + + pdev->id = 1; + + io_arg = malloc(sizeof(*io_arg)); + if (io_arg == NULL) { + r = -ENOMEM; + goto cleanup; + } + + pdev->io_efd = eventfd(0, 0); + + *io_arg = (struct io_thread_arg) { + .pdev = pdev, + .kvm = kvm, + }; + r = pthread_create(&pdev->io_thread, NULL, + virtio_pstore_io_thread, io_arg); + if (r < 0) + goto cleanup; + + r = virtio_init(kvm, pdev, &pdev->vdev, &pstore_dev_virtio_ops, + VIRTIO_DEFAULT_TRANS(kvm), PCI_DEVICE_ID_VIRTIO_PSTORE, + VIRTIO_ID_PSTORE, PCI_CLASS_PSTORE); + if (r < 0) + goto cleanup; + + list_add_tail(&pdev->list, &pdevs); + + if (compat_id == -1) + compat_id = virtio_compat_add_message("virtio-pstore", "CONFIG_VIRTIO_PSTORE"); + return 0; + +cleanup: + free(io_arg); + free(pdev->config); + free(pdev); + + return r; +} +virtio_dev_init(virtio_pstore__init); + +int virtio_pstore__exit(struct kvm *kvm) +{ + struct pstore_dev *pdev, *tmp; + + list_for_each_entry_safe(pdev, tmp, &pdevs, list) { + list_del(&pdev->list); + close(pdev->io_efd); + pdev->vdev.ops->exit(kvm, &pdev->vdev); + free(pdev); + } + + return 0; +} +virtio_dev_exit(virtio_pstore__exit);