From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-16.6 required=3.0 tests=DKIMWL_WL_MED,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH, MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_PASS,USER_AGENT_GIT,USER_IN_DEF_DKIM_WL autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id B8367C43381 for ; Mon, 1 Apr 2019 20:57:44 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 8482A208E4 for ; Mon, 1 Apr 2019 20:57:44 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b="auUdJRYP" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728548AbfDAU5n (ORCPT ); Mon, 1 Apr 2019 16:57:43 -0400 Received: from mail-yb1-f202.google.com ([209.85.219.202]:52554 "EHLO mail-yb1-f202.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728483AbfDAU5n (ORCPT ); Mon, 1 Apr 2019 16:57:43 -0400 Received: by mail-yb1-f202.google.com with SMTP id 4so8576996ybh.19 for ; Mon, 01 Apr 2019 13:57:42 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20161025; h=date:in-reply-to:message-id:mime-version:references:subject:from:to :cc; bh=EYY+lpV/sDo5X+XeFY+pituZHL8dpFPnn41AT/Pu7vs=; b=auUdJRYPP3FWq5gefhzIqzLRkYmPfowMcp30zhPVMML9c33ezOIpfc38rtLr2ZONa3 yOjmj3z4tKD92gNa6GEPxAfie8lFG79Jq6GnnAJtPEEWA802bds3vWiizHIYRgHB2jH9 wilhLA4Bkz/z5D7vSeBkNPrWzLQSlzODlVFBhdaCUhz+U/GKonXuJRm2LGawuRVFFmjY OAEVR57cNxP+LaUIZ5WV5Et1/+lRhuir9MRywGnKCANPwo0XRJivf7baNT51Y4NYHdpq 6rjCKySyrjssH9stDjvaPH17YyqpBgYlD4H3pCPS6gHOq0HmMc70nC4520IjF/VWF2ZD /v0g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:in-reply-to:message-id:mime-version :references:subject:from:to:cc; bh=EYY+lpV/sDo5X+XeFY+pituZHL8dpFPnn41AT/Pu7vs=; b=fa2jd7mPsBb8OC83NtmIB4xWD5+9kQKpKrH6Opv7otjvP5JCnSJgOyTZFfOS9Vyz6z kELSVc9b1jVt3ciOO5sUpAugf4KWk2PQ51Td1y/ne2TJnkHq+JKsgF01fL/6CMZrRBVK hlM1jmw9zTPIHIp+nlJGy+gvHwlU/sOpm8AUEBZw2amwK/bLBKLTSOKR7Muo7/PZ4MMF yFYm+/Or/Edu/tTZb6Ak+YRlAl0Obi07qCn/gP01Ed5oJX+09B7eoU8FAiQtWJ52pBwr wMU8QyeQ+Jzhx0c2ESKimYHkFzTHegX3Gg31wtit+Eh8YdoW8fDRogoP5YIiWLlhHQEU 5H6Q== X-Gm-Message-State: APjAAAWW357egHEnJ0u3hyYyvRY9Ujodgb91knZSZmst8a6O/IcDVxFN ldPo3pxvdNXVeV7f5ueiMlGDEDdqM6CoKQTFXQoOMGoi6QkBhSaBqck54c6VyALFBMTOvb2zcp3 BROG3hzNS/8AMwZjnoR6q0c0YsAMi/gtPZKK63qT8pvoj9qPuOTF1bg== X-Google-Smtp-Source: APXvYqyiknNWUmlnZChKUPmbf1TznrYBDvaXaGZBYXJlTXju2unrYBdLi0Tjqzop/114fX9M0dFLtWk= X-Received: by 2002:a5b:44e:: with SMTP id s14mr7247266ybp.100.1554152262055; Mon, 01 Apr 2019 13:57:42 -0700 (PDT) Date: Mon, 1 Apr 2019 13:57:31 -0700 In-Reply-To: <20190401205734.4400-1-sdf@google.com> Message-Id: <20190401205734.4400-3-sdf@google.com> Mime-Version: 1.0 References: <20190401205734.4400-1-sdf@google.com> X-Mailer: git-send-email 2.21.0.392.gf8f6787159e-goog Subject: [PATCH bpf 2/5] net/flow_dissector: pass flow_keys->n_proto to BPF programs From: Stanislav Fomichev To: netdev@vger.kernel.org, bpf@vger.kernel.org Cc: davem@davemloft.net, ast@kernel.org, daniel@iogearbox.net, simon.horman@netronome.com, willemb@google.com, peterpenkov96@gmail.com, Stanislav Fomichev Content-Type: text/plain; charset="UTF-8" Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org This is a preparation for the next commit that would prohibit access to the most fields of __sk_buff from the BPF programs. Instead of requiring BPF flow dissector programs to look into skb, pass all input data in the flow_keys. Signed-off-by: Stanislav Fomichev --- net/core/flow_dissector.c | 1 + tools/testing/selftests/bpf/progs/bpf_flow.c | 6 ++++-- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/net/core/flow_dissector.c b/net/core/flow_dissector.c index bb1a54747d64..9b84250039df 100644 --- a/net/core/flow_dissector.c +++ b/net/core/flow_dissector.c @@ -707,6 +707,7 @@ bool __skb_flow_bpf_dissect(struct bpf_prog *prog, /* Pass parameters to the BPF program */ memset(flow_keys, 0, sizeof(*flow_keys)); cb->qdisc_cb.flow_keys = flow_keys; + flow_keys->n_proto = skb->protocol; flow_keys->nhoff = skb_network_offset(skb); flow_keys->thoff = flow_keys->nhoff; diff --git a/tools/testing/selftests/bpf/progs/bpf_flow.c b/tools/testing/selftests/bpf/progs/bpf_flow.c index f177c7a6a6c7..75b17cada539 100644 --- a/tools/testing/selftests/bpf/progs/bpf_flow.c +++ b/tools/testing/selftests/bpf/progs/bpf_flow.c @@ -92,7 +92,6 @@ static __always_inline int parse_eth_proto(struct __sk_buff *skb, __be16 proto) { struct bpf_flow_keys *keys = skb->flow_keys; - keys->n_proto = proto; switch (proto) { case bpf_htons(ETH_P_IP): bpf_tail_call(skb, &jmp_table, IP); @@ -119,7 +118,9 @@ static __always_inline int parse_eth_proto(struct __sk_buff *skb, __be16 proto) SEC("flow_dissector") int _dissect(struct __sk_buff *skb) { - return parse_eth_proto(skb, skb->protocol); + struct bpf_flow_keys *keys = skb->flow_keys; + + return parse_eth_proto(skb, keys->n_proto); } /* Parses on IPPROTO_* */ @@ -358,6 +359,7 @@ PROG(VLAN)(struct __sk_buff *skb) vlan->h_vlan_encapsulated_proto == bpf_htons(ETH_P_8021Q)) return BPF_DROP; + keys->n_proto = vlan->h_vlan_encapsulated_proto; return parse_eth_proto(skb, vlan->h_vlan_encapsulated_proto); } -- 2.21.0.392.gf8f6787159e-goog