From nobody Tue Feb 01 15:24:33 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 849BA1916D87; Tue, 1 Feb 2022 15:24:34 +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 4Jp7yT60v0z3G4X; Tue, 1 Feb 2022 15:24:33 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1643729074; 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=Z/Ywv0Z90zpNd+Cow8FFVu0Z2Qa4Ka+V03+dMlpO8Lw=; b=gwrj2ECV8YQD7cKabtQPocvR01CmTHYbKXgFxvtnqUOkJSnpgA2oiC3DXXiu6gjb65HJNO jpL47Tce1kCjdlSwS3L7bEJpyi/W4ICl5yC/nZGkXwmoQgB2Yqp1KY8ynTA6iOGJz01ktT qDtxoY1lcxET22mIs18Zbj8LLlV4vYx2dD/DhsrORFQm5tWFnEEz+SPWorCzoHkjiqY/o1 89Dl40FlsxcBdoQf7RBcpufwakM6eS/TYtnWB9bmAzBpz4o0fep0+WXrmB5w2awPx+goQX Ihk117yFWmNqai1NjSkB+WiQqfXBQ8tmLeWhx888g1o9tJUDkCyDC4M5TrtLng== 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 AC90313598; Tue, 1 Feb 2022 15:24:33 +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 211FOXaq051298; Tue, 1 Feb 2022 15:24:33 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 211FOX4l051297; Tue, 1 Feb 2022 15:24:33 GMT (envelope-from git) Date: Tue, 1 Feb 2022 15:24:33 GMT Message-Id: <202202011524.211FOX4l051297@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: 5381f936473b - main - mlx5en: Create TIRs before flowtables. 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: 5381f936473b06e3d62da5e0f22119789db8e621 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1643729074; 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=Z/Ywv0Z90zpNd+Cow8FFVu0Z2Qa4Ka+V03+dMlpO8Lw=; b=XMc3P0uc/hRuaRxTjk/+oX41lnWpLK/xVHq5ogFD1X+/UmTCZGGrJ5lUBwHo0bHVOAOZ5k HDqh6PzwDleCcPuUbPp4ikfctfmSLWlMlVOq4JVcbevees8qkC/1SA4ZfkdKualK4MgL0B bg8tcShOALSJzf+7FvykleLLDeL7bsETpprzV7JiSAFLJqnGZO5wo5PeBQhBJjNojKcpzi +jDhMiNgayitkEsJ8bL5KHAl/Da28qd3vL56xtrovXxUm8AZaoIwD0OBsUBBhCgyRdGC9h TfuSL7GUyksUvDTM10CkmI27kkcHQXGp4aVkfQkLf6VGARMAxgGgr1DF7pPpNg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1643729074; a=rsa-sha256; cv=none; b=UX+P8eAK8NZBi3Divh+wYsS28zaL19JUZLuQln9jqbrfuxjpHaDJVeDSY9jjkUziD6pKd+ HhfgUoUGo2X8o1CjAiTyx4eEIuDdjm6B4HIGR6c8ipU16uY9yC9kZwp6iYm8+8IEvGKCfE HxGd/k+3QO/5aeUYGKMB6WjGb2pZIYDkZgSsLLZCJhNFyZYv3QyY+BSBae0TuCzDGfIieJ 61kHVXSV/R66hiM60J+Behf8z/GE8doXY4yurhYy4qBf8AlEo7vkwHBUUj77cCTBKtgRTa gW9WB9jyVlOlX6ocJLYGkjihbxpYZAOOPfA+hTLkfYlZaCo21zfJXYVWF77vYg== 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=5381f936473b06e3d62da5e0f22119789db8e621 commit 5381f936473b06e3d62da5e0f22119789db8e621 Author: Hans Petter Selasky AuthorDate: 2022-02-01 15:20:14 +0000 Commit: Hans Petter Selasky CommitDate: 2022-02-01 15:21:16 +0000 mlx5en: Create TIRs before flowtables. Because flowtables may redirect traffic to TIRs. MFC after: 1 week Sponsored by: NVIDIA Networking --- 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 171777ebba57..eec7c9cc9730 100644 --- a/sys/dev/mlx5/mlx5_en/mlx5_en_main.c +++ b/sys/dev/mlx5/mlx5_en/mlx5_en_main.c @@ -4552,16 +4552,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 */ @@ -4699,8 +4699,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); @@ -4807,8 +4807,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);