From patchwork Fri Sep 21 17:10:33 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Joe Stringer X-Patchwork-Id: 973326 X-Patchwork-Delegate: bpf@iogearbox.net Return-Path: X-Original-To: patchwork-incoming-netdev@ozlabs.org Delivered-To: patchwork-incoming-netdev@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=netdev-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=wand.net.nz Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="Il3qUqtj"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 42H0VQ3VPnz9sB5 for ; Sat, 22 Sep 2018 03:10:54 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2390809AbeIUXAk (ORCPT ); Fri, 21 Sep 2018 19:00:40 -0400 Received: from mail-yw1-f66.google.com ([209.85.161.66]:33434 "EHLO mail-yw1-f66.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2390180AbeIUXAj (ORCPT ); Fri, 21 Sep 2018 19:00:39 -0400 Received: by mail-yw1-f66.google.com with SMTP id x67-v6so5476786ywg.0 for ; Fri, 21 Sep 2018 10:10:51 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references; bh=qF0TwevV+1ONCUBjft+/NW/Llxbre0UeqnjV/Q10Vso=; b=Il3qUqtjB16Bwnetmk6p+IEsACtTwb6vouUviA4ejCQdzQkGBP9VZhZobQeWMjwkdz qeNn8xf+jtJKXFRXm3CF5cGSdGdHKR2SuHGzAGWcYPyd9zofuAIYsfn/C8r8dvMICAJ4 dJdGKnfMSyiIkmCA4/cXWXZtJp8Ez/8ieLXMNAOdmW3TUWy78CSiL+5ePtmjuoGMegwZ 3ISeGZ5fiVEJJlCpS3q8o6T33yrfAmiXxjFjXb4cNuMrqCGqmZ9DF0MpHXYg2KkNcsWw kE9KWA2bx9nAOwcdJM5j/S4FBJRHbLBkhxVeDuw1X/IlnvISUmnESQQIyijpi6q88Ch+ culQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references; bh=qF0TwevV+1ONCUBjft+/NW/Llxbre0UeqnjV/Q10Vso=; b=hT2JnpLfYlbJh7NNow+/DNbczRRcrcOvbpczk86avTiZ7OAAX7Oi0q9ysX5fm1+K5b jsFBQYBXLOuE9F+HUmKMZeBxcHfIRz2IUaVhZLTYICy/0jOr34fXKTh6zfmK5kc8uLNJ 2cEza5NUsS2Tkeh5ySW8bfSPxB+JEbkeE/la737v/di6BESOFrCf06r7ia9MHHZPWdN6 oq3NoV7cc/MJVyd2fAX0ZPvRRaHyV259djcl2y+ZRaydkNnuoqDfFcMqFCkKvaTqjtAJ p+5PO+f6w+ZYYV/EjeEy/pEl7Brb7oTsLrs/qgGVkTd+EovX1y456L6xbm4/JGwfR47j +UyQ== X-Gm-Message-State: APzg51Cm14gggs7F855PJdq8eq8q2QuFPJ66wdgD5v6lAKSLASAyYdZ9 2xa89VVWb0B5ihazIc70SzM= X-Google-Smtp-Source: ANB0VdYD2eftM/LE+iKusHDd0rlKq3UrCgN5enMZkSvmBLy+h0VLDM7fYigIgMhewX8nSg49dst/Ew== X-Received: by 2002:a0d:f902:: with SMTP id j2-v6mr21132063ywf.62.1537549851105; Fri, 21 Sep 2018 10:10:51 -0700 (PDT) Received: from localhost.localdomain ([99.0.85.34]) by smtp.gmail.com with ESMTPSA id h10-v6sm9930972ywa.35.2018.09.21.10.10.49 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 21 Sep 2018 10:10:50 -0700 (PDT) From: Joe Stringer To: ast@kernel.org Cc: netdev@vger.kernel.org, daniel@iogearbox.net, john.fastabend@gmail.com, tgraf@suug.ch, kafai@fb.com, nitin.hande@gmail.com, mauricio.vasquez@polito.it Subject: [PATCHv2 bpf-next 01/11] bpf: Add iterator for spilled registers Date: Fri, 21 Sep 2018 10:10:33 -0700 Message-Id: <20180921171043.20823-2-joe@wand.net.nz> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20180921171043.20823-1-joe@wand.net.nz> References: <20180921171043.20823-1-joe@wand.net.nz> Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Add this iterator for spilled registers, it concentrates the details of how to get the current frame's spilled registers into a single macro while clarifying the intention of the code which is calling the macro. Signed-off-by: Joe Stringer Acked-by: Alexei Starovoitov --- include/linux/bpf_verifier.h | 11 +++++++++++ kernel/bpf/verifier.c | 16 +++++++--------- 2 files changed, 18 insertions(+), 9 deletions(-) diff --git a/include/linux/bpf_verifier.h b/include/linux/bpf_verifier.h index b42b60a83e19..af262b97f586 100644 --- a/include/linux/bpf_verifier.h +++ b/include/linux/bpf_verifier.h @@ -131,6 +131,17 @@ struct bpf_verifier_state { u32 curframe; }; +#define __get_spilled_reg(slot, frame) \ + (((slot < frame->allocated_stack / BPF_REG_SIZE) && \ + (frame->stack[slot].slot_type[0] == STACK_SPILL)) \ + ? &frame->stack[slot].spilled_ptr : NULL) + +/* Iterate over 'frame', setting 'reg' to either NULL or a spilled register. */ +#define for_each_spilled_reg(iter, frame, reg) \ + for (iter = 0, reg = __get_spilled_reg(iter, frame); \ + iter < frame->allocated_stack / BPF_REG_SIZE; \ + iter++, reg = __get_spilled_reg(iter, frame)) + /* linked list of verifier states used to prune search */ struct bpf_verifier_state_list { struct bpf_verifier_state state; diff --git a/kernel/bpf/verifier.c b/kernel/bpf/verifier.c index 8ccbff4fff93..62ce45d9c558 100644 --- a/kernel/bpf/verifier.c +++ b/kernel/bpf/verifier.c @@ -2250,10 +2250,9 @@ static void __clear_all_pkt_pointers(struct bpf_verifier_env *env, if (reg_is_pkt_pointer_any(®s[i])) mark_reg_unknown(env, regs, i); - for (i = 0; i < state->allocated_stack / BPF_REG_SIZE; i++) { - if (state->stack[i].slot_type[0] != STACK_SPILL) + for_each_spilled_reg(i, state, reg) { + if (!reg) continue; - reg = &state->stack[i].spilled_ptr; if (reg_is_pkt_pointer_any(reg)) __mark_reg_unknown(reg); } @@ -3393,10 +3392,9 @@ static void find_good_pkt_pointers(struct bpf_verifier_state *vstate, for (j = 0; j <= vstate->curframe; j++) { state = vstate->frame[j]; - for (i = 0; i < state->allocated_stack / BPF_REG_SIZE; i++) { - if (state->stack[i].slot_type[0] != STACK_SPILL) + for_each_spilled_reg(i, state, reg) { + if (!reg) continue; - reg = &state->stack[i].spilled_ptr; if (reg->type == type && reg->id == dst_reg->id) reg->range = max(reg->range, new_range); } @@ -3641,7 +3639,7 @@ static void mark_map_regs(struct bpf_verifier_state *vstate, u32 regno, bool is_null) { struct bpf_func_state *state = vstate->frame[vstate->curframe]; - struct bpf_reg_state *regs = state->regs; + struct bpf_reg_state *reg, *regs = state->regs; u32 id = regs[regno].id; int i, j; @@ -3650,8 +3648,8 @@ static void mark_map_regs(struct bpf_verifier_state *vstate, u32 regno, for (j = 0; j <= vstate->curframe; j++) { state = vstate->frame[j]; - for (i = 0; i < state->allocated_stack / BPF_REG_SIZE; i++) { - if (state->stack[i].slot_type[0] != STACK_SPILL) + for_each_spilled_reg(i, state, reg) { + if (!reg) continue; mark_map_reg(&state->stack[i].spilled_ptr, 0, id, is_null); }