* [PATCH v6 0/2] lib/string_helpers: Introduce parse_int_array_user()
@ 2022-09-04 10:28 Cezary Rojewski
2022-09-04 10:28 ` [PATCH v6 1/2] " Cezary Rojewski
` (2 more replies)
0 siblings, 3 replies; 4+ messages in thread
From: Cezary Rojewski @ 2022-09-04 10:28 UTC (permalink / raw
To: alsa-devel, broonie
Cc: andy, Cezary Rojewski, intel-poland, kai.vehmanen,
yung-chuan.liao, tiwai, pierre-louis.bossart, willy, lgirdwood,
hdegoede, andy.shevchenko, ranjani.sridharan, amadeuszx.slawinski,
peter.ujfalusi, linux-kernel
Continuation of recent upstream discussion [1] regarding user string
tokenization.
First, parse_int_array_user() is introduced to allow for splitting
specified user string into a sequence of integers. Makes use of
get_options() internally so the parsing logic is not duplicated.
With that done, redundant parts of the sound driver are removed.
Originally similar functionality was added for the SOF sound driver. As
more users are on the horizon, it is desirable to update existing
string_helpers code and provide a unified solution.
Changes in v6:
- minor improvements in SOF code: dropped superfluous array-empty checks
as suggested by Andy
Changes in v5:
- fixed kernel doc for parse_int_array_user()
Changes in v4:
- renamed the function to parse_int_array_user()
- at the name several local variable names have been reworded to match
the above
Changes in v3:
- relocated tokenize_user_input() implementation to string_helpers as
requested by Matthew
Changes in v2:
- reused get_options() so no parsing logic is duplicated
- simplified __user variant with help of memdup_user_nul()
Both suggested by Andy, thanks for thorough review
[1]: https://lore.kernel.org/alsa-devel/20220707091301.1282291-1-cezary.rojewski@intel.com/
Cezary Rojewski (2):
lib/string_helpers: Introduce parse_int_array_user()
ASoC: SOF: Remove strsplit_u32() and tokenize_input()
include/linux/string_helpers.h | 2 +
lib/string_helpers.c | 44 +++++++++++++
sound/soc/sof/sof-client-probes.c | 104 +++++-------------------------
3 files changed, 61 insertions(+), 89 deletions(-)
--
2.25.1
^ permalink raw reply [flat|nested] 4+ messages in thread
* [PATCH v6 1/2] lib/string_helpers: Introduce parse_int_array_user()
2022-09-04 10:28 [PATCH v6 0/2] lib/string_helpers: Introduce parse_int_array_user() Cezary Rojewski
@ 2022-09-04 10:28 ` Cezary Rojewski
2022-09-04 10:28 ` [PATCH v6 2/2] ASoC: SOF: Remove strsplit_u32() and tokenize_input() Cezary Rojewski
2022-09-05 15:50 ` [PATCH v6 0/2] lib/string_helpers: Introduce parse_int_array_user() Mark Brown
2 siblings, 0 replies; 4+ messages in thread
From: Cezary Rojewski @ 2022-09-04 10:28 UTC (permalink / raw
To: alsa-devel, broonie
Cc: andy, Cezary Rojewski, intel-poland, kai.vehmanen,
yung-chuan.liao, tiwai, pierre-louis.bossart, willy, lgirdwood,
hdegoede, andy.shevchenko, ranjani.sridharan, amadeuszx.slawinski,
peter.ujfalusi, linux-kernel
Add new helper function to allow for splitting specified user string
into a sequence of integers. Internally it makes use of get_options() so
the returned sequence contains the integers extracted plus an additional
element that begins the sequence and specifies the integers count.
Suggested-by: Andy Shevchenko <andy.shevchenko@gmail.com>
Reviewed-by: Andy Shevchenko <andy.shevchenko@gmail.com>
Signed-off-by: Cezary Rojewski <cezary.rojewski@intel.com>
---
include/linux/string_helpers.h | 2 ++
lib/string_helpers.c | 44 ++++++++++++++++++++++++++++++++++
2 files changed, 46 insertions(+)
diff --git a/include/linux/string_helpers.h b/include/linux/string_helpers.h
index 4d72258d42fd..dc2e726fd820 100644
--- a/include/linux/string_helpers.h
+++ b/include/linux/string_helpers.h
@@ -21,6 +21,8 @@ enum string_size_units {
void string_get_size(u64 size, u64 blk_size, enum string_size_units units,
char *buf, int len);
+int parse_int_array_user(const char __user *from, size_t count, int **array);
+
#define UNESCAPE_SPACE BIT(0)
#define UNESCAPE_OCTAL BIT(1)
#define UNESCAPE_HEX BIT(2)
diff --git a/lib/string_helpers.c b/lib/string_helpers.c
index 5ed3beb066e6..230020a2e076 100644
--- a/lib/string_helpers.c
+++ b/lib/string_helpers.c
@@ -131,6 +131,50 @@ void string_get_size(u64 size, u64 blk_size, const enum string_size_units units,
}
EXPORT_SYMBOL(string_get_size);
+/**
+ * parse_int_array_user - Split string into a sequence of integers
+ * @from: The user space buffer to read from
+ * @count: The maximum number of bytes to read
+ * @array: Returned pointer to sequence of integers
+ *
+ * On success @array is allocated and initialized with a sequence of
+ * integers extracted from the @from plus an additional element that
+ * begins the sequence and specifies the integers count.
+ *
+ * Caller takes responsibility for freeing @array when it is no longer
+ * needed.
+ */
+int parse_int_array_user(const char __user *from, size_t count, int **array)
+{
+ int *ints, nints;
+ char *buf;
+ int ret = 0;
+
+ buf = memdup_user_nul(from, count);
+ if (IS_ERR(buf))
+ return PTR_ERR(buf);
+
+ get_options(buf, 0, &nints);
+ if (!nints) {
+ ret = -ENOENT;
+ goto free_buf;
+ }
+
+ ints = kcalloc(nints + 1, sizeof(*ints), GFP_KERNEL);
+ if (!ints) {
+ ret = -ENOMEM;
+ goto free_buf;
+ }
+
+ get_options(buf, nints + 1, ints);
+ *array = ints;
+
+free_buf:
+ kfree(buf);
+ return ret;
+}
+EXPORT_SYMBOL(parse_int_array_user);
+
static bool unescape_space(char **src, char **dst)
{
char *p = *dst, *q = *src;
--
2.25.1
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [PATCH v6 2/2] ASoC: SOF: Remove strsplit_u32() and tokenize_input()
2022-09-04 10:28 [PATCH v6 0/2] lib/string_helpers: Introduce parse_int_array_user() Cezary Rojewski
2022-09-04 10:28 ` [PATCH v6 1/2] " Cezary Rojewski
@ 2022-09-04 10:28 ` Cezary Rojewski
2022-09-05 15:50 ` [PATCH v6 0/2] lib/string_helpers: Introduce parse_int_array_user() Mark Brown
2 siblings, 0 replies; 4+ messages in thread
From: Cezary Rojewski @ 2022-09-04 10:28 UTC (permalink / raw
To: alsa-devel, broonie
Cc: andy, Cezary Rojewski, intel-poland, kai.vehmanen,
yung-chuan.liao, tiwai, pierre-louis.bossart, willy, lgirdwood,
hdegoede, andy.shevchenko, ranjani.sridharan, amadeuszx.slawinski,
peter.ujfalusi, linux-kernel
Make use of global integer-array parsing helper instead of the internal
one as both serve same purpose. With that, both strsplit_u32() and
tokenize_input() become unused so remove them.
Reviewed-by: Andy Shevchenko <andy.shevchenko@gmail.com>
Signed-off-by: Cezary Rojewski <cezary.rojewski@intel.com>
---
sound/soc/sof/sof-client-probes.c | 104 +++++-------------------------
1 file changed, 15 insertions(+), 89 deletions(-)
diff --git a/sound/soc/sof/sof-client-probes.c b/sound/soc/sof/sof-client-probes.c
index eb246b823461..ddeabbb5580e 100644
--- a/sound/soc/sof/sof-client-probes.c
+++ b/sound/soc/sof/sof-client-probes.c
@@ -12,6 +12,8 @@
#include <linux/debugfs.h>
#include <linux/module.h>
#include <linux/pm_runtime.h>
+#include <linux/string_helpers.h>
+
#include <sound/soc.h>
#include <sound/sof/header.h>
#include "sof-client.h"
@@ -410,79 +412,6 @@ static const struct snd_compress_ops sof_probes_compressed_ops = {
.copy = sof_probes_compr_copy,
};
-/**
- * strsplit_u32 - Split string into sequence of u32 tokens
- * @buf: String to split into tokens.
- * @delim: String containing delimiter characters.
- * @tkns: Returned u32 sequence pointer.
- * @num_tkns: Returned number of tokens obtained.
- */
-static int strsplit_u32(char *buf, const char *delim, u32 **tkns, size_t *num_tkns)
-{
- char *s;
- u32 *data, *tmp;
- size_t count = 0;
- size_t cap = 32;
- int ret = 0;
-
- *tkns = NULL;
- *num_tkns = 0;
- data = kcalloc(cap, sizeof(*data), GFP_KERNEL);
- if (!data)
- return -ENOMEM;
-
- while ((s = strsep(&buf, delim)) != NULL) {
- ret = kstrtouint(s, 0, data + count);
- if (ret)
- goto exit;
- if (++count >= cap) {
- cap *= 2;
- tmp = krealloc(data, cap * sizeof(*data), GFP_KERNEL);
- if (!tmp) {
- ret = -ENOMEM;
- goto exit;
- }
- data = tmp;
- }
- }
-
- if (!count)
- goto exit;
- *tkns = kmemdup(data, count * sizeof(*data), GFP_KERNEL);
- if (!(*tkns)) {
- ret = -ENOMEM;
- goto exit;
- }
- *num_tkns = count;
-
-exit:
- kfree(data);
- return ret;
-}
-
-static int tokenize_input(const char __user *from, size_t count,
- loff_t *ppos, u32 **tkns, size_t *num_tkns)
-{
- char *buf;
- int ret;
-
- buf = kmalloc(count + 1, GFP_KERNEL);
- if (!buf)
- return -ENOMEM;
-
- ret = simple_write_to_buffer(buf, count, ppos, from, count);
- if (ret != count) {
- ret = ret >= 0 ? -EIO : ret;
- goto exit;
- }
-
- buf[count] = '\0';
- ret = strsplit_u32(buf, ",", tkns, num_tkns);
-exit:
- kfree(buf);
- return ret;
-}
-
static ssize_t sof_probes_dfs_points_read(struct file *file, char __user *to,
size_t count, loff_t *ppos)
{
@@ -548,8 +477,8 @@ sof_probes_dfs_points_write(struct file *file, const char __user *from,
struct sof_probes_priv *priv = cdev->data;
struct device *dev = &cdev->auxdev.dev;
struct sof_probe_point_desc *desc;
- size_t num_tkns, bytes;
- u32 *tkns;
+ u32 num_elems, *array;
+ size_t bytes;
int ret, err;
if (priv->extractor_stream_tag == SOF_PROBES_INVALID_NODE_ID) {
@@ -557,16 +486,18 @@ sof_probes_dfs_points_write(struct file *file, const char __user *from,
return -ENOENT;
}
- ret = tokenize_input(from, count, ppos, &tkns, &num_tkns);
+ ret = parse_int_array_user(from, count, (int **)&array);
if (ret < 0)
return ret;
- bytes = sizeof(*tkns) * num_tkns;
- if (!num_tkns || (bytes % sizeof(*desc))) {
+
+ num_elems = *array;
+ bytes = sizeof(*array) * num_elems;
+ if (bytes % sizeof(*desc)) {
ret = -EINVAL;
goto exit;
}
- desc = (struct sof_probe_point_desc *)tkns;
+ desc = (struct sof_probe_point_desc *)&array[1];
ret = pm_runtime_resume_and_get(dev);
if (ret < 0 && ret != -EACCES) {
@@ -583,7 +514,7 @@ sof_probes_dfs_points_write(struct file *file, const char __user *from,
if (err < 0)
dev_err_ratelimited(dev, "debugfs write failed to idle %d\n", err);
exit:
- kfree(tkns);
+ kfree(array);
return ret;
}
@@ -603,22 +534,17 @@ sof_probes_dfs_points_remove_write(struct file *file, const char __user *from,
struct sof_client_dev *cdev = file->private_data;
struct sof_probes_priv *priv = cdev->data;
struct device *dev = &cdev->auxdev.dev;
- size_t num_tkns;
- u32 *tkns;
int ret, err;
+ u32 *array;
if (priv->extractor_stream_tag == SOF_PROBES_INVALID_NODE_ID) {
dev_warn(dev, "no extractor stream running\n");
return -ENOENT;
}
- ret = tokenize_input(from, count, ppos, &tkns, &num_tkns);
+ ret = parse_int_array_user(from, count, (int **)&array);
if (ret < 0)
return ret;
- if (!num_tkns) {
- ret = -EINVAL;
- goto exit;
- }
ret = pm_runtime_resume_and_get(dev);
if (ret < 0) {
@@ -626,7 +552,7 @@ sof_probes_dfs_points_remove_write(struct file *file, const char __user *from,
goto exit;
}
- ret = sof_probes_points_remove(cdev, tkns, num_tkns);
+ ret = sof_probes_points_remove(cdev, &array[1], array[0]);
if (!ret)
ret = count;
@@ -635,7 +561,7 @@ sof_probes_dfs_points_remove_write(struct file *file, const char __user *from,
if (err < 0)
dev_err_ratelimited(dev, "debugfs write failed to idle %d\n", err);
exit:
- kfree(tkns);
+ kfree(array);
return ret;
}
--
2.25.1
^ permalink raw reply related [flat|nested] 4+ messages in thread
* Re: [PATCH v6 0/2] lib/string_helpers: Introduce parse_int_array_user()
2022-09-04 10:28 [PATCH v6 0/2] lib/string_helpers: Introduce parse_int_array_user() Cezary Rojewski
2022-09-04 10:28 ` [PATCH v6 1/2] " Cezary Rojewski
2022-09-04 10:28 ` [PATCH v6 2/2] ASoC: SOF: Remove strsplit_u32() and tokenize_input() Cezary Rojewski
@ 2022-09-05 15:50 ` Mark Brown
2 siblings, 0 replies; 4+ messages in thread
From: Mark Brown @ 2022-09-05 15:50 UTC (permalink / raw
To: Cezary Rojewski, alsa-devel
Cc: andy, pierre-louis.bossart, intel-poland, kai.vehmanen, lgirdwood,
peter.ujfalusi, tiwai, linux-kernel, willy, hdegoede,
andy.shevchenko, ranjani.sridharan, amadeuszx.slawinski,
yung-chuan.liao
On Sun, 4 Sep 2022 12:28:38 +0200, Cezary Rojewski wrote:
> Continuation of recent upstream discussion [1] regarding user string
> tokenization.
>
> First, parse_int_array_user() is introduced to allow for splitting
> specified user string into a sequence of integers. Makes use of
> get_options() internally so the parsing logic is not duplicated.
>
> [...]
Applied to
https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git for-next
Thanks!
[1/2] lib/string_helpers: Introduce parse_int_array_user()
commit: d2a411f810a0db055f02cc18e5cfa833bb2c9ccc
[2/2] ASoC: SOF: Remove strsplit_u32() and tokenize_input()
commit: b9163e9b5f14d690752010ee843b2d788c3536f1
All being well this means that it will be integrated into the linux-next
tree (usually sometime in the next 24 hours) and sent to Linus during
the next merge window (or sooner if it is a bug fix), however if
problems are discovered then the patch may be dropped or reverted.
You may get further e-mails resulting from automated or manual testing
and review of the tree, please engage with people reporting problems and
send followup patches addressing any issues that are reported if needed.
If any updates are required or you are submitting further changes they
should be sent as incremental updates against current git, existing
patches will not be replaced.
Please add any relevant lists and maintainers to the CCs when replying
to this mail.
Thanks,
Mark
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2022-09-05 15:51 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2022-09-04 10:28 [PATCH v6 0/2] lib/string_helpers: Introduce parse_int_array_user() Cezary Rojewski
2022-09-04 10:28 ` [PATCH v6 1/2] " Cezary Rojewski
2022-09-04 10:28 ` [PATCH v6 2/2] ASoC: SOF: Remove strsplit_u32() and tokenize_input() Cezary Rojewski
2022-09-05 15:50 ` [PATCH v6 0/2] lib/string_helpers: Introduce parse_int_array_user() Mark Brown
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).