Re: [PATCH v1 12/12] gna: add a char device

2021-02-16 Thread Greg Kroah-Hartman
On Tue, Feb 16, 2021 at 05:05:25PM +0100, Maciej Kwapulinski wrote:
> +static inline struct gna_private *inode_to_gna(struct inode *inode)
> +{
> + return container_of(inode->i_cdev, struct gna_private, cdev);
> +}
> +
> +static int gna_open(struct inode *inode, struct file *f)
> +{
> + struct gna_file_private *file_priv;
> + struct gna_private *gna_priv;
> +
> + gna_priv = inode_to_gna(inode);
> + if (!gna_priv)
> + return -ENODEV;

Why are you testing for things that is impossible to ever happen?

Please go read your own function for proof...

{sigh}

greg k-h


[PATCH v1 12/12] gna: add a char device

2021-02-16 Thread Maciej Kwapulinski
From: Tomasz Jankowski 

The new char device is the node for applications in user space to
interact with the driver.

Signed-off-by: Tomasz Jankowski 
Tested-by: Savo Novakovic 
Co-developed-by: Jianxun Zhang 
Signed-off-by: Jianxun Zhang 
Co-developed-by: Maciej Kwapulinski 
Signed-off-by: Maciej Kwapulinski 
---
 drivers/misc/gna/gna_device.c | 157 ++
 drivers/misc/gna/gna_driver.c |  23 -
 2 files changed, 178 insertions(+), 2 deletions(-)

diff --git a/drivers/misc/gna/gna_device.c b/drivers/misc/gna/gna_device.c
index 9faf0456fee2..7b2d3b4f863b 100644
--- a/drivers/misc/gna/gna_device.c
+++ b/drivers/misc/gna/gna_device.c
@@ -1,12 +1,14 @@
 // SPDX-License-Identifier: GPL-2.0-only
 // Copyright(c) 2017-2021 Intel Corporation
 
+#include 
 #include 
 #include 
 
 #include "gna_device.h"
 #include "gna_driver.h"
 #include "gna_hw.h"
+#include "gna_ioctl.h"
 #include "gna_request.h"
 
 #define GNA_DEV_HWID_CNL   0x5A11
@@ -85,6 +87,150 @@ const struct pci_device_id gna_pci_ids[] = {
 
 MODULE_DEVICE_TABLE(pci, gna_pci_ids);
 
+static inline struct gna_private *inode_to_gna(struct inode *inode)
+{
+   return container_of(inode->i_cdev, struct gna_private, cdev);
+}
+
+static int gna_open(struct inode *inode, struct file *f)
+{
+   struct gna_file_private *file_priv;
+   struct gna_private *gna_priv;
+
+   gna_priv = inode_to_gna(inode);
+   if (!gna_priv)
+   return -ENODEV;
+
+   file_priv = kzalloc(sizeof(*file_priv), GFP_KERNEL);
+   if (!file_priv)
+   return -ENOMEM;
+
+   file_priv->fd = f;
+   file_priv->gna_priv = gna_priv;
+
+   mutex_init(_priv->memlist_lock);
+   INIT_LIST_HEAD(_priv->memory_list);
+
+   mutex_lock(_priv->filelist_lock);
+   list_add_tail(_priv->flist, _priv->file_list);
+   mutex_unlock(_priv->filelist_lock);
+
+   f->private_data = file_priv;
+
+   return 0;
+}
+
+static int gna_release(struct inode *inode, struct file *f)
+{
+   struct gna_file_private *iter_file, *temp_file;
+   struct gna_memory_object *iter_mo, *temp_mo;
+   struct gna_file_private *file_priv;
+   struct gna_private *gna_priv;
+
+   gna_priv = inode_to_gna(inode);
+   if (!gna_priv)
+   return -ENODEV;
+
+   /* free all memory objects created by that file */
+   file_priv = (struct gna_file_private *)f->private_data;
+   mutex_lock(_priv->memlist_lock);
+   list_for_each_entry_safe(iter_mo, temp_mo, _priv->memory_list, 
file_mem_list) {
+   queue_work(gna_priv->request_wq, _mo->work);
+   wait_event(iter_mo->waitq, true);
+   gna_memory_free(gna_priv, iter_mo);
+   }
+   mutex_unlock(_priv->memlist_lock);
+
+   gna_delete_file_requests(f, gna_priv);
+
+   /* delete itself from device's file list */
+   mutex_lock(_priv->filelist_lock);
+   list_for_each_entry_safe(iter_file, temp_file, _priv->file_list, 
flist) {
+   if (iter_file->fd == f) {
+   list_del(_file->flist);
+   f->private_data = NULL;
+   kfree(iter_file);
+   break;
+   }
+   }
+   mutex_unlock(_priv->filelist_lock);
+
+   return 0;
+}
+
+static const struct file_operations gna_file_ops = {
+   .owner  =   THIS_MODULE,
+   .open   =   gna_open,
+   .release=   gna_release,
+   .unlocked_ioctl =   gna_ioctl,
+};
+
+/* Reverse gna_dev_create() */
+static void gna_dev_release(struct gna_private *gna_priv)
+{
+   cdev_device_del(_priv->cdev, _priv->dev);
+
+   mutex_lock(_drv_priv.lock);
+   __clear_bit(MINOR(gna_priv->dev.devt), gna_drv_priv.dev_map);
+   mutex_unlock(_drv_priv.lock);
+
+   dev_set_drvdata(_priv->dev, NULL);
+}
+
+static int gna_dev_create(struct gna_private *gna_priv)
+{
+   struct pci_dev *pcidev;
+   struct device *dev;
+   dev_t gna_devt;
+   int dev_num;
+   int major;
+   int minor;
+   int ret;
+
+   pcidev = gna_priv->pdev;
+
+   mutex_lock(_drv_priv.lock);
+
+   dev_num = find_first_zero_bit(gna_drv_priv.dev_map, GNA_MAX_DEVICES);
+   if (dev_num == GNA_MAX_DEVICES) {
+   mutex_unlock(_drv_priv.lock);
+   dev_err(>dev, "number of gna devices reached 
maximum\n");
+   return -ENODEV;
+   }
+
+   set_bit(dev_num, gna_drv_priv.dev_map);
+   major = MAJOR(gna_drv_priv.devt);
+   minor = gna_drv_priv.minor++;
+
+   mutex_unlock(_drv_priv.lock);
+
+   gna_devt = MKDEV(major, minor);
+   dev = _priv->dev;
+   device_initialize(dev);
+   dev->devt = gna_devt;
+   dev->class = gna_class;
+   dev->parent = gna_priv->parent;
+   dev->groups = NULL;
+   dev_set_drvdata(dev, gna_priv);
+   dev_set_name(dev, "gna%d", dev_num);
+
+   cdev_init(_priv->cdev, _file_ops);
+