Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
L
linux
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Kirill Smelkov
linux
Commits
8fed7565
Commit
8fed7565
authored
Jan 11, 2023
by
David S. Miller
Browse files
Options
Browse Files
Download
Plain Diff
Merge tag 'mlx5-fixes-2023-01-09' of
git://git.kernel.org/pub/scm/linux/kernel/git/saeed/linux
mlx5-fixes-2023-01-09
parents
cb3e9864
9828994a
Changes
17
Hide whitespace changes
Inline
Side-by-side
Showing
17 changed files
with
104 additions
and
49 deletions
+104
-49
drivers/net/ethernet/mellanox/mlx5/core/cmd.c
drivers/net/ethernet/mellanox/mlx5/core/cmd.c
+2
-11
drivers/net/ethernet/mellanox/mlx5/core/en/tc/act/police.c
drivers/net/ethernet/mellanox/mlx5/core/en/tc/act/police.c
+0
-6
drivers/net/ethernet/mellanox/mlx5/core/en/tc/post_meter.c
drivers/net/ethernet/mellanox/mlx5/core/en/tc/post_meter.c
+1
-0
drivers/net/ethernet/mellanox/mlx5/core/en/tc_tun_vxlan.c
drivers/net/ethernet/mellanox/mlx5/core/en/tc_tun_vxlan.c
+2
-0
drivers/net/ethernet/mellanox/mlx5/core/en_accel/macsec.c
drivers/net/ethernet/mellanox/mlx5/core/en_accel/macsec.c
+9
-10
drivers/net/ethernet/mellanox/mlx5/core/en_main.c
drivers/net/ethernet/mellanox/mlx5/core/en_main.c
+3
-0
drivers/net/ethernet/mellanox/mlx5/core/en_rep.c
drivers/net/ethernet/mellanox/mlx5/core/en_rep.c
+2
-1
drivers/net/ethernet/mellanox/mlx5/core/en_rx.c
drivers/net/ethernet/mellanox/mlx5/core/en_rx.c
+1
-1
drivers/net/ethernet/mellanox/mlx5/core/en_tc.c
drivers/net/ethernet/mellanox/mlx5/core/en_tc.c
+3
-2
drivers/net/ethernet/mellanox/mlx5/core/eswitch_offloads.c
drivers/net/ethernet/mellanox/mlx5/core/eswitch_offloads.c
+1
-5
drivers/net/ethernet/mellanox/mlx5/core/ipoib/ethtool.c
drivers/net/ethernet/mellanox/mlx5/core/ipoib/ethtool.c
+14
-2
drivers/net/ethernet/mellanox/mlx5/core/ipoib/ipoib.c
drivers/net/ethernet/mellanox/mlx5/core/ipoib/ipoib.c
+38
-0
drivers/net/ethernet/mellanox/mlx5/core/ipoib/ipoib.h
drivers/net/ethernet/mellanox/mlx5/core/ipoib/ipoib.h
+6
-0
drivers/net/ethernet/mellanox/mlx5/core/ipoib/ipoib_vlan.c
drivers/net/ethernet/mellanox/mlx5/core/ipoib/ipoib_vlan.c
+13
-5
drivers/net/ethernet/mellanox/mlx5/core/lib/clock.c
drivers/net/ethernet/mellanox/mlx5/core/lib/clock.c
+1
-1
drivers/net/ethernet/mellanox/mlx5/core/steering/dr_rule.c
drivers/net/ethernet/mellanox/mlx5/core/steering/dr_rule.c
+7
-4
include/linux/mlx5/driver.h
include/linux/mlx5/driver.h
+1
-1
No files found.
drivers/net/ethernet/mellanox/mlx5/core/cmd.c
View file @
8fed7565
...
...
@@ -2176,15 +2176,9 @@ int mlx5_cmd_init(struct mlx5_core_dev *dev)
return
-
EINVAL
;
}
cmd
->
stats
=
kvcalloc
(
MLX5_CMD_OP_MAX
,
sizeof
(
*
cmd
->
stats
),
GFP_KERNEL
);
if
(
!
cmd
->
stats
)
return
-
ENOMEM
;
cmd
->
pool
=
dma_pool_create
(
"mlx5_cmd"
,
mlx5_core_dma_dev
(
dev
),
size
,
align
,
0
);
if
(
!
cmd
->
pool
)
{
err
=
-
ENOMEM
;
goto
dma_pool_err
;
}
if
(
!
cmd
->
pool
)
return
-
ENOMEM
;
err
=
alloc_cmd_page
(
dev
,
cmd
);
if
(
err
)
...
...
@@ -2268,8 +2262,6 @@ int mlx5_cmd_init(struct mlx5_core_dev *dev)
err_free_pool:
dma_pool_destroy
(
cmd
->
pool
);
dma_pool_err:
kvfree
(
cmd
->
stats
);
return
err
;
}
...
...
@@ -2282,7 +2274,6 @@ void mlx5_cmd_cleanup(struct mlx5_core_dev *dev)
destroy_msg_cache
(
dev
);
free_cmd_page
(
dev
,
cmd
);
dma_pool_destroy
(
cmd
->
pool
);
kvfree
(
cmd
->
stats
);
}
void
mlx5_cmd_set_state
(
struct
mlx5_core_dev
*
dev
,
...
...
drivers/net/ethernet/mellanox/mlx5/core/en/tc/act/police.c
View file @
8fed7565
...
...
@@ -34,12 +34,6 @@ static int police_act_validate(const struct flow_action_entry *act,
return
-
EOPNOTSUPP
;
}
if
(
act
->
police
.
rate_pkt_ps
)
{
NL_SET_ERR_MSG_MOD
(
extack
,
"QoS offload not support packets per second"
);
return
-
EOPNOTSUPP
;
}
return
0
;
}
...
...
drivers/net/ethernet/mellanox/mlx5/core/en/tc/post_meter.c
View file @
8fed7565
...
...
@@ -127,6 +127,7 @@ mlx5e_post_meter_add_rule(struct mlx5e_priv *priv,
attr
->
counter
=
act_counter
;
attr
->
flags
|=
MLX5_ATTR_FLAG_NO_IN_PORT
;
attr
->
inner_match_level
=
MLX5_MATCH_NONE
;
attr
->
outer_match_level
=
MLX5_MATCH_NONE
;
attr
->
chain
=
0
;
attr
->
prio
=
0
;
...
...
drivers/net/ethernet/mellanox/mlx5/core/en/tc_tun_vxlan.c
View file @
8fed7565
...
...
@@ -88,6 +88,8 @@ static int mlx5e_gen_ip_tunnel_header_vxlan(char buf[],
struct
udphdr
*
udp
=
(
struct
udphdr
*
)(
buf
);
struct
vxlanhdr
*
vxh
;
if
(
tun_key
->
tun_flags
&
TUNNEL_VXLAN_OPT
)
return
-
EOPNOTSUPP
;
vxh
=
(
struct
vxlanhdr
*
)((
char
*
)
udp
+
sizeof
(
struct
udphdr
));
*
ip_proto
=
IPPROTO_UDP
;
...
...
drivers/net/ethernet/mellanox/mlx5/core/en_accel/macsec.c
View file @
8fed7565
...
...
@@ -62,6 +62,7 @@ struct mlx5e_macsec_sa {
u32
enc_key_id
;
u32
next_pn
;
sci_t
sci
;
ssci_t
ssci
;
salt_t
salt
;
struct
rhash_head
hash
;
...
...
@@ -358,7 +359,6 @@ static int mlx5e_macsec_init_sa(struct macsec_context *ctx,
struct
mlx5_core_dev
*
mdev
=
priv
->
mdev
;
struct
mlx5_macsec_obj_attrs
obj_attrs
;
union
mlx5e_macsec_rule
*
macsec_rule
;
struct
macsec_key
*
key
;
int
err
;
obj_attrs
.
next_pn
=
sa
->
next_pn
;
...
...
@@ -368,13 +368,9 @@ static int mlx5e_macsec_init_sa(struct macsec_context *ctx,
obj_attrs
.
aso_pdn
=
macsec
->
aso
.
pdn
;
obj_attrs
.
epn_state
=
sa
->
epn_state
;
key
=
(
is_tx
)
?
&
ctx
->
sa
.
tx_sa
->
key
:
&
ctx
->
sa
.
rx_sa
->
key
;
if
(
sa
->
epn_state
.
epn_enabled
)
{
obj_attrs
.
ssci
=
(
is_tx
)
?
cpu_to_be32
((
__force
u32
)
ctx
->
sa
.
tx_sa
->
ssci
)
:
cpu_to_be32
((
__force
u32
)
ctx
->
sa
.
rx_sa
->
ssci
);
memcpy
(
&
obj_attrs
.
salt
,
&
key
->
salt
,
sizeof
(
key
->
salt
));
obj_attrs
.
ssci
=
cpu_to_be32
((
__force
u32
)
sa
->
ssci
);
memcpy
(
&
obj_attrs
.
salt
,
&
sa
->
salt
,
sizeof
(
sa
->
salt
));
}
obj_attrs
.
replay_window
=
ctx
->
secy
->
replay_window
;
...
...
@@ -499,10 +495,11 @@ mlx5e_macsec_get_macsec_device_context(const struct mlx5e_macsec *macsec,
}
static
void
update_macsec_epn
(
struct
mlx5e_macsec_sa
*
sa
,
const
struct
macsec_key
*
key
,
const
pn_t
*
next_pn_halves
)
const
pn_t
*
next_pn_halves
,
ssci_t
ssci
)
{
struct
mlx5e_macsec_epn_state
*
epn_state
=
&
sa
->
epn_state
;
sa
->
ssci
=
ssci
;
sa
->
salt
=
key
->
salt
;
epn_state
->
epn_enabled
=
1
;
epn_state
->
epn_msb
=
next_pn_halves
->
upper
;
...
...
@@ -550,7 +547,8 @@ static int mlx5e_macsec_add_txsa(struct macsec_context *ctx)
tx_sa
->
assoc_num
=
assoc_num
;
if
(
secy
->
xpn
)
update_macsec_epn
(
tx_sa
,
&
ctx_tx_sa
->
key
,
&
ctx_tx_sa
->
next_pn_halves
);
update_macsec_epn
(
tx_sa
,
&
ctx_tx_sa
->
key
,
&
ctx_tx_sa
->
next_pn_halves
,
ctx_tx_sa
->
ssci
);
err
=
mlx5_create_encryption_key
(
mdev
,
ctx
->
sa
.
key
,
secy
->
key_len
,
MLX5_ACCEL_OBJ_MACSEC_KEY
,
...
...
@@ -945,7 +943,8 @@ static int mlx5e_macsec_add_rxsa(struct macsec_context *ctx)
rx_sa
->
fs_id
=
rx_sc
->
sc_xarray_element
->
fs_id
;
if
(
ctx
->
secy
->
xpn
)
update_macsec_epn
(
rx_sa
,
&
ctx_rx_sa
->
key
,
&
ctx_rx_sa
->
next_pn_halves
);
update_macsec_epn
(
rx_sa
,
&
ctx_rx_sa
->
key
,
&
ctx_rx_sa
->
next_pn_halves
,
ctx_rx_sa
->
ssci
);
err
=
mlx5_create_encryption_key
(
mdev
,
ctx
->
sa
.
key
,
ctx
->
secy
->
key_len
,
MLX5_ACCEL_OBJ_MACSEC_KEY
,
...
...
drivers/net/ethernet/mellanox/mlx5/core/en_main.c
View file @
8fed7565
...
...
@@ -4084,6 +4084,9 @@ static netdev_features_t mlx5e_fix_features(struct net_device *netdev,
struct
mlx5e_vlan_table
*
vlan
;
struct
mlx5e_params
*
params
;
if
(
!
netif_device_present
(
netdev
))
return
features
;
vlan
=
mlx5e_fs_get_vlan
(
priv
->
fs
);
mutex_lock
(
&
priv
->
state_lock
);
params
=
&
priv
->
channels
.
params
;
...
...
drivers/net/ethernet/mellanox/mlx5/core/en_rep.c
View file @
8fed7565
...
...
@@ -191,7 +191,7 @@ static MLX5E_DECLARE_STATS_GRP_OP_UPDATE_STATS(vport_rep)
if
(
err
)
{
netdev_warn
(
priv
->
netdev
,
"vport %d error %d reading stats
\n
"
,
rep
->
vport
,
err
);
return
;
goto
out
;
}
#define MLX5_GET_CTR(p, x) \
...
...
@@ -241,6 +241,7 @@ static MLX5E_DECLARE_STATS_GRP_OP_UPDATE_STATS(vport_rep)
rep_stats
->
tx_vport_rdma_multicast_bytes
=
MLX5_GET_CTR
(
out
,
received_ib_multicast
.
octets
);
out:
kvfree
(
out
);
}
...
...
drivers/net/ethernet/mellanox/mlx5/core/en_rx.c
View file @
8fed7565
...
...
@@ -2419,7 +2419,7 @@ static inline void mlx5i_complete_rx_cqe(struct mlx5e_rq *rq,
priv
=
mlx5i_epriv
(
netdev
);
tstamp
=
&
priv
->
tstamp
;
stats
=
rq
->
stats
;
stats
=
&
priv
->
channel_stats
[
rq
->
ix
]
->
rq
;
flags_rqpn
=
be32_to_cpu
(
cqe
->
flags_rqpn
);
g
=
(
flags_rqpn
>>
28
)
&
3
;
...
...
drivers/net/ethernet/mellanox/mlx5/core/en_tc.c
View file @
8fed7565
...
...
@@ -1301,7 +1301,6 @@ mlx5e_tc_add_nic_flow(struct mlx5e_priv *priv,
if
(
attr
->
action
&
MLX5_FLOW_CONTEXT_ACTION_MOD_HDR
)
{
err
=
mlx5e_attach_mod_hdr
(
priv
,
flow
,
parse_attr
);
mlx5e_mod_hdr_dealloc
(
&
parse_attr
->
mod_hdr_acts
);
if
(
err
)
return
err
;
}
...
...
@@ -1359,8 +1358,10 @@ static void mlx5e_tc_del_nic_flow(struct mlx5e_priv *priv,
}
mutex_unlock
(
&
tc
->
t_lock
);
if
(
attr
->
action
&
MLX5_FLOW_CONTEXT_ACTION_MOD_HDR
)
if
(
attr
->
action
&
MLX5_FLOW_CONTEXT_ACTION_MOD_HDR
)
{
mlx5e_mod_hdr_dealloc
(
&
attr
->
parse_attr
->
mod_hdr_acts
);
mlx5e_detach_mod_hdr
(
priv
,
flow
);
}
if
(
attr
->
action
&
MLX5_FLOW_CONTEXT_ACTION_COUNT
)
mlx5_fc_destroy
(
priv
->
mdev
,
attr
->
counter
);
...
...
drivers/net/ethernet/mellanox/mlx5/core/eswitch_offloads.c
View file @
8fed7565
...
...
@@ -143,7 +143,7 @@ mlx5_eswitch_set_rule_source_port(struct mlx5_eswitch *esw,
if
(
mlx5_esw_indir_table_decap_vport
(
attr
))
vport
=
mlx5_esw_indir_table_decap_vport
(
attr
);
if
(
attr
&&
!
attr
->
chain
&&
esw_attr
->
int_port
)
if
(
!
attr
->
chain
&&
esw_attr
&&
esw_attr
->
int_port
)
metadata
=
mlx5e_tc_int_port_get_metadata_for_match
(
esw_attr
->
int_port
);
else
...
...
@@ -4143,8 +4143,6 @@ int mlx5_devlink_port_fn_migratable_set(struct devlink_port *port, bool enable,
}
hca_caps
=
MLX5_ADDR_OF
(
query_hca_cap_out
,
query_ctx
,
capability
);
memcpy
(
hca_caps
,
MLX5_ADDR_OF
(
query_hca_cap_out
,
query_ctx
,
capability
),
MLX5_UN_SZ_BYTES
(
hca_cap_union
));
MLX5_SET
(
cmd_hca_cap_2
,
hca_caps
,
migratable
,
1
);
err
=
mlx5_vport_set_other_func_cap
(
esw
->
dev
,
hca_caps
,
vport
->
vport
,
...
...
@@ -4236,8 +4234,6 @@ int mlx5_devlink_port_fn_roce_set(struct devlink_port *port, bool enable,
}
hca_caps
=
MLX5_ADDR_OF
(
query_hca_cap_out
,
query_ctx
,
capability
);
memcpy
(
hca_caps
,
MLX5_ADDR_OF
(
query_hca_cap_out
,
query_ctx
,
capability
),
MLX5_UN_SZ_BYTES
(
hca_cap_union
));
MLX5_SET
(
cmd_hca_cap
,
hca_caps
,
roce
,
enable
);
err
=
mlx5_vport_set_other_func_cap
(
esw
->
dev
,
hca_caps
,
vport_num
,
...
...
drivers/net/ethernet/mellanox/mlx5/core/ipoib/ethtool.c
View file @
8fed7565
...
...
@@ -90,9 +90,21 @@ static void mlx5i_get_ringparam(struct net_device *dev,
static
int
mlx5i_set_channels
(
struct
net_device
*
dev
,
struct
ethtool_channels
*
ch
)
{
struct
mlx5e_priv
*
priv
=
mlx5i_epriv
(
dev
);
struct
mlx5i_priv
*
ipriv
=
netdev_priv
(
dev
);
struct
mlx5e_priv
*
epriv
=
mlx5i_epriv
(
dev
);
/* rtnl lock protects from race between this ethtool op and sub
* interface ndo_init/uninit.
*/
ASSERT_RTNL
();
if
(
ipriv
->
num_sub_interfaces
>
0
)
{
mlx5_core_warn
(
epriv
->
mdev
,
"can't change number of channels for interfaces with sub interfaces (%u)
\n
"
,
ipriv
->
num_sub_interfaces
);
return
-
EINVAL
;
}
return
mlx5e_ethtool_set_channels
(
priv
,
ch
);
return
mlx5e_ethtool_set_channels
(
e
priv
,
ch
);
}
static
void
mlx5i_get_channels
(
struct
net_device
*
dev
,
...
...
drivers/net/ethernet/mellanox/mlx5/core/ipoib/ipoib.c
View file @
8fed7565
...
...
@@ -160,6 +160,44 @@ void mlx5i_get_stats(struct net_device *dev, struct rtnl_link_stats64 *stats)
stats
->
tx_dropped
=
sstats
->
tx_queue_dropped
;
}
struct
net_device
*
mlx5i_parent_get
(
struct
net_device
*
netdev
)
{
struct
mlx5e_priv
*
priv
=
mlx5i_epriv
(
netdev
);
struct
mlx5i_priv
*
ipriv
,
*
parent_ipriv
;
struct
net_device
*
parent_dev
;
int
parent_ifindex
;
ipriv
=
priv
->
ppriv
;
parent_ifindex
=
netdev
->
netdev_ops
->
ndo_get_iflink
(
netdev
);
parent_dev
=
dev_get_by_index
(
dev_net
(
netdev
),
parent_ifindex
);
if
(
!
parent_dev
)
return
NULL
;
parent_ipriv
=
netdev_priv
(
parent_dev
);
ASSERT_RTNL
();
parent_ipriv
->
num_sub_interfaces
++
;
ipriv
->
parent_dev
=
parent_dev
;
return
parent_dev
;
}
void
mlx5i_parent_put
(
struct
net_device
*
netdev
)
{
struct
mlx5e_priv
*
priv
=
mlx5i_epriv
(
netdev
);
struct
mlx5i_priv
*
ipriv
,
*
parent_ipriv
;
ipriv
=
priv
->
ppriv
;
parent_ipriv
=
netdev_priv
(
ipriv
->
parent_dev
);
ASSERT_RTNL
();
parent_ipriv
->
num_sub_interfaces
--
;
dev_put
(
ipriv
->
parent_dev
);
}
int
mlx5i_init_underlay_qp
(
struct
mlx5e_priv
*
priv
)
{
struct
mlx5_core_dev
*
mdev
=
priv
->
mdev
;
...
...
drivers/net/ethernet/mellanox/mlx5/core/ipoib/ipoib.h
View file @
8fed7565
...
...
@@ -54,9 +54,11 @@ struct mlx5i_priv {
struct
rdma_netdev
rn
;
/* keep this first */
u32
qpn
;
bool
sub_interface
;
u32
num_sub_interfaces
;
u32
qkey
;
u16
pkey_index
;
struct
mlx5i_pkey_qpn_ht
*
qpn_htbl
;
struct
net_device
*
parent_dev
;
char
*
mlx5e_priv
[];
};
...
...
@@ -117,5 +119,9 @@ void mlx5i_sq_xmit(struct mlx5e_txqsq *sq, struct sk_buff *skb,
struct
mlx5_av
*
av
,
u32
dqpn
,
u32
dqkey
,
bool
xmit_more
);
void
mlx5i_get_stats
(
struct
net_device
*
dev
,
struct
rtnl_link_stats64
*
stats
);
/* Reference management for child to parent interfaces. */
struct
net_device
*
mlx5i_parent_get
(
struct
net_device
*
netdev
);
void
mlx5i_parent_put
(
struct
net_device
*
netdev
);
#endif
/* CONFIG_MLX5_CORE_IPOIB */
#endif
/* __MLX5E_IPOB_H__ */
drivers/net/ethernet/mellanox/mlx5/core/ipoib/ipoib_vlan.c
View file @
8fed7565
...
...
@@ -158,21 +158,28 @@ static int mlx5i_pkey_dev_init(struct net_device *dev)
struct
mlx5e_priv
*
priv
=
mlx5i_epriv
(
dev
);
struct
mlx5i_priv
*
ipriv
,
*
parent_ipriv
;
struct
net_device
*
parent_dev
;
int
parent_ifindex
;
ipriv
=
priv
->
ppriv
;
/* Get QPN to netdevice hash table from parent */
parent_ifindex
=
dev
->
netdev_ops
->
ndo_get_iflink
(
dev
);
parent_dev
=
dev_get_by_index
(
dev_net
(
dev
),
parent_ifindex
);
/* Link to parent */
parent_dev
=
mlx5i_parent_get
(
dev
);
if
(
!
parent_dev
)
{
mlx5_core_warn
(
priv
->
mdev
,
"failed to get parent device
\n
"
);
return
-
EINVAL
;
}
if
(
dev
->
num_rx_queues
<
parent_dev
->
real_num_rx_queues
)
{
mlx5_core_warn
(
priv
->
mdev
,
"failed to create child device with rx queues [%d] less than parent's [%d]
\n
"
,
dev
->
num_rx_queues
,
parent_dev
->
real_num_rx_queues
);
mlx5i_parent_put
(
dev
);
return
-
EINVAL
;
}
/* Get QPN to netdevice hash table from parent */
parent_ipriv
=
netdev_priv
(
parent_dev
);
ipriv
->
qpn_htbl
=
parent_ipriv
->
qpn_htbl
;
dev_put
(
parent_dev
);
return
mlx5i_dev_init
(
dev
);
}
...
...
@@ -184,6 +191,7 @@ static int mlx5i_pkey_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd)
static
void
mlx5i_pkey_dev_cleanup
(
struct
net_device
*
netdev
)
{
mlx5i_parent_put
(
netdev
);
return
mlx5i_dev_cleanup
(
netdev
);
}
...
...
drivers/net/ethernet/mellanox/mlx5/core/lib/clock.c
View file @
8fed7565
...
...
@@ -681,7 +681,7 @@ static int mlx5_ptp_verify(struct ptp_clock_info *ptp, unsigned int pin,
static
const
struct
ptp_clock_info
mlx5_ptp_clock_info
=
{
.
owner
=
THIS_MODULE
,
.
name
=
"mlx5_ptp"
,
.
max_adj
=
10
0000000
,
.
max_adj
=
5
0000000
,
.
n_alarm
=
0
,
.
n_ext_ts
=
0
,
.
n_per_out
=
0
,
...
...
drivers/net/ethernet/mellanox/mlx5/core/steering/dr_rule.c
View file @
8fed7565
...
...
@@ -3,7 +3,12 @@
#include "dr_types.h"
#if defined(CONFIG_FRAME_WARN) && (CONFIG_FRAME_WARN < 2048)
/* don't try to optimize STE allocation if the stack is too constaraining */
#define DR_RULE_MAX_STES_OPTIMIZED 0
#else
#define DR_RULE_MAX_STES_OPTIMIZED 5
#endif
#define DR_RULE_MAX_STE_CHAIN_OPTIMIZED (DR_RULE_MAX_STES_OPTIMIZED + DR_ACTION_MAX_STES)
static
int
dr_rule_append_to_miss_list
(
struct
mlx5dr_domain
*
dmn
,
...
...
@@ -1218,10 +1223,7 @@ dr_rule_create_rule_nic(struct mlx5dr_rule *rule,
mlx5dr_domain_nic_unlock
(
nic_dmn
);
if
(
unlikely
(
!
hw_ste_arr_is_opt
))
kfree
(
hw_ste_arr
);
return
0
;
goto
out
;
free_rule:
dr_rule_clean_rule_members
(
rule
,
nic_rule
);
...
...
@@ -1238,6 +1240,7 @@ dr_rule_create_rule_nic(struct mlx5dr_rule *rule,
free_hw_ste:
mlx5dr_domain_nic_unlock
(
nic_dmn
);
out:
if
(
unlikely
(
!
hw_ste_arr_is_opt
))
kfree
(
hw_ste_arr
);
...
...
include/linux/mlx5/driver.h
View file @
8fed7565
...
...
@@ -315,7 +315,7 @@ struct mlx5_cmd {
struct
mlx5_cmd_debug
dbg
;
struct
cmd_msg_cache
cache
[
MLX5_NUM_COMMAND_CACHES
];
int
checksum_disabled
;
struct
mlx5_cmd_stats
*
stats
;
struct
mlx5_cmd_stats
stats
[
MLX5_CMD_OP_MAX
]
;
};
struct
mlx5_cmd_mailbox
{
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment