[Minios-devel] [UNIKRAFT PATCH v2 03/16] plat/xen/drivers/blk: Register blkfront with libukblkdev

[Roxana Nicolescu <nicolescu.roxana1996@xxxxxxxxx>]

This patch registers blkfront with libukblkdev.

Signed-off-by: Roxana Nicolescu <nicolescu.roxana1996@xxxxxxxxx>
---
 plat/xen/drivers/blk/blkfront.c | 57 +++++++++++++++++++++++++++++++++++++++++
 plat/xen/drivers/blk/blkfront.h | 56 ++++++++++++++++++++++++++++++++++++++++
 2 files changed, 113 insertions(+)
 create mode 100644 plat/xen/drivers/blk/blkfront.h

diff --git a/plat/xen/drivers/blk/blkfront.c b/plat/xen/drivers/blk/blkfront.c
index 8ba61adb..e8aa6a9d 100644
--- a/plat/xen/drivers/blk/blkfront.c
+++ b/plat/xen/drivers/blk/blkfront.c
@@ -32,19 +32,76 @@
  *
  * THIS HEADER MAY NOT BE EXTRACTED OR MODIFIED IN ANY WAY.
  */
+#include <inttypes.h>
+#include <string.h>
+#include <fcntl.h>
+#include <uk/assert.h>
+#include <uk/print.h>
+#include <uk/alloc.h>
+#include <uk/essentials.h>
+#include <uk/arch/limits.h>
+#include <uk/blkdev_driver.h>
 #include <xenbus/xenbus.h>
+#include "blkfront.h"
 
 #define DRIVER_NAME            "xen-blkfront"
 
+
+/* Get blkfront_dev* which contains blkdev */
+#define to_blkfront(blkdev) \
+       __containerof(blkdev, struct blkfront_dev, blkdev)
+
 static struct uk_alloc *drv_allocator;
 
+
+static void blkfront_unconfigure(struct uk_blkdev *blkdev)
+{
+       struct blkfront_dev *dev;
+       __u16 uid;
+
+       UK_ASSERT(blkdev != NULL);
+       dev = to_blkfront(blkdev);
+       uid = dev->uid;
+       uk_blkdev_drv_unregister(blkdev);
+       uk_free(drv_allocator, dev);
+
+       uk_pr_info(DRIVER_NAME": %"PRIu16" closed\n", uid);
+}
+
+static const struct uk_blkdev_ops blkfront_ops = {
+       .dev_unconfigure = blkfront_unconfigure,
+};
+
+/**
+ * Assign callbacks to uk_blkdev
+ */
 static int blkfront_add_dev(struct xenbus_device *dev)
 {
+       struct blkfront_dev *d = NULL;
        int rc = 0;
 
        UK_ASSERT(dev != NULL);
 
+       d = uk_calloc(drv_allocator, 1, sizeof(struct blkfront_dev));
+       if (!d)
+               return -ENOMEM;
+
+       d->blkdev.dev_ops = &blkfront_ops;
+       rc = uk_blkdev_drv_register(&d->blkdev, drv_allocator, "blkdev");
+       if (rc < 0) {
+               uk_pr_err("Failed to register blkfront with libukblkdev %d",
+                               rc);
+               goto err_register;
+       }
+
+       d->uid = rc;
+       uk_pr_info("Blkfront device registered with libukblkdev: %d\n", rc);
+       rc = 0;
+out:
        return rc;
+err_register:
+       uk_free(drv_allocator, d);
+       goto out;
 }
 
 static int blkfront_drv_init(struct uk_alloc *allocator)
diff --git a/plat/xen/drivers/blk/blkfront.h b/plat/xen/drivers/blk/blkfront.h
new file mode 100644
index 00000000..2c542cca
--- /dev/null
+++ b/plat/xen/drivers/blk/blkfront.h
@@ -0,0 +1,56 @@
+/* SPDX-License-Identifier: BSD-3-Clause */
+/*
+ * Authors: Roxana Nicolescu <nicolescu.roxana1996@xxxxxxxxx>
+ *
+ * Copyright (c) 2019, University Politehnica of Bucharest.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. Neither the name of the copyright holder nor the names of its
+ *    contributors may be used to endorse or promote products derived from
+ *    this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ *
+ * THIS HEADER MAY NOT BE EXTRACTED OR MODIFIED IN ANY WAY.
+ */
+#ifndef __BLKFRONT_H__
+#define __BLKFRONT_H__
+
+/**
+ * Unikraft Blockfront interface.
+ *
+ * This header contains all the information needed by the block device driver
+ * implementation.
+ */
+#include <uk/blkdev.h>
+
+/**
+ * Structure used to describe the Blkfront device.
+ */
+struct blkfront_dev {
+       /* Blkdev Device. */
+       struct uk_blkdev blkdev;
+       /* The blkdev identifier */
+       __u16 uid;
+};
+
+#endif /* __BLKFRONT_H__ */
-- 
2.11.0


_______________________________________________
Minios-devel mailing list
Minios-devel@xxxxxxxxxxxxxxxxxxxx
https://lists.xenproject.org/mailman/listinfo/minios-devel