From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id A92FDA0524 for ; Fri, 5 Feb 2021 12:31:54 +0100 (CET) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id A1B971889A0; Fri, 5 Feb 2021 12:31:54 +0100 (CET) Received: from mail-wm1-f42.google.com (mail-wm1-f42.google.com [209.85.128.42]) by mails.dpdk.org (Postfix) with ESMTP id 4B47040682 for ; Fri, 5 Feb 2021 12:31:53 +0100 (CET) Received: by mail-wm1-f42.google.com with SMTP id w4so5736711wmi.4 for ; Fri, 05 Feb 2021 03:31:53 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=HYQQe+YlHC0RI0DNBcPwYxtK5OO64SdqBPMgr5iAEi4=; b=IDaYCz/OFeeYZFI9eefHQ7/75NoftMulPIK2RzBIN8ZdcMldYm6x8ceMrT+zu01GwP CIgc5TpOdu4I4S9VgPjaqHQzAefOCNMTyfB0Q5uiLyOA8sMmBLzUropbj5nIw9BqEBr+ P0JSATlDN0JDEDgHKppT5JaSPNuWZUmA8oS69Nmqo0f5StkucCKJPvfvDVv7P2EQSoPV tk6CazjR7+SMytKnIzUHuNe+h0yx7GXWe2SkSZ63Jk+LxOxgVS103KJKb7pYF7nOv7yB YDupvRmmobfJxb7Fp0yu3RCG4yocxsjWaDoaLWhNneUe4cfquXuuuMA/wPsv044TBBeJ Mrrw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=HYQQe+YlHC0RI0DNBcPwYxtK5OO64SdqBPMgr5iAEi4=; b=gw9D/n6Dn1QqP2rLPNJ78euifxXdqeIaoNrJEe/9PvTdve8akOKJSS3UUSoPjLLFZp 2dZVXN24buGezQaGRfIWNs23a3aAD+fM0nxJOVHCqZ7kFUzyPBtLXc3DoyCYjts+rdQt fIjKugLqPOoM9XgRCn9v78Oi+Rvniwhv0wKRf9ZKRIJJ3sPwgmXqOKEQR9QW3miqwmRN an3KbqLEQMdqR08eh6+jFTjmpK4n2PGt+pnSTeBcqfnnzaHH0KpkS77xrXl/hFZaynOB ORs/uVd02YxkA6wCA21QTuqkOebw+XWxA4jsqPJhJf8qiuYcXxIKPvIBg+9LCmfzxosy Ftrg== X-Gm-Message-State: AOAM5338Bv0oA8bJe8C4FTza3bRAUJPrxa6EMfRK2dwzlqsJhOBvUWYy RpBwtF11p4oKOttjJHttbBk= X-Google-Smtp-Source: ABdhPJxzH15iVjfskhCNOYtWrMlj61jWv8Jg5ajNZgKuYgnu14jPpt1kO/Cms2gO5IpdM9/uSkazfw== X-Received: by 2002:a05:600c:2dd0:: with SMTP id e16mr3243099wmh.129.1612524713097; Fri, 05 Feb 2021 03:31:53 -0800 (PST) Received: from localhost ([88.98.246.218]) by smtp.gmail.com with ESMTPSA id 67sm8820541wmz.46.2021.02.05.03.31.52 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 05 Feb 2021 03:31:52 -0800 (PST) From: luca.boccassi@gmail.com To: Ori Kam Cc: dpdk stable Date: Fri, 5 Feb 2021 11:16:53 +0000 Message-Id: <20210205111920.1272063-127-luca.boccassi@gmail.com> X-Mailer: git-send-email 2.29.2 In-Reply-To: <20210205111920.1272063-1-luca.boccassi@gmail.com> References: <20210205111920.1272063-1-luca.boccassi@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [dpdk-stable] patch 'regex/mlx5: fix support for group id' has been queued to stable release 20.11.1 X-BeenThere: stable@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: patches for DPDK stable branches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: stable-bounces@dpdk.org Sender: "stable" Hi, FYI, your patch has been queued to stable release 20.11.1 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 02/07/21. So please shout if anyone has objections. Also note that after the patch there's a diff of the upstream commit vs the patch applied to the branch. This will indicate if there was any rebasing needed to apply to the stable branch. If there were code changes for rebasing (ie: not only metadata diffs), please double check that the rebase was correctly done. Queued patches are on a temporary branch at: https://github.com/bluca/dpdk-stable This queued commit can be viewed at: https://github.com/bluca/dpdk-stable/commit/89c875ea01a89936a7dd45155f21ed0923ea35fe Thanks. Luca Boccassi --- >From 89c875ea01a89936a7dd45155f21ed0923ea35fe Mon Sep 17 00:00:00 2001 From: Ori Kam Date: Thu, 7 Jan 2021 18:57:09 +0200 Subject: [PATCH] regex/mlx5: fix support for group id [ upstream commit 2cace110ea018e49aec4fd75370f2006e711d4d7 ] In order to know which groups in the RegEx engine should be used there is a need to check the req_flags. This commit adds the missing check. Fixes: 4d4e245ad637 ("regex/mlx5: support enqueue") Signed-off-by: Ori Kam --- drivers/regex/mlx5/mlx5_regex_fastpath.c | 19 ++++++++++++++++--- 1 file changed, 16 insertions(+), 3 deletions(-) diff --git a/drivers/regex/mlx5/mlx5_regex_fastpath.c b/drivers/regex/mlx5/mlx5_regex_fastpath.c index 5857617282..8d134ac98e 100644 --- a/drivers/regex/mlx5/mlx5_regex_fastpath.c +++ b/drivers/regex/mlx5/mlx5_regex_fastpath.c @@ -105,7 +105,21 @@ prep_one(struct mlx5_regex_priv *priv, struct mlx5_regex_qp *qp, { size_t wqe_offset = (sq->pi & (sq_size_get(sq) - 1)) * MLX5_SEND_WQE_BB; uint32_t lkey; + uint16_t group0 = op->req_flags & RTE_REGEX_OPS_REQ_GROUP_ID0_VALID_F ? + op->group_id0 : 0; + uint16_t group1 = op->req_flags & RTE_REGEX_OPS_REQ_GROUP_ID1_VALID_F ? + op->group_id1 : 0; + uint16_t group2 = op->req_flags & RTE_REGEX_OPS_REQ_GROUP_ID2_VALID_F ? + op->group_id2 : 0; + uint16_t group3 = op->req_flags & RTE_REGEX_OPS_REQ_GROUP_ID3_VALID_F ? + op->group_id3 : 0; + /* For backward compatibility. */ + if (!(op->req_flags & (RTE_REGEX_OPS_REQ_GROUP_ID0_VALID_F | + RTE_REGEX_OPS_REQ_GROUP_ID1_VALID_F | + RTE_REGEX_OPS_REQ_GROUP_ID2_VALID_F | + RTE_REGEX_OPS_REQ_GROUP_ID3_VALID_F))) + group0 = op->group_id0; lkey = mlx5_mr_addr2mr_bh(priv->pd, 0, &priv->mr_scache, &qp->mr_ctrl, rte_pktmbuf_mtod(op->mbuf, uintptr_t), @@ -116,9 +130,8 @@ prep_one(struct mlx5_regex_priv *priv, struct mlx5_regex_qp *qp, set_wqe_ctrl_seg((struct mlx5_wqe_ctrl_seg *)wqe, sq->pi, MLX5_OPCODE_MMO, MLX5_OPC_MOD_MMO_REGEX, sq->obj->id, 0, ds, 0, 0); - set_regex_ctrl_seg(wqe + 12, 0, op->group_id0, op->group_id1, - op->group_id2, - op->group_id3, 0); + set_regex_ctrl_seg(wqe + 12, 0, group0, group1, group2, group3, + 0); struct mlx5_wqe_data_seg *input_seg = (struct mlx5_wqe_data_seg *)(wqe + MLX5_REGEX_WQE_GATHER_OFFSET); -- 2.29.2 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2021-02-05 11:18:34.875221024 +0000 +++ 0127-regex-mlx5-fix-support-for-group-id.patch 2021-02-05 11:18:28.998694767 +0000 @@ -1 +1 @@ -From 2cace110ea018e49aec4fd75370f2006e711d4d7 Mon Sep 17 00:00:00 2001 +From 89c875ea01a89936a7dd45155f21ed0923ea35fe Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 2cace110ea018e49aec4fd75370f2006e711d4d7 ] + @@ -12 +13,0 @@ -Cc: stable@dpdk.org @@ -20 +21 @@ -index 3a0a2189b9..35ebcd9408 100644 +index 5857617282..8d134ac98e 100644 @@ -47,2 +48,2 @@ - MLX5_OPCODE_MMO, MLX5_OPC_MOD_MMO_REGEX, - sq->sq_obj.sq->id, 0, ds, 0, 0); + MLX5_OPCODE_MMO, MLX5_OPC_MOD_MMO_REGEX, sq->obj->id, + 0, ds, 0, 0);