From nobody Tue Mar 11 00:59:48 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 4ZBb5J44bYz5qQ1n; Tue, 11 Mar 2025 00:59:48 +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 4ZBb5J1wkXz3NVw; Tue, 11 Mar 2025 00:59:48 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1741654788; 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=E+2ZaPr/DC16DP3p27RiZizVT6UcnDmns+axFYxrUBQ=; b=dfq3dNzvdxtAVs2iqSumrY6dfK2Sm4r1yBpL6/qhFkJ7mvIX78JSUxk5paxm81twNN5FHs Phm+Yf1a5CToFG19Dh8TfdZzb1JIYZdy+MUkL2q6NPngTJb9BsNPtwMjYqEhyiD2QJvLlB CwPQiBv4NAQtV8zspu4SawWjQMC5aJcHA6nIuzLwFjYfClcuU81RXtqZafOHFI90Gwf9l/ y0N/RmMTm34ao0RHQRhYczIT0j+LiIlRVtM2liEl/NXttAeCrTt1KjyNT18S2+UEX7qnQu dpplYRNs8ppnMOErjzxr8yJdLEbgfN6ejZ8VAkgBEs49TL1fA7wFsZ0RYpQrBw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1741654788; a=rsa-sha256; cv=none; b=enBwCWTASFVt1Vrf+fw+h7kiiV7Tgd4i65iRNmY1ke8Kr58Kzq6sIFayPBYxgT62oX/27n 3/iVLeJemqO7EJm9TztJstdvu2kOgYEdVOY70zYi5mR5NUmhqBdIQBkoOFqmZb4uJcz3/v 0wZcpp822hO07m3cAWrlWBKp8/EJU7wnAReZxCIyI+A3ZhrFbOqDjtpbbR/Li/lLQCmj5Y cA1/Kh2q+O+9dtwvc2DgzdU1ueuc6hmyYVtQVhKor99jhHeNdpQ0gHBpP2YHOSyXAzcGR/ Cx1Mkw55Cw8ZZ/iLpFe0VIiZrjnROPcNzCr/AYbKpUHoRGjardxfeAdMKPoJ1w== 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=1741654788; 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=E+2ZaPr/DC16DP3p27RiZizVT6UcnDmns+axFYxrUBQ=; b=O0F6+Eldenmth2DMjj9pKGEPv1HnDB8QCkouWy5knb6YucP5/Rg74SlwdbJYSUJv/ny9BC ksJ7CbikdldHJWOr64VPaSa3c5g9z1pO6YfByNhSLC5B8fATG1Bsbo6K8LdjodHSJiL7eE TvqyJHj7rIwweXSYRGGmzGA6uCmw1btUjY6iGd/vHrSUoGj+12xfiuBXdX3qrhuA9G9gKx NZq1Hshd2wv0v8PrfbRPxcpCDtFbeVOg3ryqMJjM8t8VLzVbLoK05P+zynTPd1BVFvGyO7 FhbvzxCgL+qou8DN2OCRH8oRxK9ui/js87/MW6cwgMQtI+AacBjPP/zWAQLpng== 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 4ZBb5J1FzJz13Br; Tue, 11 Mar 2025 00:59:48 +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 52B0xmRl052081; Tue, 11 Mar 2025 00:59:48 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 52B0xmxO052078; Tue, 11 Mar 2025 00:59:48 GMT (envelope-from git) Date: Tue, 11 Mar 2025 00:59:48 GMT Message-Id: <202503110059.52B0xmxO052078@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: b328b79f6f2b - stable/14 - mlx5en: Fix domain set usage in TLS tag import functions 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: b328b79f6f2ba4cfe2704430e43cf7eccb4738a2 Auto-Submitted: auto-generated The branch stable/14 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=b328b79f6f2ba4cfe2704430e43cf7eccb4738a2 commit b328b79f6f2ba4cfe2704430e43cf7eccb4738a2 Author: Slava Shwartsman AuthorDate: 2025-02-24 18:08:58 +0000 Commit: Konstantin Belousov CommitDate: 2025-03-11 00:59:11 +0000 mlx5en: Fix domain set usage in TLS tag import functions (cherry picked from commit 85af37e15958bd050093e6368afe6afe8e7a5ced) --- sys/dev/mlx5/mlx5_en/mlx5_en_hw_tls.c | 2 +- sys/dev/mlx5/mlx5_en/mlx5_en_hw_tls_rx.c | 3 ++- 2 files changed, 3 insertions(+), 2 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 af280abcdcd2..a5d485597c77 100644 --- a/sys/dev/mlx5/mlx5_en/mlx5_en_hw_tls.c +++ b/sys/dev/mlx5/mlx5_en/mlx5_en_hw_tls.c @@ -117,7 +117,7 @@ mlx5e_tls_tag_import(void *arg, void **store, int cnt, int domain, int flags) for (i = 0; i != cnt; i++) { ptag = malloc_domainset(sizeof(*ptag), M_MLX5E_TLS, - mlx5_dev_domainset(arg), flags | M_ZERO); + mlx5_dev_domainset(priv->mdev), flags | M_ZERO); if (ptag == NULL) return (i); ptag->tls = &priv->tls; 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 19c6adf18809..f584e5228657 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 @@ -387,11 +387,12 @@ static int mlx5e_tls_rx_tag_import(void *arg, void **store, int cnt, int domain, int flags) { struct mlx5e_tls_rx_tag *ptag; + struct mlx5_core_dev *mdev = arg; int i; for (i = 0; i != cnt; i++) { ptag = malloc_domainset(sizeof(*ptag), M_MLX5E_TLS_RX, - mlx5_dev_domainset(arg), flags | M_ZERO); + mlx5_dev_domainset(mdev), flags | M_ZERO); mtx_init(&ptag->mtx, "mlx5-tls-rx-tag-mtx", NULL, MTX_DEF); INIT_WORK(&ptag->work, mlx5e_tls_rx_work); store[i] = ptag;