[PATCH 46/52] virtio-fs: Retrieve shm capabilities for version table

Vivek Goyal
2018-12-10T17:13:12Z

From: "Dr. David Alan Gilbert" <dgilbert@redhat.com>

Retrieve the capabilities needed to find the journal and version table.

Signed-off-by: Dr. David Alan Gilbert <dgilbert@redhat.com>
---
fs/fuse/virtio_fs.c | 26 ++++++++++++++++++++++++--
include/uapi/linux/virtio_fs.h | 2 ++
2 files changed, 26 insertions(+), 2 deletions(-)

diff --git a/fs/fuse/virtio_fs.c b/fs/fuse/virtio_fs.c
index c71bc47395b4..c18f406b61cd 100644
--- a/fs/fuse/virtio_fs.c
+++ b/fs/fuse/virtio_fs.c
@@ -589,8 +589,11 @@ static int virtio_fs_setup_dax(struct virtio_device *vdev, struct virtio_fs *fs)
phys_addr_t phys_addr;
size_t bar_len;
int ret;
- u8 have_cache, cache_bar;
- u64 cache_offset, cache_len;
+ u8 have_cache, have_journal, have_vertab;
+ u8 cache_bar, journal_bar, vertab_bar;
+ u64 cache_offset, cache_len;
+ u64 journal_offset, journal_len;
+ u64 vertab_offset, vertab_len;

if (!IS_ENABLED(CONFIG_DAX_DRIVER))
return 0;
@@ -619,6 +622,25 @@ static int virtio_fs_setup_dax(struct virtio_device *vdev, struct virtio_fs *fs)
cache_bar, cache_len, cache_offset);
}

+ have_journal = virtio_pci_find_shm_cap(pci_dev,
+ VIRTIO_FS_PCI_SHMCAP_ID_JOURNAL,
+ &journal_bar, &journal_offset,
+ &journal_len);
+ if (have_journal) {
+ dev_notice(&vdev->dev, "Journal bar: %d len: 0x%llx @ 0x%llx\n",
+ journal_bar, journal_len, journal_offset);
+ }
+
+ have_vertab = virtio_pci_find_shm_cap(pci_dev,
+ VIRTIO_FS_PCI_SHMCAP_ID_VERTAB,
+ &vertab_bar, &vertab_offset,
+ &vertab_len);
+ if (have_vertab) {
+ dev_notice(&vdev->dev, "Version table bar: %d len: 0x%llx @ 0x%llx\n",
+ vertab_bar, vertab_len, vertab_offset);
+ }
+
+
/* TODO handle case where device doesn't expose BAR? */
ret = pci_request_region(pci_dev, cache_bar, "virtio-fs-window");
if (ret < 0) {
diff --git a/include/uapi/linux/virtio_fs.h b/include/uapi/linux/virtio_fs.h
index 65a9d4a0dac0..e70741ab14a8 100644
--- a/include/uapi/linux/virtio_fs.h
+++ b/include/uapi/linux/virtio_fs.h
@@ -40,5 +40,7 @@ struct virtio_fs_config {

/* For the id field in virtio_pci_shm_cap */
#define VIRTIO_FS_PCI_SHMCAP_ID_CACHE 0
+#define VIRTIO_FS_PCI_SHMCAP_ID_VERTAB 1
+#define VIRTIO_FS_PCI_SHMCAP_ID_JOURNAL 2

#endif /* _UAPI_LINUX_VIRTIO_FS_H */
--
2.13.6