fts_read: Handle error from a NULL return better.

[bdrewery]

Summary

This is addressing cases such as fts_read(3) encountering an [EIO]
from fchdir(2) when FTS_NOCHDIR is not set. That would otherwise be
seen as a successful traversal in some of these cases while silently
discarding expected work.

As noted in r264201, fts_read() does not set errno to 0 on a successful
EOF so it needs to be set before calling it. Otherwise we might see
a random error from one of the iterations.

gzip is ignoring most errors and could be improved separately.

Sponsored by: Dell EMC

head/bin/chflags/chflags.c

while (true) {
 
                 if (i == cqe_count)
                         break;
                 if (i % MLX5E_MINI_ARRAY_SZ == 0)
                         mlx5e_read_cqe_slot(cq, cq->wq.cc + i, mini_array);
         }
 }
 
+static void
+mlx5e_input_mbs(struct mlx5e_rq *rq, struct mbufq *mbsp)
+{
+        struct mbuf *mb;
+
+        mtx_unlock(&rq->mtx);
+
+        while ((mb = mbufq_dequeue(mbsp)) != NULL) {
+#if !defined(HAVE_TCP_LRO_RX)
+                tcp_lro_queue_mbuf(&rq->lro, mb);
+#else
+                if (mb->m_pkthdr.csum_flags == 0 ||
+                    (if_getcapenable(rq->ifp) & IFCAP_LRO) == 0 ||
+                    rq->lro.lro_cnt == 0 ||
+                    tcp_lro_rx(&rq->lro, mb, 0) != 0) {
+                        if_input(rq->ifp, mb);
+                }
+#endif
+        }
+
+        mtx_lock(&rq->mtx);
+}
+
 static int
