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 BFC5AC169C4 for ; Tue, 12 Feb 2019 00:43:06 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 8C6AE20844 for ; Tue, 12 Feb 2019 00:43:06 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b="D57zv74A" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727318AbfBLAnF (ORCPT ); Mon, 11 Feb 2019 19:43:05 -0500 Received: from mail-ot1-f73.google.com ([209.85.210.73]:45743 "EHLO mail-ot1-f73.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727863AbfBLAnD (ORCPT ); Mon, 11 Feb 2019 19:43:03 -0500 Received: by mail-ot1-f73.google.com with SMTP id k12so910270otk.12 for ; Mon, 11 Feb 2019 16:43:02 -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=qqz5RegrCN8L1NVjilJsx8Ak84pUlSYYkGI27Z9WhK8=; b=D57zv74AFTQh1tThgG9KHWFjxCcKDcpyQTB6WXVBLbfYcvOfRTNIqXHseyuPKySSWx PWKFwFy/8UbmeGPaLNMii4Aoqh4jIRiEicGPfPC8hNS4Y2mCZCpumcBq0QDfWWVIUeNh hxII/E2ByGWkaObfj2bj2FDswT2yurMSNDsJlysBQcke33s3qKAdVxbcqbSS6fmPZxKC o1OAqUaIs/ernf5ZOUpm2d0rJRTKaLfT3V9+QGaW/cuJMGUZuA0QMBP6Cf94tO1IyexB 03vv4XI3+h9P/JF4MLIzk77whfpejoOL3f6ZhE6gj1oYbQWW6k1q78w/hbNAP2yG9+yh 3rIg== 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=qqz5RegrCN8L1NVjilJsx8Ak84pUlSYYkGI27Z9WhK8=; b=UHUOBwsedcQtvTQ+Mu9vDuGvdrdDtEXHtcMa0ukhwpW41F04aLGk7jUo9D8HvvIi7+ 3nhjmHZw9K+LX4QfJBUEbsMehqPrHiZ4ML+K+PQncGg6c8IM2NCM6xiPfT+xOzQutxlJ irChc+IyQyYo/qPOeMI/4rdtAE1HGxlsBwVQ4Um4zegjoA6IgWBn7+7RCBXsLR5eJX2x ZjmWFgzyxLMk1XJ8A7UYqI8R3BuZHeHD9t5gm4KoQ19aHgpMCI0fY4STm2dZUiSzhnMx yBR8jRytUFw1aeUaEKIjBlpEmVj9xjOT+gxgbFH4lsgxt75PIaLkszbgJBunoaYERnQw obwA== X-Gm-Message-State: AHQUAuYkfP+eyJphVQyfDsSsyOUVmq52KUIFqsOMeUlb46hzw7XZ9DbF nxmtfdrRQ+PO//IbCUOOdGb+03aA X-Google-Smtp-Source: AHgI3IbQYvcl7XlJ1FsK9zw+DCh0GCzImdgUU+w1O3oAMVCIK6rM0JYKk45q0VPrX7yKTQPJgJqkqhQs X-Received: by 2002:aca:5145:: with SMTP id f66mr659311oib.46.1549932182370; Mon, 11 Feb 2019 16:43:02 -0800 (PST) Date: Mon, 11 Feb 2019 16:42:44 -0800 In-Reply-To: <20190212004249.219268-1-posk@google.com> Message-Id: <20190212004249.219268-3-posk@google.com> Mime-Version: 1.0 References: <20190212004249.219268-1-posk@google.com> X-Mailer: git-send-email 2.20.1.791.gb4d0f1c61a-goog Subject: [PATCH bpf-next v9 2/7] bpf: implement BPF_LWT_ENCAP_IP mode in bpf_lwt_push_encap From: Peter Oskolkov To: Alexei Starovoitov , Daniel Borkmann , netdev@vger.kernel.org Cc: Peter Oskolkov , David Ahern , Willem de Bruijn , Peter Oskolkov Content-Type: text/plain; charset="UTF-8" Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Implement BPF_LWT_ENCAP_IP mode in bpf_lwt_push_encap BPF helper. It enables BPF programs (specifically, BPF_PROG_TYPE_LWT_IN and BPF_PROG_TYPE_LWT_XMIT prog types) to add IP encapsulation headers to packets (e.g. IP/GRE, GUE, IPIP). This is useful when thousands of different short-lived flows should be encapped, each with different and dynamically determined destination. Although lwtunnels can be used in some of these scenarios, the ability to dynamically generate encap headers adds more flexibility, e.g. when routing depends on the state of the host (reflected in global bpf maps). v7 changes: - added a call skb_clear_hash(); - removed calls to skb_set_transport_header(); - refuse to encap GSO-enabled packets. v8 changes: - fix build errors when LWT is not enabled. Note: the next patch in the patchset with deal with GSO-enabled packets, which are currently rejected at encapping attempt. Signed-off-by: Peter Oskolkov --- include/net/lwtunnel.h | 2 ++ net/core/filter.c | 3 +- net/core/lwt_bpf.c | 65 ++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 69 insertions(+), 1 deletion(-) diff --git a/include/net/lwtunnel.h b/include/net/lwtunnel.h index 33fd9ba7e0e5..671113bcb2cc 100644 --- a/include/net/lwtunnel.h +++ b/include/net/lwtunnel.h @@ -126,6 +126,8 @@ int lwtunnel_cmp_encap(struct lwtunnel_state *a, struct lwtunnel_state *b); int lwtunnel_output(struct net *net, struct sock *sk, struct sk_buff *skb); int lwtunnel_input(struct sk_buff *skb); int lwtunnel_xmit(struct sk_buff *skb); +int bpf_lwt_push_ip_encap(struct sk_buff *skb, void *hdr, u32 len, + bool ingress); static inline void lwtunnel_set_redirect(struct dst_entry *dst) { diff --git a/net/core/filter.c b/net/core/filter.c index 12c88c21b6b8..a78deb2656e1 100644 --- a/net/core/filter.c +++ b/net/core/filter.c @@ -73,6 +73,7 @@ #include #include #include +#include /** * sk_filter_trim_cap - run a packet through a socket filter @@ -4819,7 +4820,7 @@ static int bpf_push_seg6_encap(struct sk_buff *skb, u32 type, void *hdr, u32 len static int bpf_push_ip_encap(struct sk_buff *skb, void *hdr, u32 len, bool ingress) { - return -EINVAL; /* Implemented in the next patch. */ + return bpf_lwt_push_ip_encap(skb, hdr, len, ingress); } #endif diff --git a/net/core/lwt_bpf.c b/net/core/lwt_bpf.c index a648568c5e8f..e5a9850d9f48 100644 --- a/net/core/lwt_bpf.c +++ b/net/core/lwt_bpf.c @@ -390,6 +390,71 @@ static const struct lwtunnel_encap_ops bpf_encap_ops = { .owner = THIS_MODULE, }; +static int handle_gso_encap(struct sk_buff *skb, bool ipv4, int encap_len) +{ + /* Handling of GSO-enabled packets is added in the next patch. */ + return -EOPNOTSUPP; +} + +int bpf_lwt_push_ip_encap(struct sk_buff *skb, void *hdr, u32 len, bool ingress) +{ + struct iphdr *iph; + bool ipv4; + int err; + + if (unlikely(len < sizeof(struct iphdr) || len > LWT_BPF_MAX_HEADROOM)) + return -EINVAL; + + /* validate protocol and length */ + iph = (struct iphdr *)hdr; + if (iph->version == 4) { + ipv4 = true; + if (unlikely(len < iph->ihl * 4)) + return -EINVAL; + } else if (iph->version == 6) { + ipv4 = false; + if (unlikely(len < sizeof(struct ipv6hdr))) + return -EINVAL; + } else { + return -EINVAL; + } + + if (ingress) + err = skb_cow_head(skb, len + skb->mac_len); + else + err = skb_cow_head(skb, + len + LL_RESERVED_SPACE(skb_dst(skb)->dev)); + if (unlikely(err)) + return err; + + /* push the encap headers and fix pointers */ + skb_reset_inner_headers(skb); + skb->encapsulation = 1; + skb_push(skb, len); + if (ingress) + skb_postpush_rcsum(skb, iph, len); + skb_reset_network_header(skb); + memcpy(skb_network_header(skb), hdr, len); + bpf_compute_data_pointers(skb); + skb_clear_hash(skb); + + if (ipv4) { + skb->protocol = htons(ETH_P_IP); + iph = ip_hdr(skb); + + if (!iph->check) + iph->check = ip_fast_csum((unsigned char *)iph, + iph->ihl); + } else { + skb->protocol = htons(ETH_P_IPV6); + } + + if (skb_is_gso(skb)) + return handle_gso_encap(skb, ipv4, len); + + return 0; +} + static int __init bpf_lwt_init(void) { return lwtunnel_encap_add_ops(&bpf_encap_ops, LWTUNNEL_ENCAP_BPF); -- 2.20.1.791.gb4d0f1c61a-goog