Skip to contentSkip to conversation

lib/string: Use strchr() in strpbrk()

PATCH Applied Andy Shevchenko 4 participants 5 messages Jan 27, 2023 – Jan 28, 2023

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 lib/string: Use strchr() in strpbrk()

Use strchr() instead of open coding it as it's done elsewhere in the same file. Either we will have similar to what it was or possibly better performance in case architecture implements its own strchr().

Memory wise on x86_64 bloat-o-meter shows the following

  Function           old     new   delta
  strsep             111     102      -9

Total: Before=2763, After=2754, chg -0.33%

---
 lib/string.c | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)
lib/string.c +4 -6
index 4fb566ea610f..3d55ef890106 100644
@@ -480,13 +480,11 @@ EXPORT_SYMBOL(strcspn);
  */
 char *strpbrk(const char *cs, const char *ct)
 {
-	const char *sc1, *sc2;
+	const char *sc;
 
-	for (sc1 = cs; *sc1 != '\0'; ++sc1) {
-		for (sc2 = ct; *sc2 != '\0'; ++sc2) {
-			if (*sc1 == *sc2)
-				return (char *)sc1;
-		}
+	for (sc = cs; *sc != '\0'; ++sc) {
+		if (strchr(ct, *sc))
+			return (char *)sc;
 	}
 	return NULL;
 }
Signature · 1 line
2.39.0
Applied
#1 lore raw
Quoted 11 lines · Andy Shevchenko

Use strchr() instead of open coding it as it's done elsewhere in the same file. Either we will have similar to what it was or possibly better performance in case architecture implements its own strchr().

Memory wise on x86_64 bloat-o-meter shows the following

  Function           old     new   delta
  strsep             111     102      -9

Total: Before=2763, After=2754, chg -0.33%

[...]

Applied to for-next/hardening, thanks!

[1/1] lib/string: Use strchr() in strpbrk()

      https://git.kernel.org/kees/c/a5f5ee7c49da
Signature · 1 line
Kees Cook
#2 lore raw
In reply to Andy Shevchenko

From: Andy Shevchenko

Quoted 5 lines

Sent: 27 January 2023 15:52

Use strchr() instead of open coding it as it's done elsewhere in the same file. Either we will have similar to what it was or possibly better performance in case architecture implements its own strchr().

Except that you get a whole load of calls to strchr() for (typically) very few characters.
So the cost of the calls dominates, anything that tries to speed up strchr() for long strings will also slow things down.

Plausibly this version (untested) is faster!

char *strbprk(const char *str, const char *seps)

{
	const char *found, *try;

	do {
		if (*!seps)
			return NULL;
		found = strchr(str, *seps++);
	} while (!found);

	while (*seps) {
		try = memchr(str, *seps++, found - str);
		if (try)
			found = try;
	}

	return (char *)found;
}

Although I very much doubt strpbrk() is used anywhere where performance matters.

David

-
Registered Address Lakeside, Bramley Road, Mount Farm, Milton Keynes, MK1 1PT, UK Registration No: 1397386 (Wales)

#3 lore raw
Quoted 4 lines · David Laight

From: Andy Shevchenko

Quoted 2 lines

Sent: 27 January 2023 15:52

Quoted 8 lines
Quoted 3 lines

Use strchr() instead of open coding it as it's done elsewhere in the same file. Either we will have similar to what it was or possibly better performance in case architecture implements its own strchr().

Except that you get a whole load of calls to strchr() for (typically) very few characters.
So the cost of the calls dominates, anything that tries to speed up strchr() for long strings will also slow things down.

Hmm... I haven't seen the calls, I assume gcc simply inlined a copy of that.

...

Quoted 2 lines

Although I very much doubt strpbrk() is used anywhere where performance matters.

strsep()/strspn() are the users.

Signature · 2 lines
With Best Regards,
Andy Shevchenko
#4 lore raw

From: Andy Shevchenko

Quoted 11 lines

Sent: 28 January 2023 19:55

Quoted 8 lines · David Laight

From: Andy Shevchenko

Quoted 5 lines

Sent: 27 January 2023 15:52

Use strchr() instead of open coding it as it's done elsewhere in the same file. Either we will have similar to what it was or possibly better performance in case architecture implements its own strchr().

Quoted 6 lines
Quoted 4 lines

Except that you get a whole load of calls to strchr() for (typically) very few characters.
So the cost of the calls dominates, anything that tries to speed up strchr() for long strings will also slow things down.

Hmm... I haven't seen the calls, I assume gcc simply inlined a copy of that.

Anything gcc itself inlines is likely to be optimised for long strings (where inlining probably makes less difference).
In any case that will bloat the function - and you saw a size reduction.

About the worst thing that can happen here is that gcc realises the open coded loop is strchr() and then inlines its own 'fast' copy. Which is the last thing you want if the string is only a few characters long.

Quoted 7 lines

...

Quoted 2 lines

Although I very much doubt strpbrk() is used anywhere where performance matters.

strsep()/strspn() are the users.

I bet they aren't called anywhere that matters.
There is also a significant different.
strsep() is probably looking for a very small number of characters. strspn() could easily have all alphabetics.

For long strings you can actually use a bitmap of the characters. On 64bit this can, with care, be held in 4 registers. 32bit is more problematic.
But is you are just looking for " \t" the overheads are massive.

David

-
Registered Address Lakeside, Bramley Road, Mount Farm, Milton Keynes, MK1 1PT, UK Registration No: 1397386 (Wales)