Skip to contentSkip to conversation

kernel/pid.c: Improve flow of a loop inside alloc_pidmap.

PATCH In review Raphael S. Carvalho 2 participants 3 messages Mar 11, 2013

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 kernel/pid.c: Improve flow of a loop inside alloc_pidmap.

From: Raphael S.Carvalho <[email protected]>

Notes: find_next_offset searches for an available "cleaned bit" in the respective pid bitmap (page), so returns the offset if found, otherwise it returns a value equals to BITS_PER_PAGE.

For example, suppose find_next_offset didn't find any available bit, so there's no purpose to call mk_pid (Wasteful Cpu Cycles).

Therefore, I found it could be better to call mk_pid after the checking (offset < BITS_PER_PAGE) returned sucessfully! Another point: If (offset < BITS_PER_PAGE) results in a "failure", then mk_pid would be called again afterwards.

---
 kernel/pid.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)
kernel/pid.c +2 -2
index 047dc62..7ecb09a 100644
@@ -190,8 +190,8 @@ static int alloc_pidmap(struct pid_namespace *pid_ns)
 					return pid;
 				}
 				offset = find_next_offset(map, offset);
-				pid = mk_pid(pid_ns, map, offset);
-			} while (offset < BITS_PER_PAGE && pid < pid_max);
+			} while (offset < BITS_PER_PAGE && 
+				(pid = mk_pid(pid_ns, map, offset)) < pid_max);
 		}
 		if (map < &pid_ns->pidmap[(pid_max-1)/BITS_PER_PAGE]) {
 			++map;
Signature · 1 line
1.7.2.5
#1 lore raw
Quoted 19 lines · On Mon, 11 Mar 2013 18:18:56 -0300 "Raphael S. Carvalho"…

From: Raphael S.Carvalho <[email protected]>

Notes: find_next_offset searches for an available "cleaned bit" in the respective pid bitmap (page), so returns the offset if found, otherwise it returns a value equals to BITS_PER_PAGE.

For example, suppose find_next_offset didn't find any available bit, so there's no purpose to call mk_pid (Wasteful Cpu Cycles).

Therefore, I found it could be better to call mk_pid after the checking (offset < BITS_PER_PAGE) returned sucessfully! Another point: If (offset < BITS_PER_PAGE) results in a "failure", then mk_pid would be called again afterwards.

...

kernel/pid.c static int alloc_pidmap(struct pid_namespace *pid_ns) · line 197

Quoted 10 lines
kernel/pid.c +2 -2
@@ -190,8 +190,8 @@ static int alloc_pidmap(struct pid_namespace *pid_ns)
 					return pid;
 				}
 				offset = find_next_offset(map, offset);
-				pid = mk_pid(pid_ns, map, offset);
-			} while (offset < BITS_PER_PAGE && pid < pid_max);
+			} while (offset < BITS_PER_PAGE && 
+				(pid = mk_pid(pid_ns, map, offset)) < pid_max);
 		}
 		if (map < &pid_ns->pidmap[(pid_max-1)/BITS_PER_PAGE]) {
 			++map;

Looks OK. But I think it's simpler and more straightforward to do it this way?

			for ( ; ; ) {
				if (!test_and_set_bit(offset, map->page)) {
					atomic_dec(&map->nr_free);
					set_last_pid(pid_ns, last, pid);
					return pid;
				}
				offset = find_next_offset(map, offset);
				if (offset >= BITS_PER_PAGE)
					break;
				pid = mk_pid(pid_ns, map, offset);
				if (pid >= pid_max)
					break;
			}
#2 lore raw
Quoted 18 lines · Andrew Morton
Quoted 16 lines · On Mon, 11 Mar 2013 18:18:56 -0300 "Raphael S. Carvalho"…

From: Raphael S.Carvalho <[email protected]>

Notes: find_next_offset searches for an available "cleaned bit" in the respective pid bitmap (page), so returns the offset if found, otherwise it returns a value equals to BITS_PER_PAGE.

For example, suppose find_next_offset didn't find any available bit, so there's no purpose to call mk_pid (Wasteful Cpu Cycles).

Therefore, I found it could be better to call mk_pid after the checking (offset < BITS_PER_PAGE) returned sucessfully! Another point: If (offset < BITS_PER_PAGE) results in a "failure", then mk_pid would be called again afterwards.

...

Quoted 16 lines

kernel/pid.c static int alloc_pidmap(struct pid_namespace *pid_ns) · line 197

Quoted 13 lines
kernel/pid.c +2 -2
@@ -190,8 +190,8 @@ static int alloc_pidmap(struct pid_namespace *pid_ns)
                                      return pid;
                              }
                              offset = find_next_offset(map, offset);
-                             pid = mk_pid(pid_ns, map, offset);
-                     } while (offset < BITS_PER_PAGE && pid < pid_max);
+                     } while (offset < BITS_PER_PAGE &&
+                             (pid = mk_pid(pid_ns, map, offset)) < pid_max);
              }
              if (map < &pid_ns->pidmap[(pid_max-1)/BITS_PER_PAGE]) {
                      ++map;

Looks OK. But I think it's simpler and more straightforward to do it this way?

Yes, it looks much better.

Quoted 15 lines
                        for ( ; ; ) {
                                if (!test_and_set_bit(offset, map->page)) {
                                        atomic_dec(&map->nr_free);
                                        set_last_pid(pid_ns, last, pid);
                                        return pid;
                                }
                                offset = find_next_offset(map, offset);
                                if (offset >= BITS_PER_PAGE)
                                        break;
                                pid = mk_pid(pid_ns, map, offset);
                                if (pid >= pid_max)
                                        break;
                        }