Jesse Gross says: ==================== [GIT net-next] Open vSwitch Open vSwitch changes for net-next/3.14. Highlights are: * Performance improvements in the mechanism to get packets to userspace using memory mapped netlink and skb zero copy where appropriate. * Per-cpu flow stats in situations where flows are likely to be shared across CPUs. Standard flow stats are used in other situations to save memory and allocation time. * A handful of code cleanups and rationalization. ====================
Showing the changes to include/uapi/linux (1 of 17 files). Show all
Unified · Split
| @@ -40,7 +40,15 @@ struct ovs_header { · 39 unmodified lines | ||
| 40 | 40 | |
| 41 | 41 | #define OVS_DATAPATH_FAMILY "ovs_datapath" |
| 42 | 42 | #define OVS_DATAPATH_MCGROUP "ovs_datapath" |
| 43 | −#define OVS_DATAPATH_VERSION 0x1 | |
| 43 | + | |
| 44 | +/* V2: | |
| 45 | + * - API users are expected to provide OVS_DP_ATTR_USER_FEATURES | |
| 46 | + * when creating the datapath. | |
| 47 | + */ | |
| 48 | +#define OVS_DATAPATH_VERSION 2 | |
| 49 | + | |
| 50 | +/* First OVS datapath version to support features */ | |
| 51 | +#define OVS_DP_VER_FEATURES 2 | |
| 44 | 52 | |
| 45 | 53 | enum ovs_datapath_cmd { |
| 46 | 54 | OVS_DP_CMD_UNSPEC, |
| @@ -75,6 +83,7 @@ enum ovs_datapath_attr { · 28 unmodified lines | ||
| 75 | 83 | OVS_DP_ATTR_UPCALL_PID, /* Netlink PID to receive upcalls */ |
| 76 | 84 | OVS_DP_ATTR_STATS, /* struct ovs_dp_stats */ |
| 77 | 85 | OVS_DP_ATTR_MEGAFLOW_STATS, /* struct ovs_dp_megaflow_stats */ |
| 86 | + OVS_DP_ATTR_USER_FEATURES, /* OVS_DP_F_* */ | |
| 78 | 87 | __OVS_DP_ATTR_MAX |
| 79 | 88 | }; |
| 80 | 89 | |
| @@ -106,6 +115,9 @@ struct ovs_vport_stats { · 25 unmodified lines | ||
| 106 | 115 | __u64 tx_dropped; /* no space available in linux */ |
| 107 | 116 | }; |
| 108 | 117 | |
| 118 | +/* Allow last Netlink attribute to be unaligned */ | |
| 119 | +#define OVS_DP_F_UNALIGNED (1 << 0) | |
| 120 | + | |
| 109 | 121 | /* Fixed logical ports. */ |
| 110 | 122 | #define OVSP_LOCAL ((__u32)0) |
| 111 | 123 | |