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=unavailable 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 8EA9AC04AB1 for ; Mon, 13 May 2019 18:54:07 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 607AA20989 for ; Mon, 13 May 2019 18:54:07 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b="N/NN1+KH" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728897AbfEMSyG (ORCPT ); Mon, 13 May 2019 14:54:06 -0400 Received: from mail-vk1-f202.google.com ([209.85.221.202]:54432 "EHLO mail-vk1-f202.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728879AbfEMSyG (ORCPT ); Mon, 13 May 2019 14:54:06 -0400 Received: by mail-vk1-f202.google.com with SMTP id r132so6847233vke.21 for ; Mon, 13 May 2019 11:54:05 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20161025; h=date:message-id:mime-version:subject:from:to:cc; bh=ojq1kpYzLVjj7s0IxpD9pNDAUCSKVEzFe5EcgprjOmE=; b=N/NN1+KH1wMODtFxJ1Bf54yABh2tsar3BB9B2WrQsecN6NJDwv3pyRznv+SbcdjpPQ tCzqaMhW/7+es7IEmdJf2By8o6W1r+jfSra7zwsHQq7vRmFQ/5FAG2wiuw9xBIxI1Yvo JNGhwk4hcpeHHmmudR5D9dN9p88XdMIPlgXf+7l7o4S1XLxQwydzCMtVX6+NipkqLjxY PGuXheP4rzFGhRrheUTA5C93kXgpVruHwSela2EMPfrwuvqA6LuI1Rv5hvLiKqZfz7+A OsXemxsDBJUtmUMQNjbowMTPK+G8sy2cYa5C2rCbnLoe1I3l52X6kWZungHw1wJzDf+V q6fg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:message-id:mime-version:subject:from:to:cc; bh=ojq1kpYzLVjj7s0IxpD9pNDAUCSKVEzFe5EcgprjOmE=; b=J+FLdMeQCQWYFLz7hsnPvetmQ8uI52yoc0Bk6Z/76PpQnP7vrVh95j1otweHo5GTV5 JMnY8Mq33jyfEAX8yGQ/tMKNLA4GNm9PJ8ldRTSU9aYH0Ynhfia5jQaUz9/jpyTcSow7 iU9AzMmpas2VQFwsZIaq2QyrGC78eybsPpcGXxFwhQcNQ7J+fd67cyXk9gaeAcsAaU8V ZXqDVw+dWHchsHhtZfDeNdiAGkfLofRrMq7KOYcCD/3qrK5HqM6HnlNwwomflTzr78dH d++5V4ei0otRr+bTRQURqpM3tJpv18B7h8F79CTMSWLkanGcPEkpPopTTbS9Zh8r7PcI GU6A== X-Gm-Message-State: APjAAAUWht3BgDNFSqJPAOK2Nne+TH7CqMp76c7msOrQq7GeyS5LynSZ 34SizAynIppOUnDwEYezoZ6BYRS9dmqx6IIUwgqMZtpvN9866xyWIsCIqiYl8pTrmWGdH5t1TNs SNJdOa3sLy0xyfX/kS498aJAuAs6GHRAaldDFaUuRsLzoFZZ0TqXS+g== X-Google-Smtp-Source: APXvYqwdDZTAL3yc21dxQnZKNPhlwTN9jMcv/Pc/16SNZfAxZkgotJj7aqgGZCE/DF4+vhMkt5PUU08= X-Received: by 2002:a67:ed84:: with SMTP id d4mr14634240vsp.207.1557773644903; Mon, 13 May 2019 11:54:04 -0700 (PDT) Date: Mon, 13 May 2019 11:54:01 -0700 Message-Id: <20190513185402.220122-1-sdf@google.com> Mime-Version: 1.0 X-Mailer: git-send-email 2.21.0.1020.gf2820cf01a-goog Subject: [PATCH bpf 1/2] flow_dissector: support FLOW_DISSECTOR_KEY_ETH_ADDRS with BPF From: Stanislav Fomichev To: netdev@vger.kernel.org, bpf@vger.kernel.org Cc: davem@davemloft.net, ast@kernel.org, daniel@iogearbox.net, willemb@google.com, ppenkov@google.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 If we have a flow dissector BPF program attached to the namespace, FLOW_DISSECTOR_KEY_ETH_ADDRS won't trigger because we exit early. Handle FLOW_DISSECTOR_KEY_ETH_ADDRS before BPF and only if we have an skb (used by tc-flower only). Fixes: d58e468b1112 ("flow_dissector: implements flow dissector BPF hook") Signed-off-by: Stanislav Fomichev --- net/core/flow_dissector.c | 23 ++++++++++++----------- 1 file changed, 12 insertions(+), 11 deletions(-) diff --git a/net/core/flow_dissector.c b/net/core/flow_dissector.c index 9ca784c592ac..ba76d9168c8b 100644 --- a/net/core/flow_dissector.c +++ b/net/core/flow_dissector.c @@ -825,6 +825,18 @@ bool __skb_flow_dissect(const struct net *net, else if (skb->sk) net = sock_net(skb->sk); } + + if (dissector_uses_key(flow_dissector, + FLOW_DISSECTOR_KEY_ETH_ADDRS)) { + struct ethhdr *eth = eth_hdr(skb); + struct flow_dissector_key_eth_addrs *key_eth_addrs; + + key_eth_addrs = skb_flow_dissector_target(flow_dissector, + FLOW_DISSECTOR_KEY_ETH_ADDRS, + target_container); + memcpy(key_eth_addrs, ð->h_dest, + sizeof(*key_eth_addrs)); + } } WARN_ON_ONCE(!net); @@ -860,17 +872,6 @@ bool __skb_flow_dissect(const struct net *net, rcu_read_unlock(); } - if (dissector_uses_key(flow_dissector, - FLOW_DISSECTOR_KEY_ETH_ADDRS)) { - struct ethhdr *eth = eth_hdr(skb); - struct flow_dissector_key_eth_addrs *key_eth_addrs; - - key_eth_addrs = skb_flow_dissector_target(flow_dissector, - FLOW_DISSECTOR_KEY_ETH_ADDRS, - target_container); - memcpy(key_eth_addrs, ð->h_dest, sizeof(*key_eth_addrs)); - } - proto_again: fdret = FLOW_DISSECT_RET_CONTINUE; -- 2.21.0.1020.gf2820cf01a-goog