From: Jiong Wang <jiong.wang@netronome.com>
Date: Fri, 12 Apr 2019 21:59:34 +0000 (+0100)
Subject: bpf: refactor propagate_liveness to eliminate duplicated for loop
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=1b04aee7e2182454a663950e68084fa5ada9625a;p=openwrt%2Fstaging%2Fblogic.git

bpf: refactor propagate_liveness to eliminate duplicated for loop

Propagation for register and stack slot are finished in separate for loop,
while they are perfect to be put into a single loop.

This could also let them share some common variables in later patches.

Signed-off-by: Jiong Wang <jiong.wang@netronome.com>
Signed-off-by: Alexei Starovoitov <ast@kernel.org>
---

diff --git a/kernel/bpf/verifier.c b/kernel/bpf/verifier.c
index 15ab6fa817ce..da285df492fd 100644
--- a/kernel/bpf/verifier.c
+++ b/kernel/bpf/verifier.c
@@ -6254,10 +6254,8 @@ static int propagate_liveness(struct bpf_verifier_env *env,
 					return err;
 			}
 		}
-	}
 
-	/* ... and stack slots */
-	for (frame = 0; frame <= vstate->curframe; frame++) {
+		/* Propagate stack slots. */
 		state = vstate->frame[frame];
 		parent = vparent->frame[frame];
 		for (i = 0; i < state->allocated_stack / BPF_REG_SIZE &&