From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from dpdk.org (dpdk.org [92.243.14.124]) by inbox.dpdk.org (Postfix) with ESMTP id 4D3A2A0093 for ; Tue, 19 May 2020 15:13:58 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 3A0E61D8FD; Tue, 19 May 2020 15:13:58 +0200 (CEST) Received: from mail-wm1-f68.google.com (mail-wm1-f68.google.com [209.85.128.68]) by dpdk.org (Postfix) with ESMTP id 104DD1D8EC for ; Tue, 19 May 2020 15:13:56 +0200 (CEST) Received: by mail-wm1-f68.google.com with SMTP id t8so733547wmi.0 for ; Tue, 19 May 2020 06:13:56 -0700 (PDT) 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=T5xT0yvzaGA5U5sgsqTkMN+VVWiPtQ0/fK/XBxiMGmQ=; b=Df6zZWcVObSaqPdzSiLdyjBf2MMo6j3qKNlPXMFZMXyC+59fGdXnpEb1/LOs1HU/T9 tKa3couFxLPUbQmvACfrja/n6eAKDmPlzm8prk9EbFrjoNHHxQ9GRWyBDtYNweVccTwP nCKQuHtjo4cO4bk9s74vKeNDwaKInE7dQYGJ6THT9+YOSyrp7b4MtTzUnqZE5gjqwtv0 VCAiVmKf5IABYWyMK4BtP2EWy7/sggc6gp2fG4+N25d9xXoxxcN95yqdepE6BV7zUakG 9quPcY54UDFknufN+BX/kTEeXvOj1aH9nhCUy7S+QeLrrl3j81xQUi5Mv9kig/NGk3L6 GkVQ== 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=T5xT0yvzaGA5U5sgsqTkMN+VVWiPtQ0/fK/XBxiMGmQ=; b=qx9s1qoJSXCmvJDC/7fMZICwdgaJDL9KHvnpxlbi/rt5hEVvgFWwXzEpK/Vo4waPuF QiSxZ09tz329L0cnBvt6u+a8ys70UF/SL/0KvSvYsqFvF40odt9gp50LX6P+ZgMyo69w Tx9PXZJ2WyVM1czNPztJk6A2ic/BA66Ami2wuRfFAIvUzk6sxDxw9cPR6PWobjOsKdWf mRYrIbXLGDpnLNhAGvTb69aAehBTu71s5xpr5eg48pQWVyQx5RJRGKnQKTyP2cvpYFnB lmbE3pNPwprkXTu/4pNv5AziTUqbQd+Ib5EQI/fzZn4IrtkvOxgaBjIzJl6dJixZQt/w SL5w== X-Gm-Message-State: AOAM530STLEUx1v2dot5UAqDkUP34LtKocZtekMR+Df6uLFEGp+lvdLq XdmKV4SN8Np+ROuNik9yRMDhFjdyCVazk0eU X-Google-Smtp-Source: ABdhPJxCLPtS0unWB4VvJFZNiDoisSmbR/NaC+imOINYzuMGuQG4fERjx5hcdeEJaNP/Q6iPpHCQug== X-Received: by 2002:a1c:acc8:: with SMTP id v191mr5750098wme.154.1589894035790; Tue, 19 May 2020 06:13:55 -0700 (PDT) Received: from localhost ([88.98.246.218]) by smtp.gmail.com with ESMTPSA id l5sm21470078wrr.72.2020.05.19.06.13.55 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 19 May 2020 06:13:55 -0700 (PDT) From: luca.boccassi@gmail.com To: Bing Zhao Cc: Viacheslav Ovsiienko , dpdk stable Date: Tue, 19 May 2020 14:04:49 +0100 Message-Id: <20200519130549.112823-154-luca.boccassi@gmail.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200519130549.112823-1-luca.boccassi@gmail.com> References: <20200519125804.104349-1-luca.boccassi@gmail.com> <20200519130549.112823-1-luca.boccassi@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [dpdk-stable] patch 'net/mlx5: fix assert in modify converting' has been queued to stable release 19.11.3 X-BeenThere: stable@dpdk.org X-Mailman-Version: 2.1.15 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 19.11.3 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 05/21/20. 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. Thanks. Luca Boccassi --- >From 4fdea813e5d0447db8d6d8d6d0de081290355e78 Mon Sep 17 00:00:00 2001 From: Bing Zhao Date: Wed, 29 Apr 2020 21:06:14 +0800 Subject: [PATCH] net/mlx5: fix assert in modify converting [ upstream commit c8fa92f6c16691664a3f8e080233aa3480907497 ] The assertion was added incorrectly in converting the modify actions into the format of low layer driver. There is no mask specified in the rte_flow actions, and PMD driver will give a mask of all 1s to the field to be modified. For each field, the mask could not be zero. But for the whole header which contains this field, the masks of other fields could be zero. The assertion needs to be removed for debug mode. Fixes: 72a944dba163 ("net/mlx5: fix header modify action validation") Signed-off-by: Bing Zhao Acked-by: Viacheslav Ovsiienko --- drivers/net/mlx5/mlx5_flow_dv.c | 1 - 1 file changed, 1 deletion(-) diff --git a/drivers/net/mlx5/mlx5_flow_dv.c b/drivers/net/mlx5/mlx5_flow_dv.c index 8ed29adaaa..6cdaa00519 100644 --- a/drivers/net/mlx5/mlx5_flow_dv.c +++ b/drivers/net/mlx5/mlx5_flow_dv.c @@ -427,7 +427,6 @@ flow_dv_convert_modify_action(struct rte_flow_item *item, /* Fetch variable byte size mask from the array. */ mask = flow_dv_fetch_field((const uint8_t *)item->mask + field->offset, field->size); - assert(mask); if (!mask) { ++field; continue; -- 2.20.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2020-05-19 14:04:50.719611722 +0100 +++ 0154-net-mlx5-fix-assert-in-modify-converting.patch 2020-05-19 14:04:44.488653303 +0100 @@ -1,8 +1,10 @@ -From c8fa92f6c16691664a3f8e080233aa3480907497 Mon Sep 17 00:00:00 2001 +From 4fdea813e5d0447db8d6d8d6d0de081290355e78 Mon Sep 17 00:00:00 2001 From: Bing Zhao Date: Wed, 29 Apr 2020 21:06:14 +0800 Subject: [PATCH] net/mlx5: fix assert in modify converting +[ upstream commit c8fa92f6c16691664a3f8e080233aa3480907497 ] + The assertion was added incorrectly in converting the modify actions into the format of low layer driver. There is no mask specified in the rte_flow actions, and PMD driver @@ -12,7 +14,6 @@ assertion needs to be removed for debug mode. Fixes: 72a944dba163 ("net/mlx5: fix header modify action validation") -Cc: stable@dpdk.org Signed-off-by: Bing Zhao Acked-by: Viacheslav Ovsiienko @@ -21,14 +22,14 @@ 1 file changed, 1 deletion(-) diff --git a/drivers/net/mlx5/mlx5_flow_dv.c b/drivers/net/mlx5/mlx5_flow_dv.c -index c8035b352e..794afcf18c 100644 +index 8ed29adaaa..6cdaa00519 100644 --- a/drivers/net/mlx5/mlx5_flow_dv.c +++ b/drivers/net/mlx5/mlx5_flow_dv.c -@@ -435,7 +435,6 @@ flow_dv_convert_modify_action(struct rte_flow_item *item, +@@ -427,7 +427,6 @@ flow_dv_convert_modify_action(struct rte_flow_item *item, /* Fetch variable byte size mask from the array. */ mask = flow_dv_fetch_field((const uint8_t *)item->mask + field->offset, field->size); -- MLX5_ASSERT(mask); +- assert(mask); if (!mask) { ++field; continue;