UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge tag 'mlx5-updates-2017-10-06' of git://git.kernel.org/pub/scm/linux/kernel/git/mellanox/linux into k.o/for-next 

Merge Mellanox shared pull request

Signed-off-by: Doug Ledford <dledford@redhat.com>
This commit is contained in:
Doug Ledford 2017-10-10 10:49:50 -04:00
parent 318a8ab7e8 a369d4ac4d
commit 166245dd92
2 changed files with 557 additions and 327 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

835
drivers/net/ethernet/mellanox/mlx5/core/fs_core.c
View File

File diff suppressed because it is too large Load Diff

11
drivers/net/ethernet/mellanox/mlx5/core/fs_core.h
View File

@ -65,6 +65,8 @@ enum fs_fte_status {
struct mlx5_flow_steering {
struct mlx5_core_dev *dev;
struct kmem_cache *fgs_cache;
struct kmem_cache *ftes_cache;
struct mlx5_flow_root_namespace *root_ns;
struct mlx5_flow_root_namespace *fdb_root_ns;
struct mlx5_flow_root_namespace *esw_egress_root_ns;
@ -80,9 +82,12 @@ struct fs_node {
struct fs_node *parent;
struct fs_node *root;
/* lock the node for writing and traversing */
struct mutex lock;
struct rw_semaphore lock;
atomic_t refcount;
void (*remove_func)(struct fs_node *);
bool active;
void (*del_hw_func)(struct fs_node *);
void (*del_sw_func)(struct fs_node *);
atomic_t version;
};
struct mlx5_flow_rule {
@ -119,7 +124,6 @@ struct mlx5_flow_table {
/* FWD rules that point on this flow table */
struct list_head fwd_rules;
u32 flags;
struct ida fte_allocator;
struct rhltable fgs_hash;
};
@ -199,6 +203,7 @@ struct mlx5_flow_group {
struct mlx5_flow_group_mask mask;
u32 start_index;
u32 max_ftes;
struct ida fte_allocator;
u32 id;
struct rhashtable ftes_hash;
struct rhlist_head hash;