From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:34603) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bSQTA-0002yr-Cc for qemu-devel@nongnu.org; Wed, 27 Jul 2016 11:10:03 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1bSQT8-0008Ja-7o for qemu-devel@nongnu.org; Wed, 27 Jul 2016 11:09:59 -0400 Received: from mail-pf0-x242.google.com ([2607:f8b0:400e:c00::242]:34242) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bSQT7-0008JP-TC for qemu-devel@nongnu.org; Wed, 27 Jul 2016 11:09:58 -0400 Received: by mail-pf0-x242.google.com with SMTP id g202so2007011pfb.1 for ; Wed, 27 Jul 2016 08:09:57 -0700 (PDT) Sender: Namhyung Kim From: Namhyung Kim Date: Thu, 28 Jul 2016 00:08:29 +0900 Message-Id: <1469632111-23260-6-git-send-email-namhyung@kernel.org> In-Reply-To: <1469632111-23260-1-git-send-email-namhyung@kernel.org> References: <1469632111-23260-1-git-send-email-namhyung@kernel.org> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Subject: [Qemu-devel] [PATCH 5/7] virtio-pstore: Support PSTORE_TYPE_CONSOLE List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: kvm@vger.kernel.org, qemu-devel@nongnu.org, virtualization@lists.linux-foundation.org Cc: LKML , Paolo Bonzini , =?UTF-8?q?Radim=20Kr=C4=8Dm=C3=A1=C5=99?= , "Michael S. Tsirkin" , Anthony Liguori , Anton Vorontsov , Colin Cross , Kees Cook , Tony Luck , Steven Rostedt , Ingo Molnar , Minchan Kim With help of buffer management functions, it now supports CONSOLE type pstore write. The config space has flags field which defines the VIRTIO_PSTORE_CONFIG_FL_CONSOLE. When it's set, the virtio-pstore driver also sets PSTORE_FLAGS_ASYNC so that the buffer management is enabled. Cc: Paolo Bonzini Cc: Radim Krčmář Cc: "Michael S. Tsirkin" Cc: Anthony Liguori Cc: Anton Vorontsov Cc: Colin Cross Cc: Kees Cook Cc: Tony Luck Cc: Steven Rostedt Cc: Ingo Molnar Cc: Minchan Kim Cc: kvm@vger.kernel.org Cc: qemu-devel@nongnu.org Cc: virtualization@lists.linux-foundation.org Signed-off-by: Namhyung Kim --- drivers/virtio/virtio_pstore.c | 9 ++++++++- include/uapi/linux/virtio_pstore.h | 4 ++++ 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/drivers/virtio/virtio_pstore.c b/drivers/virtio/virtio_pstore.c index 4ee1c186f582..458c4d3ccbb1 100644 --- a/drivers/virtio/virtio_pstore.c +++ b/drivers/virtio/virtio_pstore.c @@ -33,6 +33,7 @@ struct type_table { u16 virtio; } type_table[] = { TYPE_TABLE_ENTRY(DMESG), + TYPE_TABLE_ENTRY(CONSOLE), }; #undef TYPE_TABLE_ENTRY @@ -276,7 +277,8 @@ static int virt_pstore_init(struct virtio_pstore *vps) psinfo->read = virt_pstore_read; psinfo->erase = virt_pstore_erase; psinfo->write = virt_pstore_write; - psinfo->flags = PSTORE_FLAGS_DMESG; + /* preserve flags from config */ + psinfo->flags |= PSTORE_FLAGS_DMESG; psinfo->data = vps; spin_lock_init(&psinfo->buf_lock); @@ -313,10 +315,15 @@ static int virtpstore_init_vqs(struct virtio_pstore *vps) static void virtpstore_init_config(struct virtio_pstore *vps) { u32 bufsize; + u32 flags; virtio_cread(vps->vdev, struct virtio_pstore_config, bufsize, &bufsize); + virtio_cread(vps->vdev, struct virtio_pstore_config, flags, &flags); vps->pstore.bufsize = PAGE_ALIGN(bufsize); + + if (flags & VIRTIO_PSTORE_CONFIG_FL_CONSOLE) + vps->pstore.flags |= PSTORE_FLAGS_CONSOLE | PSTORE_FLAGS_ASYNC; } static void virtpstore_confirm_config(struct virtio_pstore *vps) diff --git a/include/uapi/linux/virtio_pstore.h b/include/uapi/linux/virtio_pstore.h index f4b0d204d8ae..56d0b1554231 100644 --- a/include/uapi/linux/virtio_pstore.h +++ b/include/uapi/linux/virtio_pstore.h @@ -37,9 +37,12 @@ #define VIRTIO_PSTORE_TYPE_UNKNOWN 0 #define VIRTIO_PSTORE_TYPE_DMESG 1 +#define VIRTIO_PSTORE_TYPE_CONSOLE 2 #define VIRTIO_PSTORE_FL_COMPRESSED 1 +#define VIRTIO_PSTORE_CONFIG_FL_CONSOLE (1 << 0) + struct virtio_pstore_req { __virtio16 cmd; __virtio16 type; @@ -69,6 +72,7 @@ struct virtio_pstore_fileinfo { struct virtio_pstore_config { __virtio32 bufsize; + __virtio32 flags; }; #endif /* _LINUX_VIRTIO_PSTORE_H */ -- 2.8.0