From nobody Tue Feb 8 15:13:54 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 9B40119C33BB; Tue, 8 Feb 2022 15:13:56 +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 4JtRNz17lyz4dVt; Tue, 8 Feb 2022 15:13:55 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1644333235; 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=iS1byVL1kARTAIRLsxUOD+xeJIBFbhfDw1FTgV8eElQ=; b=na6sZu7bL8CMtwrhEcjFTZr4Zgkj6KBo3lqrJn9HpKSSpDC16CZRed2MwsyUQ9F5K377Qg KIHyu1AAdFyB85+ZeAaPmzRnfkbKV3mhYZwPKE49d6EQmUQTMvsUrLno674gUJSDSlWUnn iJALfio6yKE4VA7+PN0zfwz2r/DcAvLfymqz4Yp4C4vYm0SwPAMqGgikyEYGHBMLHJZ985 oeim0IeuxEK16oh2aFqBvXDqkevXAqiHB9neXmDywy5q80k98A0h1xvt1nvQH7kx6D/hA/ 9PKLDm0IF0jbiVwwSMvBE9aESEsFwNetlr2VIxuE/k/g05qZKstuk0oAEccOtQ== 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 E6BEB1B679; Tue, 8 Feb 2022 15:13:54 +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 218FDsal020582; Tue, 8 Feb 2022 15:13:54 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 218FDsSf020581; Tue, 8 Feb 2022 15:13:54 GMT (envelope-from git) Date: Tue, 8 Feb 2022 15:13:54 GMT Message-Id: <202202081513.218FDsSf020581@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: 9aca51170316 - stable/13 - mlx5en: Share DEK objects with TLS RX. 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/stable/13 X-Git-Reftype: branch X-Git-Commit: 9aca51170316a1632dfc0186210fce7c35d10a50 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1644333235; 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=iS1byVL1kARTAIRLsxUOD+xeJIBFbhfDw1FTgV8eElQ=; b=lEQwBLl1HCYxaqg4aonTqEEWnYlSzxK9Wc6iket46AMx0eY0H7ofpk66PNa9GXIAFokmee tFsJZr36Hx9Wo+S+NxCUXuWktylJhQNvPRGUbltDXxwjPukNIdOA76TrpjycBNGWQRrSmU b56sd7diaaTVdRey8z9qzDH9J4FnmKkGwq0cvuALvHFEoMUyN9/4DIywGKBrG0J/7dDj7R jaImVVHy9rMq2wTEhhSR7tovw5sofE9/7AXu/Z53jHsQACMtCwyCY1O1Sgto/kYTJ/WqxA SQ3xKeAfwlJYmIgSqbONEKjjUiEnDTxAjtFfNU0NTjY2TSe1xdMc9wONk4aZ0w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1644333235; a=rsa-sha256; cv=none; b=iYkUdn7A5sFJSb6Pjz7pDLGFipofhHNuAwOrwFO4D1i1/zV+TBUdI5VVb3WTWYF3KuRw02 BrJIyqnH4YkyT1iUlbpcyzQVlK+DBSyytR/920ImLgQgfdNeBxmQ+AbdUPcnK248i4lKqC l5sluQ4KP/W4+rn51ligi/O7nrCuziyLNIR0Ku+gkOvdGJrY0bUF1v1mwJbwhu7ar+m1Jf eWyvFgPtH26ODEngB+KHUXZaNUvhPPtH8+Be+aQikz1h36ZVzW0u16cdCB8UHqK/RbUnq0 dXQ00yKs+ULOD4DprQ/JnMRIuOShTMNjQGoeccDRonxfIH4tjZzvf1rErpRcIw== 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=9aca51170316a1632dfc0186210fce7c35d10a50 commit 9aca51170316a1632dfc0186210fce7c35d10a50 Author: Hans Petter Selasky AuthorDate: 2022-02-08 15:08:52 +0000 Commit: Hans Petter Selasky CommitDate: 2022-02-08 15:08:52 +0000 mlx5en: Share DEK objects with TLS RX. The TLS RX support also needs to be able to allocate DEK objects. Share the available objects 1:1. Sponsored by: NVIDIA Networking (cherry picked from commit 75767cb88997b6b3fc99b2336de8398cff46db2a) --- sys/dev/mlx5/mlx5_en/mlx5_en_hw_tls.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) 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 8140100685e1..57d77cc897db 100644 --- a/sys/dev/mlx5/mlx5_en/mlx5_en_hw_tls.c +++ b/sys/dev/mlx5/mlx5_en/mlx5_en_hw_tls.c @@ -121,7 +121,8 @@ mlx5e_tls_init(struct mlx5e_priv *priv) struct sysctl_oid *node; uint32_t x; - if (MLX5_CAP_GEN(priv->mdev, tls_tx) == 0) + if (MLX5_CAP_GEN(priv->mdev, tls_tx) == 0 || + MLX5_CAP_GEN(priv->mdev, log_max_dek) == 0) return (0); ptls->wq = create_singlethread_workqueue("mlx5-tls-wq"); @@ -136,7 +137,8 @@ mlx5e_tls_init(struct mlx5e_priv *priv) ptls->zone = uma_zcreate(ptls->zname, sizeof(struct mlx5e_tls_tag), NULL, NULL, mlx5e_tls_tag_zinit, mlx5e_tls_tag_zfini, UMA_ALIGN_CACHE, 0); - ptls->max_resources = 1U << MLX5_CAP_GEN(priv->mdev, log_max_dek); + /* shared between RX and TX TLS */ + ptls->max_resources = 1U << (MLX5_CAP_GEN(priv->mdev, log_max_dek) - 1); for (x = 0; x != MLX5E_TLS_STATS_NUM; x++) ptls->stats.arg[x] = counter_u64_alloc(M_WAITOK); @@ -163,7 +165,7 @@ mlx5e_tls_cleanup(struct mlx5e_priv *priv) struct mlx5e_tls *ptls = &priv->tls; uint32_t x; - if (MLX5_CAP_GEN(priv->mdev, tls_tx) == 0) + if (ptls->init == 0) return; ptls->init = 0;