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 35AD4A0093 for ; Tue, 19 May 2020 15:07:07 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 2C6F31D65B; Tue, 19 May 2020 15:07:07 +0200 (CEST) Received: from mail-wm1-f46.google.com (mail-wm1-f46.google.com [209.85.128.46]) by dpdk.org (Postfix) with ESMTP id 6D28A1D656 for ; Tue, 19 May 2020 15:07:05 +0200 (CEST) Received: by mail-wm1-f46.google.com with SMTP id z72so3493376wmc.2 for ; Tue, 19 May 2020 06:07:05 -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=3KDucHDBD40ewre+UOllmcds76TROAhZqK9jNxEzF+0=; b=r0FjaV1lwk3XOH1tZtaZXORQnkIOdUJ2NSE4z4NIU7CkWTs+EZG6SPuZSz4rWcESfp Onk3mG2dW/HorySFCvSmat4+sMqIZFVYXoEjRY//O0i8mkTz0/pZkW6RAzEAr27EUMDX UqonL9rOCbvhwXvcsDU9c1NtNFx+XQrCwLp2aszM/7AYr3PxvaLijjVzU3uyWPIGmbwB BUFuzI9Vlfe48wgZAlPu3Pl3a2qcO/3ylluH7hZn5sz7qnb82JhaEZw7ERLvTFb0hBHS U1zTzmJif2q4BVr9XTK0iQq/gar5T9DuR0W/gJPYh/1N1EudILTwIYgtvlQ7LwHr3qmS fU1g== 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=3KDucHDBD40ewre+UOllmcds76TROAhZqK9jNxEzF+0=; b=l4YVzJtWsslrGMFrr9MGw6HSGclcpHy7E+zph+5vwod0R9NvWBqajec5DTFbEqHBda Dnf9U2peP5c8VqzB/W2o0sTENYlshXzix5/xNPxY1UpuoA36Ic9XbGsKwO/2NBEWQocn 2I5X8A5+aWcn3Po2K6/TNtasK7NPk1gGs7s6W/TQmU/NVVEIJq8PynHNPlzT1s8GR689 TX+l+dr9soIkKup/1DjBUNZVoY/0OGJlaVQYYs3dGrepqVSY4Vq95O9Fgq9wo3BfQOB+ BQfbfpc4bzAQpUcSGlMoww4VJ5JYqONVyY9gO4swSF7pQBWMR1ZckvRp5Kka1R+XNLsb Jdhw== X-Gm-Message-State: AOAM531iLytALROIU0K+kOiqs335MVmW3/JsC10BiARMUYhpkU4te00H xBPYW80+lyfAsJeHFbx4id4= X-Google-Smtp-Source: ABdhPJylTtpkPtidsUsR+dUOmmHDLoQD7QfDZTb1FpyEdwVHVx39STi8kbCLwq+hwe0a/xx44kYEkg== X-Received: by 2002:a1c:3281:: with SMTP id y123mr5425985wmy.30.1589893625173; Tue, 19 May 2020 06:07:05 -0700 (PDT) Received: from localhost ([88.98.246.218]) by smtp.gmail.com with ESMTPSA id w15sm3619026wmi.35.2020.05.19.06.07.04 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 19 May 2020 06:07:04 -0700 (PDT) From: luca.boccassi@gmail.com To: Asaf Penso Cc: Dekel Peled , Matan Azrad , dpdk stable Date: Tue, 19 May 2020 14:02:38 +0100 Message-Id: <20200519130549.112823-23-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 call to modify action without init item' 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 5e3859176e72c3adac5bda7123a05c26a4a126b0 Mon Sep 17 00:00:00 2001 From: Asaf Penso Date: Wed, 25 Mar 2020 19:53:18 +0000 Subject: [PATCH] net/mlx5: fix call to modify action without init item [ upstream commit 7c2062c45193f46b81617a207b0dcd3940ce11ab ] The item is being set according to the attribute value, whether it is udp/tcp or ipv4/6. Also, there are two condition calls. If the attribute is neither udp/tcp or ipv4/6 the item is not initialized at all, but the call to the flow_dv_convert_modify_action is still being done. Also, even if the attribute is tcp/udp or ipv4/6, we still have two conditions. This patch changes the conditions, so the item will always be set. By doing this, there is also a save in the number of condition calls. Fixes: 4bb14c83df95 ("net/mlx5: support modify header using Direct Verbs") Signed-off-by: Asaf Penso Reviewed-by: Dekel Peled Acked-by: Matan Azrad --- drivers/net/mlx5/mlx5_flow_dv.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/drivers/net/mlx5/mlx5_flow_dv.c b/drivers/net/mlx5/mlx5_flow_dv.c index 48d3031c90..076a30544f 100644 --- a/drivers/net/mlx5/mlx5_flow_dv.c +++ b/drivers/net/mlx5/mlx5_flow_dv.c @@ -697,8 +697,8 @@ flow_dv_convert_action_modify_tp item.spec = &udp; item.mask = &udp_mask; field = modify_udp; - } - if (attr->tcp) { + } else { + assert(attr->tcp); memset(&tcp, 0, sizeof(tcp)); memset(&tcp_mask, 0, sizeof(tcp_mask)); if (action->type == RTE_FLOW_ACTION_TYPE_SET_TP_SRC) { @@ -768,8 +768,8 @@ flow_dv_convert_action_modify_ttl item.spec = &ipv4; item.mask = &ipv4_mask; field = modify_ipv4; - } - if (attr->ipv6) { + } else { + assert(attr->ipv6); memset(&ipv6, 0, sizeof(ipv6)); memset(&ipv6_mask, 0, sizeof(ipv6_mask)); ipv6.hdr.hop_limits = conf->ttl_value; @@ -829,8 +829,8 @@ flow_dv_convert_action_modify_dec_ttl item.spec = &ipv4; item.mask = &ipv4_mask; field = modify_ipv4; - } - if (attr->ipv6) { + } else { + assert(attr->ipv6); memset(&ipv6, 0, sizeof(ipv6)); memset(&ipv6_mask, 0, sizeof(ipv6_mask)); ipv6.hdr.hop_limits = 0xFF; -- 2.20.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2020-05-19 14:04:45.549535918 +0100 +++ 0023-net-mlx5-fix-call-to-modify-action-without-init-item.patch 2020-05-19 14:04:44.148647140 +0100 @@ -1,8 +1,10 @@ -From 7c2062c45193f46b81617a207b0dcd3940ce11ab Mon Sep 17 00:00:00 2001 +From 5e3859176e72c3adac5bda7123a05c26a4a126b0 Mon Sep 17 00:00:00 2001 From: Asaf Penso Date: Wed, 25 Mar 2020 19:53:18 +0000 Subject: [PATCH] net/mlx5: fix call to modify action without init item +[ upstream commit 7c2062c45193f46b81617a207b0dcd3940ce11ab ] + The item is being set according to the attribute value, whether it is udp/tcp or ipv4/6. Also, there are two condition calls. @@ -17,7 +19,6 @@ By doing this, there is also a save in the number of condition calls. Fixes: 4bb14c83df95 ("net/mlx5: support modify header using Direct Verbs") -Cc: stable@dpdk.org Signed-off-by: Asaf Penso Reviewed-by: Dekel Peled @@ -27,39 +28,39 @@ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/drivers/net/mlx5/mlx5_flow_dv.c b/drivers/net/mlx5/mlx5_flow_dv.c -index f90cab2961..b9bf83a4b7 100644 +index 48d3031c90..076a30544f 100644 --- a/drivers/net/mlx5/mlx5_flow_dv.c +++ b/drivers/net/mlx5/mlx5_flow_dv.c -@@ -702,8 +702,8 @@ flow_dv_convert_action_modify_tp +@@ -697,8 +697,8 @@ flow_dv_convert_action_modify_tp item.spec = &udp; item.mask = &udp_mask; field = modify_udp; - } - if (attr->tcp) { + } else { -+ MLX5_ASSERT(attr->tcp); ++ assert(attr->tcp); memset(&tcp, 0, sizeof(tcp)); memset(&tcp_mask, 0, sizeof(tcp_mask)); if (action->type == RTE_FLOW_ACTION_TYPE_SET_TP_SRC) { -@@ -773,8 +773,8 @@ flow_dv_convert_action_modify_ttl +@@ -768,8 +768,8 @@ flow_dv_convert_action_modify_ttl item.spec = &ipv4; item.mask = &ipv4_mask; field = modify_ipv4; - } - if (attr->ipv6) { + } else { -+ MLX5_ASSERT(attr->ipv6); ++ assert(attr->ipv6); memset(&ipv6, 0, sizeof(ipv6)); memset(&ipv6_mask, 0, sizeof(ipv6_mask)); ipv6.hdr.hop_limits = conf->ttl_value; -@@ -834,8 +834,8 @@ flow_dv_convert_action_modify_dec_ttl +@@ -829,8 +829,8 @@ flow_dv_convert_action_modify_dec_ttl item.spec = &ipv4; item.mask = &ipv4_mask; field = modify_ipv4; - } - if (attr->ipv6) { + } else { -+ MLX5_ASSERT(attr->ipv6); ++ assert(attr->ipv6); memset(&ipv6, 0, sizeof(ipv6)); memset(&ipv6_mask, 0, sizeof(ipv6_mask)); ipv6.hdr.hop_limits = 0xFF;