Author: hselasky
Date: Thu Oct 10 15:36:45 2019
New Revision: 353405
URL: https://svnweb.freebsd.org/changeset/base/353405
Log:
MFC r353321:
Fix regression issue after r352989:
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@
Sponsored by: Mellanox Technologies
Modified:
stable/12/sys/dev/mlx5/mlx5_en/en.h
Directory Properties:
stable/12/ (props changed)
Modified: stable/12/sys/dev/mlx5/mlx5_en/en.h
==============================================================================
--- stable/12/sys/dev/mlx5/mlx5_en/en.h Thu Oct 10 15:19:49 2019
(r353404)
+++ stable/12/sys/dev/mlx5/mlx5_en/en.h Thu Oct 10 15:36:45 2019
(r353405)
@@ -747,6 +747,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
@@ -768,7 +769,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 {
@@ -793,6 +793,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
@@ -811,7 +812,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;
_______________________________________________
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
