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 CE2D3C282C3 for ; Tue, 22 Jan 2019 21:23:23 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 8D775217D6 for ; Tue, 22 Jan 2019 21:23:23 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b="fDviCp3V" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726859AbfAVVXW (ORCPT ); Tue, 22 Jan 2019 16:23:22 -0500 Received: from mail-pg1-f201.google.com ([209.85.215.201]:34601 "EHLO mail-pg1-f201.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726756AbfAVVXV (ORCPT ); Tue, 22 Jan 2019 16:23:21 -0500 Received: by mail-pg1-f201.google.com with SMTP id d71so32922pgc.1 for ; Tue, 22 Jan 2019 13:23:21 -0800 (PST) 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=ZnhnbyHX5KxI7PB3Nd6opjdvONKFDvTuSvkXssBP5y0=; b=fDviCp3VDnYwruQ5uXFNwJxMItyWg7A7OrUBlal4mAiO42FgorWobTiwBmTw+dx1ou keSVurrWrUxVj6bKOvA0ZEg2GWZdLODJuqr3X4SFZb6j8IB/MQq9JvWC40iW9DXhvp6o 1XrtV+jbn9C3ybndmA1GEeMQX4urj2QOewRtbejZBPlWOSx/OnDsvdFqP2LghknMk7C5 NCtolNLiUvd2kCvwrJ0IndkJI2N4gJJaf9bPfJa3/WNBQFmZVWjpBrK4OipTOC4DA2IK 2TvSZSgWzMxPdUD4wD09lp0HVIeS/2UY0IFCxuaWwRh9GBy+DzfXsoHz02IIVhmYTccI Wkjg== 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=ZnhnbyHX5KxI7PB3Nd6opjdvONKFDvTuSvkXssBP5y0=; b=uI3ZHZM6QU9ZtEe/fE+i2deb+iBZJP6kjJ2ib9z3JMWkw/DZ4TPTYaGjoSz/MNKS7/ 3CLX2/QoZ+T3mFtKqCOyVEvmTp8PJrVPF01ufLYMf/i0ggzZ1W1o/FNjJPDo2v9/z24J IYkJ9gMwuEtZGtaq7WVw6iWHmHguo+hFBuaEnUufTY/tmipDvLkfG8Zf/TsIFgTEvft8 x/Y6TkPAwWlNzkI4qt7ahDBwzON3H9HErMgD750RwVCPPajjXEzrGpj3aqVtgwX03GQ+ xSetoprVsWtMK7iY5hci9ZQd4LaxyKZNgBGltZZ4nK+aqc+6LbNFdDQiLWy3kmFYU77n EktA== X-Gm-Message-State: AJcUukeULtjQwwTxST1tyUXD7Eg/vG922kMyv/7mP1bpJeG74LFPTOgr vOhtO3o2AIWZoDuO5mfPVag87violO1cwO5kwCZ+/G91aWx/n5+R9m4MUWUS23tzm8e7yMdFs6a HoTaNLjU7qTR8q0bnqsUFWVVrrcA5qdnmFwR3NByLLKlxrGBtFT3+YA== X-Google-Smtp-Source: ALg8bN6efIUgL5OvJmfHpOaNi+ja+FuVwGqHv8OZkDTpIXc8ekwXFi9arcWWYQNdv+3RTwpFe8JSgBY= X-Received: by 2002:a63:4455:: with SMTP id t21mr1405269pgk.91.1548192200538; Tue, 22 Jan 2019 13:23:20 -0800 (PST) Date: Tue, 22 Jan 2019 13:23:13 -0800 In-Reply-To: <20190122212315.137291-1-sdf@google.com> Message-Id: <20190122212315.137291-2-sdf@google.com> Mime-Version: 1.0 References: <20190122212315.137291-1-sdf@google.com> X-Mailer: git-send-email 2.20.1.321.g9e740568ce-goog Subject: [PATCH bpf-next 1/3] net/flow_dissector: move bpf case into __skb_flow_bpf_dissect From: Stanislav Fomichev To: netdev@vger.kernel.org Cc: davem@davemloft.net, ast@kernel.org, daniel@iogearbox.net, 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 way, we can reuse it for flow dissector in BPF_PROG_TEST_RUN. No functional changes. Signed-off-by: Stanislav Fomichev --- include/linux/skbuff.h | 5 +++ net/core/flow_dissector.c | 92 +++++++++++++++++++++++---------------- 2 files changed, 59 insertions(+), 38 deletions(-) diff --git a/include/linux/skbuff.h b/include/linux/skbuff.h index 93f56fddd92a..be762fc34ff3 100644 --- a/include/linux/skbuff.h +++ b/include/linux/skbuff.h @@ -1221,6 +1221,11 @@ static inline int skb_flow_dissector_bpf_prog_detach(const union bpf_attr *attr) } #endif +struct bpf_flow_keys; +bool __skb_flow_bpf_dissect(struct bpf_prog *prog, + const struct sk_buff *skb, + struct flow_dissector *flow_dissector, + struct bpf_flow_keys *flow_keys); bool __skb_flow_dissect(const struct sk_buff *skb, struct flow_dissector *flow_dissector, void *target_container, diff --git a/net/core/flow_dissector.c b/net/core/flow_dissector.c index 9f2840510e63..bb1a54747d64 100644 --- a/net/core/flow_dissector.c +++ b/net/core/flow_dissector.c @@ -683,6 +683,46 @@ static void __skb_flow_bpf_to_target(const struct bpf_flow_keys *flow_keys, } } +bool __skb_flow_bpf_dissect(struct bpf_prog *prog, + const struct sk_buff *skb, + struct flow_dissector *flow_dissector, + struct bpf_flow_keys *flow_keys) +{ + struct bpf_skb_data_end cb_saved; + struct bpf_skb_data_end *cb; + u32 result; + + /* Note that even though the const qualifier is discarded + * throughout the execution of the BPF program, all changes(the + * control block) are reverted after the BPF program returns. + * Therefore, __skb_flow_dissect does not alter the skb. + */ + + cb = (struct bpf_skb_data_end *)skb->cb; + + /* Save Control Block */ + memcpy(&cb_saved, cb, sizeof(cb_saved)); + memset(cb, 0, sizeof(*cb)); + + /* Pass parameters to the BPF program */ + memset(flow_keys, 0, sizeof(*flow_keys)); + cb->qdisc_cb.flow_keys = flow_keys; + flow_keys->nhoff = skb_network_offset(skb); + flow_keys->thoff = flow_keys->nhoff; + + bpf_compute_data_pointers((struct sk_buff *)skb); + result = BPF_PROG_RUN(prog, skb); + + /* Restore state */ + memcpy(cb, &cb_saved, sizeof(cb_saved)); + + flow_keys->nhoff = clamp_t(u16, flow_keys->nhoff, 0, skb->len); + flow_keys->thoff = clamp_t(u16, flow_keys->thoff, + flow_keys->nhoff, skb->len); + + return result == BPF_OK; +} + /** * __skb_flow_dissect - extract the flow_keys struct and return it * @skb: sk_buff to extract the flow from, can be NULL if the rest are specified @@ -714,7 +754,6 @@ bool __skb_flow_dissect(const struct sk_buff *skb, struct flow_dissector_key_vlan *key_vlan; enum flow_dissect_ret fdret; enum flow_dissector_key_id dissector_vlan = FLOW_DISSECTOR_KEY_MAX; - struct bpf_prog *attached = NULL; int num_hdrs = 0; u8 ip_proto = 0; bool ret; @@ -754,53 +793,30 @@ bool __skb_flow_dissect(const struct sk_buff *skb, FLOW_DISSECTOR_KEY_BASIC, target_container); - rcu_read_lock(); if (skb) { + struct bpf_flow_keys flow_keys; + struct bpf_prog *attached = NULL; + + rcu_read_lock(); + if (skb->dev) attached = rcu_dereference(dev_net(skb->dev)->flow_dissector_prog); else if (skb->sk) attached = rcu_dereference(sock_net(skb->sk)->flow_dissector_prog); else WARN_ON_ONCE(1); - } - if (attached) { - /* Note that even though the const qualifier is discarded - * throughout the execution of the BPF program, all changes(the - * control block) are reverted after the BPF program returns. - * Therefore, __skb_flow_dissect does not alter the skb. - */ - struct bpf_flow_keys flow_keys = {}; - struct bpf_skb_data_end cb_saved; - struct bpf_skb_data_end *cb; - u32 result; - - cb = (struct bpf_skb_data_end *)skb->cb; - - /* Save Control Block */ - memcpy(&cb_saved, cb, sizeof(cb_saved)); - memset(cb, 0, sizeof(cb_saved)); - /* Pass parameters to the BPF program */ - cb->qdisc_cb.flow_keys = &flow_keys; - flow_keys.nhoff = nhoff; - flow_keys.thoff = nhoff; - - bpf_compute_data_pointers((struct sk_buff *)skb); - result = BPF_PROG_RUN(attached, skb); - - /* Restore state */ - memcpy(cb, &cb_saved, sizeof(cb_saved)); - - flow_keys.nhoff = clamp_t(u16, flow_keys.nhoff, 0, skb->len); - flow_keys.thoff = clamp_t(u16, flow_keys.thoff, - flow_keys.nhoff, skb->len); - - __skb_flow_bpf_to_target(&flow_keys, flow_dissector, - target_container); + if (attached) { + ret = __skb_flow_bpf_dissect(attached, skb, + flow_dissector, + &flow_keys); + __skb_flow_bpf_to_target(&flow_keys, flow_dissector, + target_container); + rcu_read_unlock(); + return ret; + } rcu_read_unlock(); - return result == BPF_OK; } - rcu_read_unlock(); if (dissector_uses_key(flow_dissector, FLOW_DISSECTOR_KEY_ETH_ADDRS)) { -- 2.20.1.321.g9e740568ce-goog