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 84480C169C4 for ; Thu, 7 Feb 2019 00:37:42 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 53FC12175B for ; Thu, 7 Feb 2019 00:37:42 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b="bGSakLi9" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726852AbfBGAhl (ORCPT ); Wed, 6 Feb 2019 19:37:41 -0500 Received: from mail-it1-f201.google.com ([209.85.166.201]:35293 "EHLO mail-it1-f201.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726424AbfBGAhk (ORCPT ); Wed, 6 Feb 2019 19:37:40 -0500 Received: by mail-it1-f201.google.com with SMTP id v188so7957081ita.0 for ; Wed, 06 Feb 2019 16:37:40 -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=T+nbz922XSTgroflCI1/4gOK7m3XS1nndpSl4c7ViTs=; b=bGSakLi9GbHeFdt119wsSn87YSOtO7dFnAQdt4Q6c2W3qnkBDtfOqgCwpuie0/8Cwo vzgdlgwI2Y9M55ovy8DYu4YFgMGxqZ8F2WiK009Db1ILTIhE2giGKm+vrfSbW0l0e14o 63S4AteyeKI72OWdgugi/jwlXzDNYWC4gYjDwggUhaB07o3wcNUOboqD9ocqCXKyvCGg lMSd9SU0BZkYd0i9/rarVZL0MQQ12gXqRHm790wdJnQLh/3xmGU60FXV2B9kfwbfcB2m Z9mGTsHuo78pnCiTCGEF6yu+294trDvuEx7IRUp7Hmbtb8kpY3bmo06YbZrutIF88KLN lvWw== 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=T+nbz922XSTgroflCI1/4gOK7m3XS1nndpSl4c7ViTs=; b=bF3YYUhyhTbxtPR+S2fz6KDFMD11rzpnUN2Zjhp/lesSErQGbkcgouQNck6SpZzolR UrBB+ZmGS/io2Et86I76E//0irN8oZ0fp5FbZsxYdSVV4sFASr3d2uuGhwGJ6FavbQQw IVjBkpGFnsXBd6mkVRNVgfVgGdwSEyK3ePPuJqCVVy1ylDK55rTN+uZ6idBCAJFQnLI4 IIFsz9/ezmeXnMO/d4JgNJzxnsJs2P3bTHJN+SD0evmJyNA5YOX/dn01OKBQedj3XmMR ylsIoeEvGRbPdOqXcr6ERHrf2pyg4spQeCnL00HjSekIt4jmoF6F0F4jFHY8OymINfOE Ym+w== X-Gm-Message-State: AHQUAuZq5vPhToGDLBtbJlXh88GDuC0SuZLzvnbG6cBR3HPXv6c0WZ6V Gvsfrx/iNVUHQrQlt7Dz/6FLT8BX X-Google-Smtp-Source: AHgI3IZz4rjQlnZv0OWMwmU+S8tk6xdXPkmXmelBShhBVpq+3yfM8vNL9WAjU/rhrcD/5wXmKwOzWfWk X-Received: by 2002:a24:7a05:: with SMTP id a5mr4393207itc.30.1549499859668; Wed, 06 Feb 2019 16:37:39 -0800 (PST) Date: Wed, 6 Feb 2019 16:37:19 -0800 In-Reply-To: <20190207003720.51096-1-posk@google.com> Message-Id: <20190207003720.51096-6-posk@google.com> Mime-Version: 1.0 References: <20190207003720.51096-1-posk@google.com> X-Mailer: git-send-email 2.20.1.611.gfbb209baf1-goog Subject: [PATCH bpf-next v7 5/6] bpf: sync /include/.../bpf.h with tools/include/.../bpf.h 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 This patch copies changes in bpf.h done by a previous patch in this patchset from the kernel uapi include dir into tools uapi include dir. Signed-off-by: Peter Oskolkov --- tools/include/uapi/linux/bpf.h | 26 ++++++++++++++++++++++++-- 1 file changed, 24 insertions(+), 2 deletions(-) diff --git a/tools/include/uapi/linux/bpf.h b/tools/include/uapi/linux/bpf.h index 1777fa0c61e4..138089ff24cf 100644 --- a/tools/include/uapi/linux/bpf.h +++ b/tools/include/uapi/linux/bpf.h @@ -2016,6 +2016,19 @@ union bpf_attr { * Only works if *skb* contains an IPv6 packet. Insert a * Segment Routing Header (**struct ipv6_sr_hdr**) inside * the IPv6 header. + * **BPF_LWT_ENCAP_IP** + * IP encapsulation (GRE/GUE/IPIP/etc). The outer header + * must be IPv4 or IPv6, followed by zero or more + * additional headers, up to LWT_BPF_MAX_HEADROOM total + * bytes in all prepended headers. PLease note that + * if skb_is_gso(skb) is true, no more than two headers + * can be prepended, and the inner header, if present, + * should be either GRE or UDP/GUE. + * + * BPF_LWT_ENCAP_SEG6*** types can be called by bpf programs of + * type BPF_PROG_TYPE_LWT_IN; BPF_LWT_ENCAP_IP type can be called + * by bpf programs of types BPF_PROG_TYPE_LWT_IN and + * BPF_PROG_TYPE_LWT_XMIT. * * A call to this helper is susceptible to change the underlaying * packet buffer. Therefore, at load time, all checks on pointers @@ -2498,7 +2511,8 @@ enum bpf_hdr_start_off { /* Encapsulation type for BPF_FUNC_lwt_push_encap helper. */ enum bpf_lwt_encap_mode { BPF_LWT_ENCAP_SEG6, - BPF_LWT_ENCAP_SEG6_INLINE + BPF_LWT_ENCAP_SEG6_INLINE, + BPF_LWT_ENCAP_IP, }; #define __bpf_md_ptr(type, name) \ @@ -2586,7 +2600,15 @@ enum bpf_ret_code { BPF_DROP = 2, /* 3-6 reserved */ BPF_REDIRECT = 7, - /* >127 are reserved for prog type specific return codes */ + /* >127 are reserved for prog type specific return codes. + * + * BPF_LWT_REROUTE: used by BPF_PROG_TYPE_LWT_IN and + * BPF_PROG_TYPE_LWT_XMIT to indicate that skb had been + * changed and should be routed based on its new L3 header. + * (This is an L3 redirect, as opposed to L2 redirect + * represented by BPF_REDIRECT above). + */ + BPF_LWT_REROUTE = 128, }; struct bpf_sock { -- 2.20.1.611.gfbb209baf1-goog