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 9D9C9A0C47 for ; Tue, 10 Aug 2021 17:41:42 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 932E24014F; Tue, 10 Aug 2021 17:41:42 +0200 (CEST) Received: from smtp-relay-canonical-1.canonical.com (smtp-relay-canonical-1.canonical.com [185.125.188.121]) by mails.dpdk.org (Postfix) with ESMTP id 0340A4014F for ; Tue, 10 Aug 2021 17:41:41 +0200 (CEST) Received: from mail-ej1-f71.google.com (mail-ej1-f71.google.com [209.85.218.71]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by smtp-relay-canonical-1.canonical.com (Postfix) with ESMTPS id DF3783F357 for ; Tue, 10 Aug 2021 15:41:40 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canonical.com; s=20210705; t=1628610100; bh=BwCcY2lUS9fvhiGAQXsoKPDd9tZ+UfQSlrjkvwo+o+s=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=JPpkytMKsW9K6brTykp60Z510MTbUuTv8CH8cPkYYCUhClKX6x/SRl4NEe3kpra6T vjgJ87qz+0ZbHD1mhqDGjI1h1F3TUg2psooR4WT9aQf268Cz6zMVSwbBvciZ1zJRQ2 8+mHYeeNsnq1/NE7YM6EQ6OzPMEqjhfNl0JHSRIc66Yv1dhHxlHrOrPYRfD4kVRLwx psIosacaVt5O0rSVbiS8ZqMZREAn6iThuXwdWZUpRNGJOSLa4n6XKEmHqvaOYvJDvv g9xUY1G95bW34v5md/xFobbhHLItb1nO3DEBtfBqSiTVLOfe45OwaW05/IZDGHa1dp yrpLs/4eGwKYg== Received: by mail-ej1-f71.google.com with SMTP id kf21-20020a17090776d5b02905af6ad96f02so2024513ejc.12 for ; Tue, 10 Aug 2021 08:41:40 -0700 (PDT) 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=BwCcY2lUS9fvhiGAQXsoKPDd9tZ+UfQSlrjkvwo+o+s=; b=We6dsryYoJ/HvAZjX0VZd1NGDpRKr8KBs54emgMXWRTfGBP75wD/ayGvUa9a3bOoG2 Ltko25M0VnLH5rpZ6r2PZTReAjxLeXDNBt6iW/rnC0xJZBiBNR3jzZE5LcS4bL/jqiEV 2qKuQ9Donk1AswTEaMo3OaFovjo1UsAaIhpd5W3G6IXfll+EhiowAB184viqluvZ0rAy 38B4Sf965haJfqnGOF4X4lT7aDs6Cdajp4SwmFh6SAx0iQ52Xyna8Oaal/6ajlZZfbgO TBDoDGmIms8aNoVSmyzLJFD2kX+vBN178cmfjrImzmBMrF+rVfgGJljJfQ44HYU8owXl eNyA== X-Gm-Message-State: AOAM530k4Sl93hLp92Z3IMT1vH6RoC2NaLkH+KsaLkRnmc/fbPq0WSyR U9DhKt4aIcur19v+x8sDuY80s2Jzni6z7DjDV/MdbVD1GTnmjqIwiNaYe7P2lb37W5+1K3CmYEu lZj48Tdygl0TTLzJfzAPqDxj+ X-Received: by 2002:a05:6402:30b6:: with SMTP id df22mr5457597edb.375.1628610100593; Tue, 10 Aug 2021 08:41:40 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyPSc9xhLtlarpSEIoseaKOfQ4gFMpNmmdfNUOxBVa8Jv/oEZSOaEdhRvTTWi8GEL8tZmZWFw== X-Received: by 2002:a05:6402:30b6:: with SMTP id df22mr5457575edb.375.1628610100380; Tue, 10 Aug 2021 08:41:40 -0700 (PDT) Received: from Keschdeichel.fritz.box ([2001:67c:1560:8007::aac:c4ad]) by smtp.gmail.com with ESMTPSA id b5sm7047320ejq.56.2021.08.10.08.41.39 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 10 Aug 2021 08:41:39 -0700 (PDT) From: christian.ehrhardt@canonical.com To: Wenjun Wu Cc: Qi Zhang , dpdk stable Date: Tue, 10 Aug 2021 17:39:05 +0200 Message-Id: <20210810154022.749358-25-christian.ehrhardt@canonical.com> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20210810154022.749358-1-christian.ehrhardt@canonical.com> References: <20210810154022.749358-1-christian.ehrhardt@canonical.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [dpdk-stable] patch 'net/ice/base: fix first profile mask' has been queued to stable release 19.11.10 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 19.11.10 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 08/12/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/cpaelzer/dpdk-stable-queue This queued commit can be viewed at: https://github.com/cpaelzer/dpdk-stable-queue/commit/75d705fba918351f0af0c2f66821b81c79ac39dc Thanks. Christian Ehrhardt --- >From 75d705fba918351f0af0c2f66821b81c79ac39dc Mon Sep 17 00:00:00 2001 From: Wenjun Wu Date: Mon, 21 Jun 2021 16:59:23 +0800 Subject: [PATCH] net/ice/base: fix first profile mask [ upstream commit 148fdf2d3537cfbb912e9c619ace7205741d9a25 ] Since each PF does not share the same structure space, the first mask value should start at 0 instead of hw->pf_id * per_pf to avoid address overflow. Otherwise, address space will overlap when masks.first + masks.count > ICE_PROF_MASK_COUNT, and it may lead to unexpected variable assignment, which causes segmentation fault. Fixes: 9467486f179f ("net/ice/base: enable masking for RSS and FD field vectors") Signed-off-by: Wenjun Wu Acked-by: Qi Zhang --- drivers/net/ice/base/ice_flex_pipe.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/net/ice/base/ice_flex_pipe.c b/drivers/net/ice/base/ice_flex_pipe.c index cc95a2e0d0..eb0d784745 100644 --- a/drivers/net/ice/base/ice_flex_pipe.c +++ b/drivers/net/ice/base/ice_flex_pipe.c @@ -2953,7 +2953,7 @@ static void ice_init_prof_masks(struct ice_hw *hw, enum ice_block blk) per_pf = ICE_PROF_MASK_COUNT / hw->dev_caps.num_funcs; hw->blk[blk].masks.count = per_pf; - hw->blk[blk].masks.first = hw->pf_id * per_pf; + hw->blk[blk].masks.first = 0; ice_memset(hw->blk[blk].masks.masks, 0, sizeof(hw->blk[blk].masks.masks), ICE_NONDMA_MEM); -- 2.32.0 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2021-08-10 15:11:14.042482292 +0200 +++ 0025-net-ice-base-fix-first-profile-mask.patch 2021-08-10 15:11:12.934637493 +0200 @@ -1 +1 @@ -From 148fdf2d3537cfbb912e9c619ace7205741d9a25 Mon Sep 17 00:00:00 2001 +From 75d705fba918351f0af0c2f66821b81c79ac39dc Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 148fdf2d3537cfbb912e9c619ace7205741d9a25 ] + @@ -13 +14,0 @@ -Cc: stable@dpdk.org @@ -22 +23 @@ -index b3cea731f3..829d88bba6 100644 +index cc95a2e0d0..eb0d784745 100644 @@ -25 +26 @@ -@@ -3432,7 +3432,7 @@ static void ice_init_prof_masks(struct ice_hw *hw, enum ice_block blk) +@@ -2953,7 +2953,7 @@ static void ice_init_prof_masks(struct ice_hw *hw, enum ice_block blk)