From patchwork Wed Mar 20 14:49:41 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Willem de Bruijn X-Patchwork-Id: 1059274 X-Patchwork-Delegate: bpf@iogearbox.net Return-Path: X-Original-To: patchwork-incoming-netdev@ozlabs.org Delivered-To: patchwork-incoming-netdev@ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=netdev-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="j3U+lL6X"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 44PXrv5gPcz9sNf for ; Thu, 21 Mar 2019 01:50:07 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728258AbfCTOuG (ORCPT ); Wed, 20 Mar 2019 10:50:06 -0400 Received: from mail-qk1-f195.google.com ([209.85.222.195]:41300 "EHLO mail-qk1-f195.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728251AbfCTOuE (ORCPT ); Wed, 20 Mar 2019 10:50:04 -0400 Received: by mail-qk1-f195.google.com with SMTP id o129so14266962qke.8 for ; Wed, 20 Mar 2019 07:50:03 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=R05JDjxl8VGkdC1nKl9yFK1U2jzSRFJNn/0VfPOuD7s=; b=j3U+lL6XiPya3wJB80ZmML51j/TMNyKiMPo4PLO7Ddp57MLEqwpR1dds4nAqLK3EMT 9jgAKjeYqpqdJWKjRuJiUZ3qs/yxQTCM4cm0vDdJV+U5KeiOyXS+axctNAY8fj14Fpww 4M7nay0BfdSzoc3o2q3cLMbprZmugVqIrvZUEA2O3o79H9m43zKSL8zekEebBdiolr2C Tiv8f1xIXg02gxmMjNSVI3pTUCJCMFAEhFx0RUCyNyPqitCA0pDRvd/bJ7kAwuyHrMEC VVjHQ1mh/GBZQFlR48FG/qx800ilci5i738otlV8cRvhgmc5HPJekzVB/WS/sErmW2lX BV0w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=R05JDjxl8VGkdC1nKl9yFK1U2jzSRFJNn/0VfPOuD7s=; b=S0tt8N0NUpTg+Atc1EUusU/vj5dTmV0BwFgrLdMZUaBpYDs/A3SaxJ49rFPvznqRfS WjSPOhR9VWopdu3pahaKvfHyAxtMX+F9dRGrPc/sOaVMCHwZT0EXBUNQuWBir9YdWNxM pjl4Ta4BlZw4Hz0xl/a7SJ09WxeXntTUw/EZxlawa6VTJSPcnJb79t7VJHXnMGG49XP8 erp4Est+AlF8RNUMkpNdOzi7H4YlAqkMxuM46yV+tocBrJ5qaF93M2KKrABUzc8HwPvV dDKHukFiT2u0eMn7+tCX6Hx11Bpm3YBBUzVPd8vseRR8jLXCY6F04gG3+eSBy5PSKLn6 /n6g== X-Gm-Message-State: APjAAAUwxIdbnGD1sS6KHfwrhtLhYFQnCpXa1aK2ZdACwrkyD00gsJ1O qhJS9G5Qxj8aAg+bNkGwOtQlIRJE X-Google-Smtp-Source: APXvYqzDr1Hfvj3PxszEB1kuWdqI06iksBwss8nt1B3unYGvk0NrOCg+1SSj1fqG8yDtUhOOkGgZ0Q== X-Received: by 2002:a37:d6d6:: with SMTP id p83mr6554171qkl.51.1553093402855; Wed, 20 Mar 2019 07:50:02 -0700 (PDT) Received: from willemb1.nyc.corp.google.com ([2620:0:1003:315:3fa1:a34c:1128:1d39]) by smtp.gmail.com with ESMTPSA id x201sm1142257qkb.92.2019.03.20.07.50.01 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 20 Mar 2019 07:50:01 -0700 (PDT) From: Willem de Bruijn To: netdev@vger.kernel.org Cc: ast@kernel.org, daniel@iogearbox.net, sdf@google.com, posk@google.com, Willem de Bruijn Subject: [PATCH bpf-next 10/13] bpf: Sync bpf.h to tools Date: Wed, 20 Mar 2019 10:49:41 -0400 Message-Id: <20190320144944.147862-11-willemdebruijn.kernel@gmail.com> X-Mailer: git-send-email 2.21.0.225.g810b269d1ac-goog In-Reply-To: <20190320144944.147862-1-willemdebruijn.kernel@gmail.com> References: <20190320144944.147862-1-willemdebruijn.kernel@gmail.com> MIME-Version: 1.0 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org From: Willem de Bruijn Sync include/uapi/linux/bpf.h with tools/ Signed-off-by: Willem de Bruijn Acked-by: Soheil Hassas Yeganeh --- tools/include/uapi/linux/bpf.h | 22 +++++++++++++++++++++- 1 file changed, 21 insertions(+), 1 deletion(-) diff --git a/tools/include/uapi/linux/bpf.h b/tools/include/uapi/linux/bpf.h index 929c8e537a14a..a444534cc88d7 100644 --- a/tools/include/uapi/linux/bpf.h +++ b/tools/include/uapi/linux/bpf.h @@ -1478,7 +1478,10 @@ union bpf_attr { * Grow or shrink the room for data in the packet associated to * *skb* by *len_diff*, and according to the selected *mode*. * - * There is a single supported mode at this time: + * There are two supported modes at this time: + * + * * **BPF_ADJ_ROOM_MAC**: Adjust room at the mac layer + * (room space is added or removed below the layer 2 header). * * * **BPF_ADJ_ROOM_NET**: Adjust room at the network layer * (room space is added or removed below the layer 3 header). @@ -2590,9 +2593,26 @@ enum bpf_func_id { /* Current network namespace */ #define BPF_F_CURRENT_NETNS (-1L) +/* BPF_FUNC_skb_adjust_room flags. */ +#define BPF_F_ADJ_ROOM_FIXED_GSO (1ULL << 0) + +#define BPF_F_ADJ_ROOM_ENCAP_L3_IPV4 (1ULL << 1) +#define BPF_F_ADJ_ROOM_ENCAP_L3_IPV6 (1ULL << 2) +#define BPF_F_ADJ_ROOM_ENCAP_L3_MASK (BPF_F_ADJ_ROOM_ENCAP_L3_IPV4 | \ + BPF_F_ADJ_ROOM_ENCAP_L3_IPV6) + +#define BPF_F_ADJ_ROOM_ENCAP_L4_GRE (1ULL << 3) +#define BPF_F_ADJ_ROOM_ENCAP_L4_UDP (1ULL << 4) + +#define BPF_F_ADJ_ROOM_MASK (BPF_F_ADJ_ROOM_FIXED_GSO | \ + BPF_F_ADJ_ROOM_ENCAP_L3_MASK | \ + BPF_F_ADJ_ROOM_ENCAP_L4_GRE | \ + BPF_F_ADJ_ROOM_ENCAP_L4_UDP) + /* Mode for BPF_FUNC_skb_adjust_room helper. */ enum bpf_adj_room_mode { BPF_ADJ_ROOM_NET, + BPF_ADJ_ROOM_MAC, }; /* Mode for BPF_FUNC_skb_load_bytes_relative helper. */