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 931EE45BB6 for ; Wed, 23 Oct 2024 23:21:03 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 8D6BC43314; Wed, 23 Oct 2024 23:21:03 +0200 (CEST) Received: from mail-wm1-f53.google.com (mail-wm1-f53.google.com [209.85.128.53]) by mails.dpdk.org (Postfix) with ESMTP id 3E46A43314 for ; Wed, 23 Oct 2024 23:21:02 +0200 (CEST) Received: by mail-wm1-f53.google.com with SMTP id 5b1f17b1804b1-43155afca99so9208245e9.1 for ; Wed, 23 Oct 2024 14:21:02 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1729718462; x=1730323262; darn=dpdk.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=8in1VpIa2RDjfy2EIgfxKbfeJxVd8FXJ54lbrJskan4=; b=iZSkbwGhU1NAZROQoHtGm4Qo5N5CpcGBepBFJKqgyesX10jMDXxtR+I4Qxs/YAKplJ FB4lndlJ+d+kKTp0meMD+ehLgAEeu2KtITRgimL8ZINKWe3+/0ce27L8OGXcPGDY482+ 03ma/Uk26E4fQlW2H0l56Szwk1XDlA166YMErFUE62bIdg7YGuapVuY84HPgj6e+uaPV wobmcKkzsNScryWjkb9ypZYHuh47nqCFFvhhowMNYBO/N1s91RUqq6zzSrpb+X15Xrsp aq60hEyLJ027coRU/Lro/AcqjtDzXpNX4rtjMO3hJHR1GNR3t9T4CJJMHKBJ+WJkpiAb Xs0w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1729718462; x=1730323262; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=8in1VpIa2RDjfy2EIgfxKbfeJxVd8FXJ54lbrJskan4=; b=U0kTLCKEfz06UlYADcHJHRgsDJUvHqy8XWSnFGHQAXsEgL59u1EvgnRmtilbiidMVJ OZdRAw5sG5oMdA2Oc/+fJ14eKGVjSbCPoDgWC24JhiFDXmdrXNzJQIEPxrYLi9rQuR/T DqUiHMpL6AN0bsXyq7tzrywlGA3Q4VH+BMKp8GxaUHLurK2q+0T5/qJDEIuFaoYpzhoA Wxx8n2r+TK36iz4iPPl6gxPF5Bo10iTAyi23TKPmGsnMKIgzqKzFR53EVj4IhmwDWRgn r9JuBK+cWSraHuCNiCvV88+SbbqQdXjTD9YqKndAhC4wt6hAcHTB3P3Khq78YaDKF5wR AxKQ== X-Forwarded-Encrypted: i=1; AJvYcCViepin7ZXGOzKjpc6k99iqQfxsvMpmVDg5RHLVqgM6rv00aHng56M5Lrndfs0qWliPKKLDLMs=@dpdk.org X-Gm-Message-State: AOJu0YyyAUttyrf6p8egQWdaml4ElSZM7z+hiYtpX+LRPkWWE6Ce9ksZ Lz4sqRSB55eEtF5hnCnBhvP+ExhtiD19u5Xj60YKj7dqs2jTlY/uA38YR9np X-Google-Smtp-Source: AGHT+IEKrD6VoHKSgSwObdwy7am0X+jsomWbyfRnZw+qKZwqYIB66bjXWc+mmiZ8JmYhvfN+biIz4w== X-Received: by 2002:a5d:528e:0:b0:37e:d942:f4bf with SMTP id ffacd0b85a97d-37efc5de906mr2561869f8f.12.1729718461748; Wed, 23 Oct 2024 14:21:01 -0700 (PDT) Received: from localhost ([2a01:4b00:d036:ae00:21cd:def0:a01d:d2aa]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-37ee0a37b7dsm9760856f8f.24.2024.10.23.14.21.00 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 23 Oct 2024 14:21:00 -0700 (PDT) From: luca.boccassi@gmail.com To: Chengwen Feng Cc: Jie Hai , dpdk stable Subject: patch 'net/hns3: verify reset type from firmware' has been queued to stable release 22.11.7 Date: Wed, 23 Oct 2024 22:16:44 +0100 Message-ID: <20241023211704.1216956-64-luca.boccassi@gmail.com> X-Mailer: git-send-email 2.45.2 In-Reply-To: <20241023211704.1216956-1-luca.boccassi@gmail.com> References: <20241023211704.1216956-1-luca.boccassi@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 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 Hi, FYI, your patch has been queued to stable release 22.11.7 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 10/25/24. 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/1cdad91ab4174d6a3a2552fd01d44d7a33e9c900 Thanks. Luca Boccassi --- >From 1cdad91ab4174d6a3a2552fd01d44d7a33e9c900 Mon Sep 17 00:00:00 2001 From: Chengwen Feng Date: Sat, 12 Oct 2024 17:14:57 +0800 Subject: [PATCH] net/hns3: verify reset type from firmware [ upstream commit 3db846003734d38d59950ebe024ad6d61afe08f0 ] Verify reset-type which get from firmware. Fixes: 1c1eb759e9d7 ("net/hns3: support RAS process in Kunpeng 930") Signed-off-by: Chengwen Feng Acked-by: Jie Hai --- drivers/net/hns3/hns3_intr.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/drivers/net/hns3/hns3_intr.c b/drivers/net/hns3/hns3_intr.c index 916bf30dcb..d37c7eba6b 100644 --- a/drivers/net/hns3/hns3_intr.c +++ b/drivers/net/hns3/hns3_intr.c @@ -2252,6 +2252,12 @@ hns3_handle_module_error_data(struct hns3_hw *hw, uint32_t *buf, sum_err_info = (struct hns3_sum_err_info *)&buf[offset++]; mod_num = sum_err_info->mod_num; reset_type = sum_err_info->reset_type; + + if (reset_type >= HNS3_MAX_RESET) { + hns3_err(hw, "invalid reset type = %u", reset_type); + return; + } + if (reset_type && reset_type != HNS3_NONE_RESET) hns3_atomic_set_bit(reset_type, &hw->reset.request); -- 2.45.2 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2024-10-23 22:16:42.934646718 +0100 +++ 0064-net-hns3-verify-reset-type-from-firmware.patch 2024-10-23 22:16:40.527943830 +0100 @@ -1 +1 @@ -From 3db846003734d38d59950ebe024ad6d61afe08f0 Mon Sep 17 00:00:00 2001 +From 1cdad91ab4174d6a3a2552fd01d44d7a33e9c900 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 3db846003734d38d59950ebe024ad6d61afe08f0 ] + @@ -9 +10,0 @@ -Cc: stable@dpdk.org @@ -18 +19 @@ -index f7162ee7bc..2de2b86b02 100644 +index 916bf30dcb..d37c7eba6b 100644