From patchwork Thu Sep 27 23:26:48 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Joe Stringer X-Patchwork-Id: 975958 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="UAsUeVYi"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 42LrZ2689mz9s4Z for ; Fri, 28 Sep 2018 09:27:22 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727701AbeI1Frv (ORCPT ); Fri, 28 Sep 2018 01:47:51 -0400 Received: from mail-yw1-f68.google.com ([209.85.161.68]:37825 "EHLO mail-yw1-f68.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1725889AbeI1Frv (ORCPT ); Fri, 28 Sep 2018 01:47:51 -0400 Received: by mail-yw1-f68.google.com with SMTP id y14-v6so1857535ywa.4 for ; Thu, 27 Sep 2018 16:27:05 -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=arryqciwIcJ+JQ6b8XgA5/QZ6wcF1G6qdlUh1zejWaI=; b=UAsUeVYirHOXb0Il/+8RtcQjdde4PLPNBw34L+1fd+YuTVlQqkmnSLH8c/s7JHhSRs FQxd3qv7Xh95ssY9DOqNX2uCkOTafULWujkohTKHRW++XB/YvvJ9qRNA5YTFHXGjhVbb u4S1FvNeng6A6IbBDj4gCMpRbAGTLfmpc7VqQbt2bnV+YAsn8fCKFktQDFWi7eHRuWh8 0u6XAu5vICRuvloxEaTIFZzhCdZPIJSQIvGP/OyrgbkFR9Agd+9cYrC2ht/zQinSm2Ge UTVIOFrdz1tgUeBo+rcDnyaRL9HlYs9MJmWSohBuIHdvjsv7YG9Q0pLeSPzBjBoQOnjE zXiA== 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=arryqciwIcJ+JQ6b8XgA5/QZ6wcF1G6qdlUh1zejWaI=; b=gXIPUHERNOx/WcTiWuQg2q0kuVH4FPZyw1WlQeXiCk8r8cZR9m1CZs13qIBQ5Ebigi 0ZwJPjyt5cbuDaIiu4JyBX19/IEkJJdVWktcs9Zeyu6mMxka+yKg445+RFxsuuwjE5C4 U+SvhKWuscV+dhw+AHEvVsDz2f/Y6L4oKPjUMBwmgZPQnGe6VyJlaID+dlj2S/vwa+5C 8/dALiN9emTjxl/DtqjTZk4jV3phb0n5m4RfjZxs68256r0Nsmg7I9uW/1ySwdRQ+Pdd qYpJxiCzJn5kfCxG/hgjthSIQIwkUOn6eW57DotSBdL3Azn89VzEY9cekO6zto6aiNkD R9Og== X-Gm-Message-State: ABuFfoifqedg0B3ZZxVtz8MzkH+xDf6CetSQBFgo0C6d1EFphiUoctCe tS5W4UiXgCwMJPZW1ATpEa8= X-Google-Smtp-Source: ACcGV631RdtO5PhKorpM7gfq7JfajNzXYIrt1RXOIFUpdWJRgT9jUlt/l/kW/fB1x6SluIx6rU+mxw== X-Received: by 2002:a0d:d045:: with SMTP id s66-v6mr4678706ywd.113.1538090825436; Thu, 27 Sep 2018 16:27:05 -0700 (PDT) Received: from localhost.localdomain ([99.0.85.34]) by smtp.gmail.com with ESMTPSA id w6-v6sm4810717ywg.3.2018.09.27.16.27.04 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 27 Sep 2018 16:27:04 -0700 (PDT) From: Joe Stringer To: daniel@iogearbox.net Cc: netdev@vger.kernel.org, ast@kernel.org, john.fastabend@gmail.com, tgraf@suug.ch, kafai@fb.com, nitin.hande@gmail.com, mauricio.vasquez@polito.it Subject: [PATCHv3 bpf-next 01/12] bpf: Add iterator for spilled registers Date: Thu, 27 Sep 2018 16:26:48 -0700 Message-Id: <20180927232659.14348-2-joe@wand.net.nz> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20180927232659.14348-1-joe@wand.net.nz> References: <20180927232659.14348-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 a8cc83a970d1..18347de310ad 100644 --- a/kernel/bpf/verifier.c +++ b/kernel/bpf/verifier.c @@ -2252,10 +2252,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); } @@ -3395,10 +3394,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); } @@ -3643,7 +3641,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; @@ -3652,8 +3650,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); }