From patchwork Mon Apr 30 14:26:23 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: William Tu X-Patchwork-Id: 906705 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="urHYPt7F"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 40ZRgm434Mz9s0q for ; Tue, 1 May 2018 00:27:00 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754495AbeD3O0z (ORCPT ); Mon, 30 Apr 2018 10:26:55 -0400 Received: from mail-io0-f196.google.com ([209.85.223.196]:38175 "EHLO mail-io0-f196.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754452AbeD3O0t (ORCPT ); Mon, 30 Apr 2018 10:26:49 -0400 Received: by mail-io0-f196.google.com with SMTP id z4-v6so10367137iof.5 for ; Mon, 30 Apr 2018 07:26:49 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:subject:date:message-id; bh=T8kmUdrl7TnAclpXrVKzl/YHn8nZIlFrtlVaL39t5y8=; b=urHYPt7FtL36o4IrG8MH/vcbXBMcXd7RecaZ4yVoRrS0hlBnpX4kOR2k85EDSgiHnH 2x9MzBtqCmRGPtq7g5Ql0PUJvj9EjgYFLnGXUjNPfU30m24BPJKMIWbt0VYxHhWGpMkU CVADL39ZSWJZeMpFnQKP5IwastpnYXUWbSaAQrn4BGzwB+toO3WCStzJCcM7uKsBWVez wLYfH1Vrt/VUtsl41XSW7BrS8xLKDS9Dxn6J0QrBQ2KREPBjWDR3F7AZ/tq7wTCrbUkG mGZ3O/+kVb0eJXgckEoM4ctlNx5ow0u2+SAOncjmTZ+8y4n4ZzgMDCHH6FOyYGdesifU BsvA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id; bh=T8kmUdrl7TnAclpXrVKzl/YHn8nZIlFrtlVaL39t5y8=; b=kLBYycDXSk7gejIOG8owSaIrLKFEb/EZDyYr5dvcUMEzGY7+qD/8yiwwHQ+HVmOsqv V4Zcc5QSDD4Aihrt2iE+pSJxvk2omP/9hKRX9ZJUQDq7ebCzWexR6/431n47xvKG4KN+ +uC1bhw090OfC/gbvdmNObYrb/24n5CAexQHXbFCoTXBGtDiKRzL7cAI05hxuQxpD6dO pA6cL1i+Df0VaSywrtcqUZ8/CAsAXxSMLd0RXc7ZFQyFIyBYpNgwzJr9K935uN1fgPog C+9S3BpRu+xf+MmKGWSYimj2Dm9XQNWTF+eQQBgXGvjW/NQ0aoS361/X8MgMdLp7zJBz ywGw== X-Gm-Message-State: ALQs6tDCvpUF2ypoXcoGJ0dIp0sbxGUNeW8yjc4HmvtfNz3OX1SzX+X8 2TFZB1nyECsK0XWUoTKJIPgjzMGB X-Google-Smtp-Source: AB8JxZr6X6xqfUBqxxEEcyPMQImYEGthRPTteCVal9hN4KbKBJe0T3Gr/1FQ6noiSPKcn0P4SmcE7w== X-Received: by 2002:a6b:298f:: with SMTP id p137-v6mr13275161iop.288.1525098409149; Mon, 30 Apr 2018 07:26:49 -0700 (PDT) Received: from sc9-mailhost2.vmware.com (c-73-231-16-221.hsd1.ca.comcast.net. [73.231.16.221]) by smtp.gmail.com with ESMTPSA id g200-v6sm344026itb.26.2018.04.30.07.26.48 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 30 Apr 2018 07:26:48 -0700 (PDT) From: William Tu To: netdev@vger.kernel.org Subject: [PATCH bpf-next] tools include uapi: Grab a copy of linux/erspan.h Date: Mon, 30 Apr 2018 07:26:23 -0700 Message-Id: <1525098383-16368-1-git-send-email-u9012063@gmail.com> X-Mailer: git-send-email 2.7.4 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Bring the erspan uapi header file so BPF tunnel helpers can use it. Fixes: 933a741e3b82 ("selftests/bpf: bpf tunnel test.") Reported-by: Yonghong Song Signed-off-by: William Tu Acked-by: Yonghong Song --- tools/include/uapi/linux/erspan.h | 52 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 52 insertions(+) create mode 100644 tools/include/uapi/linux/erspan.h diff --git a/tools/include/uapi/linux/erspan.h b/tools/include/uapi/linux/erspan.h new file mode 100644 index 000000000000..841573019ae1 --- /dev/null +++ b/tools/include/uapi/linux/erspan.h @@ -0,0 +1,52 @@ +/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */ +/* + * ERSPAN Tunnel Metadata + * + * Copyright (c) 2018 VMware + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License version 2 + * as published by the Free Software Foundation. + * + * Userspace API for metadata mode ERSPAN tunnel + */ +#ifndef _UAPI_ERSPAN_H +#define _UAPI_ERSPAN_H + +#include /* For __beXX in userspace */ +#include + +/* ERSPAN version 2 metadata header */ +struct erspan_md2 { + __be32 timestamp; + __be16 sgt; /* security group tag */ +#if defined(__LITTLE_ENDIAN_BITFIELD) + __u8 hwid_upper:2, + ft:5, + p:1; + __u8 o:1, + gra:2, + dir:1, + hwid:4; +#elif defined(__BIG_ENDIAN_BITFIELD) + __u8 p:1, + ft:5, + hwid_upper:2; + __u8 hwid:4, + dir:1, + gra:2, + o:1; +#else +#error "Please fix " +#endif +}; + +struct erspan_metadata { + int version; + union { + __be32 index; /* Version 1 (type II)*/ + struct erspan_md2 md2; /* Version 2 (type III) */ + } u; +}; + +#endif /* _UAPI_ERSPAN_H */