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 17824C282C2 for ; Wed, 13 Feb 2019 19:54:06 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id DC56520675 for ; Wed, 13 Feb 2019 19:54:05 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b="J8D1JVqp" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2436581AbfBMTyE (ORCPT ); Wed, 13 Feb 2019 14:54:04 -0500 Received: from mail-vs1-f74.google.com ([209.85.217.74]:32796 "EHLO mail-vs1-f74.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726291AbfBMTyD (ORCPT ); Wed, 13 Feb 2019 14:54:03 -0500 Received: by mail-vs1-f74.google.com with SMTP id x1so944825vsc.0 for ; Wed, 13 Feb 2019 11:54: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=JXkrGznPeT+Nc9rweVoe7LHDi07YZdMJYYhHz8ok4KQ=; b=J8D1JVqpRPkUY8W/HNnPrpqnhw3qDFp/4iWkNMA6Pq6O6U1/U9fZT18zcqpTlwhfbs M5NkSrSpFFy2xjseoxIqieG8M4qJBFcFRy40TA0XJEU1iR84gxjCmYo5GX9ZjoBjkabp zum11oMqvZ3+ZXfAV0KpyyipHxtaYv7iTfNd4qlUZaLj8fY6oVWVgBTmUUDknV3brl51 DcJhr0gWRw4m5fKVPUqsbSqEg/iKrhPBh49A5zT5uFTM+lebwR84MLWwfJ9QGae+JFJ3 huqx3IydzC1Dw6/mcuA/vqCWo0ZLuYH6h0QnzcwiSXKfHINerUi62jRdiPF+n8JoMokR FL3A== 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=JXkrGznPeT+Nc9rweVoe7LHDi07YZdMJYYhHz8ok4KQ=; b=SSDmkTtmPPjEXUkG4zo6GTkwAb0Bl1VukqjzfcpC18e6iCg4WdGRkaNUoEQcP2mTXV za+BJeTtLBjItV+yTSdqt8SPA+LlLV9CNFA9NInsTWv5aq/rdX9WFO4jXoEScG8iYPCj e1M4+qUzZ+e+WmiEHCKFBFPUcjwUkuOGNzfaX/JB8B5VKRKoCKBY0gWNchsHDoqOqVHt 0XLJcZHsXzV1bRXRD9xOqFs3cufKp8eeVuLA6ge96MR+5pwnTZ5+PTDx7xLtwDO5a/OJ I25ZPdjpjqbqiCrx/WlJa4SCBvB0E80GujVVJj91NT03H50Wkd429cdGHi+hCu4KTrwR jzMQ== X-Gm-Message-State: AHQUAuatYkXcyixB5eFe9OZe+b8NbK1NWFfNwdlQf5dF9oUSIvBf1bcS Is9oT8oOS4p1E9855OWTivEKLpeb X-Google-Smtp-Source: AHgI3IYMeW3u29uC/xRvoxWFxFk7nLO0W4m1bavO6k7um6XtEb5hHufFT/6FrnWzFON7Mi/vB8hpdXpa X-Received: by 2002:a1f:34d2:: with SMTP id b201mr1609163vka.24.1550087642154; Wed, 13 Feb 2019 11:54:02 -0800 (PST) Date: Wed, 13 Feb 2019 11:53:40 -0800 In-Reply-To: <20190213195341.184969-1-posk@google.com> Message-Id: <20190213195341.184969-7-posk@google.com> Mime-Version: 1.0 References: <20190213195341.184969-1-posk@google.com> X-Mailer: git-send-email 2.20.1.791.gb4d0f1c61a-goog Subject: [PATCH bpf-next v11 6/7] 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 25c8c0e62ecf..bcdd2474eee7 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 @@ -2517,7 +2530,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) \ @@ -2606,7 +2620,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.791.gb4d0f1c61a-goog