mei: make module referencing local to the bus.c
Subsystems (2)
PATCH 1/2 mei: make module referencing local to the bus.c
Module reference counting is relevant only to the
mei client devices. Make the implementation clean
and move it to bus.c
Signed-off-by Tomas Winkler <[email protected]>
--- drivers/misc/mei/bus.c | 66 ++++++++++++++++++++++++---------------------- drivers/misc/mei/client.c | 5 ---- drivers/misc/mei/mei_dev.h | 2 -- 3 files changed, 34 insertions(+), 39 deletions(-)
drivers/misc/mei/bus.c +34 -32
@@ -449,6 +449,29 @@ bool mei_cldev_enabled(struct mei_cl_device *cldev) }EXPORT_SYMBOL_GPL (mei_cldev_enabled); +/** +* mei_cl_bus_module_get - acquire module of the underlying +* hw driver. +* +* @cldev: mei client device +* +* Return: true on success; false if the module was removed. +*/ +static bool mei_cl_bus_module_get (struct mei_cl_device *cldev) +{ +return try_module_get (cldev->bus->dev->driver->owner); +} + +/** +* mei_cl_bus_module_put - release the underlying hw module. +* +* @cldev: mei client device +*/ +static void mei_cl_bus_module_put (struct mei_cl_device *cldev) +{ +module_put (cldev->bus->dev->driver->owner); +} +/** * mei_cldev_enable - enable me client device * create connection with me client
@@ -487,9 +510,17 @@ int mei_cldev_enable(struct mei_cl_device *cldev) goto out; } +if (!mei_cl_bus_module_get (cldev)) { +dev_err (&cldev->dev,"get hw module failed" ); + ret = -ENODEV ; + goto out; + } + ret =mei_cl_connect (cl, cldev->me_cl,NULL ); -if (ret <0 ) +if (ret <0 ) {dev_err (&cldev->dev,"cannot connect\n" ); +mei_cl_bus_module_put (cldev); + } out:mutex_unlock (&bus->device_lock);
@@ -553,6 +584,8 @@ int mei_cldev_disable(struct mei_cl_device *cldev)dev_err (bus->dev,"Could not disconnect from the ME client\n" ); out: +mei_cl_bus_module_put (cldev); +/* Flush queues and remove any pending read */ mei_cl_flush_queues (cl,NULL );mei_cl_unlink (cl);
@@ -562,37 +595,6 @@ int mei_cldev_disable(struct mei_cl_device *cldev) }EXPORT_SYMBOL_GPL (mei_cldev_disable); -/** -* mei_cl_bus_module_get - acquire module of the underlying -* hw module. -* -* @cl: host client -* -* Return: true on success; false if the module was removed. -*/ -bool mei_cl_bus_module_get (struct mei_cl *cl) -{ -struct mei_cl_device *cldev = cl->cldev; - -if (!cldev) -return true; - -return try_module_get (cldev->bus->dev->driver->owner); -} - -/** -* mei_cl_bus_module_put - release the underlying hw module. -* -* @cl: host client -*/ -void mei_cl_bus_module_put (struct mei_cl *cl) -{ -struct mei_cl_device *cldev = cl->cldev; - -if (cldev) -module_put (cldev->bus->dev->driver->owner); -} -/** * mei_cl_device_find - find matching entry in the driver id table *
drivers/misc/mei/client.c +0 -5
@@ -765,8 +765,6 @@ static void mei_cl_set_disconnected(struct mei_cl *cl) cl->tx_flow_ctrl_creds =0 ; cl->timer_count =0 ; -mei_cl_bus_module_put (cl); -if (!cl->me_cl)return ;
@@ -1076,9 +1074,6 @@ int mei_cl_connect(struct mei_cl *cl, struct mei_me_client *me_cl, dev = cl->dev; -if (!mei_cl_bus_module_get (cl)) -return -ENODEV ; - rets =mei_cl_set_connecting (cl, me_cl);if (rets) goto nortpm;
drivers/misc/mei/mei_dev.h +0 -2
@@ -315,8 +315,6 @@ ssize_t __mei_cl_recv(struct mei_cl *cl, u8 *buf, size_t length,bool mei_cl_bus_rx_event (struct mei_cl *cl);bool mei_cl_bus_notify_event (struct mei_cl *cl);void mei_cl_bus_remove_devices (struct mei_device *bus); -bool mei_cl_bus_module_get (struct mei_cl *cl); -void mei_cl_bus_module_put (struct mei_cl *cl);int mei_cl_bus_init (void );void mei_cl_bus_exit (void );
Signature · 1 line
2.14.3
PATCH 2/2 mei: limit the number of queued writes
From: Alexander Usyskin <[email protected]>
Limit the number of queued writes per client. Writes above this threshold are blocked till place in the transmit queue is available.
The limit is configurable via sysfs and defaults to 50. The implementation should provide blocking I/O behavior. Prior to this change one would end up in the hands of OOM.
Signed-off-by Alexander Usyskin <[email protected]>
Signed-off-by Tomas Winkler <[email protected]>
--- Documentation/ABI/testing/sysfs-class-mei | 9 ++++ drivers/misc/mei/bus.c | 17 +++++++ drivers/misc/mei/client.c | 82 +++++++++++++++++++------------ drivers/misc/mei/debugfs.c | 7 +-- drivers/misc/mei/init.c | 1 + drivers/misc/mei/main.c | 65 ++++++++++++++++++++++++ drivers/misc/mei/mei_dev.h | 8 +++ 7 files changed, 154 insertions(+), 35 deletions(-)
Documentation/ABI/testing/sysfs-class-mei +9 -0
@@ -45,3 +45,12 @@ Contact: Tomas Winkler <[email protected]> Description: Display the driver HBM protocol version. The HBM protocol version supported by the driver. + +What: /sys/class/mei/meiN/tx_queue_limit +Date: Jan 2018 +KernelVersion: 4.16 +Contact: Tomas Winkler <[email protected]> +Description: Configure tx queue limit + + Set maximal number of pending writes + per opened session.
drivers/misc/mei/bus.c +17 -0
@@ -74,6 +74,23 @@ ssize_t __mei_cl_send(struct mei_cl *cl, u8 *buf, size_t length, goto out; } +while (cl->tx_cb_queued >= bus->tx_queue_limit) { +mutex_unlock (&bus->device_lock); + rets =wait_event_interruptible (cl->tx_wait, + cl->writing_state ==MEI_WRITE_COMPLETE || + (!mei_cl_is_connected (cl))); +mutex_lock (&bus->device_lock); +if (rets) { +if (signal_pending (current)) + rets = -EINTR ; + goto out; + } +if (!mei_cl_is_connected (cl)) { + rets = -ENODEV ; + goto out; + } + } + cb =mei_cl_alloc_cb (cl, length,MEI_FOP_WRITE ,NULL );if (!cb) { rets = -ENOMEM ;
drivers/misc/mei/client.c +50 -32
137 lines not on this page · raw message
drivers/misc/mei/debugfs.c +4 -3
@@ -97,7 +97,7 @@ static ssize_t mei_dbgfs_read_active(struct file *fp, char __user *ubuf,int pos =0 ;int ret; -#define HDR " |me|host|state|rd|wr|\n" +#define HDR " |me|host|state|rd|wr|wrq\n"if (!dev)return -ENODEV ;
@@ -130,9 +130,10 @@ static ssize_t mei_dbgfs_read_active(struct file *fp, char __user *ubuf,list_for_each_entry (cl, &dev->file_list, link) { pos +=scnprintf (buf + pos, bufsz - pos, -"%3d|%2d|%4d|%5d|%2d|%2d|\n" , +"%3d|%2d|%4d|%5d|%2d|%2d|%3u\n" , i,mei_cl_me_id (cl), cl->host_client_id, cl->state, - !list_empty (&cl->rd_completed), cl->writing_state); + !list_empty (&cl->rd_completed), cl->writing_state, + cl->tx_cb_queued); i++; } out:
drivers/misc/mei/init.c +1 -0
@@ -383,6 +383,7 @@ void mei_device_init(struct mei_device *dev,INIT_LIST_HEAD (&dev->write_waiting_list);INIT_LIST_HEAD (&dev->ctrl_wr_list);INIT_LIST_HEAD (&dev->ctrl_rd_list); + dev->tx_queue_limit =MEI_TX_QUEUE_LIMIT_DEFAULT ;INIT_DELAYED_WORK (&dev->timer_work, mei_timer);INIT_WORK (&dev->reset_work, mei_reset_work);
drivers/misc/mei/main.c +65 -0
87 lines not on this page · raw message
drivers/misc/mei/mei_dev.h +8 -0
@@ -210,6 +210,7 @@ struct mei_cl_cb {* @timer_count: watchdog timer for operation completion * @notify_en: notification - enabled/disabled * @notify_ev: pending notification event +* @tx_cb_queued: number of tx callbacks in queue * @writing_state: state of the tx * @rd_pending: pending read credits * @rd_completed: completed read
@@ -234,6 +235,7 @@ struct mei_cl {u8 timer_count;u8 notify_en;u8 notify_ev; +u8 tx_cb_queued;enum mei_file_transaction_states writing_state;struct list_head rd_pending;struct list_head rd_completed;
@@ -241,6 +243,10 @@ struct mei_cl {struct mei_cl_device *cldev; }; +#define MEI_TX_QUEUE_LIMIT_DEFAULT 50 +#define MEI_TX_QUEUE_LIMIT_MAX 255 +#define MEI_TX_QUEUE_LIMIT_MIN 30 +/** * struct mei_hw_ops - hw specific ops *
@@ -359,6 +365,7 @@ const char *mei_pg_state_str(enum mei_pg_state state);* @write_waiting_list : write completion list * @ctrl_wr_list : pending control write list * @ctrl_rd_list : pending control read list +* @tx_queue_limit: tx queues per client linit * * @file_list : list of opened handles * @open_handle_count: number of opened handles
@@ -423,6 +430,7 @@ struct mei_device {struct list_head write_waiting_list;struct list_head ctrl_wr_list;struct list_head ctrl_rd_list; +u8 tx_queue_limit;struct list_head file_list;long open_handle_count;
Signature · 1 line
2.14.3