user space client interface driver
Subsystems (3)
v3 cover user space client interface driver
V3: Added documentation for MHI UCI driver.
V2: Added mutex lock to prevent multiple readers to access same mhi buffer which can result into use after free.
Hemant Kumar (4):
bus: mhi: core: Add helper API to return number of free TREs
bus: mhi: core: Move MHI_MAX_MTU to external header file
docs: Add documentation for user space client interface
bus: mhi: clients: Add user space client interface driver
Documentation/mhi/index.rst | 1 + Documentation/mhi/uci.rst | 19 ++ drivers/bus/mhi/Kconfig | 2 + drivers/bus/mhi/Makefile | 1 + drivers/bus/mhi/clients/Kconfig | 16 + drivers/bus/mhi/clients/Makefile | 3 + drivers/bus/mhi/clients/uci.c | 652 +++++++++++++++++++++++++++++++++++++++ drivers/bus/mhi/core/main.c | 12 + include/linux/mhi.h | 12 + 9 files changed, 718 insertions(+) create mode 100644 Documentation/mhi/uci.rst create mode 100644 drivers/bus/mhi/clients/Kconfig create mode 100644 drivers/bus/mhi/clients/Makefile create mode 100644 drivers/bus/mhi/clients/uci.c
Signature · 2 lines
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum, a Linux Foundation Collaborative Project
PATCH v3 1/4 bus: mhi: core: Add helper API to return number of free TREs
Introduce mhi_get_no_free_descriptors() API to return number of TREs available to queue buffer. MHI clients can use this API to know before hand if ring is full without calling queue API.
--- drivers/bus/mhi/core/main.c | 12 ++++++++++++ include/linux/mhi.h | 9 +++++++++ 2 files changed, 21 insertions(+)
drivers/bus/mhi/core/main.c +12 -0
@@ -258,6 +258,18 @@ int mhi_destroy_device(struct device *dev, void *data)return 0 ; } +int mhi_get_no_free_descriptors (struct mhi_device *mhi_dev, +enum dma_data_direction dir) +{ +struct mhi_controller *mhi_cntrl = mhi_dev->mhi_cntrl; +struct mhi_chan *mhi_chan = (dir ==DMA_TO_DEVICE ) ? + mhi_dev->ul_chan : mhi_dev->dl_chan; +struct mhi_ring *tre_ring = &mhi_chan->tre_ring; + +return get_nr_avail_ring_elements (mhi_cntrl, tre_ring); +} +EXPORT_SYMBOL_GPL (mhi_get_no_free_descriptors); +void mhi_notify (struct mhi_device *mhi_dev,enum mhi_callback cb_reason) {struct mhi_driver *mhi_drv;
include/linux/mhi.h +9 -0
@@ -602,6 +602,15 @@ void mhi_set_mhi_state(struct mhi_controller *mhi_cntrl,void mhi_notify (struct mhi_device *mhi_dev,enum mhi_callback cb_reason);/** +* mhi_get_no_free_descriptors - Get transfer ring length +* Get # of TD available to queue buffers +* @mhi_dev: Device associated with the channels +* @dir: Direction of the channel +*/ +int mhi_get_no_free_descriptors (struct mhi_device *mhi_dev, +enum dma_data_direction dir); + +/** * mhi_prepare_for_power_up - Do pre-initialization before power up. * This is optional, call this before power up if * the controller does not want bus framework to
Signature · 2 lines
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum, a Linux Foundation Collaborative Project
PATCH v3 4/4 bus: mhi: clients: Add user space client interface driver
In reply to Hemant KumarThis MHI client driver allows user space clients to transfer data between MHI device and host using standard file operations. Device file node is created with format
/dev/mhi_<controller_name>_<mhi_device_name>
Currently it supports loopback client.
--- drivers/bus/mhi/Kconfig | 2 + drivers/bus/mhi/Makefile | 1 + drivers/bus/mhi/clients/Kconfig | 16 + drivers/bus/mhi/clients/Makefile | 3 + drivers/bus/mhi/clients/uci.c | 652 +++++++++++++++++++++++++++++++++++++++ 5 files changed, 674 insertions(+) create mode 100644 drivers/bus/mhi/clients/Kconfig create mode 100644 drivers/bus/mhi/clients/Makefile create mode 100644 drivers/bus/mhi/clients/uci.c
drivers/bus/mhi/Kconfig +2 -0
@@ -20,3 +20,5 @@ config MHI_BUS_DEBUG Enable debugfs support for use with the MHI transport. Allows reading and/or modifying some values within the MHI controller for debug and test purposes. + +source "drivers/bus/mhi/clients/Kconfig"
drivers/bus/mhi/Makefile +1 -0
@@ -1,2 +1,3 @@ # core layer obj-y += core/ +obj-y += clients/
drivers/bus/mhi/clients/Kconfig new file +16 -0
@@ -0,0 +1,16 @@ +# SPDX-License-Identifier: GPL-2.0-only + +menu "MHI clients support" + depends on MHI_BUS + +config MHI_UCI + tristate "MHI UCI" + depends on MHI_BUS + help + MHI based userspace client interface driver is for transferring + data between host and device using standard file operations from + user space. Open, read, write, and close operations are supported + by this driver. Please check mhi_uci_match_table for all supported + channels that are exposed to userspace. + +endmenu
drivers/bus/mhi/clients/Makefile new file +3 -0
@@ -0,0 +1,3 @@ +# SPDX-License-Identifier: GPL-2.0-only + +obj-$(CONFIG_MHI_UCI) +=uci.o
drivers/bus/mhi/clients/uci.c new file +652 -0
652 lines not on this page · raw message
Signature · 2 lines
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum, a Linux Foundation Collaborative Project
PATCH v3 2/4 bus: mhi: core: Move MHI_MAX_MTU to external header file
In reply to Hemant KumarCurrently this macro is defined in internal MHI header as a TRE length mask. Moving it to external header allows MHI client drivers to set this upper bound for the transmit buffer size.
--- include/linux/mhi.h | 3 +++ 1 file changed, 3 insertions(+)
include/linux/mhi.h +3 -0
@@ -16,6 +16,9 @@#include <linux/wait.h> #include <linux/workqueue.h> +/* MHI client drivers to set this upper bound for tx buffer */ +#define MHI_MAX_MTU 0xffff +#define MHI_VOTE_BUS BIT(0)/* do not disable the mhi bus */ #define MHI_VOTE_DEVICE BIT(1)/* prevent mhi device from entering lpm */
Signature · 2 lines
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum, a Linux Foundation Collaborative Project
PATCH v3 3/4 docs: Add documentation for user space client interface
In reply to Hemant KumarMHI user space client driver is creating device file node for user application to perform file operations. File operations are handled by MHI core driver. Currently Loopback MHI channel is supported by this driver.
--- Documentation/mhi/index.rst | 1 + Documentation/mhi/uci.rst | 19 +++++++++++++++++++ 2 files changed, 20 insertions(+) create mode 100644 Documentation/mhi/uci.rst
Documentation/mhi/index.rst +1 -0
@@ -9,6 +9,7 @@ MHI mhi topology + uci .. only:: subproject and html
Documentation/mhi/uci.rst new file +19 -0
@@ -0,0 +1,19 @@ +.. SPDX-License-Identifier: GPL-2.0 + +================================= +User space Client Interface (UCI) +================================= + +UCI driver enables user space clients to communicate to external MHI devices +like modem and WLAN. It creates standard character device file nodes for user +space clients to perform open, read, write, pool and close file operations. + +Device file node is created with format:- + +/dev/mhi_<controller_name>_<mhi_device_name> + +controller_name is the name of underlying bus used to transfer data. +mhi_device_name is the name of the MHI channel being used by MHI client +to send or receive data using MHI protocol. MHI channels are statically +defined by MHI specification. Driver currently supports LOOPBACK channel +index 0 (Host to device) and 1 (Device to Host).
Signature · 2 lines
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum, a Linux Foundation Collaborative Project
Re: [PATCH v3 1/4] bus: mhi: core: Add helper API to return number of free TREs
In reply to Hemant KumarQuoted 16 lines · Hemant Kumar
Introduce
mhi_get_no_free_descriptors()API to return number of TREs available to queue buffer. MHI clients can use this API to know before hand if ring is full without calling queue API.Signed-off-by Hemant Kumar <[email protected]>--- drivers/bus/mhi/core/main.c | 12 ++++++++++++ include/linux/mhi.h | 9 +++++++++ 2 files changed, 21 insertions(+)drivers/bus/mhi/core/main.c +0
-0
drivers/bus/mhi/core/main.c int mhi_destroy_device(struct device *dev, void *data) · line 262
Quoted 5 lines
drivers/bus/mhi/core/main.c +2
-0@@ -258,6 +258,18 @@ int mhi_destroy_device(struct device *dev, void *data)return 0 ; } +int mhi_get_no_free_descriptors (struct mhi_device *mhi_dev, +enum dma_data_direction dir)
How about "mhi_get_nr_free_descriptors"? Also align with '('
Quoted 18 lines
drivers/bus/mhi/core/main.c +10
-0+{ +struct mhi_controller *mhi_cntrl = mhi_dev->mhi_cntrl; +struct mhi_chan *mhi_chan = (dir ==DMA_TO_DEVICE ) ? + mhi_dev->ul_chan : mhi_dev->dl_chan; +struct mhi_ring *tre_ring = &mhi_chan->tre_ring; + +return get_nr_avail_ring_elements (mhi_cntrl, tre_ring); +} +EXPORT_SYMBOL_GPL (mhi_get_no_free_descriptors); +void mhi_notify (struct mhi_device *mhi_dev,enum mhi_callback cb_reason) {struct mhi_driver *mhi_drv;include/linux/mhi.h +0
-0
include/linux/mhi.h void mhi_set_mhi_state(struct mhi_controller *mhi_cntrl, · line 605
Quoted 4 lines
include/linux/mhi.h +1
-0@@ -602,6 +602,15 @@ void mhi_set_mhi_state(struct mhi_controller *mhi_cntrl,void mhi_notify (struct mhi_device *mhi_dev,enum mhi_callback cb_reason);/** +* mhi_get_no_free_descriptors - Get transfer ring length
Is the description correct? I'd suggest to just use the below one.
include/linux/mhi.h void mhi_set_mhi_state(struct mhi_controller *mhi_cntrl, · line 606
Quoted 1 line
include/linux/mhi.h +1
-0+* Get # of TD available to queue buffers
How about, "Get # of available TREs to queue buffers"?
include/linux/mhi.h void mhi_set_mhi_state(struct mhi_controller *mhi_cntrl, · line 611
Quoted 5 lines
include/linux/mhi.h +5
-0+* @mhi_dev: Device associated with the channels +* @dir: Direction of the channel +*/ +int mhi_get_no_free_descriptors (struct mhi_device *mhi_dev, +enum dma_data_direction dir);
Align this with '('
Thanks,
Mani
Quoted 9 lines
include/linux/mhi.h +2
-0+ +/** * mhi_prepare_for_power_up - Do pre-initialization before power up. * This is optional, call this before power up if * the controller does not want bus framework to Signature · 2 lines
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum, a Linux Foundation Collaborative Project
Re: [PATCH v3 2/4] bus: mhi: core: Move MHI_MAX_MTU to external header file
In reply to Hemant KumarQuoted 5 lines · Hemant Kumar
Currently this macro is defined in internal MHI header as a TRE length mask. Moving it to external header allows MHI client drivers to set this upper bound for the transmit buffer size.
So we have 2 definitions for MHI_MAX_MTU now? Why can't you remove the one available internally?
Thanks,
Mani
Quoted 23 lines
Signed-off-by Hemant Kumar <[email protected]>--- include/linux/mhi.h | 3 +++ 1 file changed, 3 insertions(+)include/linux/mhi.h +3
-0@@ -16,6 +16,9 @@#include <linux/wait.h> #include <linux/workqueue.h> +/* MHI client drivers to set this upper bound for tx buffer */ +#define MHI_MAX_MTU 0xffff +#define MHI_VOTE_BUS BIT(0)/* do not disable the mhi bus */ #define MHI_VOTE_DEVICE BIT(1)/* prevent mhi device from entering lpm */ Signature · 2 lines
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum, a Linux Foundation Collaborative Project
Re: [PATCH v3 3/4] docs: Add documentation for user space client interface
In reply to Hemant KumarQuoted 30 lines · Hemant Kumar
MHI user space client driver is creating device file node for user application to perform file operations. File operations are handled by MHI core driver. Currently Loopback MHI channel is supported by this driver.
Signed-off-by Hemant Kumar <[email protected]>--- Documentation/mhi/index.rst | 1 + Documentation/mhi/uci.rst | 19 +++++++++++++++++++ 2 files changed, 20 insertions(+) create mode 100644 Documentation/mhi/uci.rstDocumentation/mhi/index.rst +1
-0@@ -9,6 +9,7 @@ MHI mhi topology + uci .. only:: subproject and htmlDocumentation/mhi/uci.rst new file +0
-0
Documentation/mhi/uci.rst line 4
Quoted 4 lines
Documentation/mhi/uci.rst new file +4
-0@@ -0,0 +1,19 @@ +.. SPDX-License-Identifier: GPL-2.0 + +================================= +User space Client Interface (UCI)
Stick to 'Userspace' everywhere.
Documentation/mhi/uci.rst line 8
Quoted 4 lines
Documentation/mhi/uci.rst new file +4
-0+================================= + +UCI driver enables user space clients to communicate to external MHI devices +like modem and WLAN. It creates standard character device file nodes for user
UCI driver creates a single char device, isn't it?
Documentation/mhi/uci.rst line 10
Quoted 2 lines
Documentation/mhi/uci.rst new file +2
-0+space clients to perform open, read, write, pool and close file operations. +
poll? Btw, you need to mention explicitly how this char device can be used. You are just mentioning standard file operations.
Documentation/mhi/uci.rst line 15
Quoted 5 lines
Documentation/mhi/uci.rst new file +5
-0+Device file node is created with format:- + +/dev/mhi_<controller_name>_<mhi_device_name> + +controller_name is the name of underlying bus used to transfer data.
underlying controller instance.
Documentation/mhi/uci.rst line 16
Quoted 1 line
Documentation/mhi/uci.rst new file +1
-0+mhi_device_name is the name of the MHI channel being used by MHI client
What do you mean by MHI client here? Are you referring to userspace client?
Documentation/mhi/uci.rst line 19
Quoted 3 lines
Documentation/mhi/uci.rst new file +3
-0+to send or receive data using MHI protocol. MHI channels are statically +defined by MHI specification. Driver currently supports LOOPBACK channel +index 0 (Host to device) and 1 (Device to Host).
s/index/identifier
And explain a bit on how this LOOPBACK channel is getting used.
Thanks,
Mani
Quoted 4 lines
Signature · 2 lines
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum, a Linux Foundation Collaborative Project
Re: [PATCH v3 4/4] bus: mhi: clients: Add user space client interface driver
In reply to Hemant KumarQuoted 2 lines · Hemant Kumar
This MHI client driver allows user space clients to transfer data between MHI device and host using standard file operations.
I think we need to explicitly specify 'raw' data here. Because we have different APIs for queuing different types of data. So saying just data sounds vague unless this driver can handle multiple types of data which I don't think can happen.
And you need to update the same in docs.
Quoted 23 lines
Device file node is created with format
/dev/mhi_<controller_name>_<mhi_device_name>
Currently it supports loopback client.
Signed-off-by Hemant Kumar <[email protected]>--- drivers/bus/mhi/Kconfig | 2 + drivers/bus/mhi/Makefile | 1 + drivers/bus/mhi/clients/Kconfig | 16 + drivers/bus/mhi/clients/Makefile | 3 + drivers/bus/mhi/clients/uci.c | 652 +++++++++++++++++++++++++++++++++++++++ 5 files changed, 674 insertions(+) create mode 100644 drivers/bus/mhi/clients/Kconfig create mode 100644 drivers/bus/mhi/clients/Makefile create mode 100644 drivers/bus/mhi/clients/uci.cdrivers/bus/mhi/Kconfig +0
-0
drivers/bus/mhi/Kconfig config MHI_BUS_DEBUG · line 22
Quoted 3 lines
drivers/bus/mhi/Kconfig +0
-0@@ -20,3 +20,5 @@ config MHI_BUS_DEBUG Enable debugfs support for use with the MHI transport. Allows reading and/or modifying some values within the MHI controller for debug and test purposes.
Hmm, so this patchset depends on debugfs patches? You need to mention this in cover letter. Or even better, just make it independent.
Quoted 16 lines
drivers/bus/mhi/Kconfig +2
-0+ +source "drivers/bus/mhi/clients/Kconfig"drivers/bus/mhi/Makefile +1
-0@@ -1,2 +1,3 @@ # core layer obj-y += core/ +obj-y += clients/drivers/bus/mhi/clients/Kconfig new file +0
-0
drivers/bus/mhi/clients/Kconfig line 4
Quoted 4 lines
drivers/bus/mhi/clients/Kconfig new file +4
-0@@ -0,0 +1,16 @@ +# SPDX-License-Identifier: GPL-2.0-only + +menu "MHI clients support" + depends on MHI_BUS
I don't think we need MHI_BUS dependency here.
drivers/bus/mhi/clients/Kconfig line 10
Quoted 6 lines
drivers/bus/mhi/clients/Kconfig new file +6
-0+ +config MHI_UCI + tristate "MHI UCI" + depends on MHI_BUS + help + MHI based userspace client interface driver is for transferring
s/is for/used for/g. Also provide indent for help text.
drivers/bus/mhi/clients/Kconfig line 12
Quoted 2 lines
drivers/bus/mhi/clients/Kconfig new file +2
-0+ data between host and device using standard file operations from + user space. Open, read, write, and close operations are supported
Please use 'userspace' everywhere.
drivers/bus/mhi/clients/Makefile line 3
Quoted 13 lines
drivers/bus/mhi/clients/Kconfig new file +4
-0+ by this driver. Please check mhi_uci_match_table for all supported + channels that are exposed to userspace. + +endmenudrivers/bus/mhi/clients/Makefile new file +3
-0@@ -0,0 +1,3 @@ +# SPDX-License-Identifier: GPL-2.0-only + +obj-$(CONFIG_MHI_UCI) +=uci.o
space after '+='
drivers/bus/mhi/clients/uci.c line 7
Quoted 13 lines
drivers/bus/mhi/clients/uci.c new file +7
-0@@ -0,0 +1,652 @@ +// SPDX-License-Identifier: GPL-2.0-only +/* Copyright (c) 2018-2020, The Linux Foundation. All rights reserved.*/ + +#include <linux/kernel.h> +#include <linux/mod_devicetable.h> +#include <linux/module.h> +#include <linux/mhi.h>
Please sort includes alphabetically.
drivers/bus/mhi/clients/uci.c line 13
Quoted 6 lines
drivers/bus/mhi/clients/uci.c new file +6
-0+#include <linux/poll.h> + +#define DEVICE_NAME "mhi" +#define MHI_UCI_DRIVER_NAME "mhi_uci" +#define MAX_UCI_DEVICES (64) +
How about the kdoc comments for all fields and structures used?
drivers/bus/mhi/clients/uci.c line 18
Quoted 5 lines
drivers/bus/mhi/clients/uci.c new file +5
-0+struct uci_chan { +wait_queue_head_t wq; + +/* locks ul/dl uci device channel */ +spinlock_t lock;
It seems like you are trying to protect a field (enabled) in parent structure (uci_dev) using this lock. This sounds weird. Why can't you just use the mutex present in that?
drivers/bus/mhi/clients/uci.c line 20
Quoted 2 lines
drivers/bus/mhi/clients/uci.c new file +2
-0+ +/* user space waiting to read */
The comments should clearly portray what the field is for.
drivers/bus/mhi/clients/uci.c line 23
Quoted 3 lines
drivers/bus/mhi/clients/uci.c new file +3
-0+struct list_head pending; + +/* current buffer user space reading */
This sentence is not correct.
Quoted 8 lines
drivers/bus/mhi/clients/uci.c new file +8
-0+struct uci_buf *cur_buf; +size_t rx_size; +}; + +struct uci_buf { +void *data; +size_t len; +struct list_head node;
drivers/bus/mhi/clients/uci.c line 41
Quoted 10 lines
drivers/bus/mhi/clients/uci.c new file +10
-0+}; + +struct mhi_uci_drv { +struct list_head head; + +/* uci driver lock to sync open, probe and remove */ +struct mutex lock; +struct class *class; +int major; +dev_t dev_t;
devt?
drivers/bus/mhi/clients/uci.c line 51
Quoted 10 lines
drivers/bus/mhi/clients/uci.c new file +10
-0+}; + +struct uci_dev { +struct list_head node; +dev_t devt; +struct device *dev; +struct mhi_device *mhi_dev; +const char *chan; + +/* sync open and close */
Again, please use descriptive comments. Need not be multi lines but something which could be understood easily.
drivers/bus/mhi/clients/uci.c line 64
Quoted 13 lines
drivers/bus/mhi/clients/uci.c new file +13
-0+struct mutex mutex; +struct uci_chan ul_chan; +struct uci_chan dl_chan; +size_t mtu; + +/* maximum size of incoming buffer */ +size_t actual_mtu; +int ref_count; +bool enabled; +}; + +static DECLARE_BITMAP(uci_minors, MAX_UCI_DEVICES); +static struct mhi_uci_drv mhi_uci_drv;
Please use object names different from datatype names everywhere.
drivers/bus/mhi/clients/uci.c line 70
Quoted 6 lines
drivers/bus/mhi/clients/uci.c new file +6
-0+ +static int mhi_queue_inbound (struct uci_dev *uci_dev) +{ +struct mhi_device *mhi_dev = uci_dev->mhi_dev; +struct device *dev = &mhi_dev->dev; +int nr_trbs =mhi_get_no_free_descriptors (mhi_dev,DMA_FROM_DEVICE );
I'd prefer to have this assignment in definition block.
drivers/bus/mhi/clients/uci.c line 82
Quoted 12 lines
drivers/bus/mhi/clients/uci.c new file +12
-0+size_t mtu = uci_dev->mtu; +size_t actual_mtu = uci_dev->actual_mtu; +void *buf; +struct uci_buf *uci_buf; +int ret = -EIO , i; + +for (i =0 ; i < nr_trbs; i++) { + buf =kmalloc (mtu,GFP_KERNEL ); +if (!buf) +return -ENOMEM ; + + uci_buf = buf + actual_mtu;
Aren't you segfaulting here?
drivers/bus/mhi/clients/uci.c line 83
Quoted 1 line
drivers/bus/mhi/clients/uci.c new file +1
-0+ uci_buf->data = buf;
Where is this uci_buf getting used?
drivers/bus/mhi/clients/uci.c line 92
Quoted 9 lines
drivers/bus/mhi/clients/uci.c new file +9
-0+ +dev_dbg (dev,"Allocated buf %d of %d size %ld\n" , i, nr_trbs, + actual_mtu); + + ret =mhi_queue_buf (mhi_dev,DMA_FROM_DEVICE , buf, actual_mtu, +MHI_EOT ); +if (ret) { +kfree (buf); +dev_err (dev,"Failed to queue buffer %d\n" , i);
Failed to queue buffer: %d
drivers/bus/mhi/clients/uci.c line 94
Quoted 2 lines
drivers/bus/mhi/clients/uci.c new file +2
-0+return ret; + }
So is this buffer getting freed anywhere?
Quoted 14 lines
drivers/bus/mhi/clients/uci.c new file +14
-0+ } + +return ret; +} + +static int mhi_uci_release (struct inode *inode,struct file *file) +{ +struct uci_dev *uci_dev = file->private_data; + +mutex_lock (&uci_dev->mutex); + uci_dev->ref_count--; +if (!uci_dev->ref_count) { +struct uci_buf *itr, *tmp; +struct uci_chan *uci_chan;
drivers/bus/mhi/clients/uci.c line 118
Quoted 10 lines
drivers/bus/mhi/clients/uci.c new file +10
-0+ +if (uci_dev->enabled) +mhi_unprepare_from_transfer (uci_dev->mhi_dev); + +/* clean inbound channel */ + uci_chan = &uci_dev->dl_chan; +list_for_each_entry_safe (itr, tmp, &uci_chan->pending, node) { +list_del (&itr->node); +kfree (itr->data); + }
Add a new line after '}' and before next line of code.
drivers/bus/mhi/clients/uci.c line 128
Quoted 10 lines
drivers/bus/mhi/clients/uci.c new file +10
-0+if (uci_chan->cur_buf) +kfree (uci_chan->cur_buf->data); + + uci_chan->cur_buf =NULL ; + +if (!uci_dev->enabled) { +mutex_unlock (&uci_dev->mutex); +mutex_destroy (&uci_dev->mutex); +clear_bit (MINOR (uci_dev->devt), uci_minors); +kfree (uci_dev);
Hmm. So you are freeing uci_dev here and also trying to do the same in mhi_uci_remove.
Quoted 12 lines
drivers/bus/mhi/clients/uci.c new file +12
-0+return 0 ; + } + } + +mutex_unlock (&uci_dev->mutex); + +return 0 ; +} + +static __poll_t mhi_uci_poll (struct file *file,poll_table *wait) +{ +struct uci_dev *uci_dev = file->private_data;
drivers/bus/mhi/clients/uci.c line 150
Quoted 10 lines
drivers/bus/mhi/clients/uci.c new file +10
-0+struct mhi_device *mhi_dev = uci_dev->mhi_dev; +struct device *dev = &mhi_dev->dev; +struct uci_chan *uci_chan; +__poll_t mask =0 ; + +poll_wait (file, &uci_dev->dl_chan.wq, wait); +poll_wait (file, &uci_dev->ul_chan.wq, wait); + + uci_chan = &uci_dev->dl_chan; +spin_lock_bh (&uci_chan->lock);
This is what looks wrong to me.
drivers/bus/mhi/clients/uci.c line 151
Quoted 1 line
drivers/bus/mhi/clients/uci.c new file +1
-0+if (!uci_dev->enabled) {
So you are removing the char dev node even if there are users in the system. Why do you want to do so?
Quoted 34 lines
drivers/bus/mhi/clients/uci.c new file +34
-0+ mask =EPOLLERR ; + }else { +if (!list_empty (&uci_chan->pending) || uci_chan->cur_buf) { +dev_dbg (dev,"Client can read from node\n" ); + mask |=EPOLLIN |EPOLLRDNORM ; + } + } +spin_unlock_bh (&uci_chan->lock); + + uci_chan = &uci_dev->ul_chan; +spin_lock_bh (&uci_chan->lock); +if (!uci_dev->enabled) { + mask |=EPOLLERR ; + }else if (mhi_get_no_free_descriptors (mhi_dev,DMA_TO_DEVICE ) >0 ) { +dev_dbg (dev,"Client can write to node\n" ); + mask |=EPOLLOUT |EPOLLWRNORM ; + } +spin_unlock_bh (&uci_chan->lock); + +dev_dbg (dev,"Client attempted to poll, returning mask 0x%x\n" , mask); + +return mask; +} + +static ssize_t mhi_uci_write (struct file *file, +const char __user *buf, +size_t count, +loff_t *offp) +{ +struct uci_dev *uci_dev = file->private_data; +struct mhi_device *mhi_dev = uci_dev->mhi_dev; +struct device *dev = &mhi_dev->dev; +struct uci_chan *uci_chan = &uci_dev->ul_chan; +size_t bytes_xfered =0 ;
drivers/bus/mhi/clients/uci.c line 195
Quoted 10 lines
drivers/bus/mhi/clients/uci.c new file +10
-0+int ret, nr_avail; + +if (!buf || !count) +return -EINVAL ; + +/* confirm channel is active */ +spin_lock_bh (&uci_chan->lock); +if (!uci_dev->enabled) { +spin_unlock_bh (&uci_chan->lock); +return -ERESTARTSYS ;
You should return -ENODEV here.
drivers/bus/mhi/clients/uci.c line 199
Quoted 4 lines
drivers/bus/mhi/clients/uci.c new file +4
-0+ } + +dev_dbg (dev,"Enter: to xfer:%lu bytes\n" , count); +
Please avoid "Enter" debug prints.
drivers/bus/mhi/clients/uci.c line 205
Quoted 6 lines
drivers/bus/mhi/clients/uci.c new file +6
-0+while (count) { +size_t xfer_size; +void *kbuf; +enum mhi_flags flags; + +spin_unlock_bh (&uci_chan->lock);
Why do you want to hold the lock till here?
drivers/bus/mhi/clients/uci.c line 211
Quoted 6 lines
drivers/bus/mhi/clients/uci.c new file +6
-0+ +/* wait for free descriptors */ + ret =wait_event_interruptible (uci_chan->wq, + (!uci_dev->enabled) || + (nr_avail =mhi_get_no_free_descriptors (mhi_dev, +DMA_TO_DEVICE )) >0 );
Does using "wait_event_interruptible_timeout" makes sense here?
drivers/bus/mhi/clients/uci.c line 215
Quoted 4 lines
drivers/bus/mhi/clients/uci.c new file +4
-0+ +if (ret == -ERESTARTSYS || !uci_dev->enabled) { +dev_dbg (dev,"Exit signal caught for node or not enabled\n" ); +return -ERESTARTSYS ;
You need to return -ENODEV for !uci_dev->enabled case.
Quoted 16 lines
drivers/bus/mhi/clients/uci.c new file +16
-0+ } + + xfer_size =min_t (size_t, count, uci_dev->mtu); + kbuf =kmalloc (xfer_size,GFP_KERNEL ); +if (!kbuf) +return -ENOMEM ; + + ret =copy_from_user (kbuf, buf, xfer_size); +if (unlikely (ret)) { +kfree (kbuf); +return ret; + } + +spin_lock_bh (&uci_chan->lock); + +/* if ring is full after this force EOT */
drivers/bus/mhi/clients/uci.c line 241
Quoted 10 lines
drivers/bus/mhi/clients/uci.c new file +10
-0+if (nr_avail >1 && (count - xfer_size)) + flags =MHI_CHAIN ; +else + flags =MHI_EOT ; + +if (uci_dev->enabled) + ret =mhi_queue_buf (mhi_dev,DMA_TO_DEVICE , kbuf, + xfer_size, flags); +else + ret = -ERESTARTSYS ;
Again, please fix this all over the driver.
drivers/bus/mhi/clients/uci.c line 254
Quoted 13 lines
drivers/bus/mhi/clients/uci.c new file +13
-0+ +if (ret) { +kfree (kbuf); + goto sys_interrupt; + } + + bytes_xfered += xfer_size; + count -= xfer_size; + buf += xfer_size; + } + +spin_unlock_bh (&uci_chan->lock); +dev_dbg (dev,"Exit: Number of bytes xferred:%lu\n" , bytes_xfered);
Drop the "Exit" too.
Quoted 17 lines
drivers/bus/mhi/clients/uci.c new file +17
-0+ +return bytes_xfered; + +sys_interrupt: +spin_unlock_bh (&uci_chan->lock); + +return ret; +} + +static ssize_t mhi_uci_read (struct file *file, +char __user *buf, +size_t count, +loff_t *ppos) +{ +struct uci_dev *uci_dev = file->private_data; +struct mhi_device *mhi_dev = uci_dev->mhi_dev; +struct uci_chan *uci_chan = &uci_dev->dl_chan;
drivers/bus/mhi/clients/uci.c line 281
Quoted 10 lines
drivers/bus/mhi/clients/uci.c new file +10
-0+struct device *dev = &mhi_dev->dev; +struct uci_buf *uci_buf; +char *ptr; +size_t to_copy; +int ret =0 ; + +if (!buf) +return -EINVAL ; + +dev_dbg (dev,"Client provided buf len:%lu\n" , count);
Drop this.
Quoted 11 lines
drivers/bus/mhi/clients/uci.c new file +11
-0+ +mutex_lock (&uci_dev->mutex); +/* confirm channel is active */ +spin_lock_bh (&uci_chan->lock); +if (!uci_dev->enabled) { +spin_unlock_bh (&uci_chan->lock); +mutex_unlock (&uci_dev->mutex); +return -ERESTARTSYS ; + } + +/* No data available to read, wait */
drivers/bus/mhi/clients/uci.c line 302
Quoted 10 lines
drivers/bus/mhi/clients/uci.c new file +10
-0+if (!uci_chan->cur_buf &&list_empty (&uci_chan->pending)) { +dev_dbg (dev,"No data available to read waiting\n" ); + +spin_unlock_bh (&uci_chan->lock); +mutex_unlock (&uci_dev->mutex); + ret =wait_event_interruptible (uci_chan->wq, + (!uci_dev->enabled || + !list_empty (&uci_chan->pending))); +if (ret == -ERESTARTSYS ) { +dev_dbg (dev,"Exit signal caught for node\n" );
No need of this.
drivers/bus/mhi/clients/uci.c line 309
Quoted 7 lines
drivers/bus/mhi/clients/uci.c new file +7
-0+return -ERESTARTSYS ; + } + +mutex_lock (&uci_dev->mutex); +spin_lock_bh (&uci_chan->lock); +if (!uci_dev->enabled) { +dev_dbg (dev,"node is disabled\n" );
Okay, this is what I'm concerned about.
Quoted 27 lines
drivers/bus/mhi/clients/uci.c new file +27
-0+ ret = -ERESTARTSYS ; + goto read_error; + } + } + +/* new read, get the next descriptor from the list */ +if (!uci_chan->cur_buf) { + uci_buf =list_first_entry_or_null (&uci_chan->pending, + struct uci_buf, node); +if (unlikely (!uci_buf)) { + ret = -EIO ; + goto read_error; + } + +list_del (&uci_buf->node); + uci_chan->cur_buf = uci_buf; + uci_chan->rx_size = uci_buf->len; +dev_dbg (dev,"Got pkt of size:%zu\n" , uci_chan->rx_size); + } + + uci_buf = uci_chan->cur_buf; + +/* Copy the buffer to user space */ + to_copy =min_t (size_t, count, uci_chan->rx_size); + ptr = uci_buf->data + (uci_buf->len - uci_chan->rx_size); +spin_unlock_bh (&uci_chan->lock); +
drivers/bus/mhi/clients/uci.c line 346
Quoted 10 lines
drivers/bus/mhi/clients/uci.c new file +10
-0+ ret =copy_to_user (buf, ptr, to_copy); +if (ret) + goto err_unlock_mtx; + +spin_lock_bh (&uci_chan->lock); + +dev_dbg (dev,"Copied %lu of %lu bytes\n" , to_copy, uci_chan->rx_size); + uci_chan->rx_size -= to_copy; + +/* we finished with this buffer, queue it back to hardware */
Oh wait... what is happening here? Why do you want to do tx?
Quoted 47 lines
drivers/bus/mhi/clients/uci.c new file +47
-0+if (!uci_chan->rx_size) { + uci_chan->cur_buf =NULL ; + +if (uci_dev->enabled) + ret =mhi_queue_buf (mhi_dev,DMA_FROM_DEVICE , + uci_buf->data, + uci_dev->actual_mtu,MHI_EOT ); +else + ret = -ERESTARTSYS ; + +if (ret) { +dev_err (dev,"Failed to recycle element\n" ); +kfree (uci_buf->data); + goto read_error; + } + } +spin_unlock_bh (&uci_chan->lock); +mutex_unlock (&uci_dev->mutex); + +dev_dbg (dev,"Returning %lu bytes\n" , to_copy); + +return to_copy; + +read_error: +spin_unlock_bh (&uci_chan->lock); +err_unlock_mtx: +mutex_unlock (&uci_dev->mutex); +return ret; +} + +static int mhi_uci_open (struct inode *inode,struct file *filp) +{ +struct uci_dev *uci_dev =NULL , *tmp_dev; +int ret = -EIO ; +struct uci_buf *buf_itr, *tmp; +struct uci_chan *dl_chan; +struct mhi_device *mhi_dev; +struct device *dev; + +mutex_lock (&mhi_uci_drv.lock); +list_for_each_entry (tmp_dev, &mhi_uci_drv.head, node) { +if (tmp_dev->devt == inode->i_rdev) { + uci_dev = tmp_dev; +break ; + } + } +
drivers/bus/mhi/clients/uci.c line 403
Quoted 10 lines
drivers/bus/mhi/clients/uci.c new file +10
-0+/* could not find a minor node */ +if (!uci_dev) + goto error_exit; + + mhi_dev = uci_dev->mhi_dev; + dev = &mhi_dev->dev; + +mutex_lock (&uci_dev->mutex); +if (!uci_dev->enabled) { +dev_info (dev,"Node exist, but not in active state!\n" );
Dangling node, right.
Quoted 8 lines
drivers/bus/mhi/clients/uci.c new file +8
-0+ goto error_open_chan; + } + + uci_dev->ref_count++; + +dev_dbg (dev,"Node open, ref counts %u\n" , uci_dev->ref_count); + +if (uci_dev->ref_count ==1 ) {
drivers/bus/mhi/clients/uci.c line 421
Quoted 10 lines
drivers/bus/mhi/clients/uci.c new file +10
-0+dev_dbg (dev,"Starting channel\n" ); + ret =mhi_prepare_for_transfer (uci_dev->mhi_dev); +if (ret) { +dev_err (dev,"Error starting transfer channels\n" ); + uci_dev->ref_count--; + goto error_open_chan; + } + + ret =mhi_queue_inbound (uci_dev); +if (ret)
Decrease refcount?
Quoted 33 lines
drivers/bus/mhi/clients/uci.c new file +33
-0+ goto error_rx_queue; + } + + filp->private_data = uci_dev; +mutex_unlock (&uci_dev->mutex); +mutex_unlock (&mhi_uci_drv.lock); + +return 0 ; + +error_rx_queue: + dl_chan = &uci_dev->dl_chan; +mhi_unprepare_from_transfer (uci_dev->mhi_dev); +list_for_each_entry_safe (buf_itr, tmp, &dl_chan->pending, node) { +list_del (&buf_itr->node); +kfree (buf_itr->data); + } + +error_open_chan: +mutex_unlock (&uci_dev->mutex); + +error_exit: +mutex_unlock (&mhi_uci_drv.lock); + +return ret; +} + +static const struct file_operations mhidev_fops = { + .owner =THIS_MODULE , + .open = mhi_uci_open, + .release = mhi_uci_release, + .read = mhi_uci_read, + .write = mhi_uci_write, + .poll = mhi_uci_poll,
drivers/bus/mhi/clients/uci.c line 464
Quoted 10 lines
drivers/bus/mhi/clients/uci.c new file +10
-0+}; + +static void mhi_ul_xfer_cb (struct mhi_device *mhi_dev, +struct mhi_result *mhi_result) +{ +struct uci_dev *uci_dev =dev_get_drvdata (&mhi_dev->dev); +struct uci_chan *uci_chan = &uci_dev->ul_chan; +struct device *dev = &mhi_dev->dev; + + dev_dbg(dev, "status:%d xfer_len:%zu\n", mhi_result->transaction_status,
Always leave a space after :
Quoted 51 lines
drivers/bus/mhi/clients/uci.c new file +51
-0+ mhi_result->bytes_xferd); + +kfree (mhi_result->buf_addr); +if (!mhi_result->transaction_status) +wake_up (&uci_chan->wq); +} + +static void mhi_dl_xfer_cb (struct mhi_device *mhi_dev, +struct mhi_result *mhi_result) +{ +struct uci_dev *uci_dev =dev_get_drvdata (&mhi_dev->dev); +struct uci_chan *uci_chan = &uci_dev->dl_chan; +struct device *dev = &mhi_dev->dev; +unsigned long flags; +struct uci_buf *buf; + +dev_dbg (dev,"status:%d receive_len:%zu\n" , + mhi_result->transaction_status, mhi_result->bytes_xferd); + +if (mhi_result->transaction_status == -ENOTCONN ) { +kfree (mhi_result->buf_addr); +return ; + } + +spin_lock_irqsave (&uci_chan->lock, flags); + buf = mhi_result->buf_addr + uci_dev->actual_mtu; + buf->data = mhi_result->buf_addr; + buf->len = mhi_result->bytes_xferd; +list_add_tail (&buf->node, &uci_chan->pending); +spin_unlock_irqrestore (&uci_chan->lock, flags); + +wake_up (&uci_chan->wq); +} + +static int mhi_uci_probe (struct mhi_device *mhi_dev, +const struct mhi_device_id *id) +{ +struct uci_dev *uci_dev; +struct mhi_controller *mhi_cntrl = mhi_dev->mhi_cntrl; +struct device *dev = &mhi_dev->dev; +int minor; +int dir; + + uci_dev =kzalloc (sizeof (*uci_dev),GFP_KERNEL ); +if (!uci_dev) +return -ENOMEM ; + +mutex_init (&uci_dev->mutex); + uci_dev->mhi_dev = mhi_dev; + +mutex_lock (&uci_dev->mutex);
drivers/bus/mhi/clients/uci.c line 525
Quoted 10 lines
drivers/bus/mhi/clients/uci.c new file +10
-0+mutex_lock (&mhi_uci_drv.lock); + + minor =find_first_zero_bit (uci_minors,MAX_UCI_DEVICES ); +if (minor >=MAX_UCI_DEVICES ) { +mutex_unlock (&mhi_uci_drv.lock); +mutex_unlock (&uci_dev->mutex); +kfree (uci_dev); +return -ENOSPC ; + } +
Add a comment regarding what is going on below.
Quoted 27 lines
drivers/bus/mhi/clients/uci.c new file +27
-0+ uci_dev->devt =MKDEV (mhi_uci_drv.major, minor); + uci_dev->dev =device_create (mhi_uci_drv.class, &mhi_dev->dev, + uci_dev->devt, uci_dev, +DEVICE_NAME "_%s_%s" , +dev_name (mhi_cntrl->cntrl_dev), + mhi_dev->name); +set_bit (minor, uci_minors); + +for (dir =0 ; dir <2 ; dir++) { +struct uci_chan *uci_chan = (dir) ? + &uci_dev->ul_chan : &uci_dev->dl_chan; +spin_lock_init (&uci_chan->lock); +init_waitqueue_head (&uci_chan->wq); +INIT_LIST_HEAD (&uci_chan->pending); + } + + uci_dev->mtu =min_t (size_t, id->driver_data,MHI_MAX_MTU ); + uci_dev->actual_mtu = uci_dev->mtu -sizeof (struct uci_buf ); +dev_set_drvdata (&mhi_dev->dev, uci_dev); + uci_dev->enabled = true; + +list_add (&uci_dev->node, &mhi_uci_drv.head); +mutex_unlock (&mhi_uci_drv.lock); +mutex_unlock (&uci_dev->mutex); + +dev_info (dev,"channel:%s successfully probed\n" , mhi_dev->name); +
drivers/bus/mhi/clients/uci.c line 562
Quoted 10 lines
drivers/bus/mhi/clients/uci.c new file +10
-0+return 0 ; +}; + +static void mhi_uci_remove (struct mhi_device *mhi_dev) +{ +struct uci_dev *uci_dev =dev_get_drvdata (&mhi_dev->dev); +struct device *dev = &mhi_dev->dev; + +dev_dbg (dev,"%s: enter\n" , __func__); +
Drop this.
drivers/bus/mhi/clients/uci.c line 571
Quoted 9 lines
drivers/bus/mhi/clients/uci.c new file +9
-0+mutex_lock (&mhi_uci_drv.lock); +mutex_lock (&uci_dev->mutex); + +/* disable the node */ +spin_lock_irq (&uci_dev->dl_chan.lock); +spin_lock_irq (&uci_dev->ul_chan.lock); + uci_dev->enabled = false; +spin_unlock_irq (&uci_dev->ul_chan.lock); +spin_unlock_irq (&uci_dev->dl_chan.lock);
You need to do something better here. This doesn't look good.
drivers/bus/mhi/clients/uci.c line 580
Quoted 9 lines
drivers/bus/mhi/clients/uci.c new file +9
-0+wake_up (&uci_dev->dl_chan.wq); +wake_up (&uci_dev->ul_chan.wq); + +/* delete the node to prevent new opens */ +device_destroy (mhi_uci_drv.class, uci_dev->devt); + uci_dev->dev =NULL ; +list_del (&uci_dev->node); + +/* safe to free memory only if all file nodes are closed */
And what if it is already freed in .release?
Quoted 4 lines
drivers/bus/mhi/clients/uci.c new file +4
-0+if (!uci_dev->ref_count) { +mutex_unlock (&uci_dev->mutex); +mutex_destroy (&uci_dev->mutex); +clear_bit (MINOR (uci_dev->devt), uci_minors);
drivers/bus/mhi/clients/uci.c line 594
Quoted 10 lines
drivers/bus/mhi/clients/uci.c new file +10
-0+dev_set_drvdata (&mhi_dev->dev,NULL ); +kfree (uci_dev); +mutex_unlock (&mhi_uci_drv.lock); +return ; + } + +mutex_unlock (&uci_dev->mutex); +mutex_unlock (&mhi_uci_drv.lock); + +dev_dbg (dev,"%s: exit\n" , __func__);
Drop this.
Thanks,
Mani
Quoted 62 lines
drivers/bus/mhi/clients/uci.c new file +58
-0+} + +/* .driver_data stores max mtu */ +static const struct mhi_device_id mhi_uci_match_table[] = { + { .chan ="LOOPBACK" , .driver_data =0x1000 }, + {}, +}; +MODULE_DEVICE_TABLE (mhi, mhi_uci_match_table); + +static struct mhi_driver mhi_uci_driver = { + .id_table = mhi_uci_match_table, + .remove = mhi_uci_remove, + .probe = mhi_uci_probe, + .ul_xfer_cb = mhi_ul_xfer_cb, + .dl_xfer_cb = mhi_dl_xfer_cb, + .driver = { + .name =MHI_UCI_DRIVER_NAME , + }, +}; + +static int mhi_uci_init (void ) +{ +int ret; + + ret =register_chrdev (0 ,MHI_UCI_DRIVER_NAME , &mhidev_fops); +if (ret <0 ) +return ret; + + mhi_uci_drv.major = ret; + mhi_uci_drv.class =class_create (THIS_MODULE ,MHI_UCI_DRIVER_NAME ); +if (IS_ERR (mhi_uci_drv.class)) { +unregister_chrdev (mhi_uci_drv.major,MHI_UCI_DRIVER_NAME ); +return -ENODEV ; + } + +mutex_init (&mhi_uci_drv.lock); +INIT_LIST_HEAD (&mhi_uci_drv.head); + + ret =mhi_driver_register (&mhi_uci_driver); +if (ret) { +class_destroy (mhi_uci_drv.class); +unregister_chrdev (mhi_uci_drv.major,MHI_UCI_DRIVER_NAME ); + } + +return ret; +} + +static void __exit mhi_uci_exit(void) +{ +mhi_driver_unregister (&mhi_uci_driver); +class_destroy (mhi_uci_drv.class); +unregister_chrdev (mhi_uci_drv.major,MHI_UCI_DRIVER_NAME ); +} + +module_init (mhi_uci_init); +module_exit (mhi_uci_exit); +MODULE_LICENSE ("GPL v2" ); +MODULE_DESCRIPTION ("MHI UCI Driver" );Signature · 2 lines
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum, a Linux Foundation Collaborative Project
Re: [PATCH v3 2/4] bus: mhi: core: Move MHI_MAX_MTU to external header file
In reply to Manivannan SadhasivamHi Mani
Quoted 9 lines · Manivannan Sadhasivam
Quoted 5 lines · Hemant Kumar
Currently this macro is defined in internal MHI header as a TRE length mask. Moving it to external header allows MHI client drivers to set this upper bound for the transmit buffer size.
So we have 2 definitions for
MHI_MAX_MTUnow? Why can't you remove the one available internally?
Good catch, let me fix that in next patch series.
Quoted 27 lines
Thanks,
ManiQuoted 23 lines
Signed-off-by Hemant Kumar <[email protected]>--- include/linux/mhi.h | 3 +++ 1 file changed, 3 insertions(+)include/linux/mhi.h +3
-0@@ -16,6 +16,9 @@#include <linux/wait.h> #include <linux/workqueue.h> +/* MHI client drivers to set this upper bound for tx buffer */ +#define MHI_MAX_MTU 0xffff +#define MHI_VOTE_BUS BIT(0)/* do not disable the mhi bus */ #define MHI_VOTE_DEVICE BIT(1)/* prevent mhi device from entering lpm */ Signature · 2 lines
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum, a Linux Foundation Collaborative Project
Signature · 2 lines
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum, a Linux Foundation Collaborative Project
Re: [PATCH v3 3/4] docs: Add documentation for user space client interface
In reply to Manivannan SadhasivamHi Mani,
Quoted 25 lines · Manivannan Sadhasivam
Quoted 24 lines · Hemant Kumar
MHI user space client driver is creating device file node for user application to perform file operations. File operations are handled by MHI core driver. Currently Loopback MHI channel is supported by this driver.
Signed-off-by Hemant Kumar <[email protected]>--- Documentation/mhi/index.rst | 1 + Documentation/mhi/uci.rst | 19 +++++++++++++++++++ 2 files changed, 20 insertions(+)create mode 100644
Documentation/mhi/uci.rstDocumentation/mhi/index.rst +1
-0@@ -9,6 +9,7 @@ MHI mhi topology + uci .. only:: subproject and html
Quoted 12 lines
Documentation/mhi/uci.rst line 4
Quoted 10 lines
Documentation/mhi/uci.rst new file +4
-0@@ -0,0 +1,19 @@ +.. SPDX-License-Identifier: GPL-2.0 + +================================= +User space Client Interface (UCI)Stick to 'Userspace' everywhere.
Done.
Quoted 7 lines
Documentation/mhi/uci.rst line 8
Quoted 5 lines
Documentation/mhi/uci.rst new file +4
-0+================================= + +UCI driver enables user space clients to communicate to external MHI devices +like modem and WLAN. It creates standard character device file nodes for userUCI driver creates a single char device, isn't it?
No, it is created per device name. For example Loopback has its own char device file node. if we add another channel for a new mhi device new device file node would be created.
Quoted 6 lines
Documentation/mhi/uci.rst line 10
Quoted 3 lines
Documentation/mhi/uci.rst new file +2
-0+space clients to perform open, read, write, pool and close file operations. +poll? Btw, you need to mention explicitly how this char device can be used. You are just mentioning standard file operations.
Will fix poll.My idea was indeed to mention generic file operations so that we dont have to be specific with use case. Any userspace entity who wants to communicate over mhi can use the driver. Reason we have this driver is to abstract the mhi core specific details. Even for loopback use case, userspace can echo to device file node on one channel and get a same in response from another channel back. I can add more examples of other user space drivers use case if that helps.
Quoted 8 lines
Documentation/mhi/uci.rst line 15
Quoted 6 lines
Documentation/mhi/uci.rst new file +5
-0+Device file node is created with format:- + +/dev/mhi_<controller_name>_<mhi_device_name> + +controller_name is the name of underlying bus used to transfer data.underlying controller instance.
Done.
Quoted 4 lines
Documentation/mhi/uci.rst line 16
Quoted 2 lines
Documentation/mhi/uci.rst new file +1
-0+mhi_device_name is the name of the MHI channel being used by MHI clientWhat do you mean by MHI client here? Are you referring to userspace client?
yes. i can say "MHI client in userspace"?
Quoted 6 lines
Documentation/mhi/uci.rst line 19
Quoted 4 lines
Documentation/mhi/uci.rst new file +3
-0+to send or receive data using MHI protocol. MHI channels are statically +defined by MHI specification. Driver currently supports LOOPBACK channel +index 0 (Host to device) and 1 (Device to Host).s/index/identifier
Done.
Quoted 2 lines
And explain a bit on how this LOOPBACK channel is getting used.
Done.
Quoted 8 lines
Thanks,
ManiQuoted 4 lines
Signature · 2 lines
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum, a Linux Foundation Collaborative Project
Signature · 2 lines
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum, a Linux Foundation Collaborative Project
Re: [PATCH v3 3/4] docs: Add documentation for user space client interface
Quoted 45 lines · Hemant Kumar
Hi Mani,
Quoted 26 lines · Manivannan Sadhasivam
Quoted 25 lines · Hemant Kumar
MHI user space client driver is creating device file node for user application to perform file operations. File operations are handled by MHI core driver. Currently Loopback MHI channel is supported by this driver.
Signed-off-by Hemant Kumar <[email protected]>--- Documentation/mhi/index.rst | 1 + Documentation/mhi/uci.rst | 19 +++++++++++++++++++ 2 files changed, 20 insertions(+)create mode 100644
Documentation/mhi/uci.rstDocumentation/mhi/index.rst +1
-0@@ -9,6 +9,7 @@ MHI mhi topology + uci .. only:: subproject and htmlDocumentation/mhi/uci.rst new file +0
-1--- /dev/nullQuoted 8 lines
Documentation/mhi/uci.rst line 4
Quoted 6 lines
+++
b/Documentation/mhi/uci.rstDocumentation/mhi/uci.rst new file +4
-0@@ -0,0 +1,19 @@ +.. SPDX-License-Identifier: GPL-2.0 + +================================= +User space Client Interface (UCI)Stick to 'Userspace' everywhere.
Done.
Quoted 7 lines
Documentation/mhi/uci.rst line 8
Quoted 5 lines
Documentation/mhi/uci.rst new file +4
-0+================================= + +UCI driver enables user space clients to communicate to external MHI devices +like modem and WLAN. It creates standard character device file nodes for userUCI driver creates a single char device, isn't it?
Quoted 3 lines
No, it is created per device name. For example Loopback has its own char device file node. if we add another channel for a new mhi device new device file node would be created.
Okay, then please add a line saying that there will be separate chardev nodes for each channel specified.
Quoted 6 lines
Quoted 6 lines
Documentation/mhi/uci.rst line 10
Quoted 3 lines
Documentation/mhi/uci.rst new file +2
-0+space clients to perform open, read, write, pool and close file operations. +poll? Btw, you need to mention explicitly how this char device can be used. You are just mentioning standard file operations.
Quoted 7 lines
Will fix poll.My idea was indeed to mention generic file operations so that we dont have to be specific with use case. Any userspace entity who wants to communicate over mhi can use the driver. Reason we have this driver is to abstract the mhi core specific details. Even for loopback use case, userspace can echo to device file node on one channel and get a same in response from another channel back. I can add more examples of other user space drivers use case if that helps.
Yes, just add couple of examples.
Quoted 8 lines
Quoted 8 lines
Documentation/mhi/uci.rst line 15
Quoted 6 lines
Documentation/mhi/uci.rst new file +5
-0+Device file node is created with format:- + +/dev/mhi_<controller_name>_<mhi_device_name> + +controller_name is the name of underlying bus used to transfer data.underlying controller instance.
Quoted 6 lines
Done.
Quoted 4 lines
Documentation/mhi/uci.rst line 16
Quoted 2 lines
Documentation/mhi/uci.rst new file +1
-0+mhi_device_name is the name of the MHI channel being used by MHI clientWhat do you mean by MHI client here? Are you referring to userspace client?
yes. i can say "MHI client in userspace"?
Okay. The naming conventions used in MHI are a bit weird. So from the start itself I stuck with some fixed names and client is one of them. The term client itself refers to both client device and a driver used to talk to the device in the host. So we should explicitly mention if it is a userspace client driver or the client device.
Thanks,
Mani
Quoted 22 lines
Quoted 6 lines
Documentation/mhi/uci.rst line 19
Quoted 4 lines
Documentation/mhi/uci.rst new file +3
-0+to send or receive data using MHI protocol. MHI channels are statically +defined by MHI specification. Driver currently supports LOOPBACK channel +index 0 (Host to device) and 1 (Device to Host).s/index/identifier
Done.
Quoted 2 lines
And explain a bit on how this LOOPBACK channel is getting used.
Done.
Quoted 8 lines
Thanks,
ManiQuoted 4 lines
Signature · 2 lines
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum, a Linux Foundation Collaborative ProjectSignature · 2 lines
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum, a Linux Foundation Collaborative Project
Re: [PATCH v3 3/4] docs: Add documentation for user space client interface
Quoted 67 lines · Manivannan Sadhasivam
Quoted 45 lines · Hemant Kumar
Hi Mani,
Quoted 26 lines · Manivannan Sadhasivam
Quoted 25 lines · Hemant Kumar
MHI user space client driver is creating device file node for user application to perform file operations. File operations are handled by MHI core driver. Currently Loopback MHI channel is supported by this driver.
Signed-off-by Hemant Kumar <[email protected]>--- Documentation/mhi/index.rst | 1 + Documentation/mhi/uci.rst | 19 +++++++++++++++++++ 2 files changed, 20 insertions(+)create mode 100644
Documentation/mhi/uci.rstDocumentation/mhi/index.rst +1
-0@@ -9,6 +9,7 @@ MHI mhi topology + uci .. only:: subproject and htmlDocumentation/mhi/uci.rst new file +0
-1--- /dev/nullQuoted 8 lines
Documentation/mhi/uci.rst line 4
Quoted 6 lines
+++
b/Documentation/mhi/uci.rstDocumentation/mhi/uci.rst new file +4
-0@@ -0,0 +1,19 @@ +.. SPDX-License-Identifier: GPL-2.0 + +================================= +User space Client Interface (UCI)Stick to 'Userspace' everywhere.
Done.
Quoted 7 lines
Documentation/mhi/uci.rst line 8
Quoted 5 lines
Documentation/mhi/uci.rst new file +4
-0+================================= + +UCI driver enables user space clients to communicate to external MHI devices +like modem and WLAN. It creates standard character device file nodes for userUCI driver creates a single char device, isn't it?
Quoted 3 lines
No, it is created per device name. For example Loopback has its own char device file node. if we add another channel for a new mhi device new device file node would be created.
Okay, then please add a line saying that there will be separate chardev nodes for each channel specified.
Quoted 6 lines
Quoted 6 lines
Documentation/mhi/uci.rst line 10
Quoted 3 lines
Documentation/mhi/uci.rst new file +2
-0+space clients to perform open, read, write, pool and close file operations. +poll? Btw, you need to mention explicitly how this char device can be used. You are just mentioning standard file operations.
Quoted 7 lines
Will fix poll.My idea was indeed to mention generic file operations so that we dont have to be specific with use case. Any userspace entity who wants to communicate over mhi can use the driver. Reason we have this driver is to abstract the mhi core specific details. Even for loopback use case, userspace can echo to device file node on one channel and get a same in response from another channel back. I can add more examples of other user space drivers use case if that helps.
Quoted 2 lines
Yes, just add couple of examples.
Or.. just add loopback as an example for now and then if we add more channels in future let's make sure to document those here.
Thanks,
Mani
Quoted 46 lines
Quoted 8 lines
Quoted 8 lines
Documentation/mhi/uci.rst line 15
Quoted 6 lines
Documentation/mhi/uci.rst new file +5
-0+Device file node is created with format:- + +/dev/mhi_<controller_name>_<mhi_device_name> + +controller_name is the name of underlying bus used to transfer data.underlying controller instance.
Quoted 6 lines
Done.
Quoted 4 lines
Documentation/mhi/uci.rst line 16
Quoted 2 lines
Documentation/mhi/uci.rst new file +1
-0+mhi_device_name is the name of the MHI channel being used by MHI clientWhat do you mean by MHI client here? Are you referring to userspace client?
yes. i can say "MHI client in userspace"?
Okay. The naming conventions used in MHI are a bit weird. So from the start itself I stuck with some fixed names and client is one of them. The term client itself refers to both client device and a driver used to talk to the device in the host. So we should explicitly mention if it is a userspace client driver or the client device.
Thanks,
ManiQuoted 22 lines
Quoted 6 lines
Documentation/mhi/uci.rst line 19
Quoted 4 lines
Documentation/mhi/uci.rst new file +3
-0+to send or receive data using MHI protocol. MHI channels are statically +defined by MHI specification. Driver currently supports LOOPBACK channel +index 0 (Host to device) and 1 (Device to Host).s/index/identifier
Done.
Quoted 2 lines
And explain a bit on how this LOOPBACK channel is getting used.
Done.
Quoted 8 lines
Thanks,
ManiQuoted 4 lines
Signature · 2 lines
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum, a Linux Foundation Collaborative ProjectSignature · 2 lines
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum, a Linux Foundation Collaborative Project
Re: [PATCH v3 4/4] bus: mhi: clients: Add user space client interface driver
In reply to Manivannan SadhasivamHi Mani,
Quoted 10 lines · Manivannan Sadhasivam
Quoted 2 lines · Hemant Kumar
This MHI client driver allows user space clients to transfer data between MHI device and host using standard file operations.
I think we need to explicitly specify 'raw' data here. Because we have different APIs for queuing different types of data. So saying just data sounds vague unless this driver can handle multiple types of data which I don't think can happen.
And you need to update the same in docs.
Done.
Quoted 19 lines
Quoted 19 lines
Device file node is created with format
/dev/mhi_<controller_name>_<mhi_device_name>
Currently it supports loopback client.
Signed-off-by Hemant Kumar <[email protected]>--- drivers/bus/mhi/Kconfig | 2 + drivers/bus/mhi/Makefile | 1 + drivers/bus/mhi/clients/Kconfig | 16 + drivers/bus/mhi/clients/Makefile | 3 + drivers/bus/mhi/clients/uci.c | 652 +++++++++++++++++++++++++++++++++++++++ 5 files changed, 674 insertions(+)create mode 100644
drivers/bus/mhi/clients/Kconfigcreate mode 100644drivers/bus/mhi/clients/Makefilecreate mode 100644drivers/bus/mhi/clients/uci.c
Quoted 11 lines
drivers/bus/mhi/Kconfig config MHI_BUS_DEBUG · line 22
Quoted 8 lines
drivers/bus/mhi/Kconfig +0
-0@@ -20,3 +20,5 @@ config MHI_BUS_DEBUG Enable debugfs support for use with the MHI transport. Allows reading and/or modifying some values within the MHI controller for debug and test purposes.Hmm, so this patchset depends on debugfs patches? You need to mention this in cover letter. Or even better, just make it independent
Driver does not depend on debugfs. i need to fix that.
Quoted 15 lines
Quoted 15 lines
drivers/bus/mhi/Kconfig +2
-0+ +source "drivers/bus/mhi/clients/Kconfig"drivers/bus/mhi/Makefile +1
-0@@ -1,2 +1,3 @@ # core layer obj-y += core/ +obj-y += clients/drivers/bus/mhi/clients/Kconfig new file +0
-1--- /dev/null
Quoted 8 lines
drivers/bus/mhi/clients/Kconfig line 4
Quoted 6 lines
+++ b/drivers/bus/mhi/clients/Kconfig
drivers/bus/mhi/clients/Kconfig new file +4
-0@@ -0,0 +1,16 @@ +# SPDX-License-Identifier: GPL-2.0-only + +menu "MHI clients support" + depends on MHI_BUSI don't think we need
MHI_BUSdependency here.
Reason i added was, if MHI BUS is not enabled "MHI clients support" would not show up in the menu.
Quoted 9 lines
drivers/bus/mhi/clients/Kconfig line 10
Quoted 7 lines
drivers/bus/mhi/clients/Kconfig new file +6
-0+ +config MHI_UCI + tristate "MHI UCI" + depends on MHI_BUS + help + MHI based userspace client interface driver is for transferrings/is for/used for/g. Also provide indent for help text.
Done.
Quoted 5 lines
drivers/bus/mhi/clients/Kconfig line 12
Quoted 3 lines
drivers/bus/mhi/clients/Kconfig new file +2
-0+ data between host and device using standard file operations from + user space. Open, read, write, and close operations are supportedPlease use 'userspace' everywhere.
Done.
Quoted 16 lines
Quoted 11 lines
drivers/bus/mhi/clients/Kconfig new file +4
-0+ by this driver. Please check mhi_uci_match_table for all supported + channels that are exposed to userspace. + +endmenudrivers/bus/mhi/clients/Makefile new file +0
-0drivers/bus/mhi/clients/Makefile line 3
Quoted 3 lines
drivers/bus/mhi/clients/Makefile new file +3
-0@@ -0,0 +1,3 @@ +# SPDX-License-Identifier: GPL-2.0-only + +obj-$(CONFIG_MHI_UCI) +=uci.ospace after '+='
Done.
Quoted 16 lines
Quoted 7 lines
drivers/bus/mhi/clients/uci.c new file +0
-0drivers/bus/mhi/clients/uci.c line 7
Quoted 7 lines
drivers/bus/mhi/clients/uci.c new file +7
-0@@ -0,0 +1,652 @@ +// SPDX-License-Identifier: GPL-2.0-only +/* Copyright (c) 2018-2020, The Linux Foundation. All rights reserved.*/ + +#include <linux/kernel.h> +#include <linux/mod_devicetable.h> +#include <linux/module.h> +#include <linux/mhi.h> Please sort includes alphabetically.
you mean like this
#include <linux/kernel.h>
#include <linux/mhi.h>
#include <linux/mod_devicetable.h>
#include <linux/module.h>
Quoted 9 lines
drivers/bus/mhi/clients/uci.c line 13
Quoted 7 lines
drivers/bus/mhi/clients/uci.c new file +6
-0+#include <linux/poll.h> + +#define DEVICE_NAME "mhi" +#define MHI_UCI_DRIVER_NAME "mhi_uci" +#define MAX_UCI_DEVICES (64) +How about the kdoc comments for all fields and structures used?
Done.
Quoted 10 lines
drivers/bus/mhi/clients/uci.c line 18
Quoted 6 lines
drivers/bus/mhi/clients/uci.c new file +5
-0+struct uci_chan { +wait_queue_head_t wq; + +/* locks ul/dl uci device channel */ +spinlock_t lock;It seems like you are trying to protect a field (enabled) in parent structure (
uci_dev) using this lock. This sounds weird. Why can't you just use the mutex present in that?
i agree, let me fix locking in the entire driver.
Quoted 5 lines
drivers/bus/mhi/clients/uci.c line 20
Quoted 3 lines
drivers/bus/mhi/clients/uci.c new file +2
-0+ +/* user space waiting to read */ The comments should clearly portray what the field is for.
list of pending read buffers ?
Quoted 6 lines
drivers/bus/mhi/clients/uci.c line 23
Quoted 4 lines
drivers/bus/mhi/clients/uci.c new file +3
-0+struct list_head pending; + +/* current buffer user space reading */ This sentence is not correct.
current buffer user space is reading ?
Quoted 13 lines
Quoted 13 lines
drivers/bus/mhi/clients/uci.c new file +12
-0+struct uci_buf *cur_buf; +size_t rx_size; +}; + +struct uci_buf { +void *data; +size_t len; +struct list_head node; +}; + +struct mhi_uci_drv { +struct list_head head;
Quoted 8 lines
drivers/bus/mhi/clients/uci.c line 41
Quoted 6 lines
drivers/bus/mhi/clients/uci.c new file +6
-0+ +/* uci driver lock to sync open, probe and remove */ +struct mutex lock; +struct class *class; +int major; +dev_t dev_t;devt?
will rename it to devt
Quoted 14 lines
drivers/bus/mhi/clients/uci.c line 51
Quoted 11 lines
drivers/bus/mhi/clients/uci.c new file +10
-0+}; + +struct uci_dev { +struct list_head node; +dev_t devt; +struct device *dev; +struct mhi_device *mhi_dev; +const char *chan; + +/* sync open and close */ Again, please use descriptive comments. Need not be multi lines but something which could be understood easily.
Done.
Quoted 16 lines
Quoted 4 lines
drivers/bus/mhi/clients/uci.c new file +3
-0+struct mutex mutex; +struct uci_chan ul_chan; +struct uci_chan dl_chan;drivers/bus/mhi/clients/uci.c line 64
Quoted 10 lines
drivers/bus/mhi/clients/uci.c new file +10
-0+size_t mtu; + +/* maximum size of incoming buffer */ +size_t actual_mtu; +int ref_count; +bool enabled; +}; + +static DECLARE_BITMAP(uci_minors, MAX_UCI_DEVICES); +static struct mhi_uci_drv mhi_uci_drv;Please use object names different from datatype names everywhere.
Done.
Quoted 9 lines
drivers/bus/mhi/clients/uci.c line 70
Quoted 7 lines
drivers/bus/mhi/clients/uci.c new file +6
-0+ +static int mhi_queue_inbound (struct uci_dev *uci_dev) +{ +struct mhi_device *mhi_dev = uci_dev->mhi_dev; +struct device *dev = &mhi_dev->dev; +int nr_trbs =mhi_get_no_free_descriptors (mhi_dev,DMA_FROM_DEVICE );I'd prefer to have this assignment in definition block.
Done.
Quoted 15 lines
drivers/bus/mhi/clients/uci.c line 82
Quoted 13 lines
drivers/bus/mhi/clients/uci.c new file +12
-0+size_t mtu = uci_dev->mtu; +size_t actual_mtu = uci_dev->actual_mtu; +void *buf; +struct uci_buf *uci_buf; +int ret = -EIO , i; + +for (i =0 ; i < nr_trbs; i++) { + buf =kmalloc (mtu,GFP_KERNEL ); +if (!buf) +return -ENOMEM ; + + uci_buf = buf + actual_mtu;Aren't you segfaulting here?
no, in probe we do thisuci_dev->actual_mtu = uci_dev->mtu - sizeof(struct uci_buf);
and save meta data uci_buf data ptr and len. it is done in mhi_dl_xfer_cb() function and used in read().
Quoted 17 lines
drivers/bus/mhi/clients/uci.c line 83
Quoted 2 lines
drivers/bus/mhi/clients/uci.c new file +1
-0+ uci_buf->data = buf;Where is this
uci_bufgetting used?drivers/bus/mhi/clients/uci.c line 92
Quoted 9 lines
drivers/bus/mhi/clients/uci.c new file +9
-0+ +dev_dbg (dev,"Allocated buf %d of %d size %ld\n" , i, nr_trbs, + actual_mtu); + + ret =mhi_queue_buf (mhi_dev,DMA_FROM_DEVICE , buf, actual_mtu, +MHI_EOT ); +if (ret) { +kfree (buf); +dev_err (dev,"Failed to queue buffer %d\n" , i);Failed to queue buffer: %d
Quoted 4 lines
drivers/bus/mhi/clients/uci.c line 94
Quoted 2 lines
drivers/bus/mhi/clients/uci.c new file +2
-0+return ret; + }So is this buffer getting freed anywhere?
in mhi_uci_release().
Quoted 19 lines
Quoted 19 lines
drivers/bus/mhi/clients/uci.c new file +18
-0+ } + +return ret; +} + +static int mhi_uci_release (struct inode *inode,struct file *file) +{ +struct uci_dev *uci_dev = file->private_data; + +mutex_lock (&uci_dev->mutex); + uci_dev->ref_count--; +if (!uci_dev->ref_count) { +struct uci_buf *itr, *tmp; +struct uci_chan *uci_chan; + +if (uci_dev->enabled) +mhi_unprepare_from_transfer (uci_dev->mhi_dev); +
Quoted 8 lines
drivers/bus/mhi/clients/uci.c line 118
Quoted 6 lines
drivers/bus/mhi/clients/uci.c new file +6
-0+/* clean inbound channel */ + uci_chan = &uci_dev->dl_chan; +list_for_each_entry_safe (itr, tmp, &uci_chan->pending, node) { +list_del (&itr->node); +kfree (itr->data); + }Add a new line after '}' and before next line of code.
Done.
Quoted 14 lines
drivers/bus/mhi/clients/uci.c line 128
Quoted 11 lines
drivers/bus/mhi/clients/uci.c new file +10
-0+if (uci_chan->cur_buf) +kfree (uci_chan->cur_buf->data); + + uci_chan->cur_buf =NULL ; + +if (!uci_dev->enabled) { +mutex_unlock (&uci_dev->mutex); +mutex_destroy (&uci_dev->mutex); +clear_bit (MINOR (uci_dev->devt), uci_minors); +kfree (uci_dev);Hmm. So you are freeing
uci_devhere and also trying to do the same inmhi_uci_remove.
yes that is based on ref count, so no double free. do you see any issue with that ?
Quoted 26 lines
Quoted 13 lines
drivers/bus/mhi/clients/uci.c new file +12
-0+return 0 ; + } + } + +mutex_unlock (&uci_dev->mutex); + +return 0 ; +} + +static __poll_t mhi_uci_poll (struct file *file,poll_table *wait) +{ +struct uci_dev *uci_dev = file->private_data;drivers/bus/mhi/clients/uci.c line 150
Quoted 10 lines
drivers/bus/mhi/clients/uci.c new file +10
-0+struct mhi_device *mhi_dev = uci_dev->mhi_dev; +struct device *dev = &mhi_dev->dev; +struct uci_chan *uci_chan; +__poll_t mask =0 ; + +poll_wait (file, &uci_dev->dl_chan.wq, wait); +poll_wait (file, &uci_dev->ul_chan.wq, wait); + + uci_chan = &uci_dev->dl_chan; +spin_lock_bh (&uci_chan->lock);This is what looks wrong to me.
Quoted 4 lines
drivers/bus/mhi/clients/uci.c line 151
Quoted 1 line
drivers/bus/mhi/clients/uci.c new file +1
-0+if (!uci_dev->enabled) {So you are removing the char dev node even if there are users in the system. Why do you want to do so?
Removing char dev node is done when MHI device is removed. It is possible that user space entity would exist but MHI device is removed due to underlying transport disconnect. i dont see a way to prevent
this or i am missing your point. Can you pls elaborate your concern.
Quoted 39 lines
Quoted 39 lines
drivers/bus/mhi/clients/uci.c new file +38
-0+ mask =EPOLLERR ; + }else { +if (!list_empty (&uci_chan->pending) || uci_chan->cur_buf) { +dev_dbg (dev,"Client can read from node\n" ); + mask |=EPOLLIN |EPOLLRDNORM ; + } + } +spin_unlock_bh (&uci_chan->lock); + + uci_chan = &uci_dev->ul_chan; +spin_lock_bh (&uci_chan->lock); +if (!uci_dev->enabled) { + mask |=EPOLLERR ; + }else if (mhi_get_no_free_descriptors (mhi_dev,DMA_TO_DEVICE ) >0 ) { +dev_dbg (dev,"Client can write to node\n" ); + mask |=EPOLLOUT |EPOLLWRNORM ; + } +spin_unlock_bh (&uci_chan->lock); + +dev_dbg (dev,"Client attempted to poll, returning mask 0x%x\n" , mask); + +return mask; +} + +static ssize_t mhi_uci_write (struct file *file, +const char __user *buf, +size_t count, +loff_t *offp) +{ +struct uci_dev *uci_dev = file->private_data; +struct mhi_device *mhi_dev = uci_dev->mhi_dev; +struct device *dev = &mhi_dev->dev; +struct uci_chan *uci_chan = &uci_dev->ul_chan; +size_t bytes_xfered =0 ; +int ret, nr_avail; + +if (!buf || !count) +return -EINVAL ;
Quoted 8 lines
drivers/bus/mhi/clients/uci.c line 195
Quoted 6 lines
drivers/bus/mhi/clients/uci.c new file +6
-0+ +/* confirm channel is active */ +spin_lock_bh (&uci_chan->lock); +if (!uci_dev->enabled) { +spin_unlock_bh (&uci_chan->lock); +return -ERESTARTSYS ;You should return
-ENODEVhere.
Done.
Quoted 7 lines
drivers/bus/mhi/clients/uci.c line 199
Quoted 5 lines
drivers/bus/mhi/clients/uci.c new file +4
-0+ } + +dev_dbg (dev,"Enter: to xfer:%lu bytes\n" , count); +Please avoid "Enter" debug prints.
Done, will keep the byte count print?
Quoted 9 lines
drivers/bus/mhi/clients/uci.c line 205
Quoted 7 lines
drivers/bus/mhi/clients/uci.c new file +6
-0+while (count) { +size_t xfer_size; +void *kbuf; +enum mhi_flags flags; + +spin_unlock_bh (&uci_chan->lock);Why do you want to hold the lock till here?
Will come up with better locking in next patch set
Quoted 9 lines
drivers/bus/mhi/clients/uci.c line 211
Quoted 7 lines
drivers/bus/mhi/clients/uci.c new file +6
-0+ +/* wait for free descriptors */ + ret =wait_event_interruptible (uci_chan->wq, + (!uci_dev->enabled) || + (nr_avail =mhi_get_no_free_descriptors (mhi_dev, +DMA_TO_DEVICE )) >0 );Does using "
wait_event_interruptible_timeout" makes sense here?
No, read needs to be blocked until data comes. user space would call read() and wait for data to arrive. There is no definite time when data would arrive.
Quoted 7 lines
drivers/bus/mhi/clients/uci.c line 215
Quoted 5 lines
drivers/bus/mhi/clients/uci.c new file +4
-0+ +if (ret == -ERESTARTSYS || !uci_dev->enabled) { +dev_dbg (dev,"Exit signal caught for node or not enabled\n" ); +return -ERESTARTSYS ;You need to return
-ENODEVfor !uci_dev->enabled case.
Done.
Quoted 21 lines
Quoted 21 lines
drivers/bus/mhi/clients/uci.c new file +20
-0+ } + + xfer_size =min_t (size_t, count, uci_dev->mtu); + kbuf =kmalloc (xfer_size,GFP_KERNEL ); +if (!kbuf) +return -ENOMEM ; + + ret =copy_from_user (kbuf, buf, xfer_size); +if (unlikely (ret)) { +kfree (kbuf); +return ret; + } + +spin_lock_bh (&uci_chan->lock); + +/* if ring is full after this force EOT */ +if (nr_avail >1 && (count - xfer_size)) + flags =MHI_CHAIN ; +else + flags =MHI_EOT ;
Quoted 8 lines
drivers/bus/mhi/clients/uci.c line 241
Quoted 6 lines
drivers/bus/mhi/clients/uci.c new file +6
-0+ +if (uci_dev->enabled) + ret =mhi_queue_buf (mhi_dev,DMA_TO_DEVICE , kbuf, + xfer_size, flags); +else + ret = -ERESTARTSYS ;Again, please fix this all over the driver.
Done.
Quoted 16 lines
Quoted 4 lines
drivers/bus/mhi/clients/uci.c new file +3
-0+ +if (ret) { +kfree (kbuf);drivers/bus/mhi/clients/uci.c line 254
Quoted 10 lines
drivers/bus/mhi/clients/uci.c new file +10
-0+ goto sys_interrupt; + } + + bytes_xfered += xfer_size; + count -= xfer_size; + buf += xfer_size; + } + +spin_unlock_bh (&uci_chan->lock); +dev_dbg (dev,"Exit: Number of bytes xferred:%lu\n" , bytes_xfered);Drop the "Exit" too.
how about keeping the number of bytes xferred and remove exit from the msg ? helps in debugging user space entity vs kernel space mhi uci driver issues.
Quoted 22 lines
Quoted 22 lines
drivers/bus/mhi/clients/uci.c new file +21
-0+ +return bytes_xfered; + +sys_interrupt: +spin_unlock_bh (&uci_chan->lock); + +return ret; +} + +static ssize_t mhi_uci_read (struct file *file, +char __user *buf, +size_t count, +loff_t *ppos) +{ +struct uci_dev *uci_dev = file->private_data; +struct mhi_device *mhi_dev = uci_dev->mhi_dev; +struct uci_chan *uci_chan = &uci_dev->dl_chan; +struct device *dev = &mhi_dev->dev; +struct uci_buf *uci_buf; +char *ptr; +size_t to_copy;
Quoted 8 lines
drivers/bus/mhi/clients/uci.c line 281
Quoted 6 lines
drivers/bus/mhi/clients/uci.c new file +6
-0+int ret =0 ; + +if (!buf) +return -EINVAL ; + +dev_dbg (dev,"Client provided buf len:%lu\n" , count);Drop this.
This would help if client provided buffer is smaller than the received rx data. Even though this function would only copy the mount of buffer provided by user space but we can track that condition.
Quoted 16 lines
Quoted 16 lines
drivers/bus/mhi/clients/uci.c new file +15
-0+ +mutex_lock (&uci_dev->mutex); +/* confirm channel is active */ +spin_lock_bh (&uci_chan->lock); +if (!uci_dev->enabled) { +spin_unlock_bh (&uci_chan->lock); +mutex_unlock (&uci_dev->mutex); +return -ERESTARTSYS ; + } + +/* No data available to read, wait */ +if (!uci_chan->cur_buf &&list_empty (&uci_chan->pending)) { +dev_dbg (dev,"No data available to read waiting\n" ); + +spin_unlock_bh (&uci_chan->lock);
Quoted 8 lines
drivers/bus/mhi/clients/uci.c line 302
Quoted 6 lines
drivers/bus/mhi/clients/uci.c new file +6
-0+mutex_unlock (&uci_dev->mutex); + ret =wait_event_interruptible (uci_chan->wq, + (!uci_dev->enabled || + !list_empty (&uci_chan->pending))); +if (ret == -ERESTARTSYS ) { +dev_dbg (dev,"Exit signal caught for node\n" );No need of this.
This is same as what we are doing in write(). I can add the uci_dev->enabled check here as well and return -ENODEV as you commented for write(). Helps in debugging.
Quoted 10 lines
drivers/bus/mhi/clients/uci.c line 309
Quoted 8 lines
drivers/bus/mhi/clients/uci.c new file +7
-0+return -ERESTARTSYS ; + } + +mutex_lock (&uci_dev->mutex); +spin_lock_bh (&uci_chan->lock); +if (!uci_dev->enabled) { +dev_dbg (dev,"node is disabled\n" );Okay, this is what I'm concerned about.
If your concern is about locking, i am going to come up with the change to fix that. If you concern is about node getting removed while read is issued then i dont see how we can prevent that.
Quoted 32 lines
Quoted 32 lines
drivers/bus/mhi/clients/uci.c new file +31
-0+ ret = -ERESTARTSYS ; + goto read_error; + } + } + +/* new read, get the next descriptor from the list */ +if (!uci_chan->cur_buf) { + uci_buf =list_first_entry_or_null (&uci_chan->pending, + struct uci_buf, node); +if (unlikely (!uci_buf)) { + ret = -EIO ; + goto read_error; + } + +list_del (&uci_buf->node); + uci_chan->cur_buf = uci_buf; + uci_chan->rx_size = uci_buf->len; +dev_dbg (dev,"Got pkt of size:%zu\n" , uci_chan->rx_size); + } + + uci_buf = uci_chan->cur_buf; + +/* Copy the buffer to user space */ + to_copy =min_t (size_t, count, uci_chan->rx_size); + ptr = uci_buf->data + (uci_buf->len - uci_chan->rx_size); +spin_unlock_bh (&uci_chan->lock); + + ret =copy_to_user (buf, ptr, to_copy); +if (ret) + goto err_unlock_mtx; +
Quoted 8 lines
drivers/bus/mhi/clients/uci.c line 346
Quoted 6 lines
drivers/bus/mhi/clients/uci.c new file +6
-0+spin_lock_bh (&uci_chan->lock); + +dev_dbg (dev,"Copied %lu of %lu bytes\n" , to_copy, uci_chan->rx_size); + uci_chan->rx_size -= to_copy; + +/* we finished with this buffer, queue it back to hardware */ Oh wait... what is happening here? Why do you want to do tx?
we are not doing any TX, we are just queuing the rx buffer back to get more data.
Quoted 52 lines
Quoted 52 lines
drivers/bus/mhi/clients/uci.c new file +51
-0+if (!uci_chan->rx_size) { + uci_chan->cur_buf =NULL ; + +if (uci_dev->enabled) + ret =mhi_queue_buf (mhi_dev,DMA_FROM_DEVICE , + uci_buf->data, + uci_dev->actual_mtu,MHI_EOT ); +else + ret = -ERESTARTSYS ; + +if (ret) { +dev_err (dev,"Failed to recycle element\n" ); +kfree (uci_buf->data); + goto read_error; + } + } +spin_unlock_bh (&uci_chan->lock); +mutex_unlock (&uci_dev->mutex); + +dev_dbg (dev,"Returning %lu bytes\n" , to_copy); + +return to_copy; + +read_error: +spin_unlock_bh (&uci_chan->lock); +err_unlock_mtx: +mutex_unlock (&uci_dev->mutex); +return ret; +} + +static int mhi_uci_open (struct inode *inode,struct file *filp) +{ +struct uci_dev *uci_dev =NULL , *tmp_dev; +int ret = -EIO ; +struct uci_buf *buf_itr, *tmp; +struct uci_chan *dl_chan; +struct mhi_device *mhi_dev; +struct device *dev; + +mutex_lock (&mhi_uci_drv.lock); +list_for_each_entry (tmp_dev, &mhi_uci_drv.head, node) { +if (tmp_dev->devt == inode->i_rdev) { + uci_dev = tmp_dev; +break ; + } + } + +/* could not find a minor node */ +if (!uci_dev) + goto error_exit; +
Quoted 8 lines
drivers/bus/mhi/clients/uci.c line 403
Quoted 6 lines
drivers/bus/mhi/clients/uci.c new file +6
-0+ mhi_dev = uci_dev->mhi_dev; + dev = &mhi_dev->dev; + +mutex_lock (&uci_dev->mutex); +if (!uci_dev->enabled) { +dev_info (dev,"Node exist, but not in active state!\n" );Dangling node, right.
In case remove() is in progress and enabled is set to false but destroy_device is not called yet. It covers that case and open() is called by user space entity.
Quoted 13 lines
Quoted 13 lines
drivers/bus/mhi/clients/uci.c new file +12
-0+ goto error_open_chan; + } + + uci_dev->ref_count++; + +dev_dbg (dev,"Node open, ref counts %u\n" , uci_dev->ref_count); + +if (uci_dev->ref_count ==1 ) { +dev_dbg (dev,"Starting channel\n" ); + ret =mhi_prepare_for_transfer (uci_dev->mhi_dev); +if (ret) { +dev_err (dev,"Error starting transfer channels\n" );
Quoted 8 lines
drivers/bus/mhi/clients/uci.c line 421
Quoted 6 lines
drivers/bus/mhi/clients/uci.c new file +6
-0+ uci_dev->ref_count--; + goto error_open_chan; + } + + ret =mhi_queue_inbound (uci_dev); +if (ret)Decrease refcount?
done in release. For every open increment the ref count and for every release call decrement it, so that when ref count becomes 0 we can free memory.
Quoted 38 lines
Quoted 38 lines
drivers/bus/mhi/clients/uci.c new file +37
-0+ goto error_rx_queue; + } + + filp->private_data = uci_dev; +mutex_unlock (&uci_dev->mutex); +mutex_unlock (&mhi_uci_drv.lock); + +return 0 ; + +error_rx_queue: + dl_chan = &uci_dev->dl_chan; +mhi_unprepare_from_transfer (uci_dev->mhi_dev); +list_for_each_entry_safe (buf_itr, tmp, &dl_chan->pending, node) { +list_del (&buf_itr->node); +kfree (buf_itr->data); + } + +error_open_chan: +mutex_unlock (&uci_dev->mutex); + +error_exit: +mutex_unlock (&mhi_uci_drv.lock); + +return ret; +} + +static const struct file_operations mhidev_fops = { + .owner =THIS_MODULE , + .open = mhi_uci_open, + .release = mhi_uci_release, + .read = mhi_uci_read, + .write = mhi_uci_write, + .poll = mhi_uci_poll, +}; + +static void mhi_ul_xfer_cb (struct mhi_device *mhi_dev, +struct mhi_result *mhi_result)
Quoted 8 lines
drivers/bus/mhi/clients/uci.c line 464
Quoted 6 lines
drivers/bus/mhi/clients/uci.c new file +6
-0+{ +struct uci_dev *uci_dev =dev_get_drvdata (&mhi_dev->dev); +struct uci_chan *uci_chan = &uci_dev->ul_chan; +struct device *dev = &mhi_dev->dev; + + dev_dbg(dev, "status:%d xfer_len:%zu\n", mhi_result->transaction_status,Always leave a space after :
Done.
Quoted 56 lines
Quoted 56 lines
drivers/bus/mhi/clients/uci.c new file +55
-0+ mhi_result->bytes_xferd); + +kfree (mhi_result->buf_addr); +if (!mhi_result->transaction_status) +wake_up (&uci_chan->wq); +} + +static void mhi_dl_xfer_cb (struct mhi_device *mhi_dev, +struct mhi_result *mhi_result) +{ +struct uci_dev *uci_dev =dev_get_drvdata (&mhi_dev->dev); +struct uci_chan *uci_chan = &uci_dev->dl_chan; +struct device *dev = &mhi_dev->dev; +unsigned long flags; +struct uci_buf *buf; + +dev_dbg (dev,"status:%d receive_len:%zu\n" , + mhi_result->transaction_status, mhi_result->bytes_xferd); + +if (mhi_result->transaction_status == -ENOTCONN ) { +kfree (mhi_result->buf_addr); +return ; + } + +spin_lock_irqsave (&uci_chan->lock, flags); + buf = mhi_result->buf_addr + uci_dev->actual_mtu; + buf->data = mhi_result->buf_addr; + buf->len = mhi_result->bytes_xferd; +list_add_tail (&buf->node, &uci_chan->pending); +spin_unlock_irqrestore (&uci_chan->lock, flags); + +wake_up (&uci_chan->wq); +} + +static int mhi_uci_probe (struct mhi_device *mhi_dev, +const struct mhi_device_id *id) +{ +struct uci_dev *uci_dev; +struct mhi_controller *mhi_cntrl = mhi_dev->mhi_cntrl; +struct device *dev = &mhi_dev->dev; +int minor; +int dir; + + uci_dev =kzalloc (sizeof (*uci_dev),GFP_KERNEL ); +if (!uci_dev) +return -ENOMEM ; + +mutex_init (&uci_dev->mutex); + uci_dev->mhi_dev = mhi_dev; + +mutex_lock (&uci_dev->mutex); +mutex_lock (&mhi_uci_drv.lock); + + minor =find_first_zero_bit (uci_minors,MAX_UCI_DEVICES ); +if (minor >=MAX_UCI_DEVICES ) {
Quoted 8 lines
drivers/bus/mhi/clients/uci.c line 525
Quoted 6 lines
drivers/bus/mhi/clients/uci.c new file +6
-0+mutex_unlock (&mhi_uci_drv.lock); +mutex_unlock (&uci_dev->mutex); +kfree (uci_dev); +return -ENOSPC ; + } +Add a comment regarding what is going on below.
Done.
Quoted 32 lines
Quoted 32 lines
drivers/bus/mhi/clients/uci.c new file +31
-0+ uci_dev->devt =MKDEV (mhi_uci_drv.major, minor); + uci_dev->dev =device_create (mhi_uci_drv.class, &mhi_dev->dev, + uci_dev->devt, uci_dev, +DEVICE_NAME "_%s_%s" , +dev_name (mhi_cntrl->cntrl_dev), + mhi_dev->name); +set_bit (minor, uci_minors); + +for (dir =0 ; dir <2 ; dir++) { +struct uci_chan *uci_chan = (dir) ? + &uci_dev->ul_chan : &uci_dev->dl_chan; +spin_lock_init (&uci_chan->lock); +init_waitqueue_head (&uci_chan->wq); +INIT_LIST_HEAD (&uci_chan->pending); + } + + uci_dev->mtu =min_t (size_t, id->driver_data,MHI_MAX_MTU ); + uci_dev->actual_mtu = uci_dev->mtu -sizeof (struct uci_buf ); +dev_set_drvdata (&mhi_dev->dev, uci_dev); + uci_dev->enabled = true; + +list_add (&uci_dev->node, &mhi_uci_drv.head); +mutex_unlock (&mhi_uci_drv.lock); +mutex_unlock (&uci_dev->mutex); + +dev_info (dev,"channel:%s successfully probed\n" , mhi_dev->name); + +return 0 ; +}; + +static void mhi_uci_remove (struct mhi_device *mhi_dev)
Quoted 8 lines
drivers/bus/mhi/clients/uci.c line 562
Quoted 6 lines
drivers/bus/mhi/clients/uci.c new file +6
-0+{ +struct uci_dev *uci_dev =dev_get_drvdata (&mhi_dev->dev); +struct device *dev = &mhi_dev->dev; + +dev_dbg (dev,"%s: enter\n" , __func__); +Drop this.
I can remove the enter and exit from the message but it helps to debug race conditions between remove() and open()/release(). i Can say something like removing mhi_dev->name
Quoted 12 lines
drivers/bus/mhi/clients/uci.c line 571
Quoted 10 lines
drivers/bus/mhi/clients/uci.c new file +9
-0+mutex_lock (&mhi_uci_drv.lock); +mutex_lock (&uci_dev->mutex); + +/* disable the node */ +spin_lock_irq (&uci_dev->dl_chan.lock); +spin_lock_irq (&uci_dev->ul_chan.lock); + uci_dev->enabled = false; +spin_unlock_irq (&uci_dev->ul_chan.lock); +spin_unlock_irq (&uci_dev->dl_chan.lock);You need to do something better here. This doesn't look good.
Will come up with change to fix lock related concerns.
Quoted 12 lines
drivers/bus/mhi/clients/uci.c line 580
Quoted 10 lines
drivers/bus/mhi/clients/uci.c new file +9
-0+wake_up (&uci_dev->dl_chan.wq); +wake_up (&uci_dev->ul_chan.wq); + +/* delete the node to prevent new opens */ +device_destroy (mhi_uci_drv.class, uci_dev->devt); + uci_dev->dev =NULL ; +list_del (&uci_dev->node); + +/* safe to free memory only if all file nodes are closed */ And what if it is already freed in .release?
It is possible that ref_count becomes 0 in release() then it would be no-op here.
Quoted 17 lines
Quoted 5 lines
drivers/bus/mhi/clients/uci.c new file +4
-0+if (!uci_dev->ref_count) { +mutex_unlock (&uci_dev->mutex); +mutex_destroy (&uci_dev->mutex); +clear_bit (MINOR (uci_dev->devt), uci_minors);drivers/bus/mhi/clients/uci.c line 594
Quoted 10 lines
drivers/bus/mhi/clients/uci.c new file +10
-0+dev_set_drvdata (&mhi_dev->dev,NULL ); +kfree (uci_dev); +mutex_unlock (&mhi_uci_drv.lock); +return ; + } + +mutex_unlock (&uci_dev->mutex); +mutex_unlock (&mhi_uci_drv.lock); + +dev_dbg (dev,"%s: exit\n" , __func__);Drop this.
I can change it to mhi_dev->name removed. It helps in debugging race conditions.
Quoted 58 lines
Thanks,
ManiQuoted 54 lines
drivers/bus/mhi/clients/uci.c new file +54
-0+} + +/* .driver_data stores max mtu */ +static const struct mhi_device_id mhi_uci_match_table[] = { + { .chan ="LOOPBACK" , .driver_data =0x1000 }, + {}, +}; +MODULE_DEVICE_TABLE (mhi, mhi_uci_match_table); + +static struct mhi_driver mhi_uci_driver = { + .id_table = mhi_uci_match_table, + .remove = mhi_uci_remove, + .probe = mhi_uci_probe, + .ul_xfer_cb = mhi_ul_xfer_cb, + .dl_xfer_cb = mhi_dl_xfer_cb, + .driver = { + .name =MHI_UCI_DRIVER_NAME , + }, +}; + +static int mhi_uci_init (void ) +{ +int ret; + + ret =register_chrdev (0 ,MHI_UCI_DRIVER_NAME , &mhidev_fops); +if (ret <0 ) +return ret; + + mhi_uci_drv.major = ret; + mhi_uci_drv.class =class_create (THIS_MODULE ,MHI_UCI_DRIVER_NAME ); +if (IS_ERR (mhi_uci_drv.class)) { +unregister_chrdev (mhi_uci_drv.major,MHI_UCI_DRIVER_NAME ); +return -ENODEV ; + } + +mutex_init (&mhi_uci_drv.lock); +INIT_LIST_HEAD (&mhi_uci_drv.head); + + ret =mhi_driver_register (&mhi_uci_driver); +if (ret) { +class_destroy (mhi_uci_drv.class); +unregister_chrdev (mhi_uci_drv.major,MHI_UCI_DRIVER_NAME ); + } + +return ret; +} + +static void __exit mhi_uci_exit(void) +{ +mhi_driver_unregister (&mhi_uci_driver); +class_destroy (mhi_uci_drv.class); +unregister_chrdev (mhi_uci_drv.major,MHI_UCI_DRIVER_NAME ); +} +
Quoted 8 lines
Quoted 8 lines
drivers/bus/mhi/clients/uci.c new file +4
-0+module_init (mhi_uci_init); +module_exit (mhi_uci_exit); +MODULE_LICENSE ("GPL v2" ); +MODULE_DESCRIPTION ("MHI UCI Driver" );Signature · 2 lines
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum, a Linux Foundation Collaborative Project
I have some follow up questions based on your review comments. Please let me know your view on those questions above.
Thanks,
Hemant
Signature · 2 lines
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum, a Linux Foundation Collaborative Project
Re: [PATCH v3 4/4] bus: mhi: clients: Add user space client interface driver
Quoted 69 lines · Hemant Kumar
Hi Mani,
Quoted 10 lines · Manivannan Sadhasivam
Quoted 2 lines · Hemant Kumar
This MHI client driver allows user space clients to transfer data between MHI device and host using standard file operations.
I think we need to explicitly specify 'raw' data here. Because we have different APIs for queuing different types of data. So saying just data sounds vague unless this driver can handle multiple types of data which I don't think can happen.
And you need to update the same in docs.
Done.
Quoted 19 lines
Quoted 19 lines
Device file node is created with format
/dev/mhi_<controller_name>_<mhi_device_name>
Currently it supports loopback client.
Signed-off-by Hemant Kumar <[email protected]>--- drivers/bus/mhi/Kconfig | 2 + drivers/bus/mhi/Makefile | 1 + drivers/bus/mhi/clients/Kconfig | 16 + drivers/bus/mhi/clients/Makefile | 3 + drivers/bus/mhi/clients/uci.c | 652 +++++++++++++++++++++++++++++++++++++++ 5 files changed, 674 insertions(+)create mode 100644
drivers/bus/mhi/clients/Kconfigcreate mode 100644drivers/bus/mhi/clients/Makefilecreate mode 100644drivers/bus/mhi/clients/uci.cQuoted 11 lines
drivers/bus/mhi/Kconfig config MHI_BUS_DEBUG · line 22
Quoted 8 lines
drivers/bus/mhi/Kconfig +0
-0@@ -20,3 +20,5 @@ config MHI_BUS_DEBUG Enable debugfs support for use with the MHI transport. Allows reading and/or modifying some values within the MHI controller for debug and test purposes.Hmm, so this patchset depends on debugfs patches? You need to mention this in cover letter. Or even better, just make it independent
Driver does not depend on debugfs. i need to fix that.
Quoted 15 lines
Quoted 15 lines
drivers/bus/mhi/Kconfig +2
-0+ +source "drivers/bus/mhi/clients/Kconfig"drivers/bus/mhi/Makefile +1
-0@@ -1,2 +1,3 @@ # core layer obj-y += core/ +obj-y += clients/drivers/bus/mhi/clients/Kconfig new file +0
-1--- /dev/nullQuoted 8 lines
drivers/bus/mhi/clients/Kconfig line 4
Quoted 6 lines
+++ b/drivers/bus/mhi/clients/Kconfig
drivers/bus/mhi/clients/Kconfig new file +4
-0@@ -0,0 +1,16 @@ +# SPDX-License-Identifier: GPL-2.0-only + +menu "MHI clients support" + depends on MHI_BUSI don't think we need
MHI_BUSdependency here.
Quoted 2 lines
Reason i added was, if MHI BUS is not enabled "MHI clients support" would not show up in the menu.
We can optimize this as below:
config MHI_BUS
...
if MHI_BUS
source "drivers/bus/mhi/clients/Kconfig"
endif
Then we don't need to explicitly specify MHI_BUS dependency in sub-directories.
Quoted 49 lines
Quoted 9 lines
drivers/bus/mhi/clients/Kconfig line 10
Quoted 7 lines
drivers/bus/mhi/clients/Kconfig new file +6
-0+ +config MHI_UCI + tristate "MHI UCI" + depends on MHI_BUS + help + MHI based userspace client interface driver is for transferrings/is for/used for/g. Also provide indent for help text.
Done.
Quoted 5 lines
drivers/bus/mhi/clients/Kconfig line 12
Quoted 3 lines
drivers/bus/mhi/clients/Kconfig new file +2
-0+ data between host and device using standard file operations from + user space. Open, read, write, and close operations are supportedPlease use 'userspace' everywhere.
Done.
Quoted 16 lines
Quoted 11 lines
drivers/bus/mhi/clients/Kconfig new file +4
-0+ by this driver. Please check mhi_uci_match_table for all supported + channels that are exposed to userspace. + +endmenudrivers/bus/mhi/clients/Makefile new file +0
-0drivers/bus/mhi/clients/Makefile line 3
Quoted 3 lines
drivers/bus/mhi/clients/Makefile new file +3
-0@@ -0,0 +1,3 @@ +# SPDX-License-Identifier: GPL-2.0-only + +obj-$(CONFIG_MHI_UCI) +=uci.ospace after '+='
Done.
Quoted 16 lines
Quoted 7 lines
drivers/bus/mhi/clients/uci.c new file +0
-0drivers/bus/mhi/clients/uci.c line 7
Quoted 7 lines
drivers/bus/mhi/clients/uci.c new file +7
-0@@ -0,0 +1,652 @@ +// SPDX-License-Identifier: GPL-2.0-only +/* Copyright (c) 2018-2020, The Linux Foundation. All rights reserved.*/ + +#include <linux/kernel.h> +#include <linux/mod_devicetable.h> +#include <linux/module.h> +#include <linux/mhi.h> Please sort includes alphabetically.
Quoted 6 lines
you mean like this
#include <linux/kernel.h>
#include <linux/mhi.h>
#include <linux/mod_devicetable.h>
#include <linux/module.h>
#include <linux/module.h>
#include <linux/mod_devicetable.h>
Quoted 20 lines
Quoted 9 lines
drivers/bus/mhi/clients/uci.c line 13
Quoted 7 lines
drivers/bus/mhi/clients/uci.c new file +6
-0+#include <linux/poll.h> + +#define DEVICE_NAME "mhi" +#define MHI_UCI_DRIVER_NAME "mhi_uci" +#define MAX_UCI_DEVICES (64) +How about the kdoc comments for all fields and structures used?
Done.
Quoted 10 lines
drivers/bus/mhi/clients/uci.c line 18
Quoted 6 lines
drivers/bus/mhi/clients/uci.c new file +5
-0+struct uci_chan { +wait_queue_head_t wq; + +/* locks ul/dl uci device channel */ +spinlock_t lock;It seems like you are trying to protect a field (enabled) in parent structure (
uci_dev) using this lock. This sounds weird. Why can't you just use the mutex present in that?
Quoted 7 lines
i agree, let me fix locking in the entire driver.
Quoted 5 lines
drivers/bus/mhi/clients/uci.c line 20
Quoted 3 lines
drivers/bus/mhi/clients/uci.c new file +2
-0+ +/* user space waiting to read */ The comments should clearly portray what the field is for.
list of pending read buffers ?
okay
Quoted 7 lines
Quoted 6 lines
drivers/bus/mhi/clients/uci.c line 23
Quoted 4 lines
drivers/bus/mhi/clients/uci.c new file +3
-0+struct list_head pending; + +/* current buffer user space reading */ This sentence is not correct.
current buffer user space is reading ?
Just say, "Buffer for holding the data from device"
Quoted 79 lines
Quoted 13 lines
Quoted 13 lines
drivers/bus/mhi/clients/uci.c new file +12
-0+struct uci_buf *cur_buf; +size_t rx_size; +}; + +struct uci_buf { +void *data; +size_t len; +struct list_head node; +}; + +struct mhi_uci_drv { +struct list_head head;Quoted 8 lines
drivers/bus/mhi/clients/uci.c line 41
Quoted 6 lines
drivers/bus/mhi/clients/uci.c new file +6
-0+ +/* uci driver lock to sync open, probe and remove */ +struct mutex lock; +struct class *class; +int major; +dev_t dev_t;devt?
will rename it to devt
Quoted 14 lines
drivers/bus/mhi/clients/uci.c line 51
Quoted 11 lines
drivers/bus/mhi/clients/uci.c new file +10
-0+}; + +struct uci_dev { +struct list_head node; +dev_t devt; +struct device *dev; +struct mhi_device *mhi_dev; +const char *chan; + +/* sync open and close */ Again, please use descriptive comments. Need not be multi lines but something which could be understood easily.
Done.
Quoted 16 lines
Quoted 4 lines
drivers/bus/mhi/clients/uci.c new file +3
-0+struct mutex mutex; +struct uci_chan ul_chan; +struct uci_chan dl_chan;drivers/bus/mhi/clients/uci.c line 64
Quoted 10 lines
drivers/bus/mhi/clients/uci.c new file +10
-0+size_t mtu; + +/* maximum size of incoming buffer */ +size_t actual_mtu; +int ref_count; +bool enabled; +}; + +static DECLARE_BITMAP(uci_minors, MAX_UCI_DEVICES); +static struct mhi_uci_drv mhi_uci_drv;Please use object names different from datatype names everywhere.
Done.
Quoted 9 lines
drivers/bus/mhi/clients/uci.c line 70
Quoted 7 lines
drivers/bus/mhi/clients/uci.c new file +6
-0+ +static int mhi_queue_inbound (struct uci_dev *uci_dev) +{ +struct mhi_device *mhi_dev = uci_dev->mhi_dev; +struct device *dev = &mhi_dev->dev; +int nr_trbs =mhi_get_no_free_descriptors (mhi_dev,DMA_FROM_DEVICE );I'd prefer to have this assignment in definition block.
Done.
Quoted 15 lines
drivers/bus/mhi/clients/uci.c line 82
Quoted 13 lines
drivers/bus/mhi/clients/uci.c new file +12
-0+size_t mtu = uci_dev->mtu; +size_t actual_mtu = uci_dev->actual_mtu; +void *buf; +struct uci_buf *uci_buf; +int ret = -EIO , i; + +for (i =0 ; i < nr_trbs; i++) { + buf =kmalloc (mtu,GFP_KERNEL ); +if (!buf) +return -ENOMEM ; + + uci_buf = buf + actual_mtu;Aren't you segfaulting here?
Quoted 4 lines
no, in probe we do this
uci_dev->actual_mtu=uci_dev->mtu-sizeof(struct uci_buf); and save meta datauci_bufdata ptr and len. it is done inmhi_dl_xfer_cb()function and used inread().
Ah.. I misread this. I thought you're adding actual_mtu to buf. Sorry for the noise.
Quoted 17 lines
Quoted 17 lines
drivers/bus/mhi/clients/uci.c line 83
Quoted 2 lines
drivers/bus/mhi/clients/uci.c new file +1
-0+ uci_buf->data = buf;Where is this
uci_bufgetting used?drivers/bus/mhi/clients/uci.c line 92
Quoted 9 lines
drivers/bus/mhi/clients/uci.c new file +9
-0+ +dev_dbg (dev,"Allocated buf %d of %d size %ld\n" , i, nr_trbs, + actual_mtu); + + ret =mhi_queue_buf (mhi_dev,DMA_FROM_DEVICE , buf, actual_mtu, +MHI_EOT ); +if (ret) { +kfree (buf); +dev_err (dev,"Failed to queue buffer %d\n" , i);Failed to queue buffer: %d
Quoted 6 lines
Quoted 4 lines
drivers/bus/mhi/clients/uci.c line 94
Quoted 2 lines
drivers/bus/mhi/clients/uci.c new file +2
-0+return ret; + }So is this buffer getting freed anywhere?
in
mhi_uci_release().Quoted 1 line
You're not assigning uci_buf here. Then how it will get freed? Moreover I don't see any reason to allocate uci_buf in this function.
Quoted 41 lines
Quoted 18 lines
Quoted 18 lines
+ }drivers/bus/mhi/clients/uci.c new file +17
-0+ +return ret; +} + +static int mhi_uci_release (struct inode *inode,struct file *file) +{ +struct uci_dev *uci_dev = file->private_data; + +mutex_lock (&uci_dev->mutex); + uci_dev->ref_count--; +if (!uci_dev->ref_count) { +struct uci_buf *itr, *tmp; +struct uci_chan *uci_chan; + +if (uci_dev->enabled) +mhi_unprepare_from_transfer (uci_dev->mhi_dev); +Quoted 8 lines
drivers/bus/mhi/clients/uci.c line 118
Quoted 6 lines
drivers/bus/mhi/clients/uci.c new file +6
-0+/* clean inbound channel */ + uci_chan = &uci_dev->dl_chan; +list_for_each_entry_safe (itr, tmp, &uci_chan->pending, node) { +list_del (&itr->node); +kfree (itr->data); + }Add a new line after '}' and before next line of code.
Done.
Quoted 14 lines
drivers/bus/mhi/clients/uci.c line 128
Quoted 11 lines
drivers/bus/mhi/clients/uci.c new file +10
-0+if (uci_chan->cur_buf) +kfree (uci_chan->cur_buf->data); + + uci_chan->cur_buf =NULL ; + +if (!uci_dev->enabled) { +mutex_unlock (&uci_dev->mutex); +mutex_destroy (&uci_dev->mutex); +clear_bit (MINOR (uci_dev->devt), uci_minors); +kfree (uci_dev);Hmm. So you are freeing
uci_devhere and also trying to do the same inmhi_uci_remove.
Quoted 2 lines
yes that is based on ref count, so no double free. do you see any issue with that ?
You are decreasing the refcount here and freeing uci_dev if refcount is 0. Then in mhi_uci_remove() you're again checking if the refcount is 0 and then trying to release uci_dev. Am I missing something?
Since you're allocating uci_dev in probe(), you should only free it in remove().
Quoted 26 lines
Quoted 26 lines
Quoted 13 lines
drivers/bus/mhi/clients/uci.c new file +12
-0+return 0 ; + } + } + +mutex_unlock (&uci_dev->mutex); + +return 0 ; +} + +static __poll_t mhi_uci_poll (struct file *file,poll_table *wait) +{ +struct uci_dev *uci_dev = file->private_data;drivers/bus/mhi/clients/uci.c line 150
Quoted 10 lines
drivers/bus/mhi/clients/uci.c new file +10
-0+struct mhi_device *mhi_dev = uci_dev->mhi_dev; +struct device *dev = &mhi_dev->dev; +struct uci_chan *uci_chan; +__poll_t mask =0 ; + +poll_wait (file, &uci_dev->dl_chan.wq, wait); +poll_wait (file, &uci_dev->ul_chan.wq, wait); + + uci_chan = &uci_dev->dl_chan; +spin_lock_bh (&uci_chan->lock);This is what looks wrong to me.
Quoted 8 lines
Quoted 4 lines
drivers/bus/mhi/clients/uci.c
Quoted 1 line
drivers/bus/mhi/clients/uci.c new file +1
-0+if (!uci_dev->enabled) {So you are removing the char dev node even if there are users in the system. Why do you want to do so?
Removing char dev node is done when MHI device is removed. It is possible that user space entity would exist but MHI device is removed due to underlying transport disconnect. i dont see a way to prevent this or i am missing your point. Can you pls elaborate your concern.
I didn't closely look where the device is getting created. Please ignore my comment...
Quoted 75 lines
Quoted 39 lines
Quoted 39 lines
drivers/bus/mhi/clients/uci.c new file +38
-0+ mask =EPOLLERR ; + }else { +if (!list_empty (&uci_chan->pending) || uci_chan->cur_buf) { +dev_dbg (dev,"Client can read from node\n" ); + mask |=EPOLLIN |EPOLLRDNORM ; + } + } +spin_unlock_bh (&uci_chan->lock); + + uci_chan = &uci_dev->ul_chan; +spin_lock_bh (&uci_chan->lock); +if (!uci_dev->enabled) { + mask |=EPOLLERR ; + }else if (mhi_get_no_free_descriptors (mhi_dev,DMA_TO_DEVICE ) >0 ) { +dev_dbg (dev,"Client can write to node\n" ); + mask |=EPOLLOUT |EPOLLWRNORM ; + } +spin_unlock_bh (&uci_chan->lock); + +dev_dbg (dev,"Client attempted to poll, returning mask 0x%x\n" , mask); + +return mask; +} + +static ssize_t mhi_uci_write (struct file *file, +const char __user *buf, +size_t count, +loff_t *offp) +{ +struct uci_dev *uci_dev = file->private_data; +struct mhi_device *mhi_dev = uci_dev->mhi_dev; +struct device *dev = &mhi_dev->dev; +struct uci_chan *uci_chan = &uci_dev->ul_chan; +size_t bytes_xfered =0 ; +int ret, nr_avail; + +if (!buf || !count) +return -EINVAL ;Quoted 8 lines
drivers/bus/mhi/clients/uci.c line 195
Quoted 6 lines
drivers/bus/mhi/clients/uci.c new file +6
-0+ +/* confirm channel is active */ +spin_lock_bh (&uci_chan->lock); +if (!uci_dev->enabled) { +spin_unlock_bh (&uci_chan->lock); +return -ERESTARTSYS ;You should return
-ENODEVhere.Done.
Quoted 7 lines
drivers/bus/mhi/clients/uci.c line 199
Quoted 5 lines
drivers/bus/mhi/clients/uci.c new file +4
-0+ } + +dev_dbg (dev,"Enter: to xfer:%lu bytes\n" , count); +Please avoid "Enter" debug prints.
Done, will keep the byte count print?
Quoted 9 lines
drivers/bus/mhi/clients/uci.c line 205
Quoted 7 lines
drivers/bus/mhi/clients/uci.c new file +6
-0+while (count) { +size_t xfer_size; +void *kbuf; +enum mhi_flags flags; + +spin_unlock_bh (&uci_chan->lock);Why do you want to hold the lock till here?
Will come up with better locking in next patch set
Quoted 9 lines
drivers/bus/mhi/clients/uci.c line 211
Quoted 7 lines
drivers/bus/mhi/clients/uci.c new file +6
-0+ +/* wait for free descriptors */ + ret =wait_event_interruptible (uci_chan->wq, + (!uci_dev->enabled) || + (nr_avail =mhi_get_no_free_descriptors (mhi_dev, +DMA_TO_DEVICE )) >0 );Does using "
wait_event_interruptible_timeout" makes sense here?
Quoted 3 lines
No, read needs to be blocked until data comes. user space would call
read()and wait for data to arrive. There is no definite time when data would arrive.
Hmm, I thought we could timeout at some point. But that's fine.
Quoted 54 lines
Quoted 7 lines
drivers/bus/mhi/clients/uci.c line 215
Quoted 5 lines
drivers/bus/mhi/clients/uci.c new file +4
-0+ +if (ret == -ERESTARTSYS || !uci_dev->enabled) { +dev_dbg (dev,"Exit signal caught for node or not enabled\n" ); +return -ERESTARTSYS ;You need to return
-ENODEVfor !uci_dev->enabled case.Done.
Quoted 21 lines
Quoted 21 lines
drivers/bus/mhi/clients/uci.c new file +20
-0+ } + + xfer_size =min_t (size_t, count, uci_dev->mtu); + kbuf =kmalloc (xfer_size,GFP_KERNEL ); +if (!kbuf) +return -ENOMEM ; + + ret =copy_from_user (kbuf, buf, xfer_size); +if (unlikely (ret)) { +kfree (kbuf); +return ret; + } + +spin_lock_bh (&uci_chan->lock); + +/* if ring is full after this force EOT */ +if (nr_avail >1 && (count - xfer_size)) + flags =MHI_CHAIN ; +else + flags =MHI_EOT ;Quoted 8 lines
drivers/bus/mhi/clients/uci.c line 241
Quoted 6 lines
drivers/bus/mhi/clients/uci.c new file +6
-0+ +if (uci_dev->enabled) + ret =mhi_queue_buf (mhi_dev,DMA_TO_DEVICE , kbuf, + xfer_size, flags); +else + ret = -ERESTARTSYS ;Again, please fix this all over the driver.
Done.
Quoted 16 lines
Quoted 4 lines
drivers/bus/mhi/clients/uci.c new file +3
-0+ +if (ret) { +kfree (kbuf);drivers/bus/mhi/clients/uci.c line 254
Quoted 10 lines
drivers/bus/mhi/clients/uci.c new file +10
-0+ goto sys_interrupt; + } + + bytes_xfered += xfer_size; + count -= xfer_size; + buf += xfer_size; + } + +spin_unlock_bh (&uci_chan->lock); +dev_dbg (dev,"Exit: Number of bytes xferred:%lu\n" , bytes_xfered);Drop the "Exit" too.
Quoted 3 lines
how about keeping the number of bytes xferred and remove exit from the msg ? helps in debugging user space entity vs kernel space mhi uci driver issues.
Quoted 1 line
Yep, just remove 'Exit'.
Quoted 29 lines
Quoted 21 lines
Quoted 21 lines
drivers/bus/mhi/clients/uci.c new file +21
-0+ +return bytes_xfered; + +sys_interrupt: +spin_unlock_bh (&uci_chan->lock); + +return ret; +} + +static ssize_t mhi_uci_read (struct file *file, +char __user *buf, +size_t count, +loff_t *ppos) +{ +struct uci_dev *uci_dev = file->private_data; +struct mhi_device *mhi_dev = uci_dev->mhi_dev; +struct uci_chan *uci_chan = &uci_dev->dl_chan; +struct device *dev = &mhi_dev->dev; +struct uci_buf *uci_buf; +char *ptr; +size_t to_copy;Quoted 8 lines
drivers/bus/mhi/clients/uci.c line 281
Quoted 6 lines
drivers/bus/mhi/clients/uci.c new file +6
-0+int ret =0 ; + +if (!buf) +return -EINVAL ; + +dev_dbg (dev,"Client provided buf len:%lu\n" , count);Drop this.
Quoted 4 lines
This would help if client provided buffer is smaller than the received rx data. Even though this function would only copy the mount of buffer provided by user space but we can track that condition.
Quoted 1 line
The userspace will know how much buffer allocated, so no need to say it here.
Quoted 23 lines
Quoted 15 lines
Quoted 15 lines
drivers/bus/mhi/clients/uci.c new file +15
-0+ +mutex_lock (&uci_dev->mutex); +/* confirm channel is active */ +spin_lock_bh (&uci_chan->lock); +if (!uci_dev->enabled) { +spin_unlock_bh (&uci_chan->lock); +mutex_unlock (&uci_dev->mutex); +return -ERESTARTSYS ; + } + +/* No data available to read, wait */ +if (!uci_chan->cur_buf &&list_empty (&uci_chan->pending)) { +dev_dbg (dev,"No data available to read waiting\n" ); + +spin_unlock_bh (&uci_chan->lock);Quoted 8 lines
drivers/bus/mhi/clients/uci.c line 302
Quoted 6 lines
drivers/bus/mhi/clients/uci.c new file +6
-0+mutex_unlock (&uci_dev->mutex); + ret =wait_event_interruptible (uci_chan->wq, + (!uci_dev->enabled || + !list_empty (&uci_chan->pending))); +if (ret == -ERESTARTSYS ) { +dev_dbg (dev,"Exit signal caught for node\n" );No need of this.
Quoted 3 lines
This is same as what we are doing in
write(). I can add theuci_dev->enabledcheck here as well and return-ENODEVas you commented forwrite(). Helps in debugging.
Okay
Quoted 53 lines
Quoted 10 lines
drivers/bus/mhi/clients/uci.c line 309
Quoted 8 lines
drivers/bus/mhi/clients/uci.c new file +7
-0+return -ERESTARTSYS ; + } + +mutex_lock (&uci_dev->mutex); +spin_lock_bh (&uci_chan->lock); +if (!uci_dev->enabled) { +dev_dbg (dev,"node is disabled\n" );Okay, this is what I'm concerned about.
If your concern is about locking, i am going to come up with the change to fix that. If you concern is about node getting removed while read is issued then i dont see how we can prevent that.
Quoted 32 lines
Quoted 32 lines
drivers/bus/mhi/clients/uci.c new file +31
-0+ ret = -ERESTARTSYS ; + goto read_error; + } + } + +/* new read, get the next descriptor from the list */ +if (!uci_chan->cur_buf) { + uci_buf =list_first_entry_or_null (&uci_chan->pending, + struct uci_buf, node); +if (unlikely (!uci_buf)) { + ret = -EIO ; + goto read_error; + } + +list_del (&uci_buf->node); + uci_chan->cur_buf = uci_buf; + uci_chan->rx_size = uci_buf->len; +dev_dbg (dev,"Got pkt of size:%zu\n" , uci_chan->rx_size); + } + + uci_buf = uci_chan->cur_buf; + +/* Copy the buffer to user space */ + to_copy =min_t (size_t, count, uci_chan->rx_size); + ptr = uci_buf->data + (uci_buf->len - uci_chan->rx_size); +spin_unlock_bh (&uci_chan->lock); + + ret =copy_to_user (buf, ptr, to_copy); +if (ret) + goto err_unlock_mtx; +Quoted 8 lines
drivers/bus/mhi/clients/uci.c line 346
Quoted 6 lines
drivers/bus/mhi/clients/uci.c new file +6
-0+spin_lock_bh (&uci_chan->lock); + +dev_dbg (dev,"Copied %lu of %lu bytes\n" , to_copy, uci_chan->rx_size); + uci_chan->rx_size -= to_copy; + +/* we finished with this buffer, queue it back to hardware */ Oh wait... what is happening here? Why do you want to do tx?
Quoted 2 lines
we are not doing any TX, we are just queuing the rx buffer back to get more data.
But why? You are doing this unconditionally!
Quoted 60 lines
Quoted 52 lines
Quoted 52 lines
drivers/bus/mhi/clients/uci.c new file +51
-0+if (!uci_chan->rx_size) { + uci_chan->cur_buf =NULL ; + +if (uci_dev->enabled) + ret =mhi_queue_buf (mhi_dev,DMA_FROM_DEVICE , + uci_buf->data, + uci_dev->actual_mtu,MHI_EOT ); +else + ret = -ERESTARTSYS ; + +if (ret) { +dev_err (dev,"Failed to recycle element\n" ); +kfree (uci_buf->data); + goto read_error; + } + } +spin_unlock_bh (&uci_chan->lock); +mutex_unlock (&uci_dev->mutex); + +dev_dbg (dev,"Returning %lu bytes\n" , to_copy); + +return to_copy; + +read_error: +spin_unlock_bh (&uci_chan->lock); +err_unlock_mtx: +mutex_unlock (&uci_dev->mutex); +return ret; +} + +static int mhi_uci_open (struct inode *inode,struct file *filp) +{ +struct uci_dev *uci_dev =NULL , *tmp_dev; +int ret = -EIO ; +struct uci_buf *buf_itr, *tmp; +struct uci_chan *dl_chan; +struct mhi_device *mhi_dev; +struct device *dev; + +mutex_lock (&mhi_uci_drv.lock); +list_for_each_entry (tmp_dev, &mhi_uci_drv.head, node) { +if (tmp_dev->devt == inode->i_rdev) { + uci_dev = tmp_dev; +break ; + } + } + +/* could not find a minor node */ +if (!uci_dev) + goto error_exit; +Quoted 8 lines
drivers/bus/mhi/clients/uci.c line 403
Quoted 6 lines
drivers/bus/mhi/clients/uci.c new file +6
-0+ mhi_dev = uci_dev->mhi_dev; + dev = &mhi_dev->dev; + +mutex_lock (&uci_dev->mutex); +if (!uci_dev->enabled) { +dev_info (dev,"Node exist, but not in active state!\n" );Dangling node, right.
Quoted 3 lines
In case
remove()is in progress and enabled is set to false butdestroy_deviceis not called yet. It covers that case andopen()is called by user space entity.
Hmm, okay.
Quoted 21 lines
Quoted 13 lines
Quoted 13 lines
drivers/bus/mhi/clients/uci.c new file +12
-0+ goto error_open_chan; + } + + uci_dev->ref_count++; + +dev_dbg (dev,"Node open, ref counts %u\n" , uci_dev->ref_count); + +if (uci_dev->ref_count ==1 ) { +dev_dbg (dev,"Starting channel\n" ); + ret =mhi_prepare_for_transfer (uci_dev->mhi_dev); +if (ret) { +dev_err (dev,"Error starting transfer channels\n" );Quoted 8 lines
drivers/bus/mhi/clients/uci.c line 421
Quoted 6 lines
drivers/bus/mhi/clients/uci.c new file +6
-0+ uci_dev->ref_count--; + goto error_open_chan; + } + + ret =mhi_queue_inbound (uci_dev); +if (ret)Decrease refcount?
Quoted 3 lines
done in release. For every open increment the ref count and for every release call decrement it, so that when ref count becomes 0 we can free memory.
Even if open() fails?
Quoted 152 lines
Quoted 38 lines
Quoted 38 lines
drivers/bus/mhi/clients/uci.c new file +37
-0+ goto error_rx_queue; + } + + filp->private_data = uci_dev; +mutex_unlock (&uci_dev->mutex); +mutex_unlock (&mhi_uci_drv.lock); + +return 0 ; + +error_rx_queue: + dl_chan = &uci_dev->dl_chan; +mhi_unprepare_from_transfer (uci_dev->mhi_dev); +list_for_each_entry_safe (buf_itr, tmp, &dl_chan->pending, node) { +list_del (&buf_itr->node); +kfree (buf_itr->data); + } + +error_open_chan: +mutex_unlock (&uci_dev->mutex); + +error_exit: +mutex_unlock (&mhi_uci_drv.lock); + +return ret; +} + +static const struct file_operations mhidev_fops = { + .owner =THIS_MODULE , + .open = mhi_uci_open, + .release = mhi_uci_release, + .read = mhi_uci_read, + .write = mhi_uci_write, + .poll = mhi_uci_poll, +}; + +static void mhi_ul_xfer_cb (struct mhi_device *mhi_dev, +struct mhi_result *mhi_result)Quoted 8 lines
drivers/bus/mhi/clients/uci.c line 464
Quoted 6 lines
drivers/bus/mhi/clients/uci.c new file +6
-0+{ +struct uci_dev *uci_dev =dev_get_drvdata (&mhi_dev->dev); +struct uci_chan *uci_chan = &uci_dev->ul_chan; +struct device *dev = &mhi_dev->dev; + + dev_dbg(dev, "status:%d xfer_len:%zu\n", mhi_result->transaction_status,Always leave a space after :
Done.
Quoted 56 lines
Quoted 56 lines
drivers/bus/mhi/clients/uci.c new file +55
-0+ mhi_result->bytes_xferd); + +kfree (mhi_result->buf_addr); +if (!mhi_result->transaction_status) +wake_up (&uci_chan->wq); +} + +static void mhi_dl_xfer_cb (struct mhi_device *mhi_dev, +struct mhi_result *mhi_result) +{ +struct uci_dev *uci_dev =dev_get_drvdata (&mhi_dev->dev); +struct uci_chan *uci_chan = &uci_dev->dl_chan; +struct device *dev = &mhi_dev->dev; +unsigned long flags; +struct uci_buf *buf; + +dev_dbg (dev,"status:%d receive_len:%zu\n" , + mhi_result->transaction_status, mhi_result->bytes_xferd); + +if (mhi_result->transaction_status == -ENOTCONN ) { +kfree (mhi_result->buf_addr); +return ; + } + +spin_lock_irqsave (&uci_chan->lock, flags); + buf = mhi_result->buf_addr + uci_dev->actual_mtu; + buf->data = mhi_result->buf_addr; + buf->len = mhi_result->bytes_xferd; +list_add_tail (&buf->node, &uci_chan->pending); +spin_unlock_irqrestore (&uci_chan->lock, flags); + +wake_up (&uci_chan->wq); +} + +static int mhi_uci_probe (struct mhi_device *mhi_dev, +const struct mhi_device_id *id) +{ +struct uci_dev *uci_dev; +struct mhi_controller *mhi_cntrl = mhi_dev->mhi_cntrl; +struct device *dev = &mhi_dev->dev; +int minor; +int dir; + + uci_dev =kzalloc (sizeof (*uci_dev),GFP_KERNEL ); +if (!uci_dev) +return -ENOMEM ; + +mutex_init (&uci_dev->mutex); + uci_dev->mhi_dev = mhi_dev; + +mutex_lock (&uci_dev->mutex); +mutex_lock (&mhi_uci_drv.lock); + + minor =find_first_zero_bit (uci_minors,MAX_UCI_DEVICES ); +if (minor >=MAX_UCI_DEVICES ) {Quoted 8 lines
drivers/bus/mhi/clients/uci.c line 525
Quoted 6 lines
drivers/bus/mhi/clients/uci.c new file +6
-0+mutex_unlock (&mhi_uci_drv.lock); +mutex_unlock (&uci_dev->mutex); +kfree (uci_dev); +return -ENOSPC ; + } +Add a comment regarding what is going on below.
Done.
Quoted 32 lines
Quoted 32 lines
drivers/bus/mhi/clients/uci.c new file +31
-0+ uci_dev->devt =MKDEV (mhi_uci_drv.major, minor); + uci_dev->dev =device_create (mhi_uci_drv.class, &mhi_dev->dev, + uci_dev->devt, uci_dev, +DEVICE_NAME "_%s_%s" , +dev_name (mhi_cntrl->cntrl_dev), + mhi_dev->name); +set_bit (minor, uci_minors); + +for (dir =0 ; dir <2 ; dir++) { +struct uci_chan *uci_chan = (dir) ? + &uci_dev->ul_chan : &uci_dev->dl_chan; +spin_lock_init (&uci_chan->lock); +init_waitqueue_head (&uci_chan->wq); +INIT_LIST_HEAD (&uci_chan->pending); + } + + uci_dev->mtu =min_t (size_t, id->driver_data,MHI_MAX_MTU ); + uci_dev->actual_mtu = uci_dev->mtu -sizeof (struct uci_buf ); +dev_set_drvdata (&mhi_dev->dev, uci_dev); + uci_dev->enabled = true; + +list_add (&uci_dev->node, &mhi_uci_drv.head); +mutex_unlock (&mhi_uci_drv.lock); +mutex_unlock (&uci_dev->mutex); + +dev_info (dev,"channel:%s successfully probed\n" , mhi_dev->name); + +return 0 ; +}; + +static void mhi_uci_remove (struct mhi_device *mhi_dev)Quoted 8 lines
drivers/bus/mhi/clients/uci.c line 562
Quoted 6 lines
drivers/bus/mhi/clients/uci.c new file +6
-0+{ +struct uci_dev *uci_dev =dev_get_drvdata (&mhi_dev->dev); +struct device *dev = &mhi_dev->dev; + +dev_dbg (dev,"%s: enter\n" , __func__); +Drop this.
Quoted 3 lines
I can remove the enter and exit from the message but it helps to debug race conditions between
remove()and open()/release(). i Can say something like removingmhi_dev->name
Okay.
Quoted 25 lines
Quoted 12 lines
drivers/bus/mhi/clients/uci.c line 571
Quoted 10 lines
drivers/bus/mhi/clients/uci.c new file +9
-0+mutex_lock (&mhi_uci_drv.lock); +mutex_lock (&uci_dev->mutex); + +/* disable the node */ +spin_lock_irq (&uci_dev->dl_chan.lock); +spin_lock_irq (&uci_dev->ul_chan.lock); + uci_dev->enabled = false; +spin_unlock_irq (&uci_dev->ul_chan.lock); +spin_unlock_irq (&uci_dev->dl_chan.lock);You need to do something better here. This doesn't look good.
Will come up with change to fix lock related concerns.
Quoted 12 lines
drivers/bus/mhi/clients/uci.c line 580
Quoted 10 lines
drivers/bus/mhi/clients/uci.c new file +9
-0+wake_up (&uci_dev->dl_chan.wq); +wake_up (&uci_dev->ul_chan.wq); + +/* delete the node to prevent new opens */ +device_destroy (mhi_uci_drv.class, uci_dev->devt); + uci_dev->dev =NULL ; +list_del (&uci_dev->node); + +/* safe to free memory only if all file nodes are closed */ And what if it is already freed in .release?
Quoted 2 lines
It is possible that
ref_countbecomes 0 inrelease()then it would be no-op here.
No-op? You are calling kfree again.
Quoted 17 lines
Quoted 17 lines
Quoted 5 lines
drivers/bus/mhi/clients/uci.c new file +4
-0+if (!uci_dev->ref_count) { +mutex_unlock (&uci_dev->mutex); +mutex_destroy (&uci_dev->mutex); +clear_bit (MINOR (uci_dev->devt), uci_minors);drivers/bus/mhi/clients/uci.c line 594
Quoted 10 lines
drivers/bus/mhi/clients/uci.c new file +10
-0+dev_set_drvdata (&mhi_dev->dev,NULL ); +kfree (uci_dev); +mutex_unlock (&mhi_uci_drv.lock); +return ; + } + +mutex_unlock (&uci_dev->mutex); +mutex_unlock (&mhi_uci_drv.lock); + +dev_dbg (dev,"%s: exit\n" , __func__);Drop this.
Quoted 2 lines
I can change it to
mhi_dev->nameremoved. It helps in debugging race conditions.
Okay.
Quoted 75 lines
Quoted 58 lines
Thanks,
ManiQuoted 54 lines
drivers/bus/mhi/clients/uci.c new file +54
-0+} + +/* .driver_data stores max mtu */ +static const struct mhi_device_id mhi_uci_match_table[] = { + { .chan ="LOOPBACK" , .driver_data =0x1000 }, + {}, +}; +MODULE_DEVICE_TABLE (mhi, mhi_uci_match_table); + +static struct mhi_driver mhi_uci_driver = { + .id_table = mhi_uci_match_table, + .remove = mhi_uci_remove, + .probe = mhi_uci_probe, + .ul_xfer_cb = mhi_ul_xfer_cb, + .dl_xfer_cb = mhi_dl_xfer_cb, + .driver = { + .name =MHI_UCI_DRIVER_NAME , + }, +}; + +static int mhi_uci_init (void ) +{ +int ret; + + ret =register_chrdev (0 ,MHI_UCI_DRIVER_NAME , &mhidev_fops); +if (ret <0 ) +return ret; + + mhi_uci_drv.major = ret; + mhi_uci_drv.class =class_create (THIS_MODULE ,MHI_UCI_DRIVER_NAME ); +if (IS_ERR (mhi_uci_drv.class)) { +unregister_chrdev (mhi_uci_drv.major,MHI_UCI_DRIVER_NAME ); +return -ENODEV ; + } + +mutex_init (&mhi_uci_drv.lock); +INIT_LIST_HEAD (&mhi_uci_drv.head); + + ret =mhi_driver_register (&mhi_uci_driver); +if (ret) { +class_destroy (mhi_uci_drv.class); +unregister_chrdev (mhi_uci_drv.major,MHI_UCI_DRIVER_NAME ); + } + +return ret; +} + +static void __exit mhi_uci_exit(void) +{ +mhi_driver_unregister (&mhi_uci_driver); +class_destroy (mhi_uci_drv.class); +unregister_chrdev (mhi_uci_drv.major,MHI_UCI_DRIVER_NAME ); +} +Quoted 8 lines
Quoted 8 lines
drivers/bus/mhi/clients/uci.c new file +4
-0+module_init (mhi_uci_init); +module_exit (mhi_uci_exit); +MODULE_LICENSE ("GPL v2" ); +MODULE_DESCRIPTION ("MHI UCI Driver" );Signature · 2 lines
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum, a Linux Foundation Collaborative ProjectI have some follow up questions based on your review comments. Please let me know your view on those questions above.
Thanks,
HemantSignature · 2 lines
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum, a Linux Foundation Collaborative Project
Re: [PATCH v3 4/4] bus: mhi: clients: Add user space client interface driver
Hi Mani,
Quoted 78 lines · Manivannan Sadhasivam
Quoted 69 lines · Hemant Kumar
Hi Mani,
Quoted 10 lines · Manivannan Sadhasivam
Quoted 2 lines · Hemant Kumar
This MHI client driver allows user space clients to transfer data between MHI device and host using standard file operations.
I think we need to explicitly specify 'raw' data here. Because we have different APIs for queuing different types of data. So saying just data sounds vague unless this driver can handle multiple types of data which I don't think can happen.
And you need to update the same in docs.
Done.
Quoted 19 lines
Quoted 19 lines
Device file node is created with format
/dev/mhi_<controller_name>_<mhi_device_name>
Currently it supports loopback client.
Signed-off-by Hemant Kumar <[email protected]>--- drivers/bus/mhi/Kconfig | 2 + drivers/bus/mhi/Makefile | 1 + drivers/bus/mhi/clients/Kconfig | 16 + drivers/bus/mhi/clients/Makefile | 3 + drivers/bus/mhi/clients/uci.c | 652 +++++++++++++++++++++++++++++++++++++++ 5 files changed, 674 insertions(+)create mode 100644
drivers/bus/mhi/clients/Kconfigcreate mode 100644drivers/bus/mhi/clients/Makefilecreate mode 100644drivers/bus/mhi/clients/uci.cQuoted 11 lines
drivers/bus/mhi/Kconfig config MHI_BUS_DEBUG · line 22
Quoted 8 lines
drivers/bus/mhi/Kconfig +0
-0@@ -20,3 +20,5 @@ config MHI_BUS_DEBUG Enable debugfs support for use with the MHI transport. Allows reading and/or modifying some values within the MHI controller for debug and test purposes.Hmm, so this patchset depends on debugfs patches? You need to mention this in cover letter. Or even better, just make it independent
Driver does not depend on debugfs. i need to fix that.
Quoted 15 lines
Quoted 15 lines
drivers/bus/mhi/Kconfig +2
-0+ +source "drivers/bus/mhi/clients/Kconfig"drivers/bus/mhi/Makefile +1
-0@@ -1,2 +1,3 @@ # core layer obj-y += core/ +obj-y += clients/drivers/bus/mhi/clients/Kconfig new file +0
-1--- /dev/nullQuoted 8 lines
drivers/bus/mhi/clients/Kconfig line 4
Quoted 6 lines
+++ b/drivers/bus/mhi/clients/Kconfig
drivers/bus/mhi/clients/Kconfig new file +4
-0@@ -0,0 +1,16 @@ +# SPDX-License-Identifier: GPL-2.0-only + +menu "MHI clients support" + depends on MHI_BUSI don't think we need
MHI_BUSdependency here.Quoted 2 lines
Reason i added was, if MHI BUS is not enabled "MHI clients support" would not show up in the menu.
We can optimize this as below:
config
MHI_BUS...
Quoted 7 lines
if
MHI_BUSsource "
drivers/bus/mhi/clients/Kconfig"endif
Then we don't need to explicitly specify
MHI_BUSdependency in sub-directories.
Done.
Quoted 208 lines
Quoted 50 lines
Quoted 10 lines
drivers/bus/mhi/clients/Kconfig line 10
Quoted 8 lines
drivers/bus/mhi/clients/Kconfig new file +6
-0+ +config MHI_UCI + tristate "MHI UCI" + depends on MHI_BUS + help + MHI based userspace client interface driver is for transferrings/is for/used for/g. Also provide indent for help text.
Done.
Quoted 5 lines
drivers/bus/mhi/clients/Kconfig line 12
Quoted 3 lines
drivers/bus/mhi/clients/Kconfig new file +2
-0+ data between host and device using standard file operations from + user space. Open, read, write, and close operations are supportedPlease use 'userspace' everywhere.
Done.
Quoted 16 lines
Quoted 11 lines
drivers/bus/mhi/clients/Kconfig new file +4
-0+ by this driver. Please check mhi_uci_match_table for all supported + channels that are exposed to userspace. + +endmenudrivers/bus/mhi/clients/Makefile new file +0
-0drivers/bus/mhi/clients/Makefile line 3
Quoted 3 lines
drivers/bus/mhi/clients/Makefile new file +3
-0@@ -0,0 +1,3 @@ +# SPDX-License-Identifier: GPL-2.0-only + +obj-$(CONFIG_MHI_UCI) +=uci.ospace after '+='
Done.
Quoted 16 lines
Quoted 7 lines
drivers/bus/mhi/clients/uci.c new file +0
-0drivers/bus/mhi/clients/uci.c line 7
Quoted 7 lines
drivers/bus/mhi/clients/uci.c new file +7
-0@@ -0,0 +1,652 @@ +// SPDX-License-Identifier: GPL-2.0-only +/* Copyright (c) 2018-2020, The Linux Foundation. All rights reserved.*/ + +#include <linux/kernel.h> +#include <linux/mod_devicetable.h> +#include <linux/module.h> +#include <linux/mhi.h> Please sort includes alphabetically.
Quoted 6 lines
you mean like this
#include <linux/kernel.h>
#include <linux/mhi.h>
#include <linux/mod_devicetable.h>
#include <linux/module.h>#include <
linux/module.h>
#include <linux/mod_devicetable.h>Quoted 20 lines
Quoted 9 lines
drivers/bus/mhi/clients/uci.c line 13
Quoted 7 lines
drivers/bus/mhi/clients/uci.c new file +6
-0+#include <linux/poll.h> + +#define DEVICE_NAME "mhi" +#define MHI_UCI_DRIVER_NAME "mhi_uci" +#define MAX_UCI_DEVICES (64) +How about the kdoc comments for all fields and structures used?
Done.
Quoted 10 lines
drivers/bus/mhi/clients/uci.c line 18
Quoted 6 lines
drivers/bus/mhi/clients/uci.c new file +5
-0+struct uci_chan { +wait_queue_head_t wq; + +/* locks ul/dl uci device channel */ +spinlock_t lock;It seems like you are trying to protect a field (enabled) in parent structure (
uci_dev) using this lock. This sounds weird. Why can't you just use the mutex present in that?Quoted 7 lines
i agree, let me fix locking in the entire driver.
Quoted 5 lines
drivers/bus/mhi/clients/uci.c line 20
Quoted 3 lines
drivers/bus/mhi/clients/uci.c new file +2
-0+ +/* user space waiting to read */ The comments should clearly portray what the field is for.
list of pending read buffers ?
okay
Quoted 7 lines
Quoted 6 lines
drivers/bus/mhi/clients/uci.c line 23
Quoted 4 lines
drivers/bus/mhi/clients/uci.c new file +3
-0+struct list_head pending; + +/* current buffer user space reading */ This sentence is not correct.
current buffer user space is reading ?
Just say, "Buffer for holding the data from device"
Quoted 79 lines
Quoted 13 lines
Quoted 13 lines
drivers/bus/mhi/clients/uci.c new file +12
-0+struct uci_buf *cur_buf; +size_t rx_size; +}; + +struct uci_buf { +void *data; +size_t len; +struct list_head node; +}; + +struct mhi_uci_drv { +struct list_head head;Quoted 8 lines
drivers/bus/mhi/clients/uci.c line 41
Quoted 6 lines
drivers/bus/mhi/clients/uci.c new file +6
-0+ +/* uci driver lock to sync open, probe and remove */ +struct mutex lock; +struct class *class; +int major; +dev_t dev_t;devt?
will rename it to devt
Quoted 14 lines
drivers/bus/mhi/clients/uci.c line 51
Quoted 11 lines
drivers/bus/mhi/clients/uci.c new file +10
-0+}; + +struct uci_dev { +struct list_head node; +dev_t devt; +struct device *dev; +struct mhi_device *mhi_dev; +const char *chan; + +/* sync open and close */ Again, please use descriptive comments. Need not be multi lines but something which could be understood easily.
Done.
Quoted 16 lines
Quoted 4 lines
drivers/bus/mhi/clients/uci.c new file +3
-0+struct mutex mutex; +struct uci_chan ul_chan; +struct uci_chan dl_chan;drivers/bus/mhi/clients/uci.c line 64
Quoted 10 lines
drivers/bus/mhi/clients/uci.c new file +10
-0+size_t mtu; + +/* maximum size of incoming buffer */ +size_t actual_mtu; +int ref_count; +bool enabled; +}; + +static DECLARE_BITMAP(uci_minors, MAX_UCI_DEVICES); +static struct mhi_uci_drv mhi_uci_drv;Please use object names different from datatype names everywhere.
Done.
Quoted 9 lines
drivers/bus/mhi/clients/uci.c line 70
Quoted 7 lines
drivers/bus/mhi/clients/uci.c new file +6
-0+ +static int mhi_queue_inbound (struct uci_dev *uci_dev) +{ +struct mhi_device *mhi_dev = uci_dev->mhi_dev; +struct device *dev = &mhi_dev->dev; +int nr_trbs =mhi_get_no_free_descriptors (mhi_dev,DMA_FROM_DEVICE );I'd prefer to have this assignment in definition block.
Done.
Quoted 15 lines
drivers/bus/mhi/clients/uci.c line 82
Quoted 13 lines
drivers/bus/mhi/clients/uci.c new file +12
-0+size_t mtu = uci_dev->mtu; +size_t actual_mtu = uci_dev->actual_mtu; +void *buf; +struct uci_buf *uci_buf; +int ret = -EIO , i; + +for (i =0 ; i < nr_trbs; i++) { + buf =kmalloc (mtu,GFP_KERNEL ); +if (!buf) +return -ENOMEM ; + + uci_buf = buf + actual_mtu;Aren't you segfaulting here?
Quoted 4 lines
no, in probe we do this
uci_dev->actual_mtu=uci_dev->mtu-sizeof(struct uci_buf); and save meta datauci_bufdata ptr and len. it is done inmhi_dl_xfer_cb()function and used inread().Ah.. I misread this. I thought you're adding
actual_mtuto buf. Sorry for the noise.Quoted 21 lines
Quoted 21 lines
drivers/bus/mhi/clients/uci.c line 83
Quoted 2 lines
drivers/bus/mhi/clients/uci.c new file +1
-0+ uci_buf->data = buf;Where is this
uci_bufgetting used?drivers/bus/mhi/clients/uci.c line 92
Quoted 9 lines
drivers/bus/mhi/clients/uci.c new file +9
-0+ +dev_dbg (dev,"Allocated buf %d of %d size %ld\n" , i, nr_trbs, + actual_mtu); + + ret =mhi_queue_buf (mhi_dev,DMA_FROM_DEVICE , buf, actual_mtu, +MHI_EOT ); +if (ret) { +kfree (buf); +dev_err (dev,"Failed to queue buffer %d\n" , i);Failed to queue buffer: %d
drivers/bus/mhi/clients/uci.c line 94
Quoted 2 lines
drivers/bus/mhi/clients/uci.c new file +2
-0+return ret; + }So is this buffer getting freed anywhere?
Quoted 5 lines
Quoted 2 lines
in
mhi_uci_release().Quoted 1 line
You're not assigning
uci_bufhere. Then how it will get freed? Moreover I don't see any reason to allocateuci_bufin this function.
It is done above right after kmallocuci_buf = buf + actual_mtu;
Later uci_buf->data is saving the buf pointer in this function, which is getting freed in mhi_uci_release() like this:-
list_for_each_entry_safe(itr, tmp, &uci_chan->pending, node){ list_del(&itr->node);
kfree(itr->data);
}Quoted 42 lines
Quoted 42 lines
Quoted 19 lines
Quoted 19 lines
+ }drivers/bus/mhi/clients/uci.c new file +17
-0+ +return ret; +} + +static int mhi_uci_release (struct inode *inode,struct file *file) +{ +struct uci_dev *uci_dev = file->private_data; + +mutex_lock (&uci_dev->mutex); + uci_dev->ref_count--; +if (!uci_dev->ref_count) { +struct uci_buf *itr, *tmp; +struct uci_chan *uci_chan; + +if (uci_dev->enabled) +mhi_unprepare_from_transfer (uci_dev->mhi_dev); +Quoted 8 lines
drivers/bus/mhi/clients/uci.c line 118
Quoted 6 lines
drivers/bus/mhi/clients/uci.c new file +6
-0+/* clean inbound channel */ + uci_chan = &uci_dev->dl_chan; +list_for_each_entry_safe (itr, tmp, &uci_chan->pending, node) { +list_del (&itr->node); +kfree (itr->data); + }Add a new line after '}' and before next line of code.
Done.
Quoted 14 lines
drivers/bus/mhi/clients/uci.c line 128
Quoted 11 lines
drivers/bus/mhi/clients/uci.c new file +10
-0+if (uci_chan->cur_buf) +kfree (uci_chan->cur_buf->data); + + uci_chan->cur_buf =NULL ; + +if (!uci_dev->enabled) { +mutex_unlock (&uci_dev->mutex); +mutex_destroy (&uci_dev->mutex); +clear_bit (MINOR (uci_dev->devt), uci_minors); +kfree (uci_dev);Hmm. So you are freeing
uci_devhere and also trying to do the same inmhi_uci_remove.
Quoted 4 lines
Quoted 2 lines
yes that is based on ref count, so no double free. do you see any issue with that ?
You are decreasing the refcount here and freeing
uci_devif refcount is 0. Then
freeing only if uci_dev->enabled is false - which happens if remove() is already called.
Quoted 2 lines
in
mhi_uci_remove()you're again checking if the refcount is 0 and then trying to releaseuci_dev. Am I missing something?
if uci_dev->enabled is true then we free it remove.
Quoted 211 lines
Since you're allocating
uci_devinprobe(), you should only free it inremove().Quoted 26 lines
Quoted 26 lines
Quoted 13 lines
drivers/bus/mhi/clients/uci.c new file +12
-0+return 0 ; + } + } + +mutex_unlock (&uci_dev->mutex); + +return 0 ; +} + +static __poll_t mhi_uci_poll (struct file *file,poll_table *wait) +{ +struct uci_dev *uci_dev = file->private_data;drivers/bus/mhi/clients/uci.c line 150
Quoted 10 lines
drivers/bus/mhi/clients/uci.c new file +10
-0+struct mhi_device *mhi_dev = uci_dev->mhi_dev; +struct device *dev = &mhi_dev->dev; +struct uci_chan *uci_chan; +__poll_t mask =0 ; + +poll_wait (file, &uci_dev->dl_chan.wq, wait); +poll_wait (file, &uci_dev->ul_chan.wq, wait); + + uci_chan = &uci_dev->dl_chan; +spin_lock_bh (&uci_chan->lock);This is what looks wrong to me.
Quoted 8 lines
Quoted 4 lines
drivers/bus/mhi/clients/uci.c
Quoted 1 line
drivers/bus/mhi/clients/uci.c new file +1
-0+if (!uci_dev->enabled) {So you are removing the char dev node even if there are users in the system. Why do you want to do so?
Removing char dev node is done when MHI device is removed. It is possible that user space entity would exist but MHI device is removed due to underlying transport disconnect. i dont see a way to prevent this or i am missing your point. Can you pls elaborate your concern.
I didn't closely look where the device is getting created. Please ignore my comment...
Quoted 75 lines
Quoted 39 lines
Quoted 39 lines
drivers/bus/mhi/clients/uci.c new file +38
-0+ mask =EPOLLERR ; + }else { +if (!list_empty (&uci_chan->pending) || uci_chan->cur_buf) { +dev_dbg (dev,"Client can read from node\n" ); + mask |=EPOLLIN |EPOLLRDNORM ; + } + } +spin_unlock_bh (&uci_chan->lock); + + uci_chan = &uci_dev->ul_chan; +spin_lock_bh (&uci_chan->lock); +if (!uci_dev->enabled) { + mask |=EPOLLERR ; + }else if (mhi_get_no_free_descriptors (mhi_dev,DMA_TO_DEVICE ) >0 ) { +dev_dbg (dev,"Client can write to node\n" ); + mask |=EPOLLOUT |EPOLLWRNORM ; + } +spin_unlock_bh (&uci_chan->lock); + +dev_dbg (dev,"Client attempted to poll, returning mask 0x%x\n" , mask); + +return mask; +} + +static ssize_t mhi_uci_write (struct file *file, +const char __user *buf, +size_t count, +loff_t *offp) +{ +struct uci_dev *uci_dev = file->private_data; +struct mhi_device *mhi_dev = uci_dev->mhi_dev; +struct device *dev = &mhi_dev->dev; +struct uci_chan *uci_chan = &uci_dev->ul_chan; +size_t bytes_xfered =0 ; +int ret, nr_avail; + +if (!buf || !count) +return -EINVAL ;Quoted 8 lines
drivers/bus/mhi/clients/uci.c line 195
Quoted 6 lines
drivers/bus/mhi/clients/uci.c new file +6
-0+ +/* confirm channel is active */ +spin_lock_bh (&uci_chan->lock); +if (!uci_dev->enabled) { +spin_unlock_bh (&uci_chan->lock); +return -ERESTARTSYS ;You should return
-ENODEVhere.Done.
Quoted 7 lines
drivers/bus/mhi/clients/uci.c line 199
Quoted 5 lines
drivers/bus/mhi/clients/uci.c new file +4
-0+ } + +dev_dbg (dev,"Enter: to xfer:%lu bytes\n" , count); +Please avoid "Enter" debug prints.
Done, will keep the byte count print?
Quoted 9 lines
drivers/bus/mhi/clients/uci.c line 205
Quoted 7 lines
drivers/bus/mhi/clients/uci.c new file +6
-0+while (count) { +size_t xfer_size; +void *kbuf; +enum mhi_flags flags; + +spin_unlock_bh (&uci_chan->lock);Why do you want to hold the lock till here?
Will come up with better locking in next patch set
Quoted 9 lines
drivers/bus/mhi/clients/uci.c line 211
Quoted 7 lines
drivers/bus/mhi/clients/uci.c new file +6
-0+ +/* wait for free descriptors */ + ret =wait_event_interruptible (uci_chan->wq, + (!uci_dev->enabled) || + (nr_avail =mhi_get_no_free_descriptors (mhi_dev, +DMA_TO_DEVICE )) >0 );Does using "
wait_event_interruptible_timeout" makes sense here?Quoted 3 lines
No, read needs to be blocked until data comes. user space would call
read()and wait for data to arrive. There is no definite time when data would arrive.Hmm, I thought we could timeout at some point. But that's fine.
Quoted 54 lines
Quoted 7 lines
drivers/bus/mhi/clients/uci.c line 215
Quoted 5 lines
drivers/bus/mhi/clients/uci.c new file +4
-0+ +if (ret == -ERESTARTSYS || !uci_dev->enabled) { +dev_dbg (dev,"Exit signal caught for node or not enabled\n" ); +return -ERESTARTSYS ;You need to return
-ENODEVfor !uci_dev->enabled case.Done.
Quoted 21 lines
Quoted 21 lines
drivers/bus/mhi/clients/uci.c new file +20
-0+ } + + xfer_size =min_t (size_t, count, uci_dev->mtu); + kbuf =kmalloc (xfer_size,GFP_KERNEL ); +if (!kbuf) +return -ENOMEM ; + + ret =copy_from_user (kbuf, buf, xfer_size); +if (unlikely (ret)) { +kfree (kbuf); +return ret; + } + +spin_lock_bh (&uci_chan->lock); + +/* if ring is full after this force EOT */ +if (nr_avail >1 && (count - xfer_size)) + flags =MHI_CHAIN ; +else + flags =MHI_EOT ;Quoted 8 lines
drivers/bus/mhi/clients/uci.c line 241
Quoted 6 lines
drivers/bus/mhi/clients/uci.c new file +6
-0+ +if (uci_dev->enabled) + ret =mhi_queue_buf (mhi_dev,DMA_TO_DEVICE , kbuf, + xfer_size, flags); +else + ret = -ERESTARTSYS ;Again, please fix this all over the driver.
Done.
Quoted 16 lines
Quoted 4 lines
drivers/bus/mhi/clients/uci.c new file +3
-0+ +if (ret) { +kfree (kbuf);drivers/bus/mhi/clients/uci.c line 254
Quoted 10 lines
drivers/bus/mhi/clients/uci.c new file +10
-0+ goto sys_interrupt; + } + + bytes_xfered += xfer_size; + count -= xfer_size; + buf += xfer_size; + } + +spin_unlock_bh (&uci_chan->lock); +dev_dbg (dev,"Exit: Number of bytes xferred:%lu\n" , bytes_xfered);Drop the "Exit" too.
Quoted 3 lines
how about keeping the number of bytes xferred and remove exit from the msg ? helps in debugging user space entity vs kernel space mhi uci driver issues.
Quoted 1 line
Yep, just remove 'Exit'.
Quoted 29 lines
Quoted 29 lines
Quoted 17 lines
drivers/bus/mhi/clients/uci.c new file +17
-0+ +return bytes_xfered; + +sys_interrupt: +spin_unlock_bh (&uci_chan->lock); + +return ret; +} + +static ssize_t mhi_uci_read (struct file *file, +char __user *buf, +size_t count, +loff_t *ppos) +{ +struct uci_dev *uci_dev = file->private_data; +struct mhi_device *mhi_dev = uci_dev->mhi_dev; +struct uci_chan *uci_chan = &uci_dev->dl_chan;drivers/bus/mhi/clients/uci.c line 281
Quoted 10 lines
drivers/bus/mhi/clients/uci.c new file +10
-0+struct device *dev = &mhi_dev->dev; +struct uci_buf *uci_buf; +char *ptr; +size_t to_copy; +int ret =0 ; + +if (!buf) +return -EINVAL ; + +dev_dbg (dev,"Client provided buf len:%lu\n" , count);Drop this.
Quoted 6 lines
Quoted 4 lines
This would help if client provided buffer is smaller than the received rx data. Even though this function would only copy the mount of buffer provided by user space but we can track that condition.
Quoted 1 line
The userspace will know how much buffer allocated, so no need to say it here.
Done.
Quoted 83 lines
Quoted 24 lines
Quoted 16 lines
Quoted 16 lines
drivers/bus/mhi/clients/uci.c new file +15
-0+ +mutex_lock (&uci_dev->mutex); +/* confirm channel is active */ +spin_lock_bh (&uci_chan->lock); +if (!uci_dev->enabled) { +spin_unlock_bh (&uci_chan->lock); +mutex_unlock (&uci_dev->mutex); +return -ERESTARTSYS ; + } + +/* No data available to read, wait */ +if (!uci_chan->cur_buf &&list_empty (&uci_chan->pending)) { +dev_dbg (dev,"No data available to read waiting\n" ); + +spin_unlock_bh (&uci_chan->lock);Quoted 8 lines
drivers/bus/mhi/clients/uci.c line 302
Quoted 6 lines
drivers/bus/mhi/clients/uci.c new file +6
-0+mutex_unlock (&uci_dev->mutex); + ret =wait_event_interruptible (uci_chan->wq, + (!uci_dev->enabled || + !list_empty (&uci_chan->pending))); +if (ret == -ERESTARTSYS ) { +dev_dbg (dev,"Exit signal caught for node\n" );No need of this.
Quoted 3 lines
This is same as what we are doing in
write(). I can add theuci_dev->enabledcheck here as well and return-ENODEVas you commented forwrite(). Helps in debugging.Okay
Quoted 53 lines
Quoted 10 lines
drivers/bus/mhi/clients/uci.c line 309
Quoted 8 lines
drivers/bus/mhi/clients/uci.c new file +7
-0+return -ERESTARTSYS ; + } + +mutex_lock (&uci_dev->mutex); +spin_lock_bh (&uci_chan->lock); +if (!uci_dev->enabled) { +dev_dbg (dev,"node is disabled\n" );Okay, this is what I'm concerned about.
If your concern is about locking, i am going to come up with the change to fix that. If you concern is about node getting removed while read is issued then i dont see how we can prevent that.
Quoted 40 lines
Quoted 28 lines
drivers/bus/mhi/clients/uci.c new file +27
-0+ ret = -ERESTARTSYS ; + goto read_error; + } + } + +/* new read, get the next descriptor from the list */ +if (!uci_chan->cur_buf) { + uci_buf =list_first_entry_or_null (&uci_chan->pending, + struct uci_buf, node); +if (unlikely (!uci_buf)) { + ret = -EIO ; + goto read_error; + } + +list_del (&uci_buf->node); + uci_chan->cur_buf = uci_buf; + uci_chan->rx_size = uci_buf->len; +dev_dbg (dev,"Got pkt of size:%zu\n" , uci_chan->rx_size); + } + + uci_buf = uci_chan->cur_buf; + +/* Copy the buffer to user space */ + to_copy =min_t (size_t, count, uci_chan->rx_size); + ptr = uci_buf->data + (uci_buf->len - uci_chan->rx_size); +spin_unlock_bh (&uci_chan->lock); +drivers/bus/mhi/clients/uci.c line 346
Quoted 10 lines
drivers/bus/mhi/clients/uci.c new file +10
-0+ ret =copy_to_user (buf, ptr, to_copy); +if (ret) + goto err_unlock_mtx; + +spin_lock_bh (&uci_chan->lock); + +dev_dbg (dev,"Copied %lu of %lu bytes\n" , to_copy, uci_chan->rx_size); + uci_chan->rx_size -= to_copy; + +/* we finished with this buffer, queue it back to hardware */ Oh wait... what is happening here? Why do you want to do tx?
Quoted 4 lines
Quoted 2 lines
we are not doing any TX, we are just queuing the rx buffer back to get more data.
But why? You are doing this unconditionally!
This is typical way of doing read(), as you dont know when is the next packet would arrive so you just keep TREs queued to get the packet from MHI Device side in case they have more data to send to Host.
Quoted 88 lines
Quoted 61 lines
Quoted 53 lines
Quoted 53 lines
drivers/bus/mhi/clients/uci.c new file +51
-0+if (!uci_chan->rx_size) { + uci_chan->cur_buf =NULL ; + +if (uci_dev->enabled) + ret =mhi_queue_buf (mhi_dev,DMA_FROM_DEVICE , + uci_buf->data, + uci_dev->actual_mtu,MHI_EOT ); +else + ret = -ERESTARTSYS ; + +if (ret) { +dev_err (dev,"Failed to recycle element\n" ); +kfree (uci_buf->data); + goto read_error; + } + } +spin_unlock_bh (&uci_chan->lock); +mutex_unlock (&uci_dev->mutex); + +dev_dbg (dev,"Returning %lu bytes\n" , to_copy); + +return to_copy; + +read_error: +spin_unlock_bh (&uci_chan->lock); +err_unlock_mtx: +mutex_unlock (&uci_dev->mutex); +return ret; +} + +static int mhi_uci_open (struct inode *inode,struct file *filp) +{ +struct uci_dev *uci_dev =NULL , *tmp_dev; +int ret = -EIO ; +struct uci_buf *buf_itr, *tmp; +struct uci_chan *dl_chan; +struct mhi_device *mhi_dev; +struct device *dev; + +mutex_lock (&mhi_uci_drv.lock); +list_for_each_entry (tmp_dev, &mhi_uci_drv.head, node) { +if (tmp_dev->devt == inode->i_rdev) { + uci_dev = tmp_dev; +break ; + } + } + +/* could not find a minor node */ +if (!uci_dev) + goto error_exit; +Quoted 8 lines
drivers/bus/mhi/clients/uci.c line 403
Quoted 6 lines
drivers/bus/mhi/clients/uci.c new file +6
-0+ mhi_dev = uci_dev->mhi_dev; + dev = &mhi_dev->dev; + +mutex_lock (&uci_dev->mutex); +if (!uci_dev->enabled) { +dev_info (dev,"Node exist, but not in active state!\n" );Dangling node, right.
Quoted 3 lines
In case
remove()is in progress and enabled is set to false butdestroy_deviceis not called yet. It covers that case andopen()is called by user space entity.Hmm, okay.
Quoted 21 lines
Quoted 21 lines
Quoted 9 lines
drivers/bus/mhi/clients/uci.c new file +8
-0+ goto error_open_chan; + } + + uci_dev->ref_count++; + +dev_dbg (dev,"Node open, ref counts %u\n" , uci_dev->ref_count); + +if (uci_dev->ref_count ==1 ) {drivers/bus/mhi/clients/uci.c line 421
Quoted 10 lines
drivers/bus/mhi/clients/uci.c new file +10
-0+dev_dbg (dev,"Starting channel\n" ); + ret =mhi_prepare_for_transfer (uci_dev->mhi_dev); +if (ret) { +dev_err (dev,"Error starting transfer channels\n" ); + uci_dev->ref_count--; + goto error_open_chan; + } + + ret =mhi_queue_inbound (uci_dev); +if (ret)Decrease refcount?
Quoted 5 lines
Quoted 3 lines
done in release. For every open increment the ref count and for every release call decrement it, so that when ref count becomes 0 we can free memory.
Even if
open()fails?
Nice catch, will decrement ref count if mhi_queue_inbound() fails.
Quoted 184 lines
Quoted 153 lines
Quoted 39 lines
Quoted 39 lines
drivers/bus/mhi/clients/uci.c new file +37
-0+ goto error_rx_queue; + } + + filp->private_data = uci_dev; +mutex_unlock (&uci_dev->mutex); +mutex_unlock (&mhi_uci_drv.lock); + +return 0 ; + +error_rx_queue: + dl_chan = &uci_dev->dl_chan; +mhi_unprepare_from_transfer (uci_dev->mhi_dev); +list_for_each_entry_safe (buf_itr, tmp, &dl_chan->pending, node) { +list_del (&buf_itr->node); +kfree (buf_itr->data); + } + +error_open_chan: +mutex_unlock (&uci_dev->mutex); + +error_exit: +mutex_unlock (&mhi_uci_drv.lock); + +return ret; +} + +static const struct file_operations mhidev_fops = { + .owner =THIS_MODULE , + .open = mhi_uci_open, + .release = mhi_uci_release, + .read = mhi_uci_read, + .write = mhi_uci_write, + .poll = mhi_uci_poll, +}; + +static void mhi_ul_xfer_cb (struct mhi_device *mhi_dev, +struct mhi_result *mhi_result)Quoted 8 lines
drivers/bus/mhi/clients/uci.c line 464
Quoted 6 lines
drivers/bus/mhi/clients/uci.c new file +6
-0+{ +struct uci_dev *uci_dev =dev_get_drvdata (&mhi_dev->dev); +struct uci_chan *uci_chan = &uci_dev->ul_chan; +struct device *dev = &mhi_dev->dev; + + dev_dbg(dev, "status:%d xfer_len:%zu\n", mhi_result->transaction_status,Always leave a space after :
Done.
Quoted 56 lines
Quoted 56 lines
drivers/bus/mhi/clients/uci.c new file +55
-0+ mhi_result->bytes_xferd); + +kfree (mhi_result->buf_addr); +if (!mhi_result->transaction_status) +wake_up (&uci_chan->wq); +} + +static void mhi_dl_xfer_cb (struct mhi_device *mhi_dev, +struct mhi_result *mhi_result) +{ +struct uci_dev *uci_dev =dev_get_drvdata (&mhi_dev->dev); +struct uci_chan *uci_chan = &uci_dev->dl_chan; +struct device *dev = &mhi_dev->dev; +unsigned long flags; +struct uci_buf *buf; + +dev_dbg (dev,"status:%d receive_len:%zu\n" , + mhi_result->transaction_status, mhi_result->bytes_xferd); + +if (mhi_result->transaction_status == -ENOTCONN ) { +kfree (mhi_result->buf_addr); +return ; + } + +spin_lock_irqsave (&uci_chan->lock, flags); + buf = mhi_result->buf_addr + uci_dev->actual_mtu; + buf->data = mhi_result->buf_addr; + buf->len = mhi_result->bytes_xferd; +list_add_tail (&buf->node, &uci_chan->pending); +spin_unlock_irqrestore (&uci_chan->lock, flags); + +wake_up (&uci_chan->wq); +} + +static int mhi_uci_probe (struct mhi_device *mhi_dev, +const struct mhi_device_id *id) +{ +struct uci_dev *uci_dev; +struct mhi_controller *mhi_cntrl = mhi_dev->mhi_cntrl; +struct device *dev = &mhi_dev->dev; +int minor; +int dir; + + uci_dev =kzalloc (sizeof (*uci_dev),GFP_KERNEL ); +if (!uci_dev) +return -ENOMEM ; + +mutex_init (&uci_dev->mutex); + uci_dev->mhi_dev = mhi_dev; + +mutex_lock (&uci_dev->mutex); +mutex_lock (&mhi_uci_drv.lock); + + minor =find_first_zero_bit (uci_minors,MAX_UCI_DEVICES ); +if (minor >=MAX_UCI_DEVICES ) {Quoted 8 lines
drivers/bus/mhi/clients/uci.c line 525
Quoted 6 lines
drivers/bus/mhi/clients/uci.c new file +6
-0+mutex_unlock (&mhi_uci_drv.lock); +mutex_unlock (&uci_dev->mutex); +kfree (uci_dev); +return -ENOSPC ; + } +Add a comment regarding what is going on below.
Done.
Quoted 32 lines
Quoted 32 lines
drivers/bus/mhi/clients/uci.c new file +31
-0+ uci_dev->devt =MKDEV (mhi_uci_drv.major, minor); + uci_dev->dev =device_create (mhi_uci_drv.class, &mhi_dev->dev, + uci_dev->devt, uci_dev, +DEVICE_NAME "_%s_%s" , +dev_name (mhi_cntrl->cntrl_dev), + mhi_dev->name); +set_bit (minor, uci_minors); + +for (dir =0 ; dir <2 ; dir++) { +struct uci_chan *uci_chan = (dir) ? + &uci_dev->ul_chan : &uci_dev->dl_chan; +spin_lock_init (&uci_chan->lock); +init_waitqueue_head (&uci_chan->wq); +INIT_LIST_HEAD (&uci_chan->pending); + } + + uci_dev->mtu =min_t (size_t, id->driver_data,MHI_MAX_MTU ); + uci_dev->actual_mtu = uci_dev->mtu -sizeof (struct uci_buf ); +dev_set_drvdata (&mhi_dev->dev, uci_dev); + uci_dev->enabled = true; + +list_add (&uci_dev->node, &mhi_uci_drv.head); +mutex_unlock (&mhi_uci_drv.lock); +mutex_unlock (&uci_dev->mutex); + +dev_info (dev,"channel:%s successfully probed\n" , mhi_dev->name); + +return 0 ; +}; + +static void mhi_uci_remove (struct mhi_device *mhi_dev)Quoted 8 lines
drivers/bus/mhi/clients/uci.c line 562
Quoted 6 lines
drivers/bus/mhi/clients/uci.c new file +6
-0+{ +struct uci_dev *uci_dev =dev_get_drvdata (&mhi_dev->dev); +struct device *dev = &mhi_dev->dev; + +dev_dbg (dev,"%s: enter\n" , __func__); +Drop this.
Quoted 3 lines
I can remove the enter and exit from the message but it helps to debug race conditions between
remove()and open()/release(). i Can say something like removingmhi_dev->nameOkay.
Quoted 25 lines
Quoted 12 lines
drivers/bus/mhi/clients/uci.c line 571
Quoted 10 lines
drivers/bus/mhi/clients/uci.c new file +9
-0+mutex_lock (&mhi_uci_drv.lock); +mutex_lock (&uci_dev->mutex); + +/* disable the node */ +spin_lock_irq (&uci_dev->dl_chan.lock); +spin_lock_irq (&uci_dev->ul_chan.lock); + uci_dev->enabled = false; +spin_unlock_irq (&uci_dev->ul_chan.lock); +spin_unlock_irq (&uci_dev->dl_chan.lock);You need to do something better here. This doesn't look good.
Will come up with change to fix lock related concerns.
Quoted 12 lines
drivers/bus/mhi/clients/uci.c line 580
Quoted 10 lines
drivers/bus/mhi/clients/uci.c new file +9
-0+wake_up (&uci_dev->dl_chan.wq); +wake_up (&uci_dev->ul_chan.wq); + +/* delete the node to prevent new opens */ +device_destroy (mhi_uci_drv.class, uci_dev->devt); + uci_dev->dev =NULL ; +list_del (&uci_dev->node); + +/* safe to free memory only if all file nodes are closed */ And what if it is already freed in .release?
Quoted 4 lines
Quoted 2 lines
It is possible that
ref_countbecomes 0 inrelease()then it would be no-op here.No-op? You are calling kfree again.
No, the way it works is: In release() we decrement ref count and check if uci_dev->enabled is false which means remove was already called. In that case we free in release(). In case remove was not called yet, then if release() is called we do not free uci_dev and free it on remove(). Both functions are protected with same mutext lock uci_dev->lock.
Quoted 18 lines
Quoted 18 lines
Quoted 18 lines
Quoted 6 lines
drivers/bus/mhi/clients/uci.c new file +4
-0+if (!uci_dev->ref_count) { +mutex_unlock (&uci_dev->mutex); +mutex_destroy (&uci_dev->mutex); +clear_bit (MINOR (uci_dev->devt), uci_minors);drivers/bus/mhi/clients/uci.c line 594
Quoted 10 lines
drivers/bus/mhi/clients/uci.c new file +10
-0+dev_set_drvdata (&mhi_dev->dev,NULL ); +kfree (uci_dev); +mutex_unlock (&mhi_uci_drv.lock); +return ; + } + +mutex_unlock (&uci_dev->mutex); +mutex_unlock (&mhi_uci_drv.lock); + +dev_dbg (dev,"%s: exit\n" , __func__);Drop this.
Quoted 80 lines
Quoted 2 lines
I can change it to
mhi_dev->nameremoved. It helps in debugging race conditions.Okay.
Quoted 75 lines
Quoted 58 lines
Thanks,
ManiQuoted 54 lines
drivers/bus/mhi/clients/uci.c new file +54
-0+} + +/* .driver_data stores max mtu */ +static const struct mhi_device_id mhi_uci_match_table[] = { + { .chan ="LOOPBACK" , .driver_data =0x1000 }, + {}, +}; +MODULE_DEVICE_TABLE (mhi, mhi_uci_match_table); + +static struct mhi_driver mhi_uci_driver = { + .id_table = mhi_uci_match_table, + .remove = mhi_uci_remove, + .probe = mhi_uci_probe, + .ul_xfer_cb = mhi_ul_xfer_cb, + .dl_xfer_cb = mhi_dl_xfer_cb, + .driver = { + .name =MHI_UCI_DRIVER_NAME , + }, +}; + +static int mhi_uci_init (void ) +{ +int ret; + + ret =register_chrdev (0 ,MHI_UCI_DRIVER_NAME , &mhidev_fops); +if (ret <0 ) +return ret; + + mhi_uci_drv.major = ret; + mhi_uci_drv.class =class_create (THIS_MODULE ,MHI_UCI_DRIVER_NAME ); +if (IS_ERR (mhi_uci_drv.class)) { +unregister_chrdev (mhi_uci_drv.major,MHI_UCI_DRIVER_NAME ); +return -ENODEV ; + } + +mutex_init (&mhi_uci_drv.lock); +INIT_LIST_HEAD (&mhi_uci_drv.head); + + ret =mhi_driver_register (&mhi_uci_driver); +if (ret) { +class_destroy (mhi_uci_drv.class); +unregister_chrdev (mhi_uci_drv.major,MHI_UCI_DRIVER_NAME ); + } + +return ret; +} + +static void __exit mhi_uci_exit(void) +{ +mhi_driver_unregister (&mhi_uci_driver); +class_destroy (mhi_uci_drv.class); +unregister_chrdev (mhi_uci_drv.major,MHI_UCI_DRIVER_NAME ); +} +Quoted 8 lines
Quoted 8 lines
drivers/bus/mhi/clients/uci.c new file +4
-0+module_init (mhi_uci_init); +module_exit (mhi_uci_exit); +MODULE_LICENSE ("GPL v2" ); +MODULE_DESCRIPTION ("MHI UCI Driver" );Signature · 2 lines
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum, a Linux Foundation Collaborative ProjectI have some follow up questions based on your review comments. Please let me know your view on those questions above.
Thanks,
HemantSignature · 2 lines
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum, a Linux Foundation Collaborative Project
Thanks,
Hemant
Signature · 2 lines
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum, a Linux Foundation Collaborative Project
Re: [PATCH v3 4/4] bus: mhi: clients: Add user space client interface driver
Quoted 50 lines · Hemant Kumar
Hi Mani,
Quoted 47 lines · Manivannan Sadhasivam
Quoted 46 lines · Hemant Kumar
Hi Mani,
Quoted 10 lines · Manivannan Sadhasivam
Quoted 2 lines · Hemant Kumar
This MHI client driver allows user space clients to transfer data between MHI device and host using standard file operations.
I think we need to explicitly specify 'raw' data here. Because we have different APIs for queuing different types of data. So saying just data sounds vague unless this driver can handle multiple types of data which I don't think can happen.
And you need to update the same in docs.
Done.
Quoted 19 lines
Quoted 19 lines
Device file node is created with format
/dev/mhi_<controller_name>_<mhi_device_name>
Currently it supports loopback client.
Signed-off-by Hemant Kumar <[email protected]>--- drivers/bus/mhi/Kconfig | 2 + drivers/bus/mhi/Makefile | 1 + drivers/bus/mhi/clients/Kconfig | 16 + drivers/bus/mhi/clients/Makefile | 3 + drivers/bus/mhi/clients/uci.c | 652 +++++++++++++++++++++++++++++++++++++++ 5 files changed, 674 insertions(+)create mode 100644
drivers/bus/mhi/clients/Kconfigcreate mode 100644drivers/bus/mhi/clients/Makefilecreate mode 100644drivers/bus/mhi/clients/uci.cQuoted 11 lines
drivers/bus/mhi/Kconfig config MHI_BUS_DEBUG · line 22
Quoted 8 lines
drivers/bus/mhi/Kconfig +0
-0@@ -20,3 +20,5 @@ config MHI_BUS_DEBUG Enable debugfs support for use with the MHI transport. Allows reading and/or modifying some values within the MHI controller for debug and test purposes.Hmm, so this patchset depends on debugfs patches? You need to mention this in cover letter. Or even better, just make it independent
Driver does not depend on debugfs. i need to fix that.
[...]
Quoted 24 lines
Quoted 24 lines
Quoted 23 lines
Quoted 17 lines
drivers/bus/mhi/Kconfig
Quoted 2 lines
drivers/bus/mhi/Kconfig +1
-0+ uci_buf->data = buf;Where is this
uci_bufgetting used?drivers/bus/mhi/Kconfig
Quoted 9 lines
drivers/bus/mhi/Kconfig +9
-0+ + dev_dbg(dev, "Allocated buf %d of %d size %ld\n", i, nr_trbs, + actual_mtu); + + ret = mhi_queue_buf(mhi_dev, DMA_FROM_DEVICE, buf, actual_mtu, + MHI_EOT); + if (ret) { + kfree(buf); + dev_err(dev, "Failed to queue buffer %d\n", i);Failed to queue buffer: %d
Quoted 4 lines
drivers/bus/mhi/Kconfig
Quoted 2 lines
drivers/bus/mhi/Kconfig +2
-0+ return ret; + }So is this buffer getting freed anywhere?
in
mhi_uci_release().Quoted 1 line
Quoted 8 lines
Quoted 2 lines
You're not assigning
uci_bufhere. Then how it will get freed? Moreover I don't see any reason to allocateuci_bufin this function.It is done above right after kmalloc
uci_buf= buf +actual_mtu;Later
uci_buf->datais saving the buf pointer in this function, which is getting freed inmhi_uci_release()like this:-
Ah, right. I was a bit confused with the tricy use of pointers ;)
Quoted 357 lines
list_for_each_entry_safe(itr, tmp, &uci_chan->pending, node){list_del(&itr->node); kfree(itr->data); }Quoted 42 lines
Quoted 42 lines
Quoted 19 lines
Quoted 19 lines
+ }drivers/bus/mhi/Kconfig +17
-0+ + return ret; +} + +static int mhi_uci_release(struct inode *inode, struct file *file) +{ + struct uci_dev *uci_dev = file->private_data; + + mutex_lock(&uci_dev->mutex); + uci_dev->ref_count--; + if (!uci_dev->ref_count) { + struct uci_buf *itr, *tmp; + struct uci_chan *uci_chan; + + if (uci_dev->enabled) + mhi_unprepare_from_transfer(uci_dev->mhi_dev); +Quoted 8 lines
drivers/bus/mhi/Kconfig
Quoted 6 lines
drivers/bus/mhi/Kconfig +6
-0+ /* clean inbound channel */ + uci_chan = &uci_dev->dl_chan; + list_for_each_entry_safe(itr, tmp, &uci_chan->pending, node) { + list_del(&itr->node); + kfree(itr->data); + }Add a new line after '}' and before next line of code.
Done.
Quoted 14 lines
drivers/bus/mhi/Kconfig
Quoted 11 lines
drivers/bus/mhi/Kconfig +10
-0+ if (uci_chan->cur_buf) + kfree(uci_chan->cur_buf->data); + + uci_chan->cur_buf = NULL; + + if (!uci_dev->enabled) { + mutex_unlock(&uci_dev->mutex); + mutex_destroy(&uci_dev->mutex); + clear_bit(MINOR(uci_dev->devt), uci_minors); + kfree(uci_dev);Hmm. So you are freeing
uci_devhere and also trying to do the same inmhi_uci_remove.Quoted 4 lines
Quoted 2 lines
yes that is based on ref count, so no double free. do you see any issue with that ?
You are decreasing the refcount here and freeing
uci_devif refcount is 0. Thenfreeing only if
uci_dev->enabledis false - which happens ifremove()is already called.Quoted 2 lines
in
mhi_uci_remove()you're again checking if the refcount is 0 and then trying to releaseuci_dev. Am I missing something?if
uci_dev->enabledis true then we free it remove.Quoted 211 lines
Since you're allocating
uci_devinprobe(), you should only free it inremove().Quoted 26 lines
Quoted 26 lines
Quoted 13 lines
drivers/bus/mhi/Kconfig +12
-0+ return 0; + } + } + + mutex_unlock(&uci_dev->mutex); + + return 0; +} + +static __poll_t mhi_uci_poll(struct file *file, poll_table *wait) +{ + struct uci_dev *uci_dev = file->private_data;drivers/bus/mhi/Kconfig
Quoted 10 lines
drivers/bus/mhi/Kconfig +10
-0+ struct mhi_device *mhi_dev = uci_dev->mhi_dev; + struct device *dev = &mhi_dev->dev; + struct uci_chan *uci_chan; + __poll_t mask = 0; + + poll_wait(file, &uci_dev->dl_chan.wq, wait); + poll_wait(file, &uci_dev->ul_chan.wq, wait); + + uci_chan = &uci_dev->dl_chan; + spin_lock_bh(&uci_chan->lock);This is what looks wrong to me.
Quoted 8 lines
Quoted 4 lines
drivers/bus/mhi/Kconfig
Quoted 1 line
drivers/bus/mhi/Kconfig +1
-0+ if (!uci_dev->enabled) {So you are removing the char dev node even if there are users in the system. Why do you want to do so?
Removing char dev node is done when MHI device is removed. It is possible that user space entity would exist but MHI device is removed due to underlying transport disconnect. i dont see a way to prevent this or i am missing your point. Can you pls elaborate your concern.
I didn't closely look where the device is getting created. Please ignore my comment...
Quoted 75 lines
Quoted 39 lines
Quoted 39 lines
drivers/bus/mhi/Kconfig +38
-0+ mask = EPOLLERR; + } else { + if (!list_empty(&uci_chan->pending) || uci_chan->cur_buf) { + dev_dbg(dev, "Client can read from node\n"); + mask |= EPOLLIN | EPOLLRDNORM; + } + } + spin_unlock_bh(&uci_chan->lock); + + uci_chan = &uci_dev->ul_chan; + spin_lock_bh(&uci_chan->lock); + if (!uci_dev->enabled) { + mask |= EPOLLERR; + } else if (mhi_get_no_free_descriptors(mhi_dev, DMA_TO_DEVICE) > 0) { + dev_dbg(dev, "Client can write to node\n"); + mask |= EPOLLOUT | EPOLLWRNORM; + } + spin_unlock_bh(&uci_chan->lock); + + dev_dbg(dev, "Client attempted to poll, returning mask 0x%x\n", mask); + + return mask; +} + +static ssize_t mhi_uci_write(struct file *file, + const char __user *buf, + size_t count, + loff_t *offp) +{ + struct uci_dev *uci_dev = file->private_data; + struct mhi_device *mhi_dev = uci_dev->mhi_dev; + struct device *dev = &mhi_dev->dev; + struct uci_chan *uci_chan = &uci_dev->ul_chan; + size_t bytes_xfered = 0; + int ret, nr_avail; + + if (!buf || !count) + return -EINVAL;Quoted 8 lines
drivers/bus/mhi/Kconfig
Quoted 6 lines
drivers/bus/mhi/Kconfig +6
-0+ + /* confirm channel is active */ + spin_lock_bh(&uci_chan->lock); + if (!uci_dev->enabled) { + spin_unlock_bh(&uci_chan->lock); + return -ERESTARTSYS;You should return
-ENODEVhere.Done.
Quoted 7 lines
drivers/bus/mhi/Kconfig
Quoted 5 lines
drivers/bus/mhi/Kconfig +4
-0+ } + + dev_dbg(dev, "Enter: to xfer:%lu bytes\n", count); +Please avoid "Enter" debug prints.
Done, will keep the byte count print?
Quoted 9 lines
drivers/bus/mhi/Kconfig
Quoted 7 lines
drivers/bus/mhi/Kconfig +6
-0+ while (count) { + size_t xfer_size; + void *kbuf; + enum mhi_flags flags; + + spin_unlock_bh(&uci_chan->lock);Why do you want to hold the lock till here?
Will come up with better locking in next patch set
Quoted 9 lines
drivers/bus/mhi/Kconfig
Quoted 7 lines
drivers/bus/mhi/Kconfig +6
-0+ + /* wait for free descriptors */ + ret = wait_event_interruptible(uci_chan->wq, + (!uci_dev->enabled) || + (nr_avail = mhi_get_no_free_descriptors(mhi_dev, + DMA_TO_DEVICE)) > 0);Does using "
wait_event_interruptible_timeout" makes sense here?Quoted 3 lines
No, read needs to be blocked until data comes. user space would call
read()and wait for data to arrive. There is no definite time when data would arrive.Hmm, I thought we could timeout at some point. But that's fine.
Quoted 54 lines
Quoted 7 lines
drivers/bus/mhi/Kconfig
Quoted 5 lines
drivers/bus/mhi/Kconfig +4
-0+ + if (ret == -ERESTARTSYS || !uci_dev->enabled) { + dev_dbg(dev, "Exit signal caught for node or not enabled\n"); + return -ERESTARTSYS;You need to return
-ENODEVfor !uci_dev->enabled case.Done.
Quoted 21 lines
Quoted 21 lines
drivers/bus/mhi/Kconfig +20
-0+ } + + xfer_size = min_t(size_t, count, uci_dev->mtu); + kbuf = kmalloc(xfer_size, GFP_KERNEL); + if (!kbuf) + return -ENOMEM; + + ret = copy_from_user(kbuf, buf, xfer_size); + if (unlikely(ret)) { + kfree(kbuf); + return ret; + } + + spin_lock_bh(&uci_chan->lock); + + /* if ring is full after this force EOT */ + if (nr_avail > 1 && (count - xfer_size)) + flags = MHI_CHAIN; + else + flags = MHI_EOT;Quoted 8 lines
drivers/bus/mhi/Kconfig
Quoted 6 lines
drivers/bus/mhi/Kconfig +6
-0+ + if (uci_dev->enabled) + ret = mhi_queue_buf(mhi_dev, DMA_TO_DEVICE, kbuf, + xfer_size, flags); + else + ret = -ERESTARTSYS;Again, please fix this all over the driver.
Done.
Quoted 16 lines
Quoted 4 lines
drivers/bus/mhi/Kconfig +3
-0+ + if (ret) { + kfree(kbuf);drivers/bus/mhi/Kconfig
Quoted 10 lines
drivers/bus/mhi/Kconfig +10
-0+ goto sys_interrupt; + } + + bytes_xfered += xfer_size; + count -= xfer_size; + buf += xfer_size; + } + + spin_unlock_bh(&uci_chan->lock); + dev_dbg(dev, "Exit: Number of bytes xferred:%lu\n", bytes_xfered);Drop the "Exit" too.
Quoted 3 lines
how about keeping the number of bytes xferred and remove exit from the msg ? helps in debugging user space entity vs kernel space mhi uci driver issues.
Quoted 1 line
Yep, just remove 'Exit'.
Quoted 29 lines
Quoted 29 lines
Quoted 17 lines
drivers/bus/mhi/Kconfig +17
-0+ + return bytes_xfered; + +sys_interrupt: + spin_unlock_bh(&uci_chan->lock); + + return ret; +} + +static ssize_t mhi_uci_read(struct file *file, + char __user *buf, + size_t count, + loff_t *ppos) +{ + struct uci_dev *uci_dev = file->private_data; + struct mhi_device *mhi_dev = uci_dev->mhi_dev; + struct uci_chan *uci_chan = &uci_dev->dl_chan;drivers/bus/mhi/Kconfig
Quoted 10 lines
drivers/bus/mhi/Kconfig +10
-0+ struct device *dev = &mhi_dev->dev; + struct uci_buf *uci_buf; + char *ptr; + size_t to_copy; + int ret = 0; + + if (!buf) + return -EINVAL; + + dev_dbg(dev, "Client provided buf len:%lu\n", count);Drop this.
Quoted 6 lines
Quoted 4 lines
This would help if client provided buffer is smaller than the received rx data. Even though this function would only copy the mount of buffer provided by user space but we can track that condition.
Quoted 1 line
The userspace will know how much buffer allocated, so no need to say it here.
Done.
Quoted 83 lines
Quoted 24 lines
Quoted 16 lines
Quoted 16 lines
drivers/bus/mhi/Kconfig +15
-0+ + mutex_lock(&uci_dev->mutex); + /* confirm channel is active */ + spin_lock_bh(&uci_chan->lock); + if (!uci_dev->enabled) { + spin_unlock_bh(&uci_chan->lock); + mutex_unlock(&uci_dev->mutex); + return -ERESTARTSYS; + } + + /* No data available to read, wait */ + if (!uci_chan->cur_buf && list_empty(&uci_chan->pending)) { + dev_dbg(dev, "No data available to read waiting\n"); + + spin_unlock_bh(&uci_chan->lock);Quoted 8 lines
drivers/bus/mhi/Kconfig
Quoted 6 lines
drivers/bus/mhi/Kconfig +6
-0+ mutex_unlock(&uci_dev->mutex); + ret = wait_event_interruptible(uci_chan->wq, + (!uci_dev->enabled || + !list_empty(&uci_chan->pending))); + if (ret == -ERESTARTSYS) { + dev_dbg(dev, "Exit signal caught for node\n");No need of this.
Quoted 3 lines
This is same as what we are doing in
write(). I can add theuci_dev->enabledcheck here as well and return-ENODEVas you commented forwrite(). Helps in debugging.Okay
Quoted 53 lines
Quoted 10 lines
drivers/bus/mhi/Kconfig
Quoted 8 lines
drivers/bus/mhi/Kconfig +7
-0+ return -ERESTARTSYS; + } + + mutex_lock(&uci_dev->mutex); + spin_lock_bh(&uci_chan->lock); + if (!uci_dev->enabled) { + dev_dbg(dev, "node is disabled\n");Okay, this is what I'm concerned about.
If your concern is about locking, i am going to come up with the change to fix that. If you concern is about node getting removed while read is issued then i dont see how we can prevent that.
Quoted 40 lines
Quoted 28 lines
drivers/bus/mhi/Kconfig +27
-0+ ret = -ERESTARTSYS; + goto read_error; + } + } + + /* new read, get the next descriptor from the list */ + if (!uci_chan->cur_buf) { + uci_buf = list_first_entry_or_null(&uci_chan->pending, + struct uci_buf, node); + if (unlikely(!uci_buf)) { + ret = -EIO; + goto read_error; + } + + list_del(&uci_buf->node); + uci_chan->cur_buf = uci_buf; + uci_chan->rx_size = uci_buf->len; + dev_dbg(dev, "Got pkt of size:%zu\n", uci_chan->rx_size); + } + + uci_buf = uci_chan->cur_buf; + + /* Copy the buffer to user space */ + to_copy = min_t(size_t, count, uci_chan->rx_size); + ptr = uci_buf->data + (uci_buf->len - uci_chan->rx_size); + spin_unlock_bh(&uci_chan->lock); +drivers/bus/mhi/Kconfig
Quoted 10 lines
drivers/bus/mhi/Kconfig +10
-0+ ret = copy_to_user(buf, ptr, to_copy); + if (ret) + goto err_unlock_mtx; + + spin_lock_bh(&uci_chan->lock); + + dev_dbg(dev, "Copied %lu of %lu bytes\n", to_copy, uci_chan->rx_size); + uci_chan->rx_size -= to_copy; + + /* we finished with this buffer, queue it back to hardware */Oh wait... what is happening here? Why do you want to do tx?
Quoted 7 lines
Quoted 4 lines
Quoted 2 lines
we are not doing any TX, we are just queuing the rx buffer back to get more data.
But why? You are doing this unconditionally!
This is typical way of doing
read(), as you dont know when is the next packet would arrive so you just keep TREs queued to get the packet from MHI Device side in case they have more data to send to Host.
That's a typical way of doing MHI read ;) Anyway, it is fine.
Quoted 95 lines
Quoted 88 lines
Quoted 61 lines
Quoted 53 lines
Quoted 53 lines
drivers/bus/mhi/Kconfig +51
-0+ if (!uci_chan->rx_size) { + uci_chan->cur_buf = NULL; + + if (uci_dev->enabled) + ret = mhi_queue_buf(mhi_dev, DMA_FROM_DEVICE, + uci_buf->data, + uci_dev->actual_mtu, MHI_EOT); + else + ret = -ERESTARTSYS; + + if (ret) { + dev_err(dev, "Failed to recycle element\n"); + kfree(uci_buf->data); + goto read_error; + } + } + spin_unlock_bh(&uci_chan->lock); + mutex_unlock(&uci_dev->mutex); + + dev_dbg(dev, "Returning %lu bytes\n", to_copy); + + return to_copy; + +read_error: + spin_unlock_bh(&uci_chan->lock); +err_unlock_mtx: + mutex_unlock(&uci_dev->mutex); + return ret; +} + +static int mhi_uci_open(struct inode *inode, struct file *filp) +{ + struct uci_dev *uci_dev = NULL, *tmp_dev; + int ret = -EIO; + struct uci_buf *buf_itr, *tmp; + struct uci_chan *dl_chan; + struct mhi_device *mhi_dev; + struct device *dev; + + mutex_lock(&mhi_uci_drv.lock); + list_for_each_entry(tmp_dev, &mhi_uci_drv.head, node) { + if (tmp_dev->devt == inode->i_rdev) { + uci_dev = tmp_dev; + break; + } + } + + /* could not find a minor node */ + if (!uci_dev) + goto error_exit; +Quoted 8 lines
drivers/bus/mhi/Kconfig
Quoted 6 lines
drivers/bus/mhi/Kconfig +6
-0+ mhi_dev = uci_dev->mhi_dev; + dev = &mhi_dev->dev; + + mutex_lock(&uci_dev->mutex); + if (!uci_dev->enabled) { + dev_info(dev, "Node exist, but not in active state!\n");Dangling node, right.
Quoted 3 lines
In case
remove()is in progress and enabled is set to false butdestroy_deviceis not called yet. It covers that case andopen()is called by user space entity.Hmm, okay.
Quoted 21 lines
Quoted 21 lines
Quoted 9 lines
drivers/bus/mhi/Kconfig +8
-0+ goto error_open_chan; + } + + uci_dev->ref_count++; + + dev_dbg(dev, "Node open, ref counts %u\n", uci_dev->ref_count); + + if (uci_dev->ref_count == 1) {drivers/bus/mhi/Kconfig
Quoted 10 lines
drivers/bus/mhi/Kconfig +10
-0+ dev_dbg(dev, "Starting channel\n"); + ret = mhi_prepare_for_transfer(uci_dev->mhi_dev); + if (ret) { + dev_err(dev, "Error starting transfer channels\n"); + uci_dev->ref_count--; + goto error_open_chan; + } + + ret = mhi_queue_inbound(uci_dev); + if (ret)Decrease refcount?
Quoted 5 lines
Quoted 3 lines
done in release. For every open increment the ref count and for every release call decrement it, so that when ref count becomes 0 we can free memory.
Even if
open()fails?Nice catch, will decrement ref count if
mhi_queue_inbound()fails.Quoted 1 line
[...]
Quoted 29 lines
Quoted 29 lines
Quoted 28 lines
Quoted 13 lines
drivers/bus/mhi/Kconfig
Quoted 11 lines
drivers/bus/mhi/Kconfig +9
-0+ mutex_lock(&mhi_uci_drv.lock); + mutex_lock(&uci_dev->mutex); + + /* disable the node */ + spin_lock_irq(&uci_dev->dl_chan.lock); + spin_lock_irq(&uci_dev->ul_chan.lock); + uci_dev->enabled = false; + spin_unlock_irq(&uci_dev->ul_chan.lock); + spin_unlock_irq(&uci_dev->dl_chan.lock);You need to do something better here. This doesn't look good.
Will come up with change to fix lock related concerns.
Quoted 12 lines
drivers/bus/mhi/Kconfig
Quoted 10 lines
drivers/bus/mhi/Kconfig +9
-0+ wake_up(&uci_dev->dl_chan.wq); + wake_up(&uci_dev->ul_chan.wq); + + /* delete the node to prevent new opens */ + device_destroy(mhi_uci_drv.class, uci_dev->devt); + uci_dev->dev = NULL; + list_del(&uci_dev->node); + + /* safe to free memory only if all file nodes are closed */And what if it is already freed in .release?
It is possible that
ref_countbecomes 0 inrelease()then it would be no-op here.
Quoted 6 lines
Quoted 1 line
No-op? You are calling kfree again.
No, the way it works is: In
release()we decrement ref count and check ifuci_dev->enabledis false which means remove was already called. In that case we free inrelease(). In case remove was not called yet, then ifrelease()is called we do not freeuci_devand free it onremove(). Both functions are protected with same mutext lockuci_dev->lock.
I see... Again I overlooked it.
Thanks,
Mani
Quoted 104 lines
Quoted 18 lines
Quoted 18 lines
Quoted 18 lines
Quoted 6 lines
drivers/bus/mhi/Kconfig +4
-0+ if (!uci_dev->ref_count) { + mutex_unlock(&uci_dev->mutex); + mutex_destroy(&uci_dev->mutex); + clear_bit(MINOR(uci_dev->devt), uci_minors);drivers/bus/mhi/Kconfig
Quoted 10 lines
drivers/bus/mhi/Kconfig +10
-0+ dev_set_drvdata(&mhi_dev->dev, NULL); + kfree(uci_dev); + mutex_unlock(&mhi_uci_drv.lock); + return; + } + + mutex_unlock(&uci_dev->mutex); + mutex_unlock(&mhi_uci_drv.lock); + + dev_dbg(dev, "%s: exit\n", __func__);Drop this.
Quoted 80 lines
Quoted 2 lines
I can change it to
mhi_dev->nameremoved. It helps in debugging race conditions.Okay.
Quoted 75 lines
Quoted 58 lines
Thanks,
ManiQuoted 54 lines
drivers/bus/mhi/Kconfig +54
-0+} + +/* .driver_data stores max mtu */ +static const struct mhi_device_id mhi_uci_match_table[] = { + { .chan = "LOOPBACK", .driver_data = 0x1000 }, + {}, +}; +MODULE_DEVICE_TABLE(mhi, mhi_uci_match_table); + +static struct mhi_driver mhi_uci_driver = { + .id_table = mhi_uci_match_table, + .remove = mhi_uci_remove, + .probe = mhi_uci_probe, + .ul_xfer_cb = mhi_ul_xfer_cb, + .dl_xfer_cb = mhi_dl_xfer_cb, + .driver = { + .name = MHI_UCI_DRIVER_NAME, + }, +}; + +static int mhi_uci_init(void) +{ + int ret; + + ret = register_chrdev(0, MHI_UCI_DRIVER_NAME, &mhidev_fops); + if (ret < 0) + return ret; + + mhi_uci_drv.major = ret; + mhi_uci_drv.class = class_create(THIS_MODULE, MHI_UCI_DRIVER_NAME); + if (IS_ERR(mhi_uci_drv.class)) { + unregister_chrdev(mhi_uci_drv.major, MHI_UCI_DRIVER_NAME); + return -ENODEV; + } + + mutex_init(&mhi_uci_drv.lock); + INIT_LIST_HEAD(&mhi_uci_drv.head); + + ret = mhi_driver_register(&mhi_uci_driver); + if (ret) { + class_destroy(mhi_uci_drv.class); + unregister_chrdev(mhi_uci_drv.major, MHI_UCI_DRIVER_NAME); + } + + return ret; +} + +static void __exit mhi_uci_exit(void) +{ + mhi_driver_unregister(&mhi_uci_driver); + class_destroy(mhi_uci_drv.class); + unregister_chrdev(mhi_uci_drv.major, MHI_UCI_DRIVER_NAME); +} +Quoted 8 lines
Quoted 8 lines
drivers/bus/mhi/Kconfig +4
-0+module_init(mhi_uci_init); +module_exit(mhi_uci_exit); +MODULE_LICENSE("GPL v2"); +MODULE_DESCRIPTION("MHI UCI Driver");Signature · 2 lines
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum, a Linux Foundation Collaborative ProjectI have some follow up questions based on your review comments. Please let me know your view on those questions above.
Thanks,
HemantSignature · 2 lines
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum, a Linux Foundation Collaborative ProjectThanks,
HemantSignature · 2 lines
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum, a Linux Foundation Collaborative Project