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 C8F21A0C47 for ; Tue, 10 Aug 2021 17:44:12 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id C358C4014F; Tue, 10 Aug 2021 17:44:12 +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 479B34014F for ; Tue, 10 Aug 2021 17:44:11 +0200 (CEST) Received: from mail-ej1-f70.google.com (mail-ej1-f70.google.com [209.85.218.70]) (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 1CDB93F107 for ; Tue, 10 Aug 2021 15:44:11 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canonical.com; s=20210705; t=1628610251; bh=UI53h83VpXFg+KQip7/qJ78aI8y4KyrYoiMP/DC7Ywk=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=bkTaPNdfonolrft2f8a/aXCAC1J0Laqq+5Rv/FwiuCeeMviDPgxDpUGrsUSNNKUmR cwcCJu5I+7OFhXCKCmQjADfrdBpKidt8+QJ3V82ZvKRnvrCLAUrtuOo7XZxwgVWyWR Nl4dXtCFOXQndYRPET0oMyM+3DiYQ3d9SXRP7kmNti08XEuaakOY17ibl8CQRdsm/M KovgJvlAjpDl6rYPipuM1W+feUugdq6sUR5H/fqv3V8I32Kw1nMM6XCP0IYqxsVc1C NVcSLXesNVaMdSKcd6DVXkU56UgReOKWRqIsNCSxhy4loTHuBkxr44nueSvs7XRpZn yOweBJPXfwWiw== Received: by mail-ej1-f70.google.com with SMTP id h17-20020a1709070b11b02905b5ced62193so711640ejl.1 for ; Tue, 10 Aug 2021 08:44:11 -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=UI53h83VpXFg+KQip7/qJ78aI8y4KyrYoiMP/DC7Ywk=; b=sxEm7GkPLgvsAavcz0tRUlzuYG5HpYeemWG8BjPtibKu/fcwUau70tkX6oeBRKn3ni /R6lx76Cniwe22XEVlsVrQE8TONhFPvk9zsq3M7o9kqG9O/4x9M+RZn00bzNiChNk2fo H1eZcLOde3NFcWaoOjYvoycnNL2At56Czopt/iTrlImH5NyBQptJIH8BC6fV6kBhEY8g BsDaRQa539u+4iinRbJUJy2dSDXsQgbmkCZyNi5eRtEkxuJiUbigQitjyyvqqYmwH8vZ z7w0C1Q4hUTxtTmWHUXDPG6cNaJcLEwwtz+PwqzmJz6DjvaXYlwjFpPa6K05tsGzCUkl MHSw== X-Gm-Message-State: AOAM531+HbvqfBm9JS5TjxcGzE/vNc5tSKg+uQNkGeXHotxillBkXuJH zjyhhVgKpXI/YLndrJ1L9QymaidJ+pqtWFOLHoORDjsr7o6VXuysixtdzf7WFOI/q7IMYSWzDcD s0O3+NazP5IJ3jV5UfFjbuoRC X-Received: by 2002:a17:907:2706:: with SMTP id w6mr7266721ejk.101.1628610250869; Tue, 10 Aug 2021 08:44:10 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwaQ89boXjordMHFqxa+0WnXAPXkv80yqusO5386sH9qLR7vszjg+Q92C5k0Uu/Ap/FCC2USQ== X-Received: by 2002:a17:907:2706:: with SMTP id w6mr7266710ejk.101.1628610250708; Tue, 10 Aug 2021 08:44:10 -0700 (PDT) Received: from Keschdeichel.fritz.box ([2001:67c:1560:8007::aac:c4ad]) by smtp.gmail.com with ESMTPSA id fp5sm3646319ejc.6.2021.08.10.08.44.10 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 10 Aug 2021 08:44:10 -0700 (PDT) From: christian.ehrhardt@canonical.com To: Wenjun Wu Cc: Qi Zhang , dpdk stable Date: Tue, 10 Aug 2021 17:39:51 +0200 Message-Id: <20210810154022.749358-71-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: revert change of 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/ff5c98462cd6787df67a0261d6b5a48ef6591711 Thanks. Christian Ehrhardt --- >From ff5c98462cd6787df67a0261d6b5a48ef6591711 Mon Sep 17 00:00:00 2001 From: Wenjun Wu Date: Tue, 13 Jul 2021 09:51:04 +0800 Subject: [PATCH] net/ice/base: revert change of first profile mask [ upstream commit 0a37b22875d67f37a561012e30456ad51bd79061 ] Segmentation fault mentioned in below commit is related to other root cause under investigation. This reverts patch below since it may have potential risk and side effect if the first profile mask is set to 0. Fixes: 148fdf2d3537 ("net/ice/base: fix first profile mask") 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 eb0d784745..cc95a2e0d0 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 = 0; + hw->blk[blk].masks.first = hw->pf_id * per_pf; 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:15.762784212 +0200 +++ 0071-net-ice-base-revert-change-of-first-profile-mask.patch 2021-08-10 15:11:13.078638532 +0200 @@ -1 +1 @@ -From 0a37b22875d67f37a561012e30456ad51bd79061 Mon Sep 17 00:00:00 2001 +From ff5c98462cd6787df67a0261d6b5a48ef6591711 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 0a37b22875d67f37a561012e30456ad51bd79061 ] + @@ -12 +13,0 @@ -Cc: stable@dpdk.org @@ -21 +22 @@ -index 829d88bba6..b3cea731f3 100644 +index eb0d784745..cc95a2e0d0 100644 @@ -24 +25 @@ -@@ -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)