Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]

Groups > linux.kernel > #1234551

[PATCH 2/2] regmap: debugfs: improve regmap_reg_ranges_read_file()

Show all headers | View raw

* A page is a bit much for two integers and a bit of punctuation. 64
  bytes should suffice.

* Calling strlen() on entry no less than three times is silly,
  especially when snprintf() has returned that value (which was just
  thrown away).

* Transferring entry to the output buffer using snprintf is silly,
  when we know the length. Use memcpy instead.

* Making the newline part of entry, we can avoid having to account for
  it separately in multiple places.

Signed-off-by: Rasmus Villemoes <linux@rasmusvillemoes.dk>
---
 drivers/base/regmap/regmap-debugfs.c | 19 +++++++++----------
 1 file changed, 9 insertions(+), 10 deletions(-)

diff --git a/drivers/base/regmap/regmap-debugfs.c b/drivers/base/regmap/regmap-debugfs.c
index 9fb3f6fc26b0..01110c0b8be0 100644
--- a/drivers/base/regmap/regmap-debugfs.c
+++ b/drivers/base/regmap/regmap-debugfs.c
@@ -333,6 +333,8 @@ static ssize_t regmap_reg_ranges_read_file(struct file *file,
 	char *buf;
 	char *entry;
 	int ret;
+	unsigned entry_len;
+	const unsigned entry_size = 64;
 
 	if (*ppos < 0 || !count)
 		return -EINVAL;
@@ -341,7 +343,7 @@ static ssize_t regmap_reg_ranges_read_file(struct file *file,
 	if (!buf)
 		return -ENOMEM;
 
-	entry = kmalloc(PAGE_SIZE, GFP_KERNEL);
+	entry = kmalloc(entry_size, GFP_KERNEL);
 	if (!entry) {
 		kfree(buf);
 		return -ENOMEM;
@@ -360,18 +362,15 @@ static ssize_t regmap_reg_ranges_read_file(struct file *file,
 	p = 0;
 	mutex_lock(&map->cache_lock);
 	list_for_each_entry(c, &map->debugfs_off_cache, list) {
-		snprintf(entry, PAGE_SIZE, "%x-%x",
-			 c->base_reg, c->max_reg);
+		entry_len = snprintf(entry, entry_size, "%x-%x\n",
+				     c->base_reg, c->max_reg);
 		if (p >= *ppos) {
-			if (buf_pos + 1 + strlen(entry) > count)
+			if (buf_pos + entry_len > count)
 				break;
-			snprintf(buf + buf_pos, count - buf_pos,
-				 "%s", entry);
-			buf_pos += strlen(entry);
-			buf[buf_pos] = '\n';
-			buf_pos++;
+			memcpy(buf + buf_pos, entry, entry_len);
+			buf_pos += entry_len;
 		}
-		p += strlen(entry) + 1;
+		p += entry_len;
 	}
 	mutex_unlock(&map->cache_lock);
 
-- 
2.1.3

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

Back to linux.kernel | Previous | Next — Previous in thread | Next in thread | Find similar | Unroll thread

Thread

[PATCH 1/2] regmap: debugfs: remove bogus check Rasmus Villemoes <linux@rasmusvillemoes.dk> - 2015-09-29 00:30 +0200
  [PATCH 2/2] regmap: debugfs: improve regmap_reg_ranges_read_file() Rasmus Villemoes <linux@rasmusvillemoes.dk> - 2015-09-29 00:30 +0200
    Re: [PATCH 2/2] regmap: debugfs: improve  regmap_reg_ranges_read_file() Mark Brown <broonie@kernel.org> - 2015-09-29 20:40 +0200
      Re: [PATCH 2/2] regmap: debugfs: improve regmap_reg_ranges_read_file() Rasmus Villemoes <linux@rasmusvillemoes.dk> - 2015-09-30 12:00 +0200
        Re: [PATCH 2/2] regmap: debugfs: improve  regmap_reg_ranges_read_file() Mark Brown <broonie@kernel.org> - 2015-09-30 19:20 +0200
    [PATCH v2 2/3] regmap: debugfs: use memcpy instead of snprintf Rasmus Villemoes <linux@rasmusvillemoes.dk> - 2015-09-30 20:40 +0200
    [PATCH v2 3/3] regmap: debugfs: simplify regmap_reg_ranges_read_file() slightly Rasmus Villemoes <linux@rasmusvillemoes.dk> - 2015-09-30 20:40 +0200
    [PATCH v2 1/3] regmap: debugfs: use snprintf return value in regmap_reg_ranges_read_file() Rasmus Villemoes <linux@rasmusvillemoes.dk> - 2015-09-30 20:40 +0200
  Re: [PATCH 1/2] regmap: debugfs: remove bogus check Mark Brown <broonie@kernel.org> - 2015-09-29 20:20 +0200
    Re: [PATCH 1/2] regmap: debugfs: remove bogus check Rasmus Villemoes <linux@rasmusvillemoes.dk> - 2015-09-30 09:30 +0200
      Re: [PATCH 1/2] regmap: debugfs: remove bogus check Mark Brown <broonie@kernel.org> - 2015-09-30 19:30 +0200
        Re: [PATCH 1/2] regmap: debugfs: remove bogus check Rasmus Villemoes <linux@rasmusvillemoes.dk> - 2015-09-30 20:00 +0200
          Re: [PATCH 1/2] regmap: debugfs: remove bogus check Mark Brown <broonie@kernel.org> - 2015-09-30 20:20 +0200

csiph-web