From nobody Tue Feb 08 15:14:10 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 CAE6019C3E47; Tue, 8 Feb 2022 15:14:12 +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 4JtRPH12wHz4dj2; Tue, 8 Feb 2022 15:14:11 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1644333251; 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=FKpjl0ShN7pWbFjVD919OCe+0pDAOBUTChYvcFdROTY=; b=mLTDlZmx8BFw38MeI09dZQvj+bPegyAncyoLLMh7ndV/Ww+LvrujASuL/cyV4mp1eMShJf HPbjvuTl9wTPXLSLKco0mPhsJB0PaMpO8naKO0QMzJh+1VJU1enEj0EXc8SpRF7KmOIqGj z1zqsZe1KAJHX7p5AcPAIc8IKTyoYtNMznG2vlGCPN7RSlpIfco/i6cpQ6yTtGvQp7MUAt HK/dF9kbtHzqbLzmbJfpyngQ9elYgmJXbALB0UG8JbUI9GkcesElE/Uy/CdDeVXHN4Mv6+ I/4NtK/65LSOaklseIHgav4KIO1Lh70ysLC+HpsiUwNM4WDmMeup9/0b/GCaqA== 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 E06A11BC18; Tue, 8 Feb 2022 15:14:10 +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 218FEAIN020938; Tue, 8 Feb 2022 15:14:10 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 218FEAFC020937; Tue, 8 Feb 2022 15:14:10 GMT (envelope-from git) Date: Tue, 8 Feb 2022 15:14:10 GMT Message-Id: <202202081514.218FEAFC020937@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: 952d47e5cc33 - stable/13 - mlx5en: Create TIRs before flowtables. 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: 952d47e5cc3313d8f869d44a3671caa5e2bd94df Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1644333251; 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=FKpjl0ShN7pWbFjVD919OCe+0pDAOBUTChYvcFdROTY=; b=NjFq5bYTbcq0Lgel6VMIDdb/P8JtoZeidKe/rRuMWSRQ9lQWd1SPq6RboCvn+wjDb/2FLG 5tmiUCH7+uL6Y/4fPwvtTaSjB4Zghqt5zE05uX9x1+qccV5+NOwbTSEEQ6tsTw/y7AecAn x6adxjmBut2ufIFAPRDLwE9yZWnu9SrA8voSbyLi3qDG5mkFd2qnX9tYmnDzGNz83UiKCe xngu1AfI5LWKK9f+6kkn1QCRVWPFYnqlRLu6pwH1ZCpu5rJi6XQhT+ZDHB2EObavq9m0nI sHruUJ4wICeMYBynxB4XPJ4WryihBZoa1Yhpe6139CJHlgseocYOoZPspd85gA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1644333251; a=rsa-sha256; cv=none; b=GBPErDGQP3t9sGUROAmfM10iZSqUIWXuaJmkfsNAv9nr+PMXJlMV6OK2zYGxaVKeBeCxAN /LQat64GGPuFJ/Dt7GstTqN6SmrUubUsB9QfAzlTUy5LQSQH2QHCsQRirBh3wwJ7O56E4K 3BYQg1NlkHJH6i2zvX59kLQE9uoJWdsQklIZjSpq7fG8YZxWUZ4kn2GLZKDI85KU3/rkvK yc8KxiqbmH5eA+R0vFc1cFg8W3AbsRYVIP/YBjwhF/vLG6ScgezNYDdczdpwhLNB2HMlBG Eg835RPQaA8vMYlSDJU0U02g/mLNRSyB9Vs5+46cbK/WJX8peaZrIelTrXOPNg== 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=952d47e5cc3313d8f869d44a3671caa5e2bd94df commit 952d47e5cc3313d8f869d44a3671caa5e2bd94df Author: Hans Petter Selasky AuthorDate: 2022-02-08 15:08:54 +0000 Commit: Hans Petter Selasky CommitDate: 2022-02-08 15:08:54 +0000 mlx5en: Create TIRs before flowtables. Because flowtables may redirect traffic to TIRs. Sponsored by: NVIDIA Networking (cherry picked from commit 5381f936473b06e3d62da5e0f22119789db8e621) --- sys/dev/mlx5/mlx5_en/mlx5_en_main.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/sys/dev/mlx5/mlx5_en/mlx5_en_main.c b/sys/dev/mlx5/mlx5_en/mlx5_en_main.c index 5330dd384fa3..03a92a7a25cc 100644 --- a/sys/dev/mlx5/mlx5_en/mlx5_en_main.c +++ b/sys/dev/mlx5/mlx5_en/mlx5_en_main.c @@ -4621,16 +4621,16 @@ mlx5e_create_ifp(struct mlx5_core_dev *mdev) goto err_open_drop_rq; } - err = mlx5e_open_flow_tables(priv); + err = mlx5e_open_tirs(priv); if (err) { - if_printf(ifp, "%s: mlx5e_open_flow_tables failed (%d)\n", __func__, err); + mlx5_en_err(ifp, "mlx5e_open_tirs() failed, %d\n", err); goto err_open_rqt; } - err = mlx5e_open_tirs(priv); + err = mlx5e_open_flow_tables(priv); if (err) { - mlx5_en_err(ifp, "mlx5e_open_tirs() failed, %d\n", err); - goto err_open_flow_tables; + if_printf(ifp, "%s: mlx5e_open_flow_tables failed (%d)\n", __func__, err); + goto err_open_tirs; } /* set default MTU */ @@ -4768,8 +4768,8 @@ mlx5e_create_ifp(struct mlx5_core_dev *mdev) return (priv); -err_open_flow_tables: - mlx5e_close_flow_tables(priv); +err_open_tirs: + mlx5e_close_tirs(priv); err_open_rqt: mlx5_core_destroy_rqt(priv->mdev, priv->rqtn, 0); @@ -4876,8 +4876,8 @@ mlx5e_destroy_ifp(struct mlx5_core_dev *mdev, void *vpriv) ifmedia_removeall(&priv->media); ether_ifdetach(ifp); - mlx5e_close_tirs(priv); mlx5e_close_flow_tables(priv); + mlx5e_close_tirs(priv); mlx5_core_destroy_rqt(priv->mdev, priv->rqtn, 0); mlx5e_close_drop_rq(&priv->drop_rq); mlx5e_tls_cleanup(priv);