-mlx5e_poll_rx_cq(struct mlx5e_rq *rq, int budget)
+mlx5e_poll_rx_cq(struct mlx5e_rq *rq, struct mbufq *mbsp, int budget)
 {
         struct pfil_head *pfil;
-        int i, rv;
+        int i, c, rv;
 
         CURVNET_SET_QUIET(if_getvnet(rq->ifp));
         pfil = rq->channel->priv->pfil;
-        for (i = 0; i < budget; i++) {
+        for (i = 0, c = 0; i < budget; i++) {
                 struct mlx5e_rx_wqe *wqe;
                 struct mlx5_cqe64 *cqe;
                 struct mbuf *mb;
                 __be16 wqe_counter_be;
                 u16 wqe_counter;
                 u32 byte_cnt, seglen;
 
                 cqe = mlx5e_get_cqe(&rq->cq);
rx_common:
                 mlx5e_build_rx_mbuf(cqe, rq, mb, &rq->mbuf[wqe_counter],
                     byte_cnt);
                 rq->stats.bytes += byte_cnt;
                 rq->stats.packets++;
 #ifdef NUMA
                 mb->m_pkthdr.numa_domain = if_getnumadomain(rq->ifp);
 #endif
 
-#if !defined(HAVE_TCP_LRO_RX)
-                tcp_lro_queue_mbuf(&rq->lro, mb);
-#else
-                if (mb->m_pkthdr.csum_flags == 0 ||
-                    (if_getcapenable(rq->ifp) & IFCAP_LRO) == 0 ||
-                    rq->lro.lro_cnt == 0 ||
-                    tcp_lro_rx(&rq->lro, mb, 0) != 0) {
-                        if_input(rq->ifp, mb);
-                }
-#endif
+                mbufq_enqueue(mbsp, mb);
 wq_ll_pop:
                 mlx5_wq_ll_pop(&rq->wq, wqe_counter_be,
                     &wqe->next.next_wqe_index);
         }
         CURVNET_RESTORE();
 
         mlx5_cqwq_update_db_record(&rq->cq.wq);
 
         /* ensure cq space is freed before enabling more cqes */
         atomic_thread_fence_rel();
         return (i);
 }
 
 void
 mlx5e_rx_cq_comp(struct mlx5_core_cq *mcq, struct mlx5_eqe *eqe __unused)
 {
         struct mlx5e_channel *c = container_of(mcq, struct mlx5e_channel, rq.cq.mcq);
         struct mlx5e_rq *rq = container_of(mcq, struct mlx5e_rq, cq.mcq);
-        int i = 0;
+        struct mbufq mbs;
+        int i, wqe_processed;
 
+        mbufq_init(&mbs, 0);
+
 #ifdef HAVE_PER_CQ_EVENT_PACKET
 #if (MHLEN < 15)
 #error "MHLEN is too small"
 #endif
         struct mbuf *mb = m_gethdr(M_NOWAIT, MT_DATA);
 
         if (mb != NULL) {
                 /* this code is used for debugging purpose only */
#endif
         mtx_unlock(&c->iq.lock);
 
         mtx_lock(&rq->mtx);
 
         /*
          * Polling the entire CQ without posting new WQEs results in
          * lack of receive WQEs during heavy traffic scenarios.
          */
-        while (1) {
-                if (mlx5e_poll_rx_cq(rq, MLX5E_RX_BUDGET_MAX) !=
-                    MLX5E_RX_BUDGET_MAX)
-                        break;
-                i += MLX5E_RX_BUDGET_MAX;
-                if (i >= MLX5E_BUDGET_MAX)
-                        break;
+        for (i = 0; i < MLX5E_BUDGET_MAX; i+= wqe_processed) {
+                wqe_processed = mlx5e_poll_rx_cq(rq, &mbs,
+                    MLX5E_RX_BUDGET_MAX);
+                mlx5e_input_mbs(rq, &mbs);
+                MPASS(mbufq_empty(&mbs));
                 mlx5e_post_rx_wqes(rq);
+                if (wqe_processed != MLX5E_RX_BUDGET_MAX)
+                        break;
         }
-        mlx5e_post_rx_wqes(rq);
+
         /* check for dynamic interrupt moderation callback */
         if (rq->dim.mode != NET_DIM_CQ_PERIOD_MODE_DISABLED)
                 net_dim(&rq->dim, rq->stats.packets, rq->stats.bytes);
-        mlx5e_cq_arm(&rq->cq, MLX5_GET_DOORBELL_LOCK(&rq->channel->priv->doorbell_lock));
-        tcp_lro_flush_all(&rq->lro);
+        mlx5e_cq_arm(&rq->cq, MLX5_GET_DOORBELL_LOCK(
+            &rq->channel->priv->doorbell_lock));
         mtx_unlock(&rq->mtx);
+        tcp_lro_flush_all(&rq->lro);
 
         for (int j = 0; j != MLX5E_MAX_TX_NUM_TC; j++) {
                 mtx_lock(&c->sq[j].lock);
                 c->sq[j].db_inhibit--;
                 /* Update the doorbell record, if any. */
                 mlx5e_tx_notify_hw(c->sq + j, true);
                 mtx_unlock(&c->sq[j].lock);
         }
 
         mtx_lock(&c->iq.lock);
         c->iq.db_inhibit--;
         mlx5e_iq_notify_hw(&c->iq);
         mtx_unlock(&c->iq.lock);
 }

head/bin/chmod/chmod.c

while (true) {
 
                 if (i == cqe_count)
                         break;
                 if (i % MLX5E_MINI_ARRAY_SZ == 0)
                         mlx5e_read_cqe_slot(cq, cq->wq.cc + i, mini_array);
         }
 }
 
+static void
+mlx5e_input_mbs(struct mlx5e_rq *rq, struct mbufq *mbsp)
+{
+        struct mbuf *mb;
+
+        mtx_unlock(&rq->mtx);
+
+        while ((mb = mbufq_dequeue(mbsp)) != NULL) {
+#if !defined(HAVE_TCP_LRO_RX)
+                tcp_lro_queue_mbuf(&rq->lro, mb);
+#else
+                if (mb->m_pkthdr.csum_flags == 0 ||
+                    (if_getcapenable(rq->ifp) & IFCAP_LRO) == 0 ||
+                    rq->lro.lro_cnt == 0 ||
+                    tcp_lro_rx(&rq->lro, mb, 0) != 0) {
+                        if_input(rq->ifp, mb);
+                }
+#endif
+        }
+
+        mtx_lock(&rq->mtx);
+}
+
 static int
-mlx5e_poll_rx_cq(struct mlx5e_rq *rq, int budget)
+mlx5e_poll_rx_cq(struct mlx5e_rq *rq, struct mbufq *mbsp, int budget)
 {
         struct pfil_head *pfil;
-        int i, rv;
+        int i, c, rv;
 
         CURVNET_SET_QUIET(if_getvnet(rq->ifp));
         pfil = rq->channel->priv->pfil;
-        for (i = 0; i < budget; i++) {
+        for (i = 0, c = 0; i < budget; i++) {
                 struct mlx5e_rx_wqe *wqe;
                 struct mlx5_cqe64 *cqe;
                 struct mbuf *mb;
                 __be16 wqe_counter_be;
                 u16 wqe_counter;
                 u32 byte_cnt, seglen;
 
                 cqe = mlx5e_get_cqe(&rq->cq);
rx_common:
                 mlx5e_build_rx_mbuf(cqe, rq, mb, &rq->mbuf[wqe_counter],
                     byte_cnt);
                 rq->stats.bytes += byte_cnt;
                 rq->stats.packets++;
 #ifdef NUMA
                 mb->m_pkthdr.numa_domain = if_getnumadomain(rq->ifp);
 #endif
 
-#if !defined(HAVE_TCP_LRO_RX)
-                tcp_lro_queue_mbuf(&rq->lro, mb);
-#else
-                if (mb->m_pkthdr.csum_flags == 0 ||
-                    (if_getcapenable(rq->ifp) & IFCAP_LRO) == 0 ||
-                    rq->lro.lro_cnt == 0 ||
-                    tcp_lro_rx(&rq->lro, mb, 0) != 0) {
-                        if_input(rq->ifp, mb);
-                }
-#endif
+                mbufq_enqueue(mbsp, mb);
 wq_ll_pop:
                 mlx5_wq_ll_pop(&rq->wq, wqe_counter_be,
                     &wqe->next.next_wqe_index);
         }
         CURVNET_RESTORE();
 
         mlx5_cqwq_update_db_record(&rq->cq.wq);
 
         /* ensure cq space is freed before enabling more cqes */
         atomic_thread_fence_rel();
         return (i);
 }
 
 void
 mlx5e_rx_cq_comp(struct mlx5_core_cq *mcq, struct mlx5_eqe *eqe __unused)
 {
         struct mlx5e_channel *c = container_of(mcq, struct mlx5e_channel, rq.cq.mcq);
         struct mlx5e_rq *rq = container_of(mcq, struct mlx5e_rq, cq.mcq);
-        int i = 0;
+        struct mbufq mbs;
+        int i, wqe_processed;
 
+        mbufq_init(&mbs, 0);
+
 #ifdef HAVE_PER_CQ_EVENT_PACKET
 #if (MHLEN < 15)
 #error "MHLEN is too small"
 #endif
         struct mbuf *mb = m_gethdr(M_NOWAIT, MT_DATA);
 
         if (mb != NULL) {
                 /* this code is used for debugging purpose only */
#endif
         mtx_unlock(&c->iq.lock);
 
         mtx_lock(&rq->mtx);
 
         /*
          * Polling the entire CQ without posting new WQEs results in
          * lack of receive WQEs during heavy traffic scenarios.
          */
-        while (1) {
-                if (mlx5e_poll_rx_cq(rq, MLX5E_RX_BUDGET_MAX) !=
-                    MLX5E_RX_BUDGET_MAX)
-                        break;
-                i += MLX5E_RX_BUDGET_MAX;
-                if (i >= MLX5E_BUDGET_MAX)
-                        break;
+        for (i = 0; i < MLX5E_BUDGET_MAX; i+= wqe_processed) {
+                wqe_processed = mlx5e_poll_rx_cq(rq, &mbs,
+                    MLX5E_RX_BUDGET_MAX);
+                mlx5e_input_mbs(rq, &mbs);
+                MPASS(mbufq_empty(&mbs));
                 mlx5e_post_rx_wqes(rq);
+                if (wqe_processed != MLX5E_RX_BUDGET_MAX)
+                        break;
         }
-        mlx5e_post_rx_wqes(rq);
+
         /* check for dynamic interrupt moderation callback */
         if (rq->dim.mode != NET_DIM_CQ_PERIOD_MODE_DISABLED)
                 net_dim(&rq->dim, rq->stats.packets, rq->stats.bytes);
-        mlx5e_cq_arm(&rq->cq, MLX5_GET_DOORBELL_LOCK(&rq->channel->priv->doorbell_lock));
-        tcp_lro_flush_all(&rq->lro);
+        mlx5e_cq_arm(&rq->cq, MLX5_GET_DOORBELL_LOCK(
+            &rq->channel->priv->doorbell_lock));
         mtx_unlock(&rq->mtx);
+        tcp_lro_flush_all(&rq->lro);
 
         for (int j = 0; j != MLX5E_MAX_TX_NUM_TC; j++) {
                 mtx_lock(&c->sq[j].lock);
                 c->sq[j].db_inhibit--;
                 /* Update the doorbell record, if any. */
                 mlx5e_tx_notify_hw(c->sq + j, true);
                 mtx_unlock(&c->sq[j].lock);
         }
 
         mtx_lock(&c->iq.lock);
         c->iq.db_inhibit--;
         mlx5e_iq_notify_hw(&c->iq);
         mtx_unlock(&c->iq.lock);
 }

head/bin/cp/cp.c

while (true) {
 
                 if (i == cqe_count)
                         break;
                 if (i % MLX5E_MINI_ARRAY_SZ == 0)
                         mlx5e_read_cqe_slot(cq, cq->wq.cc + i, mini_array);
         }
 }
 
+static void
+mlx5e_input_mbs(struct mlx5e_rq *rq, struct mbufq *mbsp)
+{
+        struct mbuf *mb;
+
+        mtx_unlock(&rq->mtx);
+
+        while ((mb = mbufq_dequeue(mbsp)) != NULL) {
+#if !defined(HAVE_TCP_LRO_RX)
+                tcp_lro_queue_mbuf(&rq->lro, mb);
+#else
+                if (mb->m_pkthdr.csum_flags == 0 ||
+                    (if_getcapenable(rq->ifp) & IFCAP_LRO) == 0 ||
+                    rq->lro.lro_cnt == 0 ||
+                    tcp_lro_rx(&rq->lro, mb, 0) != 0) {
+                        if_input(rq->ifp, mb);
+                }
+#endif
+        }
+
+        mtx_lock(&rq->mtx);
+}
+
 static int
-mlx5e_poll_rx_cq(struct mlx5e_rq *rq, int budget)
+mlx5e_poll_rx_cq(struct mlx5e_rq *rq, struct mbufq *mbsp, int budget)
 {
         struct pfil_head *pfil;
-        int i, rv;
+        int i, c, rv;
 
         CURVNET_SET_QUIET(if_getvnet(rq->ifp));
         pfil = rq->channel->priv->pfil;
-        for (i = 0; i < budget; i++) {
+        for (i = 0, c = 0; i < budget; i++) {
                 struct mlx5e_rx_wqe *wqe;
                 struct mlx5_cqe64 *cqe;
                 struct mbuf *mb;
                 __be16 wqe_counter_be;
                 u16 wqe_counter;
                 u32 byte_cnt, seglen;
 
                 cqe = mlx5e_get_cqe(&rq->cq);
rx_common:
                 mlx5e_build_rx_mbuf(cqe, rq, mb, &rq->mbuf[wqe_counter],
                     byte_cnt);
                 rq->stats.bytes += byte_cnt;
                 rq->stats.packets++;
 #ifdef NUMA
                 mb->m_pkthdr.numa_domain = if_getnumadomain(rq->ifp);
 #endif
 
-#if !defined(HAVE_TCP_LRO_RX)
-                tcp_lro_queue_mbuf(&rq->lro, mb);
-#else
-                if (mb->m_pkthdr.csum_flags == 0 ||
-                    (if_getcapenable(rq->ifp) & IFCAP_LRO) == 0 ||
-                    rq->lro.lro_cnt == 0 ||
-                    tcp_lro_rx(&rq->lro, mb, 0) != 0) {
-                        if_input(rq->ifp, mb);
-                }
-#endif
+                mbufq_enqueue(mbsp, mb);
 wq_ll_pop:
                 mlx5_wq_ll_pop(&rq->wq, wqe_counter_be,
                     &wqe->next.next_wqe_index);
         }
         CURVNET_RESTORE();
 
         mlx5_cqwq_update_db_record(&rq->cq.wq);
 
         /* ensure cq space is freed before enabling more cqes */
         atomic_thread_fence_rel();
         return (i);
 }
 
 void
 mlx5e_rx_cq_comp(struct mlx5_core_cq *mcq, struct mlx5_eqe *eqe __unused)
 {
         struct mlx5e_channel *c = container_of(mcq, struct mlx5e_channel, rq.cq.mcq);
         struct mlx5e_rq *rq = container_of(mcq, struct mlx5e_rq, cq.mcq);
-        int i = 0;
+        struct mbufq mbs;
+        int i, wqe_processed;
 
+        mbufq_init(&mbs, 0);
+
 #ifdef HAVE_PER_CQ_EVENT_PACKET
 #if (MHLEN < 15)
 #error "MHLEN is too small"
 #endif
         struct mbuf *mb = m_gethdr(M_NOWAIT, MT_DATA);
 
         if (mb != NULL) {
                 /* this code is used for debugging purpose only */
#endif
         mtx_unlock(&c->iq.lock);
 
         mtx_lock(&rq->mtx);
 
         /*
          * Polling the entire CQ without posting new WQEs results in
          * lack of receive WQEs during heavy traffic scenarios.
          */
-        while (1) {
-                if (mlx5e_poll_rx_cq(rq, MLX5E_RX_BUDGET_MAX) !=
-                    MLX5E_RX_BUDGET_MAX)
-                        break;
-                i += MLX5E_RX_BUDGET_MAX;
-                if (i >= MLX5E_BUDGET_MAX)
-                        break;
+        for (i = 0; i < MLX5E_BUDGET_MAX; i+= wqe_processed) {
+                wqe_processed = mlx5e_poll_rx_cq(rq, &mbs,
+                    MLX5E_RX_BUDGET_MAX);
+                mlx5e_input_mbs(rq, &mbs);
+                MPASS(mbufq_empty(&mbs));
                 mlx5e_post_rx_wqes(rq);
+                if (wqe_processed != MLX5E_RX_BUDGET_MAX)
+                        break;
         }
-        mlx5e_post_rx_wqes(rq);
+
         /* check for dynamic interrupt moderation callback */
         if (rq->dim.mode != NET_DIM_CQ_PERIOD_MODE_DISABLED)
                 net_dim(&rq->dim, rq->stats.packets, rq->stats.bytes);
-        mlx5e_cq_arm(&rq->cq, MLX5_GET_DOORBELL_LOCK(&rq->channel->priv->doorbell_lock));
-        tcp_lro_flush_all(&rq->lro);
+        mlx5e_cq_arm(&rq->cq, MLX5_GET_DOORBELL_LOCK(
+            &rq->channel->priv->doorbell_lock));
         mtx_unlock(&rq->mtx);
+        tcp_lro_flush_all(&rq->lro);
 
         for (int j = 0; j != MLX5E_MAX_TX_NUM_TC; j++) {
                 mtx_lock(&c->sq[j].lock);
                 c->sq[j].db_inhibit--;
                 /* Update the doorbell record, if any. */
                 mlx5e_tx_notify_hw(c->sq + j, true);
                 mtx_unlock(&c->sq[j].lock);
         }
 
         mtx_lock(&c->iq.lock);
         c->iq.db_inhibit--;
         mlx5e_iq_notify_hw(&c->iq);
         mtx_unlock(&c->iq.lock);
 }

head/bin/ls/ls.c

while (true) {
 
                 if (i == cqe_count)
                         break;
                 if (i % MLX5E_MINI_ARRAY_SZ == 0)
                         mlx5e_read_cqe_slot(cq, cq->wq.cc + i, mini_array);
         }
 }
 
+static void
+mlx5e_input_mbs(struct mlx5e_rq *rq, struct mbufq *mbsp)
+{
+        struct mbuf *mb;
+
+        mtx_unlock(&rq->mtx);
+
+        while ((mb = mbufq_dequeue(mbsp)) != NULL) {
+#if !defined(HAVE_TCP_LRO_RX)
+                tcp_lro_queue_mbuf(&rq->lro, mb);
+#else
+                if (mb->m_pkthdr.csum_flags == 0 ||
+                    (if_getcapenable(rq->ifp) & IFCAP_LRO) == 0 ||
+                    rq->lro.lro_cnt == 0 ||
+                    tcp_lro_rx(&rq->lro, mb, 0) != 0) {
+                        if_input(rq->ifp, mb);
+                }
+#endif
+        }
+
+        mtx_lock(&rq->mtx);
+}
+
 static int
-mlx5e_poll_rx_cq(struct mlx5e_rq *rq, int budget)
+mlx5e_poll_rx_cq(struct mlx5e_rq *rq, struct mbufq *mbsp, int budget)
 {
         struct pfil_head *pfil;
-        int i, rv;
+        int i, c, rv;
 
         CURVNET_SET_QUIET(if_getvnet(rq->ifp));
         pfil = rq->channel->priv->pfil;
-        for (i = 0; i < budget; i++) {
+        for (i = 0, c = 0; i < budget; i++) {
                 struct mlx5e_rx_wqe *wqe;
                 struct mlx5_cqe64 *cqe;
                 struct mbuf *mb;
                 __be16 wqe_counter_be;
                 u16 wqe_counter;
                 u32 byte_cnt, seglen;
 
                 cqe = mlx5e_get_cqe(&rq->cq);
rx_common:
                 mlx5e_build_rx_mbuf(cqe, rq, mb, &rq->mbuf[wqe_counter],
                     byte_cnt);
                 rq->stats.bytes += byte_cnt;
                 rq->stats.packets++;
 #ifdef NUMA
                 mb->m_pkthdr.numa_domain = if_getnumadomain(rq->ifp);
 #endif
 
-#if !defined(HAVE_TCP_LRO_RX)
-                tcp_lro_queue_mbuf(&rq->lro, mb);
-#else
-                if (mb->m_pkthdr.csum_flags == 0 ||
-                    (if_getcapenable(rq->ifp) & IFCAP_LRO) == 0 ||
-                    rq->lro.lro_cnt == 0 ||
-                    tcp_lro_rx(&rq->lro, mb, 0) != 0) {
-                        if_input(rq->ifp, mb);
-                }
-#endif
+                mbufq_enqueue(mbsp, mb);
 wq_ll_pop:
                 mlx5_wq_ll_pop(&rq->wq, wqe_counter_be,
                     &wqe->next.next_wqe_index);
         }
         CURVNET_RESTORE();
 
         mlx5_cqwq_update_db_record(&rq->cq.wq);
 
         /* ensure cq space is freed before enabling more cqes */
         atomic_thread_fence_rel();
         return (i);
 }
 
 void
 mlx5e_rx_cq_comp(struct mlx5_core_cq *mcq, struct mlx5_eqe *eqe __unused)
 {
         struct mlx5e_channel *c = container_of(mcq, struct mlx5e_channel, rq.cq.mcq);
         struct mlx5e_rq *rq = container_of(mcq, struct mlx5e_rq, cq.mcq);
-        int i = 0;
+        struct mbufq mbs;
+        int i, wqe_processed;
 
+        mbufq_init(&mbs, 0);
+
 #ifdef HAVE_PER_CQ_EVENT_PACKET
 #if (MHLEN < 15)
 #error "MHLEN is too small"
 #endif
         struct mbuf *mb = m_gethdr(M_NOWAIT, MT_DATA);
 
         if (mb != NULL) {
                 /* this code is used for debugging purpose only */
#endif
         mtx_unlock(&c->iq.lock);
 
         mtx_lock(&rq->mtx);
 
         /*
          * Polling the entire CQ without posting new WQEs results in
          * lack of receive WQEs during heavy traffic scenarios.
          */
-        while (1) {
-                if (mlx5e_poll_rx_cq(rq, MLX5E_RX_BUDGET_MAX) !=
-                    MLX5E_RX_BUDGET_MAX)
-                        break;
-                i += MLX5E_RX_BUDGET_MAX;
-                if (i >= MLX5E_BUDGET_MAX)
-                        break;
+        for (i = 0; i < MLX5E_BUDGET_MAX; i+= wqe_processed) {
+                wqe_processed = mlx5e_poll_rx_cq(rq, &mbs,
+                    MLX5E_RX_BUDGET_MAX);
+                mlx5e_input_mbs(rq, &mbs);
+                MPASS(mbufq_empty(&mbs));
                 mlx5e_post_rx_wqes(rq);
+                if (wqe_processed != MLX5E_RX_BUDGET_MAX)
+                        break;
         }
-        mlx5e_post_rx_wqes(rq);
+
         /* check for dynamic interrupt moderation callback */
         if (rq->dim.mode != NET_DIM_CQ_PERIOD_MODE_DISABLED)
                 net_dim(&rq->dim, rq->stats.packets, rq->stats.bytes);
-        mlx5e_cq_arm(&rq->cq, MLX5_GET_DOORBELL_LOCK(&rq->channel->priv->doorbell_lock));
-        tcp_lro_flush_all(&rq->lro);
+        mlx5e_cq_arm(&rq->cq, MLX5_GET_DOORBELL_LOCK(
+            &rq->channel->priv->doorbell_lock));
         mtx_unlock(&rq->mtx);
+        tcp_lro_flush_all(&rq->lro);
 
         for (int j = 0; j != MLX5E_MAX_TX_NUM_TC; j++) {
                 mtx_lock(&c->sq[j].lock);
                 c->sq[j].db_inhibit--;
                 /* Update the doorbell record, if any. */
                 mlx5e_tx_notify_hw(c->sq + j, true);
                 mtx_unlock(&c->sq[j].lock);
         }
 
         mtx_lock(&c->iq.lock);
         c->iq.db_inhibit--;
         mlx5e_iq_notify_hw(&c->iq);
         mtx_unlock(&c->iq.lock);
 }