From patchwork Wed Apr 10 19:50:16 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jiong Wang X-Patchwork-Id: 1083562 X-Patchwork-Delegate: bpf@iogearbox.net Return-Path: X-Original-To: incoming-bpf@patchwork.ozlabs.org Delivered-To: patchwork-incoming-bpf@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=bpf-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=netronome.com Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=netronome-com.20150623.gappssmtp.com header.i=@netronome-com.20150623.gappssmtp.com header.b="uEZdv+/p"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 44fZX35h5pz9s7h for ; Thu, 11 Apr 2019 05:50:43 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726677AbfDJTun (ORCPT ); Wed, 10 Apr 2019 15:50:43 -0400 Received: from mail-wm1-f66.google.com ([209.85.128.66]:51954 "EHLO mail-wm1-f66.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726230AbfDJTum (ORCPT ); Wed, 10 Apr 2019 15:50:42 -0400 Received: by mail-wm1-f66.google.com with SMTP id 4so3907145wmf.1 for ; Wed, 10 Apr 2019 12:50:41 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=netronome-com.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=j3+vr9FJ4cb7vK24Lm/VGA0FkexNyzFHzTsS6dRPTCU=; b=uEZdv+/pFhLYh67FsjyZugndyUP5IS7K84EsLaLSHsVQyN6V1ByyYSYxcB4XubuZQH TW3e43XYu2TNSnvsF5KvrukruZQ0s77ZdKdBSmtWZ75k6aAOimUnhdpY058zhV8sRgIW PMR36A+CH3AusrWqzz+j1JLL+044WouUhhUdIFl0DCBss8Uw5OA/1pBsqi7qcZMeYJIy Dru2IZZ+UE+2cdw/xEA2SIc+JsTRM3UCZvQVugdoXqIAYLJMtTuJKCHWkTA4ebyb8vAb aLhr7iekiq7oFeMjKoBQKbmevP+38fGkCgHPXSh3n1vxS+R8sPr1EFI4EXR+3JeP6nJY vLcw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=j3+vr9FJ4cb7vK24Lm/VGA0FkexNyzFHzTsS6dRPTCU=; b=svo+agFplrTTAWP/lQgUfJFC6PR850Hv5tr33a33+J4vWY9MDE4fhAYV4XFybnZ1wN sf6b+PUBKOWdBacFmdsb9vPZ9bQli98Lcg1RPKUaYU76F8k4OcfEscGlrf8U57apZlD2 DQk/JL7qYJqsDsCdTX8b0ofJFrqXnk+jrLR7H4j+Te68yVq2Kd7Jf6OakWovhg1RJhkM SQ9T1gnEEhJtWugltD7jvdoc5EYK36a7qU0UigYk6xKFLx32z3xgbyKelDO5jFXD3+ZN FwW4mB5hdYqLtmrU2DHbdE+c8IXAz0HGtqLR0+KHbmCdah3N9PjFPz7Xaqp54H6Fp4dE ulRQ== X-Gm-Message-State: APjAAAVSv3axLwlfMOP+Ch0mZpudQeBOnbXOKl/M+6mW/yBCy12K12MV UFdP+n3BGWMmTAB22+QLilx1yA== X-Google-Smtp-Source: APXvYqwt8T0P6+2CX/IKz8AeZ2osBO/CVSd3J2eXF3j54mlL4BEjMuFKJI/sZBc0nLiYbaTP8ezNNA== X-Received: by 2002:a1c:f310:: with SMTP id q16mr3855263wmq.102.1554925841171; Wed, 10 Apr 2019 12:50:41 -0700 (PDT) Received: from cbtest28.netronome.com ([217.38.71.146]) by smtp.gmail.com with ESMTPSA id 4sm2288540wmg.12.2019.04.10.12.50.40 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 10 Apr 2019 12:50:40 -0700 (PDT) From: Jiong Wang To: alexei.starovoitov@gmail.com, daniel@iogearbox.net Cc: bpf@vger.kernel.org, netdev@vger.kernel.org, oss-drivers@netronome.com, Jiong Wang Subject: [PATCH/RFC v2 bpf-next 02/19] bpf: refactor propagate_liveness to eliminate code redundance Date: Wed, 10 Apr 2019 20:50:16 +0100 Message-Id: <1554925833-7333-3-git-send-email-jiong.wang@netronome.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1554925833-7333-1-git-send-email-jiong.wang@netronome.com> References: <1554925833-7333-1-git-send-email-jiong.wang@netronome.com> Sender: bpf-owner@vger.kernel.org Precedence: bulk List-Id: netdev.vger.kernel.org Access to reg states were not factored out, the consequence is long code for dereferencing them which made the indentation not good for reading. This patch factor out these code so the core code in the loop could be easier to follow. Signed-off-by: Jiong Wang Reviewed-by: Jakub Kicinski --- kernel/bpf/verifier.c | 34 ++++++++++++++++++++-------------- 1 file changed, 20 insertions(+), 14 deletions(-) diff --git a/kernel/bpf/verifier.c b/kernel/bpf/verifier.c index f6ebe80..d57082a 100644 --- a/kernel/bpf/verifier.c +++ b/kernel/bpf/verifier.c @@ -6201,8 +6201,9 @@ static int propagate_liveness(struct bpf_verifier_env *env, const struct bpf_verifier_state *vstate, struct bpf_verifier_state *vparent) { - int i, frame, err = 0; + struct bpf_reg_state *state_reg, *parent_reg; struct bpf_func_state *state, *parent; + int i, frame, err = 0; if (vparent->curframe != vstate->curframe) { WARN(1, "propagate_live: parent frame %d current frame %d\n", @@ -6212,28 +6213,33 @@ static int propagate_liveness(struct bpf_verifier_env *env, /* Propagate read liveness of registers... */ BUILD_BUG_ON(BPF_REG_FP + 1 != MAX_BPF_REG); for (frame = 0; frame <= vstate->curframe; frame++) { + parent = vparent->frame[frame]; + state = vstate->frame[frame]; + parent_reg = parent->regs; + state_reg = state->regs; /* We don't need to worry about FP liveness, it's read-only */ for (i = frame < vstate->curframe ? BPF_REG_6 : 0; i < BPF_REG_FP; i++) { - if (vparent->frame[frame]->regs[i].live & REG_LIVE_READ) + if (parent_reg[i].live & REG_LIVE_READ) continue; - if (vstate->frame[frame]->regs[i].live & REG_LIVE_READ) { - err = mark_reg_read(env, &vstate->frame[frame]->regs[i], - &vparent->frame[frame]->regs[i]); - if (err) - return err; - } + if (!(state_reg[i].live & REG_LIVE_READ)) + continue; + err = mark_reg_read(env, &state_reg[i], &parent_reg[i]); + if (err) + return err; } /* Propagate stack slots. */ - state = vstate->frame[frame]; - parent = vparent->frame[frame]; for (i = 0; i < state->allocated_stack / BPF_REG_SIZE && i < parent->allocated_stack / BPF_REG_SIZE; i++) { - if (parent->stack[i].spilled_ptr.live & REG_LIVE_READ) + parent_reg = &parent->stack[i].spilled_ptr; + state_reg = &state->stack[i].spilled_ptr; + if (parent_reg->live & REG_LIVE_READ) continue; - if (state->stack[i].spilled_ptr.live & REG_LIVE_READ) - mark_reg_read(env, &state->stack[i].spilled_ptr, - &parent->stack[i].spilled_ptr); + if (!(state_reg->live & REG_LIVE_READ)) + continue; + err = mark_reg_read(env, state_reg, parent_reg); + if (err) + return err; } } return err;