From nobody Thu Feb 17 12:13:50 2022 X-Original-To: dev-commits-src-all@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 158E719C2B21; Thu, 17 Feb 2022 12:13:51 +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 4Jztz25t4Lz4tZG; Thu, 17 Feb 2022 12:13:50 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1645100030; 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=sL+yeerY0VjdJvzaIqbJ4ziEEBdPP4ZLHE3l5MKZH18=; b=cusiPiDkeayKUetiSRxM1zxgBKXeQ9igCOB4nl0iIX5+1SUUyu9ML18FuDzWKex9U6dbxV 4su7gO2GShiusSDfo5J3GvfRH3prcAq17JLUM3BwMPWOU6nwI+GO/gbUFMJqmsCa9yQrk4 CjsqSQlfpadS9YBoI8tfOKBANQbnOD6HlmxyeNDpWuhB1rOA24kXf2pOINg86OdHTayWVz UaD2CguvkeHKYrcZUn9Tw+kIWAyR8ZQVcNaP3hmea5KyJ/aQ+ksiq7RnTGJH3qEn/glxLH RCdbyeUZaco5Oh/fU1UKbJ+lS9A0X8jiquJwiUGJB7sDgaxNLikmsBc8AE40nA== 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 9CD1A1B05; Thu, 17 Feb 2022 12:13:50 +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 21HCDoVC027573; Thu, 17 Feb 2022 12:13:50 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 21HCDoeH027572; Thu, 17 Feb 2022 12:13:50 GMT (envelope-from git) Date: Thu, 17 Feb 2022 12:13:50 GMT Message-Id: <202202171213.21HCDoeH027572@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Hans Petter Selasky Subject: git: 015f22f5d033 - main - mlx5en: Fix TLS worker thread race. List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@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/main X-Git-Reftype: branch X-Git-Commit: 015f22f5d0338882ab4a1e1585622ff3568dface Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1645100030; 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=sL+yeerY0VjdJvzaIqbJ4ziEEBdPP4ZLHE3l5MKZH18=; b=wCXESAbSs8KVxG3kkOBbsUho4CZLm6S3E0UhUdzlZzW0evXt+64kxShnKzwUaR1/1sl7ph Ny+LOSZdJaX9BYpxqBPcoVq/WXUX5EQY9mb61M0Y49/lCjrDbSM4qFoonorLG0mYnDQ5H7 sp6XRV/jjp6oM3OH/7ES7yAvI/+Z70BjvFXhYTmGUxCq4pPjqouOgw19B/XRjozJtDgFbH sM8KnMEEEHSaDhohgm/m5blHOt0Wiq7ZbTrIman1/ScCV7bfBgKcU46mumul/FND+s9XYn eFSRSeUcRmN4wE1w419hGBAjXmKsBlkRLV+p/zxbQTJ/agN/gZrblwF+d9XgHw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1645100030; a=rsa-sha256; cv=none; b=P1Zn+XrbkxXckonSM3XMmyleztqoRThTn0c1n6MX44WAb+BLp+o+vRPs9qlPmX0RhUF5hw Rg40Dcn1g3AyNqqGmakm7nhj/W4kzdJUHbVnaJiiF9TbPLVMUzxK62ZE6UAAJEzwhtOJlv /qOJ+SILPDnZvvYbbUN7s+o0+EnL6sl9hBhjIpx5ALi5YDIsyS97t3ygEwpyLSO4BTnIeh bIt2qnzLWvQiZOuCAXy/rH4T4AotK+xu38YYUrLw4RU7oysWXW3VMUXXCMPv8h7UIgMD1x XVMRnXWYiaVCmVMd+OKyv5uJaK/+4NYUywZj85sHSGIfKthz9HcURK/daf0wrQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by hselasky: URL: https://cgit.FreeBSD.org/src/commit/?id=015f22f5d0338882ab4a1e1585622ff3568dface commit 015f22f5d0338882ab4a1e1585622ff3568dface Author: Hans Petter Selasky AuthorDate: 2022-02-17 11:48:57 +0000 Commit: Hans Petter Selasky CommitDate: 2022-02-17 12:13:09 +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. MFC after: 1 week Sponsored by: NVIDIA Networking --- sys/dev/mlx5/mlx5_en/en_hw_tls.h | 3 ++- sys/dev/mlx5/mlx5_en/en_hw_tls_rx.h | 3 ++- sys/dev/mlx5/mlx5_en/mlx5_en_hw_tls.c | 11 +++++++---- sys/dev/mlx5/mlx5_en/mlx5_en_hw_tls_rx.c | 12 ++++++++---- 4 files changed, 19 insertions(+), 10 deletions(-) diff --git a/sys/dev/mlx5/mlx5_en/en_hw_tls.h b/sys/dev/mlx5/mlx5_en/en_hw_tls.h index f9d5ae23e82c..70b493a5e82d 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/en_hw_tls_rx.h b/sys/dev/mlx5/mlx5_en/en_hw_tls_rx.h index 4bdcbda0076e..4843a0ab8423 100644 --- a/sys/dev/mlx5/mlx5_en/en_hw_tls_rx.h +++ b/sys/dev/mlx5/mlx5_en/en_hw_tls_rx.h @@ -70,7 +70,8 @@ struct mlx5e_tls_rx_tag { #define MLX5E_TLS_RX_ST_INIT 0 #define MLX5E_TLS_RX_ST_SETUP 1 #define MLX5E_TLS_RX_ST_READY 2 -#define MLX5E_TLS_RX_ST_FREED 3 +#define MLX5E_TLS_RX_ST_RELEASE 3 +#define MLX5E_TLS_RX_ST_FREED 4 /* * The following fields are used to store the TCP starting 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 a1973740571d..e6b4759aeb7a 100644 --- a/sys/dev/mlx5/mlx5_en/mlx5_en_hw_tls.c +++ b/sys/dev/mlx5/mlx5_en/mlx5_en_hw_tls.c @@ -127,9 +127,10 @@ mlx5e_tls_tag_release(void *arg, void **store, int cnt) 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; @@ -256,7 +257,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); @@ -330,7 +331,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); @@ -438,6 +438,9 @@ mlx5e_tls_snd_tag_alloc(struct ifnet *ifp, m_snd_tag_init(&ptag->tag, ifp, snd_tag_sw); *ppmt = &ptag->tag; + /* reset state */ + ptag->state = MLX5E_TLS_ST_INIT; + queue_work(priv->tls.wq, &ptag->work); flush_work(&ptag->work); @@ -483,7 +486,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; diff --git a/sys/dev/mlx5/mlx5_en/mlx5_en_hw_tls_rx.c b/sys/dev/mlx5/mlx5_en/mlx5_en_hw_tls_rx.c index 4a6fc8f2d202..39bbd6a37cf3 100644 --- a/sys/dev/mlx5/mlx5_en/mlx5_en_hw_tls_rx.c +++ b/sys/dev/mlx5/mlx5_en/mlx5_en_hw_tls_rx.c @@ -427,8 +427,10 @@ mlx5e_tls_rx_tag_release(void *arg, void **store, int cnt) static void mlx5e_tls_rx_tag_zfree(struct mlx5e_tls_rx_tag *ptag) { + /* make sure any unhandled taskqueue events are ignored */ + ptag->state = MLX5E_TLS_RX_ST_FREED; + /* reset some variables */ - ptag->state = MLX5E_TLS_RX_ST_INIT; ptag->dek_index = 0; ptag->dek_index_ok = 0; ptag->tirn = 0; @@ -569,7 +571,7 @@ mlx5e_tls_rx_work(struct work_struct *work) MLX5E_TLS_RX_TAG_UNLOCK(ptag); break; - case MLX5E_TLS_RX_ST_FREED: + case MLX5E_TLS_RX_ST_RELEASE: /* remove flow rule for incoming traffic, if any */ if (ptag->flow_rule != NULL) mlx5e_accel_fs_del_inpcb(ptag->flow_rule); @@ -676,7 +678,6 @@ mlx5e_tls_rx_snd_tag_alloc(struct ifnet *ifp, return (ENOMEM); /* sanity check default values */ - MPASS(ptag->state == MLX5E_TLS_RX_ST_INIT); MPASS(ptag->dek_index == 0); MPASS(ptag->dek_index_ok == 0); @@ -760,6 +761,9 @@ mlx5e_tls_rx_snd_tag_alloc(struct ifnet *ifp, m_snd_tag_init(&ptag->tag, ifp, &mlx5e_tls_rx_snd_tag_sw); *ppmt = &ptag->tag; + /* reset state */ + ptag->state = MLX5E_TLS_RX_ST_INIT; + queue_work(priv->tls_rx.wq, &ptag->work); flush_work(&ptag->work); @@ -989,7 +993,7 @@ mlx5e_tls_rx_snd_tag_free(struct m_snd_tag *pmt) struct mlx5e_priv *priv; MLX5E_TLS_RX_TAG_LOCK(ptag); - ptag->state = MLX5E_TLS_RX_ST_FREED; + ptag->state = MLX5E_TLS_RX_ST_RELEASE; MLX5E_TLS_RX_TAG_UNLOCK(ptag); priv = ptag->tag.ifp->if_softc;