Skip to contentSkip to conversation

utsname: Optimize clone_uts_ns()

PATCH In review Li kunyu 2 participants 2 messages Jan 15, 2024

lore
Share & tools
lore

Li kunyu

author
#0 lore raw

PATCH 1/1 utsname: Optimize clone_uts_ns()

Optimize the err variable assignment location so that the err variable is manually modified when an error occurs.

---
 kernel/utsname.c | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)
kernel/utsname.c +6 -4
index b1ac3ca870f24..f55568e00927c 100644
@@ -49,15 +49,17 @@ static struct uts_namespace *clone_uts_ns(struct user_namespace *user_ns,
 	struct ucounts *ucounts;
 	int err;
 
-	err = -ENOSPC;
 	ucounts = inc_uts_namespaces(user_ns);
-	if (!ucounts)
+	if (!ucounts) {
+		err = -ENOSPC;
 		goto fail;
+	}
 
-	err = -ENOMEM;
 	ns = create_uts_ns();
-	if (!ns)
+	if (!ns) {
+		err = -ENOMEM;
 		goto fail_dec;
+	}
 
 	err = ns_alloc_inum(&ns->ns);
 	if (err)
Signature · 1 line
2.18.2
#1 lore raw
Quoted 2 lines · Li kunyu

Optimize the err variable assignment location so that the err variable is manually modified when an error occurs.

First of all, this is *not* an optimization in any meaningful sense - compiler is perfectly capable to shift those assignments (from either form) and choose whatever it prefers.

Incidentally, it might end up lifting the store out of if - it's entirely possible that

	r1 = v
	flag = (r2 == 0)
	if flag goto fail
is better than
	flag = (r2 == 0)
	if flag goto l
	...
l:
	r1 = v
	goto fail

provided that assignment to r1 and checking r2 can be done in parallel and that's assuming that it will figure out that branch is unlikely.

Readability might be a good reason; optimization... no. Leave that to compiler; it will override your choice here anyway.