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 32719A0C4C for ; Mon, 12 Jul 2021 15:12:39 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 2C2F5411A3; Mon, 12 Jul 2021 15:12:39 +0200 (CEST) Received: from mail-wm1-f42.google.com (mail-wm1-f42.google.com [209.85.128.42]) by mails.dpdk.org (Postfix) with ESMTP id C75ED4069D for ; Mon, 12 Jul 2021 15:12:37 +0200 (CEST) Received: by mail-wm1-f42.google.com with SMTP id l6so3095673wmq.0 for ; Mon, 12 Jul 2021 06:12:37 -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=F0Y5ZNwlKKP2qDBt8H5it1QNF7HC5ZU7sizPu1CV4gs=; b=l/WNAPAAWiuRH1z+cIIRjXzNTq2Dbomag/fqNRtICaC4DcYwYU+S8lEoNFee5jJ9dh GRjZy4r1HDq9azMo1qtZrRW8P2iE7dAWqNetMwlJlLtn5n4C50YjZm8LFAQCki8xuuYh sgXop/5NerFr9aBISHYfwWigDplifS/EhkCO4m3vHsPw5msZN5ayt2ZpGCB3iMhpljT/ 6FE2Dt8lumWo9Z/eHuNuAPTAmY+SIKjbThl1ZnLN4c1bjpO+D+B2cIv0aZ8FiGLjxG2N YZdKJSXe3vfaaJ3mbT8AESduMzNTQDy6xvvk15PDwsTlkxPlksNFF1M5Ct5F81DnRfp3 VtZw== 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=F0Y5ZNwlKKP2qDBt8H5it1QNF7HC5ZU7sizPu1CV4gs=; b=b+FQb3wdlCzL1ZBraJ/NNfgpHVvRwDtVFlvVjoHZQJkLpPJf/Izz98IukJ03ss+3EY gUsMtp8zvoL+th+A01EHpQrC9RosjbTxrkGGOrMwOF2He0Dy7lqe4qaoKhcEK2pZ/Akv pWoZoyG7o0YmY1yuiBMdTbqT2aXv+DS3UFIyyVj/bJmlREcrdRkeTvwGbJinpdUOiyTl EPpmnCrBQFtMgliTrf+vLuVQpHY8dyk/N25LJlOK3TXzaaTmTRwCq8rz2lPeN/h59p7w I0bcIYxWW3f4vM/YAq0/AKsvnB70f7/JG0/XGT9ERUlC9StH4jreq+A+qF+DRo6WId1B rjgA== X-Gm-Message-State: AOAM533xFV/tQuVeyumf/OF/FTtYsDNtEM9WjG+1fDaHFyrIdnF/EBEu YcC4lOEVmKRTS1icUW93PvM= X-Google-Smtp-Source: ABdhPJw+48PziakamOa0nvbYhuHn68wZy7s1P/sw/qGcA66BkDxvY1TUdmxw2E3odqVq6YFI3gxoxA== X-Received: by 2002:a05:600c:214a:: with SMTP id v10mr13794680wml.17.1626095557580; Mon, 12 Jul 2021 06:12:37 -0700 (PDT) Received: from localhost ([137.220.125.106]) by smtp.gmail.com with ESMTPSA id p16sm14445410wrs.52.2021.07.12.06.12.36 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 12 Jul 2021 06:12:36 -0700 (PDT) From: luca.boccassi@gmail.com To: Wenjun Wu Cc: Qi Zhang , dpdk stable Date: Mon, 12 Jul 2021 14:04:44 +0100 Message-Id: <20210712130551.2462159-49-luca.boccassi@gmail.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20210712130551.2462159-1-luca.boccassi@gmail.com> References: <20210712130551.2462159-1-luca.boccassi@gmail.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 20.11.3 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 20.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 07/14/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/bluca/dpdk-stable This queued commit can be viewed at: https://github.com/bluca/dpdk-stable/commit/d2db814c040ba66f20e6e3e411b4f7e6f418610b Thanks. Luca Boccassi --- >From d2db814c040ba66f20e6e3e411b4f7e6f418610b 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 d74fecbf5b..de2c696477 100644 --- a/drivers/net/ice/base/ice_flex_pipe.c +++ b/drivers/net/ice/base/ice_flex_pipe.c @@ -3125,7 +3125,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.30.2 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2021-07-12 13:41:39.174969941 +0100 +++ 0049-net-ice-base-fix-first-profile-mask.patch 2021-07-12 13:41:36.370120111 +0100 @@ -1 +1 @@ -From 148fdf2d3537cfbb912e9c619ace7205741d9a25 Mon Sep 17 00:00:00 2001 +From d2db814c040ba66f20e6e3e411b4f7e6f418610b 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 d74fecbf5b..de2c696477 100644 @@ -25 +26 @@ -@@ -3432,7 +3432,7 @@ static void ice_init_prof_masks(struct ice_hw *hw, enum ice_block blk) +@@ -3125,7 +3125,7 @@ static void ice_init_prof_masks(struct ice_hw *hw, enum ice_block blk)