From nobody Thu Feb 24 10:04:25 2022 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 3407F19E06A4; Thu, 24 Feb 2022 10:04:26 +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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4K47mT3y8Qz3Q4h; Thu, 24 Feb 2022 10:04:25 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1645697066; 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=xQUks/5fXuezjbQ4/oGphQ9cqvfeghgdNo4IzfGFuc8=; b=WqtaU76f3C7sfxzs0cnuymt/gN94J0I9tYaKZpU+OrYQcs3XBqzBwNb4o/AmKFGhmTQBnV rE7GKMS6Z5Th9Q8EKlMGiE2UCf4vgUReE6IIeBTw2QSN/WnvG7VOBT7zenriZZwr+wMmZ9 RV4Jqsqy/qLFHC7sYLC0Pgu256QBsqm8HZlcmD8y1EVCnnk98M77rCH2aD4ssGEuZ9dyZy FZV0KgtGxkWVngz+s2trEWFk+Vor46NfU1TOD6QKC8TpM8ZfHcsfECZwQk7PpI6Wvw2Z5K EoGPi0eQZJgF4SqiprIcEmepznAMqKk1o/OePVqrQzGDB85s1dEPQ5og0oVgMA== 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 638011F05; Thu, 24 Feb 2022 10:04:25 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 21OA4PKY003676; Thu, 24 Feb 2022 10:04:25 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 21OA4PvW003675; Thu, 24 Feb 2022 10:04:25 GMT (envelope-from git) Date: Thu, 24 Feb 2022 10:04:25 GMT Message-Id: <202202241004.21OA4PvW003675@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Hans Petter Selasky Subject: git: 353c1239fb7d - stable/13 - mlx5en: Fix TLS worker thread race. 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: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: hselasky X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 353c1239fb7d7660ecf032ca9ce6e9070bd48cce Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1645697066; 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=xQUks/5fXuezjbQ4/oGphQ9cqvfeghgdNo4IzfGFuc8=; b=UFBbmoMEMyldA1y+/NiRmEua+3lFwZm9GgLbJdZlrzPiqi0F4cR9gsxt/szQvtqfqEVPI5 /JNwCDBUBwYiZR0Yuxs6zxMMErLGHPpGZL38uBrlwqTZiSBeITzZB7iNQXX4AknLWddTrL QqzgaWEh1pxFhWVtNEjq/oGNBIg9eeQaLxF6/VBdKa0bSAufsiSKWaejovJOL2t4x4LXmJ 1aw5h9xAA+S0bCvYzAPgkoha05Hy+bJ/Eh4Wo/sSxkVcuC007UWrix5sNGpWY7gnu+e3mk pdR2Yz6ha6GEd3KrUUi8DqHIoRniqpPCiOKAjuzeCPCDYJH8tU62B30zfZR1Bg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1645697066; a=rsa-sha256; cv=none; b=C67ZBWICDqkVSoAZa2LLL9SyXWDgS5Ug4dFFoEpJyR2SDro1/SijAQ+QCmwknlc5mqTupj 96nxCnD0QT1tG3enpeeJLsBAi+pjlHaQo67ssr+BuO5kB25B6aMu0aImaDovJw4xj0/US5 6xGhS+aUss8U/UIxfryuqxKPl8PXYOuf6K3w1fxlNeZC1CoEXdPitbNqXRBzWpzdAwJH+q J29aXN6oaRWAmAIshWH30UZDKY9c73T4+FP8dhX5XY23OonN/TnVhiXGxPuBHx/eo7Yk10 ei02TGw7jt7ZLwqHHueBqyqP05ZxI3a6eu5ghSa8g6vVExrXoQbRwixh9D1SPA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by hselasky: URL: https://cgit.FreeBSD.org/src/commit/?id=353c1239fb7d7660ecf032ca9ce6e9070bd48cce commit 353c1239fb7d7660ecf032ca9ce6e9070bd48cce Author: Hans Petter Selasky AuthorDate: 2022-02-24 09:59:14 +0000 Commit: Hans Petter Selasky CommitDate: 2022-02-24 09:59:14 +0000 mlx5en: Fix TLS worker thread race. Create a dedicated free state, in case the taskqueue worker is still pending, to avoid re-activation of a freed send tag. Sponsored by: NVIDIA Networking (cherry picked from commit 015f22f5d0338882ab4a1e1585622ff3568dface) --- sys/dev/mlx5/mlx5_en/en_hw_tls.h | 3 ++- sys/dev/mlx5/mlx5_en/mlx5_en_hw_tls.c | 11 +++++++---- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/sys/dev/mlx5/mlx5_en/en_hw_tls.h b/sys/dev/mlx5/mlx5_en/en_hw_tls.h index 7ba00fc1f363..8784c07b750d 100644 --- a/sys/dev/mlx5/mlx5_en/en_hw_tls.h +++ b/sys/dev/mlx5/mlx5_en/en_hw_tls.h @@ -55,7 +55,8 @@ struct mlx5e_tls_tag { #define MLX5E_TLS_ST_INIT 0 #define MLX5E_TLS_ST_SETUP 1 #define MLX5E_TLS_ST_TXRDY 2 -#define MLX5E_TLS_ST_FREED 3 +#define MLX5E_TLS_ST_RELEASE 3 +#define MLX5E_TLS_ST_FREED 4 struct work_struct work; uint32_t dek_index_ok:1; diff --git a/sys/dev/mlx5/mlx5_en/mlx5_en_hw_tls.c b/sys/dev/mlx5/mlx5_en/mlx5_en_hw_tls.c index e28fddcfd116..359bd9bddc7f 100644 --- a/sys/dev/mlx5/mlx5_en/mlx5_en_hw_tls.c +++ b/sys/dev/mlx5/mlx5_en/mlx5_en_hw_tls.c @@ -98,9 +98,10 @@ mlx5e_tls_tag_zfini(void *mem, int size) static void mlx5e_tls_tag_zfree(struct mlx5e_tls_tag *ptag) { + /* make sure any unhandled taskqueue events are ignored */ + ptag->state = MLX5E_TLS_ST_FREED; /* reset some variables */ - ptag->state = MLX5E_TLS_ST_INIT; ptag->dek_index = 0; ptag->dek_index_ok = 0; @@ -225,7 +226,7 @@ mlx5e_tls_work(struct work_struct *work) MLX5E_TLS_TAG_UNLOCK(ptag); break; - case MLX5E_TLS_ST_FREED: + case MLX5E_TLS_ST_RELEASE: /* try to destroy DEK context by ID */ if (ptag->dek_index_ok) err = mlx5_encryption_key_destroy(priv->mdev, ptag->dek_index); @@ -298,7 +299,6 @@ mlx5e_tls_snd_tag_alloc(struct ifnet *ifp, return (ENOMEM); /* sanity check default values */ - MPASS(ptag->state == MLX5E_TLS_ST_INIT); MPASS(ptag->dek_index == 0); MPASS(ptag->dek_index_ok == 0); @@ -404,6 +404,9 @@ mlx5e_tls_snd_tag_alloc(struct ifnet *ifp, m_snd_tag_init(&ptag->tag, ifp, params->hdr.type); *ppmt = &ptag->tag; + /* reset state */ + ptag->state = MLX5E_TLS_ST_INIT; + queue_work(priv->tls.wq, &ptag->work); flush_work(&ptag->work); @@ -470,7 +473,7 @@ mlx5e_tls_snd_tag_free(struct m_snd_tag *pmt) m_snd_tag_rele(ptag->rl_tag); MLX5E_TLS_TAG_LOCK(ptag); - ptag->state = MLX5E_TLS_ST_FREED; + ptag->state = MLX5E_TLS_ST_RELEASE; MLX5E_TLS_TAG_UNLOCK(ptag); priv = ptag->tag.ifp->if_softc;