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 651FDA0518 for ; Fri, 24 Jul 2020 14:03:01 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 59EE41C010; Fri, 24 Jul 2020 14:03:01 +0200 (CEST) Received: from mail-wr1-f67.google.com (mail-wr1-f67.google.com [209.85.221.67]) by dpdk.org (Postfix) with ESMTP id 443171C027 for ; Fri, 24 Jul 2020 14:03:00 +0200 (CEST) Received: by mail-wr1-f67.google.com with SMTP id q5so8073191wru.6 for ; Fri, 24 Jul 2020 05:03:00 -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=8lFX3vvCR6oY9cRAK1lkbF5TAHMiVRyHSsoRAcK5ajg=; b=iM+k6m1LlpCCN1Z+CgdqMVp8RdULOtW4eUwY083K28OK3Qha3ObCeaJCv5IJ7Spzy7 f/A9A/MM2yIZ9bk2FRFoxvjKySIKYpz0P3VvajYvjm+eqXO0bg56zI8FP7XqfPZJ89JW 7stPCCE5NCgoQqhRsxbnb9B8zyRmXen9oXe7HtU0bd0SsDmtU21O4qhyxiBW9pB0fG57 yq7NZtx1SOhMXskFS42R3oR8RjXmrc5HYmfsE99zoiZkF9zHuxNVmYtxyPIULwVtNSJG SBKWjOb9KFV4mym5qwoMqeC2ulHLUY+qbYY2Gr04dYaSV1Rwy7lPGR/Od4REaiTMM/2i zeGg== 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=8lFX3vvCR6oY9cRAK1lkbF5TAHMiVRyHSsoRAcK5ajg=; b=UU8Qc/a5uVc1lKRs5hS4muizAp8rOzWQ2ZfDYINyUsEgbZCgTEbmzNsXdk8UFU8Xzx FmGvWFrUAJiSpnbAZAhX2Q/eutXaUtejPU72FILFLcjEr6frfSKwWMrV9s5xi2LIfhHo YtgVD0N9qCfRtb34LSpvyRV5pcp8Ps2S7xf5GChlrzRKJ8xsqNZLDherd9zVKa8HYKcL b/uePIqaxFeVn+oJ0gvZeK0k8whlUHrfLH+GebZcbiZ15V7lezQBVpKuL75lZFNIRwcQ fgarpYhNiDPk/vYp+vYxSROtCUBiRTwElI9JD7VWhiGYbabElRLZltSVU7yincAWA5vM ZwBw== X-Gm-Message-State: AOAM531NHKNE2rAceoyG9BZo4bIDxRIBwQP2VdIzAVHQYZX9okawBcHB misDi9LnMj8BFDE6I7qC0K8MJDIClw60NQ== X-Google-Smtp-Source: ABdhPJxyQkPiiufQrP4Ir7JKL7LzPDfeNHaU5MgshvWERpE2bcZWZ1yNA/wNBobpXkA2VHiBMsKhKw== X-Received: by 2002:adf:dcc8:: with SMTP id x8mr641721wrm.16.1595592179990; Fri, 24 Jul 2020 05:02:59 -0700 (PDT) Received: from localhost ([88.98.246.218]) by smtp.gmail.com with ESMTPSA id j5sm6695110wmb.15.2020.07.24.05.02.58 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 24 Jul 2020 05:02:59 -0700 (PDT) From: luca.boccassi@gmail.com To: Qi Zhang Cc: Wei Zhao , Paul M Stillwell Jr , Qiming Yang , dpdk stable Date: Fri, 24 Jul 2020 12:57:55 +0100 Message-Id: <20200724120030.1863487-37-luca.boccassi@gmail.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200724120030.1863487-1-luca.boccassi@gmail.com> References: <20200724120030.1863487-1-luca.boccassi@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [dpdk-stable] patch 'net/ice/base: fix reference count on VSI list update' has been queued to stable release 19.11.4 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.4 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 07/26/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 c92e3b5e69b907b1739bde61184459e4e31301c6 Mon Sep 17 00:00:00 2001 From: Qi Zhang Date: Mon, 15 Jun 2020 10:05:09 +0800 Subject: [PATCH] net/ice/base: fix reference count on VSI list update [ upstream commit fda75f4c409917112b1a9694ce9969187bcfb779 ] The parameter ref_cnt is used for tracking how many rules are reusing this VSI list, so it can only be updated when a rule which using this list be deleted. Fixes: f89aa3affa9e ("net/ice/base: support removing advanced rule") Signed-off-by: Wei Zhao Signed-off-by: Paul M Stillwell Jr Signed-off-by: Qi Zhang Acked-by: Qiming Yang --- drivers/net/ice/base/ice_switch.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/net/ice/base/ice_switch.c b/drivers/net/ice/base/ice_switch.c index 72b04f84f..940e4ce40 100644 --- a/drivers/net/ice/base/ice_switch.c +++ b/drivers/net/ice/base/ice_switch.c @@ -6333,6 +6333,7 @@ ice_adv_rem_update_vsi_list(struct ice_hw *hw, u16 vsi_handle, tmp_fltr.fwd_id.hw_vsi_id, status); return status; } + fm_list->vsi_list_info->ref_cnt--; /* Remove the VSI list since it is no longer used */ status = ice_remove_vsi_list_rule(hw, vsi_list_id, lkup_type); @@ -6411,7 +6412,6 @@ ice_rem_adv_rule(struct ice_hw *hw, struct ice_adv_lkup_elem *lkups, if (list_elem->rule_info.sw_act.fltr_act != ICE_FWD_TO_VSI_LIST) { remove_rule = true; } else if (list_elem->vsi_count > 1) { - list_elem->vsi_list_info->ref_cnt--; remove_rule = false; vsi_handle = rinfo->sw_act.vsi_handle; status = ice_adv_rem_update_vsi_list(hw, vsi_handle, list_elem); -- 2.20.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2020-07-24 12:53:50.044016631 +0100 +++ 0037-net-ice-base-fix-reference-count-on-VSI-list-update.patch 2020-07-24 12:53:48.247005714 +0100 @@ -1,14 +1,15 @@ -From fda75f4c409917112b1a9694ce9969187bcfb779 Mon Sep 17 00:00:00 2001 +From c92e3b5e69b907b1739bde61184459e4e31301c6 Mon Sep 17 00:00:00 2001 From: Qi Zhang Date: Mon, 15 Jun 2020 10:05:09 +0800 Subject: [PATCH] net/ice/base: fix reference count on VSI list update +[ upstream commit fda75f4c409917112b1a9694ce9969187bcfb779 ] + The parameter ref_cnt is used for tracking how many rules are reusing this VSI list, so it can only be updated when a rule which using this list be deleted. Fixes: f89aa3affa9e ("net/ice/base: support removing advanced rule") -Cc: stable@dpdk.org Signed-off-by: Wei Zhao Signed-off-by: Paul M Stillwell Jr @@ -19,10 +20,10 @@ 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/net/ice/base/ice_switch.c b/drivers/net/ice/base/ice_switch.c -index 84102368b..9c7e55ff9 100644 +index 72b04f84f..940e4ce40 100644 --- a/drivers/net/ice/base/ice_switch.c +++ b/drivers/net/ice/base/ice_switch.c -@@ -7488,6 +7488,7 @@ ice_adv_rem_update_vsi_list(struct ice_hw *hw, u16 vsi_handle, +@@ -6333,6 +6333,7 @@ ice_adv_rem_update_vsi_list(struct ice_hw *hw, u16 vsi_handle, tmp_fltr.fwd_id.hw_vsi_id, status); return status; } @@ -30,7 +31,7 @@ /* Remove the VSI list since it is no longer used */ status = ice_remove_vsi_list_rule(hw, vsi_list_id, lkup_type); -@@ -7566,7 +7567,6 @@ ice_rem_adv_rule(struct ice_hw *hw, struct ice_adv_lkup_elem *lkups, +@@ -6411,7 +6412,6 @@ ice_rem_adv_rule(struct ice_hw *hw, struct ice_adv_lkup_elem *lkups, if (list_elem->rule_info.sw_act.fltr_act != ICE_FWD_TO_VSI_LIST) { remove_rule = true; } else if (list_elem->vsi_count > 1) {