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 E4843C282D8 for ; Fri, 1 Feb 2019 17:22:51 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id B271C218AC for ; Fri, 1 Feb 2019 17:22:51 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b="QfAwwmLk" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1731228AbfBARWu (ORCPT ); Fri, 1 Feb 2019 12:22:50 -0500 Received: from mail-qk1-f202.google.com ([209.85.222.202]:48090 "EHLO mail-qk1-f202.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728880AbfBARWt (ORCPT ); Fri, 1 Feb 2019 12:22:49 -0500 Received: by mail-qk1-f202.google.com with SMTP id w124so2703468qkc.14 for ; Fri, 01 Feb 2019 09:22:49 -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=kjS2W78fCTbiEWfzm1QtN4JYg+tvgPhyY9/S76eJgc0=; b=QfAwwmLkN8X1oemgX4ngO9lEWzuH4/C6J9PCG+5dfOshmcDLgZkIBb2Rnh6JcKkeXh jiZElowcZ5zorLxXTBTMFKKpnCuPGX8v8WnrEbBnajStPxuSpfGi8r/b1DjbgeWAdEgN ItObxmmBW39k2L+qvt34BG1HCYtaBq7SewaojtHhK5Q2CZJU7bmTO/pOAFbd/KmGGrrw GzonHcUXtAF+77Q27zx9eJmcsNdWHApjeunutF4dhzzmd925jlvklpg7JE7BYgPLCKc+ rYBRpUN6aSD91GAl952a64iMnHxLCTuCI1Wb6NwVJs00sbXJI2yQHMCML/1+x+H0ZlGn RXfA== 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=kjS2W78fCTbiEWfzm1QtN4JYg+tvgPhyY9/S76eJgc0=; b=D4z5y77h6yMz6QtkE2p7Vv4KsNtAmLvWUTpOO20SVI4NHZE5URZ+59l5glu/Vja1qo +xaoB6ehqqhXiu6tOw8CoQ51378YZFBJI07TylV/uAKtmTERdDdVBMYQdTLcX2DIFhkm 7rRSIxuvkDVTa1dNDiWJLwqcN2pZfmbWgreeOzPBrS5/ghFoWcscAouof9Wc+qo0CS+S Ro2xscCcPmnzEP4ETLi3FIbY1okRLq2GCF4Xt+wVfVfWxjl9VZv35r6cOADHcmV8oDev B/kkJU9oPkbq0jnawwxwjqpweTVGDEeMzwqMxQnpv6iMMPKpolgz/WJhxV+DXJLT/978 VwdA== X-Gm-Message-State: AHQUAuZvGQAb3KC6HQyrs2AjnXaGtB5MvUklKxALvFh1QyfUNwkyGw7Z 1Qsu+wLFXoRBAaJsfOho6IvoslFR X-Google-Smtp-Source: AHgI3Ia5eui/XdSJulPGWLBWH1rg/WzHi0cz0/eH+S3DrsbfZgXy2lsvwPRrzh9phlY9I1x+IN0uimVf X-Received: by 2002:a0c:8a7c:: with SMTP id 57mr13527587qvu.45.1549041768566; Fri, 01 Feb 2019 09:22:48 -0800 (PST) Date: Fri, 1 Feb 2019 09:22:28 -0800 In-Reply-To: <20190201172229.108867-1-posk@google.com> Message-Id: <20190201172229.108867-5-posk@google.com> Mime-Version: 1.0 References: <20190201172229.108867-1-posk@google.com> X-Mailer: git-send-email 2.20.1.611.gfbb209baf1-goog Subject: [PATCH bpf-next v6 4/5] bpf: sync //bpf.h with tools//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 | 23 +++++++++++++++++++++-- 1 file changed, 21 insertions(+), 2 deletions(-) diff --git a/tools/include/uapi/linux/bpf.h b/tools/include/uapi/linux/bpf.h index 60b99b730a41..911c15585fab 100644 --- a/tools/include/uapi/linux/bpf.h +++ b/tools/include/uapi/linux/bpf.h @@ -2015,6 +2015,16 @@ 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. + * + * 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 @@ -2495,7 +2505,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) \ @@ -2583,7 +2594,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