From 9ca8dbcc65cfc63d6f5ef3312a33184e1d726e00 Mon Sep 17 00:00:00 2001 From: Yunhong Jiang Date: Tue, 4 Aug 2015 12:17:53 -0700 Subject: Add the rt linux 4.1.3-rt3 as base Import the rt linux 4.1.3-rt3 as OPNFV kvm base. It's from git://git.kernel.org/pub/scm/linux/kernel/git/rt/linux-rt-devel.git linux-4.1.y-rt and the base is: commit 0917f823c59692d751951bf5ea699a2d1e2f26a2 Author: Sebastian Andrzej Siewior Date: Sat Jul 25 12:13:34 2015 +0200 Prepare v4.1.3-rt3 Signed-off-by: Sebastian Andrzej Siewior We lose all the git history this way and it's not good. We should apply another opnfv project repo in future. Change-Id: I87543d81c9df70d99c5001fbdf646b202c19f423 Signed-off-by: Yunhong Jiang --- kernel/include/uapi/linux/tc_act/Kbuild | 12 +++++++ kernel/include/uapi/linux/tc_act/tc_bpf.h | 33 ++++++++++++++++++ kernel/include/uapi/linux/tc_act/tc_connmark.h | 22 ++++++++++++ kernel/include/uapi/linux/tc_act/tc_csum.h | 32 ++++++++++++++++++ kernel/include/uapi/linux/tc_act/tc_defact.h | 19 +++++++++++ kernel/include/uapi/linux/tc_act/tc_gact.h | 32 ++++++++++++++++++ kernel/include/uapi/linux/tc_act/tc_ipt.h | 21 ++++++++++++ kernel/include/uapi/linux/tc_act/tc_mirred.h | 27 +++++++++++++++ kernel/include/uapi/linux/tc_act/tc_nat.h | 27 +++++++++++++++ kernel/include/uapi/linux/tc_act/tc_pedit.h | 34 +++++++++++++++++++ kernel/include/uapi/linux/tc_act/tc_skbedit.h | 46 ++++++++++++++++++++++++++ kernel/include/uapi/linux/tc_act/tc_vlan.h | 35 ++++++++++++++++++++ 12 files changed, 340 insertions(+) create mode 100644 kernel/include/uapi/linux/tc_act/Kbuild create mode 100644 kernel/include/uapi/linux/tc_act/tc_bpf.h create mode 100644 kernel/include/uapi/linux/tc_act/tc_connmark.h create mode 100644 kernel/include/uapi/linux/tc_act/tc_csum.h create mode 100644 kernel/include/uapi/linux/tc_act/tc_defact.h create mode 100644 kernel/include/uapi/linux/tc_act/tc_gact.h create mode 100644 kernel/include/uapi/linux/tc_act/tc_ipt.h create mode 100644 kernel/include/uapi/linux/tc_act/tc_mirred.h create mode 100644 kernel/include/uapi/linux/tc_act/tc_nat.h create mode 100644 kernel/include/uapi/linux/tc_act/tc_pedit.h create mode 100644 kernel/include/uapi/linux/tc_act/tc_skbedit.h create mode 100644 kernel/include/uapi/linux/tc_act/tc_vlan.h (limited to 'kernel/include/uapi/linux/tc_act') diff --git a/kernel/include/uapi/linux/tc_act/Kbuild b/kernel/include/uapi/linux/tc_act/Kbuild new file mode 100644 index 000000000..242cf0c6e --- /dev/null +++ b/kernel/include/uapi/linux/tc_act/Kbuild @@ -0,0 +1,12 @@ +# UAPI Header export list +header-y += tc_csum.h +header-y += tc_defact.h +header-y += tc_gact.h +header-y += tc_ipt.h +header-y += tc_mirred.h +header-y += tc_nat.h +header-y += tc_pedit.h +header-y += tc_skbedit.h +header-y += tc_vlan.h +header-y += tc_bpf.h +header-y += tc_connmark.h diff --git a/kernel/include/uapi/linux/tc_act/tc_bpf.h b/kernel/include/uapi/linux/tc_act/tc_bpf.h new file mode 100644 index 000000000..07f17cc70 --- /dev/null +++ b/kernel/include/uapi/linux/tc_act/tc_bpf.h @@ -0,0 +1,33 @@ +/* + * Copyright (c) 2015 Jiri Pirko + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + */ + +#ifndef __LINUX_TC_BPF_H +#define __LINUX_TC_BPF_H + +#include + +#define TCA_ACT_BPF 13 + +struct tc_act_bpf { + tc_gen; +}; + +enum { + TCA_ACT_BPF_UNSPEC, + TCA_ACT_BPF_TM, + TCA_ACT_BPF_PARMS, + TCA_ACT_BPF_OPS_LEN, + TCA_ACT_BPF_OPS, + TCA_ACT_BPF_FD, + TCA_ACT_BPF_NAME, + __TCA_ACT_BPF_MAX, +}; +#define TCA_ACT_BPF_MAX (__TCA_ACT_BPF_MAX - 1) + +#endif diff --git a/kernel/include/uapi/linux/tc_act/tc_connmark.h b/kernel/include/uapi/linux/tc_act/tc_connmark.h new file mode 100644 index 000000000..994b0971b --- /dev/null +++ b/kernel/include/uapi/linux/tc_act/tc_connmark.h @@ -0,0 +1,22 @@ +#ifndef __UAPI_TC_CONNMARK_H +#define __UAPI_TC_CONNMARK_H + +#include +#include + +#define TCA_ACT_CONNMARK 14 + +struct tc_connmark { + tc_gen; + __u16 zone; +}; + +enum { + TCA_CONNMARK_UNSPEC, + TCA_CONNMARK_PARMS, + TCA_CONNMARK_TM, + __TCA_CONNMARK_MAX +}; +#define TCA_CONNMARK_MAX (__TCA_CONNMARK_MAX - 1) + +#endif diff --git a/kernel/include/uapi/linux/tc_act/tc_csum.h b/kernel/include/uapi/linux/tc_act/tc_csum.h new file mode 100644 index 000000000..a047c49a3 --- /dev/null +++ b/kernel/include/uapi/linux/tc_act/tc_csum.h @@ -0,0 +1,32 @@ +#ifndef __LINUX_TC_CSUM_H +#define __LINUX_TC_CSUM_H + +#include +#include + +#define TCA_ACT_CSUM 16 + +enum { + TCA_CSUM_UNSPEC, + TCA_CSUM_PARMS, + TCA_CSUM_TM, + __TCA_CSUM_MAX +}; +#define TCA_CSUM_MAX (__TCA_CSUM_MAX - 1) + +enum { + TCA_CSUM_UPDATE_FLAG_IPV4HDR = 1, + TCA_CSUM_UPDATE_FLAG_ICMP = 2, + TCA_CSUM_UPDATE_FLAG_IGMP = 4, + TCA_CSUM_UPDATE_FLAG_TCP = 8, + TCA_CSUM_UPDATE_FLAG_UDP = 16, + TCA_CSUM_UPDATE_FLAG_UDPLITE = 32 +}; + +struct tc_csum { + tc_gen; + + __u32 update_flags; +}; + +#endif /* __LINUX_TC_CSUM_H */ diff --git a/kernel/include/uapi/linux/tc_act/tc_defact.h b/kernel/include/uapi/linux/tc_act/tc_defact.h new file mode 100644 index 000000000..17dddb40f --- /dev/null +++ b/kernel/include/uapi/linux/tc_act/tc_defact.h @@ -0,0 +1,19 @@ +#ifndef __LINUX_TC_DEF_H +#define __LINUX_TC_DEF_H + +#include + +struct tc_defact { + tc_gen; +}; + +enum { + TCA_DEF_UNSPEC, + TCA_DEF_TM, + TCA_DEF_PARMS, + TCA_DEF_DATA, + __TCA_DEF_MAX +}; +#define TCA_DEF_MAX (__TCA_DEF_MAX - 1) + +#endif diff --git a/kernel/include/uapi/linux/tc_act/tc_gact.h b/kernel/include/uapi/linux/tc_act/tc_gact.h new file mode 100644 index 000000000..f7bf94eed --- /dev/null +++ b/kernel/include/uapi/linux/tc_act/tc_gact.h @@ -0,0 +1,32 @@ +#ifndef __LINUX_TC_GACT_H +#define __LINUX_TC_GACT_H + +#include +#include + +#define TCA_ACT_GACT 5 +struct tc_gact { + tc_gen; + +}; + +struct tc_gact_p { +#define PGACT_NONE 0 +#define PGACT_NETRAND 1 +#define PGACT_DETERM 2 +#define MAX_RAND (PGACT_DETERM + 1 ) + __u16 ptype; + __u16 pval; + int paction; +}; + +enum { + TCA_GACT_UNSPEC, + TCA_GACT_TM, + TCA_GACT_PARMS, + TCA_GACT_PROB, + __TCA_GACT_MAX +}; +#define TCA_GACT_MAX (__TCA_GACT_MAX - 1) + +#endif diff --git a/kernel/include/uapi/linux/tc_act/tc_ipt.h b/kernel/include/uapi/linux/tc_act/tc_ipt.h new file mode 100644 index 000000000..130aaadf6 --- /dev/null +++ b/kernel/include/uapi/linux/tc_act/tc_ipt.h @@ -0,0 +1,21 @@ +#ifndef __LINUX_TC_IPT_H +#define __LINUX_TC_IPT_H + +#include + +#define TCA_ACT_IPT 6 +#define TCA_ACT_XT 10 + +enum { + TCA_IPT_UNSPEC, + TCA_IPT_TABLE, + TCA_IPT_HOOK, + TCA_IPT_INDEX, + TCA_IPT_CNT, + TCA_IPT_TM, + TCA_IPT_TARG, + __TCA_IPT_MAX +}; +#define TCA_IPT_MAX (__TCA_IPT_MAX - 1) + +#endif diff --git a/kernel/include/uapi/linux/tc_act/tc_mirred.h b/kernel/include/uapi/linux/tc_act/tc_mirred.h new file mode 100644 index 000000000..7561750e8 --- /dev/null +++ b/kernel/include/uapi/linux/tc_act/tc_mirred.h @@ -0,0 +1,27 @@ +#ifndef __LINUX_TC_MIR_H +#define __LINUX_TC_MIR_H + +#include +#include + +#define TCA_ACT_MIRRED 8 +#define TCA_EGRESS_REDIR 1 /* packet redirect to EGRESS*/ +#define TCA_EGRESS_MIRROR 2 /* mirror packet to EGRESS */ +#define TCA_INGRESS_REDIR 3 /* packet redirect to INGRESS*/ +#define TCA_INGRESS_MIRROR 4 /* mirror packet to INGRESS */ + +struct tc_mirred { + tc_gen; + int eaction; /* one of IN/EGRESS_MIRROR/REDIR */ + __u32 ifindex; /* ifindex of egress port */ +}; + +enum { + TCA_MIRRED_UNSPEC, + TCA_MIRRED_TM, + TCA_MIRRED_PARMS, + __TCA_MIRRED_MAX +}; +#define TCA_MIRRED_MAX (__TCA_MIRRED_MAX - 1) + +#endif diff --git a/kernel/include/uapi/linux/tc_act/tc_nat.h b/kernel/include/uapi/linux/tc_act/tc_nat.h new file mode 100644 index 000000000..6663aeba0 --- /dev/null +++ b/kernel/include/uapi/linux/tc_act/tc_nat.h @@ -0,0 +1,27 @@ +#ifndef __LINUX_TC_NAT_H +#define __LINUX_TC_NAT_H + +#include +#include + +#define TCA_ACT_NAT 9 + +enum { + TCA_NAT_UNSPEC, + TCA_NAT_PARMS, + TCA_NAT_TM, + __TCA_NAT_MAX +}; +#define TCA_NAT_MAX (__TCA_NAT_MAX - 1) + +#define TCA_NAT_FLAG_EGRESS 1 + +struct tc_nat { + tc_gen; + __be32 old_addr; + __be32 new_addr; + __be32 mask; + __u32 flags; +}; + +#endif diff --git a/kernel/include/uapi/linux/tc_act/tc_pedit.h b/kernel/include/uapi/linux/tc_act/tc_pedit.h new file mode 100644 index 000000000..716cfabcd --- /dev/null +++ b/kernel/include/uapi/linux/tc_act/tc_pedit.h @@ -0,0 +1,34 @@ +#ifndef __LINUX_TC_PED_H +#define __LINUX_TC_PED_H + +#include +#include + +#define TCA_ACT_PEDIT 7 + +enum { + TCA_PEDIT_UNSPEC, + TCA_PEDIT_TM, + TCA_PEDIT_PARMS, + __TCA_PEDIT_MAX +}; +#define TCA_PEDIT_MAX (__TCA_PEDIT_MAX - 1) + +struct tc_pedit_key { + __u32 mask; /* AND */ + __u32 val; /*XOR */ + __u32 off; /*offset */ + __u32 at; + __u32 offmask; + __u32 shift; +}; + +struct tc_pedit_sel { + tc_gen; + unsigned char nkeys; + unsigned char flags; + struct tc_pedit_key keys[0]; +}; +#define tc_pedit tc_pedit_sel + +#endif diff --git a/kernel/include/uapi/linux/tc_act/tc_skbedit.h b/kernel/include/uapi/linux/tc_act/tc_skbedit.h new file mode 100644 index 000000000..7a2e910a5 --- /dev/null +++ b/kernel/include/uapi/linux/tc_act/tc_skbedit.h @@ -0,0 +1,46 @@ +/* + * Copyright (c) 2008, Intel Corporation. + * + * This program is free software; you can redistribute it and/or modify it + * under the terms and conditions of the GNU General Public License, + * version 2, as published by the Free Software Foundation. + * + * This program is distributed in the hope it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for + * more details. + * + * You should have received a copy of the GNU General Public License along with + * this program; if not, write to the Free Software Foundation, Inc., 59 Temple + * Place - Suite 330, Boston, MA 02111-1307 USA. + * + * Author: Alexander Duyck + */ + +#ifndef __LINUX_TC_SKBEDIT_H +#define __LINUX_TC_SKBEDIT_H + +#include + +#define TCA_ACT_SKBEDIT 11 + +#define SKBEDIT_F_PRIORITY 0x1 +#define SKBEDIT_F_QUEUE_MAPPING 0x2 +#define SKBEDIT_F_MARK 0x4 + +struct tc_skbedit { + tc_gen; +}; + +enum { + TCA_SKBEDIT_UNSPEC, + TCA_SKBEDIT_TM, + TCA_SKBEDIT_PARMS, + TCA_SKBEDIT_PRIORITY, + TCA_SKBEDIT_QUEUE_MAPPING, + TCA_SKBEDIT_MARK, + __TCA_SKBEDIT_MAX +}; +#define TCA_SKBEDIT_MAX (__TCA_SKBEDIT_MAX - 1) + +#endif diff --git a/kernel/include/uapi/linux/tc_act/tc_vlan.h b/kernel/include/uapi/linux/tc_act/tc_vlan.h new file mode 100644 index 000000000..f7b8d448b --- /dev/null +++ b/kernel/include/uapi/linux/tc_act/tc_vlan.h @@ -0,0 +1,35 @@ +/* + * Copyright (c) 2014 Jiri Pirko + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + */ + +#ifndef __LINUX_TC_VLAN_H +#define __LINUX_TC_VLAN_H + +#include + +#define TCA_ACT_VLAN 12 + +#define TCA_VLAN_ACT_POP 1 +#define TCA_VLAN_ACT_PUSH 2 + +struct tc_vlan { + tc_gen; + int v_action; +}; + +enum { + TCA_VLAN_UNSPEC, + TCA_VLAN_TM, + TCA_VLAN_PARMS, + TCA_VLAN_PUSH_VLAN_ID, + TCA_VLAN_PUSH_VLAN_PROTOCOL, + __TCA_VLAN_MAX, +}; +#define TCA_VLAN_MAX (__TCA_VLAN_MAX - 1) + +#endif -- cgit 1.2.3-korg