Skip to content

Commit

Permalink
Fix regression issue after r352989:
Browse files Browse the repository at this point in the history
As noted by the commit message, callouts are now persistant
and should not be in the auto-zero section of the RQ's and SQ's.
This fixes an assert when using the TX completion event
factor feature with mlx5en(4).

Found by:	gallatin@
MFC after:	3 days
Sponsored by:	Mellanox Technologies
  • Loading branch information
hselasky committed Oct 8, 2019
1 parent f4077c0 commit a9b0596
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions sys/dev/mlx5/mlx5_en/en.h
Original file line number Diff line number Diff line change
Expand Up @@ -748,6 +748,7 @@ struct mlx5e_rq {
/* persistant fields */
struct mtx mtx;
struct mlx5e_rq_stats stats;
struct callout watchdog;

/* data path */
#define mlx5e_rq_zero_start wq
Expand All @@ -769,7 +770,6 @@ struct mlx5e_rq {
struct mlx5_wq_ctrl wq_ctrl;
u32 rqn;
struct mlx5e_channel *channel;
struct callout watchdog;
} __aligned(MLX5E_CACHELINE_SIZE);

struct mlx5e_sq_mbuf {
Expand All @@ -794,6 +794,7 @@ struct mlx5e_sq {
struct mtx lock;
struct mtx comp_lock;
struct mlx5e_sq_stats stats;
struct callout cev_callout;

/* data path */
#define mlx5e_sq_zero_start dma_tag
Expand All @@ -812,7 +813,6 @@ struct mlx5e_sq {
#define MLX5E_CEV_STATE_SEND_NOPS 1 /* send NOPs */
#define MLX5E_CEV_STATE_HOLD_NOPS 2 /* don't send NOPs yet */
u16 running; /* set if SQ is running */
struct callout cev_callout;
union {
u32 d32[2];
u64 d64;
Expand Down

0 comments on commit a9b0596

Please sign in to comment.