From nobody Mon Apr 7 01:29:20 2025 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4ZWBSz2l5jz5sNmG; Mon, 07 Apr 2025 01:29:23 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4ZWBSy5Bftz3wwB; Mon, 07 Apr 2025 01:29:22 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1743989362; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=b7B5S+KEcFerDX34/WOhZ6LeubA8/X7NCCpS5Wqvid4=; b=ePiEKLRHwQ2zuJ6edq92Lyj2XIiiSipLMInR8wfox7eSUHzBveG3953g1zOIakRvMxOpid UQ4v5ULCBQ9TXA3cO9b1v0f0tYqOOTEFwWILUr71QKwtpE++w1DYU0AXQhfJIuDE+XQvXH wrx0FFx95anKsKKD5d2xefi7YZy+InKKFYcOeoTLCojPYXHGGSmmMA8GtKQmCqNpBelPbv f0U9rbaG9feY7/uLgFOng/O1WRNN9MKA6HDjmjGkiPKD0WVW61hB8rjEjPG6WcIeDixll1 WgPLUcQN5NAAB73ec/SzomsfxmliWOsXt/Oq6r+zdtQYpD7N8j1aPy58QGSVTA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1743989362; a=rsa-sha256; cv=none; b=JcZ89qcoeQb+ieAiXXjU7ikHDVbcDBJU/k1lOB6QajM3Gc/udeu9mA6l5tV818ry4G8OsO c1gWFhLvUhTLIkJKpT9PJrTAnDlxTp48rcgMjoN9tDGmAXdbwXp2qsWs7OC4uJWH9AMpdK MOopbZb+g4/mZ+14MmqVqBIVAvawsC3hjiOKJiRgHR/QjxUAFtNz7msq+y1Bh2VVI9nV30 6dHVtZxQN3tiEASg7KlAnZVkNsrGeJAkdw4N1cv0wdvaXnVf6+r8KmKb9blPcZggTNQmcv 56AT1F8IPYKpPjR89koV6xlbZBnxQh3rZ/oHtsg4auWbOiNqMrovJfgxeTjA1Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1743989362; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=b7B5S+KEcFerDX34/WOhZ6LeubA8/X7NCCpS5Wqvid4=; b=paYn1g8/4XQVEsMHPffMD4j9dl5JCUWtLBY4VWi7S/eR6p+nvcuuVC8XK47L93iUMbYrCC iuameiQVLhNXkdq+Ka0qF+lvjUJsdC+GbPWXfECD3De1Hs0XY6FR7WIZ8usUjp3eBWeFYQ UILbzr3+8MrZ6m6J5XWcQfhTB9vjGHxprqArkkWGYeqwZYpg566Gwi7UjA4aVazt4jWEVo 5HHLguqgxyfTKHf83cgAzQpSjYzy3zTUlcaSk5xVlGjQLrQZwkT4xWYuu3/3v1BB6A3jD8 KpF7e/9WfPPl0jqhQKmXg8CV1FXljDkBm2Nhlg0E6UJtUl7ByDmMpcD+KBfoBA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4ZWBSw3RQdz9gm; Mon, 07 Apr 2025 01:29:20 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 5371TK9Z063531; Mon, 7 Apr 2025 01:29:20 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5371TKQd063528; Mon, 7 Apr 2025 01:29:20 GMT (envelope-from git) Date: Mon, 7 Apr 2025 01:29:20 GMT Message-Id: <202504070129.5371TKQd063528@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Konstantin Belousov Subject: git: 477c394ce138 - stable/14 - mlx5en: sync channel close with the rq completion processing List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kib X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 477c394ce138c83e8b4517ebc36564b5f52a9a1f Auto-Submitted: auto-generated The branch stable/14 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=477c394ce138c83e8b4517ebc36564b5f52a9a1f commit 477c394ce138c83e8b4517ebc36564b5f52a9a1f Author: Konstantin Belousov AuthorDate: 2025-03-04 07:45:17 +0000 Commit: Konstantin Belousov CommitDate: 2025-04-07 01:28:23 +0000 mlx5en: sync channel close with the rq completion processing (cherry picked from commit f0adc907fc7d3eebfc692fd5f4987c97e61b103d) --- sys/dev/mlx5/mlx5_en/en.h | 1 + sys/dev/mlx5/mlx5_en/mlx5_en_main.c | 11 +++++++++++ sys/dev/mlx5/mlx5_en/mlx5_en_rx.c | 5 +++++ 3 files changed, 17 insertions(+) diff --git a/sys/dev/mlx5/mlx5_en/en.h b/sys/dev/mlx5/mlx5_en/en.h index 7741419ade55..d962366892d7 100644 --- a/sys/dev/mlx5/mlx5_en/en.h +++ b/sys/dev/mlx5/mlx5_en/en.h @@ -769,6 +769,7 @@ struct mlx5e_rq { struct mlx5e_cq cq; struct lro_ctrl lro; volatile int enabled; + int processing; int ix; /* Dynamic Interrupt Moderation */ diff --git a/sys/dev/mlx5/mlx5_en/mlx5_en_main.c b/sys/dev/mlx5/mlx5_en/mlx5_en_main.c index 4e3e66abf6d9..058923be5769 100644 --- a/sys/dev/mlx5/mlx5_en/mlx5_en_main.c +++ b/sys/dev/mlx5/mlx5_en/mlx5_en_main.c @@ -1463,6 +1463,17 @@ static void mlx5e_close_rq_wait(struct mlx5e_rq *rq) { + mtx_lock(&rq->mtx); + MPASS(rq->enabled == 0); + while (rq->processing > 0) { + /* + * No wakeup, relying on timeout. + * Use msleep_sbt() since msleep() conflicts with linuxkpi. + */ + msleep_sbt(&rq->processing, &rq->mtx, 0, "mlx5ecrq", + tick_sbt * hz, 0, C_HARDCLOCK); + } + mtx_unlock(&rq->mtx); mlx5e_disable_rq(rq); mlx5e_close_cq(&rq->cq); cancel_work_sync(&rq->dim.work); diff --git a/sys/dev/mlx5/mlx5_en/mlx5_en_rx.c b/sys/dev/mlx5/mlx5_en/mlx5_en_rx.c index 2ed2060d5a5d..8e47d7392007 100644 --- a/sys/dev/mlx5/mlx5_en/mlx5_en_rx.c +++ b/sys/dev/mlx5/mlx5_en/mlx5_en_rx.c @@ -689,6 +689,9 @@ mlx5e_rx_cq_comp(struct mlx5_core_cq *mcq, struct mlx5_eqe *eqe __unused) mtx_unlock(&c->iq.lock); mtx_lock(&rq->mtx); + if (rq->enabled == 0) + goto out; + rq->processing++; /* * Polling the entire CQ without posting new WQEs results in @@ -709,6 +712,8 @@ mlx5e_rx_cq_comp(struct mlx5_core_cq *mcq, struct mlx5_eqe *eqe __unused) 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); + rq->processing--; +out: mtx_unlock(&rq->mtx); for (int j = 0; j != MLX5E_MAX_TX_NUM_TC; j++) {