From: William Breathitt Gray <vilhelm.gray@gmail.com> To: jic23@kernel.org Cc: linux-stm32@st-md-mailman.stormreply.com, kernel@pengutronix.de, a.fatoum@pengutronix.de, kamel.bouhara@bootlin.com, gwendal@chromium.org, alexandre.belloni@bootlin.com, david@lechnology.com, linux-iio@vger.kernel.org, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, syednwaris@gmail.com, patrick.havelange@essensium.com, fabrice.gasnier@st.com, mcoquelin.stm32@gmail.com, alexandre.torgue@st.com, o.rempel@pengutronix.de, jarkko.nikula@linux.intel.com, William Breathitt Gray <vilhelm.gray@gmail.com> Subject: [PATCH v12 15/17] counter: Implement events_queue_size sysfs attribute Date: Mon, 5 Jul 2021 17:19:03 +0900 [thread overview] Message-ID: <e298043c880b350a42bdc40452376a3708bf533b.1625471640.git.vilhelm.gray@gmail.com> (raw) In-Reply-To: <cover.1625471640.git.vilhelm.gray@gmail.com> The events_queue_size sysfs attribute provides a way for users to dynamically configure the Counter events queue size for the Counter character device interface. The size is in number of struct counter_event data structures. The number of elements will be rounded-up to a power of 2 due to a requirement of the kfifo_alloc function called during reallocation of the queue. Cc: Oleksij Rempel <o.rempel@pengutronix.de> Signed-off-by: William Breathitt Gray <vilhelm.gray@gmail.com> --- Documentation/ABI/testing/sysfs-bus-counter | 8 ++++ drivers/counter/counter-chrdev.c | 4 ++ drivers/counter/counter-sysfs.c | 44 +++++++++++++++++++++ include/linux/counter.h | 2 + 4 files changed, 58 insertions(+) diff --git a/Documentation/ABI/testing/sysfs-bus-counter b/Documentation/ABI/testing/sysfs-bus-counter index e0e99adb0ecc..84ebb1ed28ed 100644 --- a/Documentation/ABI/testing/sysfs-bus-counter +++ b/Documentation/ABI/testing/sysfs-bus-counter @@ -233,6 +233,14 @@ Description: shorter or equal to configured value are ignored. Value 0 means filter is disabled. +What: /sys/bus/counter/devices/counterX/events_queue_size +KernelVersion: 5.15 +Contact: linux-iio@vger.kernel.org +Description: + Size of the Counter events queue in number of struct + counter_event data structures. The number of elements will be + rounded-up to a power of 2. + What: /sys/bus/counter/devices/counterX/name KernelVersion: 5.2 Contact: linux-iio@vger.kernel.org diff --git a/drivers/counter/counter-chrdev.c b/drivers/counter/counter-chrdev.c index 92805b1f65b8..13644c87d02a 100644 --- a/drivers/counter/counter-chrdev.c +++ b/drivers/counter/counter-chrdev.c @@ -323,6 +323,9 @@ static int counter_chrdev_open(struct inode *inode, struct file *filp) typeof(*counter), chrdev); + if (!mutex_trylock(&counter->chrdev_lock)) + return -EBUSY; + get_device(&counter->dev); filp->private_data = counter; @@ -339,6 +342,7 @@ static int counter_chrdev_release(struct inode *inode, struct file *filp) return err; put_device(&counter->dev); + mutex_unlock(&counter->chrdev_lock); return 0; } diff --git a/drivers/counter/counter-sysfs.c b/drivers/counter/counter-sysfs.c index eb1505bfbd89..bf038eff4587 100644 --- a/drivers/counter/counter-sysfs.c +++ b/drivers/counter/counter-sysfs.c @@ -8,7 +8,9 @@ #include <linux/err.h> #include <linux/gfp.h> #include <linux/kernel.h> +#include <linux/kfifo.h> #include <linux/list.h> +#include <linux/mutex.h> #include <linux/string.h> #include <linux/sysfs.h> #include <linux/types.h> @@ -782,12 +784,48 @@ static int counter_num_counts_read(struct counter_device *counter, u8 *val) return 0; } +static int counter_events_queue_size_read(struct counter_device *counter, + u64 *val) +{ + *val = kfifo_size(&counter->events); + return 0; +} + +static int counter_events_queue_size_write(struct counter_device *counter, + u64 val) +{ + int err; + DECLARE_KFIFO_PTR(events, struct counter_event); + + /* Verify chrdev is not currently being used */ + if (!mutex_trylock(&counter->chrdev_lock)) + return -EBUSY; + + /* Allocate new events queue */ + err = kfifo_alloc(&events, val, GFP_ATOMIC); + if (err) + return err; + + /* Swap in new events queue */ + kfifo_free(&counter->events); + counter->events.kfifo = events.kfifo; + + mutex_unlock(&counter->chrdev_lock); + + return 0; +} + static struct counter_comp counter_num_signals_comp = COUNTER_COMP_DEVICE_U8("num_signals", counter_num_signals_read, NULL); static struct counter_comp counter_num_counts_comp = COUNTER_COMP_DEVICE_U8("num_counts", counter_num_counts_read, NULL); +static struct counter_comp counter_events_queue_size_comp = + COUNTER_COMP_DEVICE_U64("events_queue_size", + counter_events_queue_size_read, + counter_events_queue_size_write); + static int counter_sysfs_attr_add(struct counter_device *const counter, struct counter_attribute_group *group) { @@ -826,6 +864,12 @@ static int counter_sysfs_attr_add(struct counter_device *const counter, if (err < 0) return err; + /* Create num_counts attribute */ + err = counter_attr_create(dev, group, &counter_events_queue_size_comp, + scope, NULL); + if (err < 0) + return err; + /* Create an attribute for each extension */ for (i = 0; i < counter->num_ext; i++) { ext = counter->ext + i; diff --git a/include/linux/counter.h b/include/linux/counter.h index 3f0bbe4ff702..854fcaf49c32 100644 --- a/include/linux/counter.h +++ b/include/linux/counter.h @@ -289,6 +289,7 @@ struct counter_ops { * @priv: optional private data supplied by driver * @dev: internal device structure * @chrdev: internal character device structure + * @chrdev_lock: lock to limit chrdev to a single open at a time * @events_list: list of current watching Counter events * @events_list_lock: lock to protect Counter events list operations * @next_events_list: list of next watching Counter events @@ -314,6 +315,7 @@ struct counter_device { struct device dev; struct cdev chrdev; + struct mutex chrdev_lock; struct list_head events_list; spinlock_t events_list_lock; struct list_head next_events_list; -- 2.32.0
WARNING: multiple messages have this Message-ID (diff)
From: William Breathitt Gray <vilhelm.gray@gmail.com> To: jic23@kernel.org Cc: linux-stm32@st-md-mailman.stormreply.com, kernel@pengutronix.de, a.fatoum@pengutronix.de, kamel.bouhara@bootlin.com, gwendal@chromium.org, alexandre.belloni@bootlin.com, david@lechnology.com, linux-iio@vger.kernel.org, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, syednwaris@gmail.com, patrick.havelange@essensium.com, fabrice.gasnier@st.com, mcoquelin.stm32@gmail.com, alexandre.torgue@st.com, o.rempel@pengutronix.de, jarkko.nikula@linux.intel.com, William Breathitt Gray <vilhelm.gray@gmail.com> Subject: [PATCH v12 15/17] counter: Implement events_queue_size sysfs attribute Date: Mon, 5 Jul 2021 17:19:03 +0900 [thread overview] Message-ID: <e298043c880b350a42bdc40452376a3708bf533b.1625471640.git.vilhelm.gray@gmail.com> (raw) In-Reply-To: <cover.1625471640.git.vilhelm.gray@gmail.com> The events_queue_size sysfs attribute provides a way for users to dynamically configure the Counter events queue size for the Counter character device interface. The size is in number of struct counter_event data structures. The number of elements will be rounded-up to a power of 2 due to a requirement of the kfifo_alloc function called during reallocation of the queue. Cc: Oleksij Rempel <o.rempel@pengutronix.de> Signed-off-by: William Breathitt Gray <vilhelm.gray@gmail.com> --- Documentation/ABI/testing/sysfs-bus-counter | 8 ++++ drivers/counter/counter-chrdev.c | 4 ++ drivers/counter/counter-sysfs.c | 44 +++++++++++++++++++++ include/linux/counter.h | 2 + 4 files changed, 58 insertions(+) diff --git a/Documentation/ABI/testing/sysfs-bus-counter b/Documentation/ABI/testing/sysfs-bus-counter index e0e99adb0ecc..84ebb1ed28ed 100644 --- a/Documentation/ABI/testing/sysfs-bus-counter +++ b/Documentation/ABI/testing/sysfs-bus-counter @@ -233,6 +233,14 @@ Description: shorter or equal to configured value are ignored. Value 0 means filter is disabled. +What: /sys/bus/counter/devices/counterX/events_queue_size +KernelVersion: 5.15 +Contact: linux-iio@vger.kernel.org +Description: + Size of the Counter events queue in number of struct + counter_event data structures. The number of elements will be + rounded-up to a power of 2. + What: /sys/bus/counter/devices/counterX/name KernelVersion: 5.2 Contact: linux-iio@vger.kernel.org diff --git a/drivers/counter/counter-chrdev.c b/drivers/counter/counter-chrdev.c index 92805b1f65b8..13644c87d02a 100644 --- a/drivers/counter/counter-chrdev.c +++ b/drivers/counter/counter-chrdev.c @@ -323,6 +323,9 @@ static int counter_chrdev_open(struct inode *inode, struct file *filp) typeof(*counter), chrdev); + if (!mutex_trylock(&counter->chrdev_lock)) + return -EBUSY; + get_device(&counter->dev); filp->private_data = counter; @@ -339,6 +342,7 @@ static int counter_chrdev_release(struct inode *inode, struct file *filp) return err; put_device(&counter->dev); + mutex_unlock(&counter->chrdev_lock); return 0; } diff --git a/drivers/counter/counter-sysfs.c b/drivers/counter/counter-sysfs.c index eb1505bfbd89..bf038eff4587 100644 --- a/drivers/counter/counter-sysfs.c +++ b/drivers/counter/counter-sysfs.c @@ -8,7 +8,9 @@ #include <linux/err.h> #include <linux/gfp.h> #include <linux/kernel.h> +#include <linux/kfifo.h> #include <linux/list.h> +#include <linux/mutex.h> #include <linux/string.h> #include <linux/sysfs.h> #include <linux/types.h> @@ -782,12 +784,48 @@ static int counter_num_counts_read(struct counter_device *counter, u8 *val) return 0; } +static int counter_events_queue_size_read(struct counter_device *counter, + u64 *val) +{ + *val = kfifo_size(&counter->events); + return 0; +} + +static int counter_events_queue_size_write(struct counter_device *counter, + u64 val) +{ + int err; + DECLARE_KFIFO_PTR(events, struct counter_event); + + /* Verify chrdev is not currently being used */ + if (!mutex_trylock(&counter->chrdev_lock)) + return -EBUSY; + + /* Allocate new events queue */ + err = kfifo_alloc(&events, val, GFP_ATOMIC); + if (err) + return err; + + /* Swap in new events queue */ + kfifo_free(&counter->events); + counter->events.kfifo = events.kfifo; + + mutex_unlock(&counter->chrdev_lock); + + return 0; +} + static struct counter_comp counter_num_signals_comp = COUNTER_COMP_DEVICE_U8("num_signals", counter_num_signals_read, NULL); static struct counter_comp counter_num_counts_comp = COUNTER_COMP_DEVICE_U8("num_counts", counter_num_counts_read, NULL); +static struct counter_comp counter_events_queue_size_comp = + COUNTER_COMP_DEVICE_U64("events_queue_size", + counter_events_queue_size_read, + counter_events_queue_size_write); + static int counter_sysfs_attr_add(struct counter_device *const counter, struct counter_attribute_group *group) { @@ -826,6 +864,12 @@ static int counter_sysfs_attr_add(struct counter_device *const counter, if (err < 0) return err; + /* Create num_counts attribute */ + err = counter_attr_create(dev, group, &counter_events_queue_size_comp, + scope, NULL); + if (err < 0) + return err; + /* Create an attribute for each extension */ for (i = 0; i < counter->num_ext; i++) { ext = counter->ext + i; diff --git a/include/linux/counter.h b/include/linux/counter.h index 3f0bbe4ff702..854fcaf49c32 100644 --- a/include/linux/counter.h +++ b/include/linux/counter.h @@ -289,6 +289,7 @@ struct counter_ops { * @priv: optional private data supplied by driver * @dev: internal device structure * @chrdev: internal character device structure + * @chrdev_lock: lock to limit chrdev to a single open at a time * @events_list: list of current watching Counter events * @events_list_lock: lock to protect Counter events list operations * @next_events_list: list of next watching Counter events @@ -314,6 +315,7 @@ struct counter_device { struct device dev; struct cdev chrdev; + struct mutex chrdev_lock; struct list_head events_list; spinlock_t events_list_lock; struct list_head next_events_list; -- 2.32.0 _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
next prev parent reply other threads:[~2021-07-05 8:20 UTC|newest] Thread overview: 101+ messages / expand[flat|nested] mbox.gz Atom feed top 2021-07-05 8:18 [PATCH v12 00/17] Introduce the Counter character device interface William Breathitt Gray 2021-07-05 8:18 ` William Breathitt Gray 2021-07-05 8:18 ` [PATCH v12 01/17] counter: 104-quad-8: Return error when invalid mode during ceiling_write William Breathitt Gray 2021-07-05 8:18 ` William Breathitt Gray 2021-07-05 8:18 ` [PATCH v12 02/17] counter: Return error code on invalid modes William Breathitt Gray 2021-07-05 8:18 ` William Breathitt Gray 2021-07-09 17:40 ` David Lechner 2021-07-09 17:40 ` David Lechner 2021-07-05 8:18 ` [PATCH v12 03/17] counter: Standardize to ERANGE for limit exceeded errors William Breathitt Gray 2021-07-05 8:18 ` William Breathitt Gray 2021-07-05 8:18 ` [PATCH v12 04/17] counter: Rename counter_signal_value to counter_signal_level William Breathitt Gray 2021-07-05 8:18 ` William Breathitt Gray 2021-07-05 8:18 ` [PATCH v12 05/17] counter: Rename counter_count_function to counter_function William Breathitt Gray 2021-07-05 8:18 ` William Breathitt Gray 2021-07-05 8:18 ` [PATCH v12 06/17] counter: Internalize sysfs interface code William Breathitt Gray 2021-07-11 9:49 ` Syed Nayyar Waris 2021-07-11 11:42 ` Jonathan Cameron 2021-07-11 11:42 ` Jonathan Cameron 2021-07-05 8:18 ` [PATCH v12 07/17] counter: Update counter.h comments to reflect sysfs internalization William Breathitt Gray 2021-07-05 8:18 ` William Breathitt Gray 2021-07-09 17:49 ` David Lechner 2021-07-09 17:49 ` David Lechner 2021-07-10 9:41 ` William Breathitt Gray 2021-07-10 9:41 ` William Breathitt Gray 2021-07-05 8:18 ` [PATCH v12 08/17] docs: counter: Update " William Breathitt Gray 2021-07-05 8:18 ` William Breathitt Gray 2021-07-09 17:56 ` David Lechner 2021-07-09 17:56 ` David Lechner 2021-07-05 8:18 ` [PATCH v12 09/17] counter: Move counter enums to uapi header William Breathitt Gray 2021-07-05 8:18 ` William Breathitt Gray 2021-07-05 8:18 ` [PATCH v12 10/17] counter: Add character device interface William Breathitt Gray 2021-07-05 8:18 ` William Breathitt Gray 2021-07-10 19:37 ` David Lechner 2021-07-10 19:37 ` David Lechner 2021-07-11 12:20 ` Jonathan Cameron 2021-07-11 12:20 ` Jonathan Cameron 2021-07-12 10:28 ` William Breathitt Gray 2021-07-12 10:28 ` William Breathitt Gray 2021-07-05 8:18 ` [PATCH v12 11/17] docs: counter: Document " William Breathitt Gray 2021-07-05 8:18 ` William Breathitt Gray 2021-07-10 20:15 ` David Lechner 2021-07-10 20:15 ` David Lechner 2021-07-11 10:41 ` William Breathitt Gray 2021-07-11 10:41 ` William Breathitt Gray 2021-07-05 8:19 ` [PATCH v12 12/17] tools/counter: Create Counter tools William Breathitt Gray 2021-07-05 8:19 ` William Breathitt Gray 2021-07-10 16:53 ` David Lechner 2021-07-10 16:53 ` David Lechner 2021-07-11 11:28 ` William Breathitt Gray 2021-07-11 11:28 ` William Breathitt Gray 2021-07-11 14:05 ` David Lechner 2021-07-11 14:05 ` David Lechner 2021-07-11 13:22 ` Jonathan Cameron 2021-07-11 13:22 ` Jonathan Cameron 2021-07-05 8:19 ` [PATCH v12 13/17] counter: Implement signalZ_action_component_id sysfs attribute William Breathitt Gray 2021-07-05 8:19 ` William Breathitt Gray 2021-07-10 16:20 ` David Lechner 2021-07-10 16:20 ` David Lechner 2021-07-05 8:19 ` [PATCH v12 14/17] counter: Implement *_component_id sysfs attributes William Breathitt Gray 2021-07-05 8:19 ` William Breathitt Gray 2021-07-10 17:06 ` David Lechner 2021-07-10 17:06 ` David Lechner 2021-07-11 13:28 ` Jonathan Cameron 2021-07-11 13:28 ` Jonathan Cameron 2021-07-11 14:08 ` David Lechner 2021-07-11 14:08 ` David Lechner 2021-07-12 10:19 ` Jonathan Cameron 2021-07-12 10:19 ` Jonathan Cameron 2021-07-05 8:19 ` William Breathitt Gray [this message] 2021-07-05 8:19 ` [PATCH v12 15/17] counter: Implement events_queue_size sysfs attribute William Breathitt Gray 2021-07-06 11:40 ` Jarkko Nikula 2021-07-06 11:40 ` Jarkko Nikula 2021-07-10 10:25 ` William Breathitt Gray 2021-07-10 10:25 ` William Breathitt Gray 2021-07-10 15:43 ` David Lechner 2021-07-10 15:43 ` David Lechner 2021-07-10 16:08 ` David Lechner 2021-07-10 16:08 ` David Lechner 2021-07-10 17:53 ` David Lechner 2021-07-10 17:53 ` David Lechner 2021-07-11 9:12 ` William Breathitt Gray 2021-07-11 9:12 ` William Breathitt Gray 2021-07-05 8:19 ` [PATCH v12 16/17] counter: 104-quad-8: Replace mutex with spinlock William Breathitt Gray 2021-07-05 8:19 ` William Breathitt Gray 2021-07-05 8:19 ` [PATCH v12 17/17] counter: 104-quad-8: Add IRQ support for the ACCES 104-QUAD-8 William Breathitt Gray 2021-07-05 8:19 ` William Breathitt Gray 2021-07-11 13:44 ` Jonathan Cameron 2021-07-11 13:44 ` Jonathan Cameron 2021-07-12 10:59 ` William Breathitt Gray 2021-07-12 10:59 ` William Breathitt Gray 2021-07-06 11:40 ` [PATCH v12 00/17] Introduce the Counter character device interface Jarkko Nikula 2021-07-06 11:40 ` Jarkko Nikula 2021-07-07 0:28 ` William Breathitt Gray 2021-07-07 0:28 ` William Breathitt Gray 2021-07-11 13:48 ` Jonathan Cameron 2021-07-11 13:48 ` Jonathan Cameron 2021-07-12 10:48 ` William Breathitt Gray 2021-07-12 10:48 ` William Breathitt Gray 2021-07-05 16:36 [PATCH v12 15/17] counter: Implement events_queue_size sysfs attribute kernel test robot 2021-07-06 7:48 ` Dan Carpenter 2021-07-06 7:48 ` Dan Carpenter
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=e298043c880b350a42bdc40452376a3708bf533b.1625471640.git.vilhelm.gray@gmail.com \ --to=vilhelm.gray@gmail.com \ --cc=a.fatoum@pengutronix.de \ --cc=alexandre.belloni@bootlin.com \ --cc=alexandre.torgue@st.com \ --cc=david@lechnology.com \ --cc=fabrice.gasnier@st.com \ --cc=gwendal@chromium.org \ --cc=jarkko.nikula@linux.intel.com \ --cc=jic23@kernel.org \ --cc=kamel.bouhara@bootlin.com \ --cc=kernel@pengutronix.de \ --cc=linux-arm-kernel@lists.infradead.org \ --cc=linux-iio@vger.kernel.org \ --cc=linux-kernel@vger.kernel.org \ --cc=linux-stm32@st-md-mailman.stormreply.com \ --cc=mcoquelin.stm32@gmail.com \ --cc=o.rempel@pengutronix.de \ --cc=patrick.havelange@essensium.com \ --cc=syednwaris@gmail.com \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.