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 5CA11A00C2 for ; Tue, 8 Mar 2022 15:16:10 +0100 (CET) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 59A74410E6; Tue, 8 Mar 2022 15:16:10 +0100 (CET) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by mails.dpdk.org (Postfix) with ESMTP id DB29C406A2 for ; Tue, 8 Mar 2022 15:16:08 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1646748968; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=Q88M16zO8j0+OgUsRb1ZrxcomeQL0qiEUR8vIxPZGZE=; b=fCQu16Ozy7PEcn1Hk8DUyr1mUkQdMOv5Zf69mDzaTrbxefz1GIaPm4H/tRLCTPprsaJz+I knoxEnImf37gqC8wHAf+HoyeszVN0qCqVm9aHzeMauMWpv4B5qyJ0tssIl6SJ2hCx9NX+3 4od8B4Nhaoydyq8eOpHAGqNQt+FtFS0= Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-569-_TT7Vs6UNLmNpMPuJlD7pg-1; Tue, 08 Mar 2022 09:16:06 -0500 X-MC-Unique: _TT7Vs6UNLmNpMPuJlD7pg-1 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id DADF01091DA3; Tue, 8 Mar 2022 14:16:04 +0000 (UTC) Received: from rh.Home (unknown [10.39.195.190]) by smtp.corp.redhat.com (Postfix) with ESMTP id D5F7184629; Tue, 8 Mar 2022 14:16:03 +0000 (UTC) From: Kevin Traynor To: Gregory Etelson Cc: Viacheslav Ovsiienko , dpdk stable Subject: patch 'net/mlx5: fix flex item header length translation' has been queued to stable release 21.11.1 Date: Tue, 8 Mar 2022 14:14:42 +0000 Message-Id: <20220308141500.286915-27-ktraynor@redhat.com> In-Reply-To: <20220308141500.286915-1-ktraynor@redhat.com> References: <20220308141500.286915-1-ktraynor@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=ktraynor@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" 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 Hi, FYI, your patch has been queued to stable release 21.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 03/14/22. 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/kevintraynor/dpdk-stable This queued commit can be viewed at: https://github.com/kevintraynor/dpdk-stable/commit/49180a4530d637de5025003e48b0ebecc57059c0 Thanks. Kevin --- >From 49180a4530d637de5025003e48b0ebecc57059c0 Mon Sep 17 00:00:00 2001 From: Gregory Etelson Date: Tue, 1 Mar 2022 14:28:24 +0200 Subject: [PATCH] net/mlx5: fix flex item header length translation [ upstream commit 7bda5beead88fbc8717f7cee770bd8d9baf4d20d ] Flex item API provides support for network header with a fixed and variable lengths. When PMD compiles a new flex item object configuration it converts RTE parameters into matching PMD PARSE_GRAPH parameters and checks the parameter values against port capabilities. Current implementation mismatched PARSE_GRAPH configuration fields for the fixed size header. Fixes: b293e8e49d78 ("net/mlx5: translate flex item configuration") Signed-off-by: Gregory Etelson Acked-by: Viacheslav Ovsiienko --- drivers/net/mlx5/mlx5_flow_flex.c | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/drivers/net/mlx5/mlx5_flow_flex.c b/drivers/net/mlx5/mlx5_flow_flex.c index 9413d4d817..3ef46db1f6 100644 --- a/drivers/net/mlx5/mlx5_flow_flex.c +++ b/drivers/net/mlx5/mlx5_flow_flex.c @@ -383,13 +383,9 @@ mlx5_flex_translate_length(struct mlx5_hca_flex_attr *attr, (error, EINVAL, RTE_FLOW_ERROR_TYPE_ITEM, NULL, "unsupported header length field mode (FIXED)"); - if (attr->header_length_mask_width < field->field_size) + if (field->field_size || + field->offset_mask || field->offset_shift) return rte_flow_error_set (error, EINVAL, RTE_FLOW_ERROR_TYPE_ITEM, NULL, - "header length field width exceeds limit"); - if (field->offset_shift < 0 || - field->offset_shift > attr->header_length_mask_width) - return rte_flow_error_set - (error, EINVAL, RTE_FLOW_ERROR_TYPE_ITEM, NULL, - "invalid header length field shift (FIXED"); + "invalid fields for fixed mode"); if (field->field_base < 0) return rte_flow_error_set -- 2.34.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2022-03-08 13:55:29.110230291 +0000 +++ 0027-net-mlx5-fix-flex-item-header-length-translation.patch 2022-03-08 13:55:28.496315163 +0000 @@ -1 +1 @@ -From 7bda5beead88fbc8717f7cee770bd8d9baf4d20d Mon Sep 17 00:00:00 2001 +From 49180a4530d637de5025003e48b0ebecc57059c0 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 7bda5beead88fbc8717f7cee770bd8d9baf4d20d ] + @@ -16 +17,0 @@ -Cc: stable@dpdk.org @@ -25 +26 @@ -index 26f0dfa36f..fb08910ddb 100644 +index 9413d4d817..3ef46db1f6 100644