From nobody Wed Nov 15 23:09:12 2023 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 4SVzPj077Mz50rlv; Wed, 15 Nov 2023 23:09:13 +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 4SVzPh66wZz3N3b; Wed, 15 Nov 2023 23:09:12 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1700089752; 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=iS5vFe24Nrz9Yo9pLvlehntej2zVYQjqWJJh934b/Ok=; b=NyCFqWwm/GYoEy7NFfNSMZETSeQRVSLgAUtLap9ojwQq3hA/jhuzRfnI2xv6ApkyBcYPSN WDsv8B4hbokprhlf6iA8fRGwYcEqtoDSeS8ViEvn4kyxcQ/6pwFZA0DrNP77pbyzKa/seK ZgD2h6BpYKyB9WDMpq8QlAETG3Qukt1zwNv1c5nr+moxQB6k876mPAgSjoGAMa6fK5bvHm sHKzEnB2r8xXf8UvTr+LXzxN9DYuv+QX7OH2NNNftsGpFSPvSxVlrNVtfJOdGXuU3rqgRf TxheJ+pUclTEqkt+RaL8uhXh1ha93QjvKc8LmWzIbJzB4ejEidov2kO9/w3ivw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1700089752; 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=iS5vFe24Nrz9Yo9pLvlehntej2zVYQjqWJJh934b/Ok=; b=uoxQRMCdrUAC1qpjsyEjXRlJP/qUdf4926dCzndyW0nIcjwDnpNXlCrs18oEYq2caqtf6z k8AT2BzEAKUfJOsMvb01Bx2Td0bZNuMZ7kqb61Fn5j6MqRs0i7+FOqdvJF3DIfJEyvacba xyBKDyhBrvJwU+DMSLluxh8kLxhnyIBlz58p7c4QxLpbdIhkTAwNlO87eZCuCkvWPhP9Xh oEDIoMTXR7zjvL0zfgMR2iVc4TYYQLPQ4r+jjZJ7SwVwhEF4ZLZwn/BSFkD2tpsP1sSWEN 8Yu2T/PanYfiwdh8PRpZ9IygSnZzq/eeu41f2ktIDodZS3qRO/j04bhsFDnb+Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1700089752; a=rsa-sha256; cv=none; b=JEEwEdDDdn8R2JvdoDxvARm9fJJzuNbLaiAWfHYAmJjcuQMOnPwQMtE9YhHgaCqJQQbCHQ UvxCnZPp6VvOGxnkHddUiD8rlAKRo1lytREzTlYvacSTnBMF168jca4scPA/daSxMOipRX FnmGl8UnMfWsH3Y+dXVWxwBxEQ55FmZRw7yqBHs72nAo8zc4ZNPp6x6N1c7rkBLOeM3X5B BRb6BHOb5TPGPAGAXYO16bFJCIXXHMXq3StjIEMgrIDrspkU26R1jMnDpbMyCGNBJEpQ2p JHcyzgZyB5hUWOSqppcr9Tu60EjufYsbuiQ+M89IFCDI55xW0LJ97KCC7mBAmA== 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 4SVzPh58zCzbKB; Wed, 15 Nov 2023 23:09:12 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3AFN9Cs2064910; Wed, 15 Nov 2023 23:09:12 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3AFN9C7X064907; Wed, 15 Nov 2023 23:09:12 GMT (envelope-from git) Date: Wed, 15 Nov 2023 23:09:12 GMT Message-Id: <202311152309.3AFN9C7X064907@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Konstantin Belousov Subject: git: 6a6af22b6ec4 - main - mlx5: Add a no-append flow insertion mode 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: kib X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 6a6af22b6ec42eb0436381fae8dd1b86bc4c6327 Auto-Submitted: auto-generated The branch main has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=6a6af22b6ec42eb0436381fae8dd1b86bc4c6327 commit 6a6af22b6ec42eb0436381fae8dd1b86bc4c6327 Author: Mark Bloch AuthorDate: 2023-02-20 15:46:42 +0000 Commit: Konstantin Belousov CommitDate: 2023-11-15 23:08:16 +0000 mlx5: Add a no-append flow insertion mode This allows to insert a rule and make sure it doesn't get combined by the steering layer with any other rule. Signed-off-by: Mark Bloch Sponsored by: NVidia networking MFC after: 1 week --- sys/dev/mlx5/fs.h | 5 +++++ sys/dev/mlx5/mlx5_core/mlx5_fs_tree.c | 4 ++++ 2 files changed, 9 insertions(+) diff --git a/sys/dev/mlx5/fs.h b/sys/dev/mlx5/fs.h index d61a2bb498b7..f62716d806d0 100644 --- a/sys/dev/mlx5/fs.h +++ b/sys/dev/mlx5/fs.h @@ -96,8 +96,13 @@ enum mlx5_flow_act_actions { MLX5_FLOW_ACT_ACTIONS_PACKET_REFORMAT = 1 << 2, }; +enum MLX5_FLOW_ACT_FLAGS { + MLX5_FLOW_ACT_NO_APPEND = 1 << 0, +}; + struct mlx5_flow_act { u32 actions; /* See enum mlx5_flow_act_actions */ + u32 flags; u32 flow_tag; struct mlx5_modify_hdr *modify_hdr; struct mlx5_pkt_reformat *pkt_reformat; diff --git a/sys/dev/mlx5/mlx5_core/mlx5_fs_tree.c b/sys/dev/mlx5/mlx5_core/mlx5_fs_tree.c index dcf93e5fc892..c4edc940b1bc 100644 --- a/sys/dev/mlx5/mlx5_core/mlx5_fs_tree.c +++ b/sys/dev/mlx5/mlx5_core/mlx5_fs_tree.c @@ -1806,6 +1806,9 @@ static struct mlx5_flow_rule *fs_add_dst_fg(struct mlx5_flow_group *fg, char fte_name[20]; mutex_lock(&fg->base.lock); + if (flow_act->flags & MLX5_FLOW_ACT_NO_APPEND) + goto insert_fte; + fs_for_each_fte(fte, fg) { /* TODO: Check of size against PRM max size */ mutex_lock(&fte->base.lock); @@ -1821,6 +1824,7 @@ static struct mlx5_flow_rule *fs_add_dst_fg(struct mlx5_flow_group *fg, mutex_unlock(&fte->base.lock); } +insert_fte: fs_get_parent(ft, fg); if (fg->num_ftes == fg->max_ftes) { dst = ERR_PTR(-ENOSPC);