From nobody Fri Dec 19 09:44:47 2025 Received: from canpmsgout05.his.huawei.com (canpmsgout05.his.huawei.com [113.46.200.220]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 0E18E32ED53; Tue, 9 Dec 2025 13:39:41 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=113.46.200.220 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1765287584; cv=none; b=RBbPWWD8l90E4LgN5bgDBS/zvFVDumqf9wZ44Cd4sI2UM7UtiL1ddFrXAlxfGHnZOHhQQnQCXU6LTt03/GA8W0gbi+mecB1SBKaocyT2SGs8tfl3KTbBkq//A/tC7Mf/fnkvO2q1TuVIBwHUKzk07VuA5JhxguWtCYYf/GbYje8= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1765287584; c=relaxed/simple; bh=uKk1q6G1xxRI9lFlI+KlF1jeF5aDlqgEu6wI+JD3sEo=; h=From:To:CC:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=cUIll6z8nvShRQiQDBG7zMS6Spi/Jmr84kgRHGxb6HZWB7jMA/2V0KxW5N561GKHwb3KGVFwbKN53wTS4/aVWVeEwo1xkQ66BdCKjANhikLGWskt8l3cOjjMgoAWwJ8x+8wWygcA13ZtSnky/CyJqCseCxSzpi0yeJfPndTQ73U= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=huawei.com; spf=pass smtp.mailfrom=huawei.com; dkim=pass (1024-bit key) header.d=huawei.com header.i=@huawei.com header.b=ydukaw4h; arc=none smtp.client-ip=113.46.200.220 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=huawei.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=huawei.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=huawei.com header.i=@huawei.com header.b="ydukaw4h" dkim-signature: v=1; a=rsa-sha256; d=huawei.com; s=dkim; c=relaxed/relaxed; q=dns/txt; h=From; bh=d0ZH9JZE6cJljODPXPOZp/NH7WwBbc8dYLkopeTIbxc=; b=ydukaw4hQc5rb8bXmrJAiElvWqoYnS1F/jgK82/b2DVnkI2fipYC4NQPuWcv0XGIncQrYACa/ L+6mQDtmmI0TK02z2Pwf2SgGbogStXFG6v4ntUBUZjVtx8eOcqyNoE21+29Rnkt32BimcsJVvSX 4v32BCMkmujnMnYyuucTIwQ= Received: from mail.maildlp.com (unknown [172.19.88.194]) by canpmsgout05.his.huawei.com (SkyGuard) with ESMTPS id 4dQfzH1q47z12LKY; Tue, 9 Dec 2025 21:37:15 +0800 (CST) Received: from kwepemk100013.china.huawei.com (unknown [7.202.194.61]) by mail.maildlp.com (Postfix) with ESMTPS id 744DE140156; Tue, 9 Dec 2025 21:39:33 +0800 (CST) Received: from localhost.localdomain (10.90.31.46) by kwepemk100013.china.huawei.com (7.202.194.61) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.1544.11; Tue, 9 Dec 2025 21:39:32 +0800 From: Jijie Shao To: , , , , , CC: , , , , , , , , , , Subject: [PATCH net 1/3] net: hns3: using the num_tqps in the vf driver to apply for resources Date: Tue, 9 Dec 2025 21:38:23 +0800 Message-ID: <20251209133825.3577343-2-shaojijie@huawei.com> X-Mailer: git-send-email 2.30.0 In-Reply-To: <20251209133825.3577343-1-shaojijie@huawei.com> References: <20251209133825.3577343-1-shaojijie@huawei.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: kwepems200002.china.huawei.com (7.221.188.68) To kwepemk100013.china.huawei.com (7.202.194.61) Content-Type: text/plain; charset="utf-8" From: Jian Shen Currently, hdev->htqp is allocated using hdev->num_tqps, and kinfo->tqp is allocated using kinfo->num_tqps. However, kinfo->num_tqps is set to min(new_tqps, hdev->num_tqps); Therefore, kinfo->num_tqps may be smaller than hdev->num_tqps, which causes some hdev->htqp[i] to remain uninitialized in hclgevf_knic_setup(). Thus, this patch allocates hdev->htqp and kinfo->tqp using hdev->num_tqps, ensuring that the lengths of hdev->htqp and kinfo->tqp are consistent and that all elements are properly initialized. Fixes: e2cb1dec9779 ("net: hns3: Add HNS3 VF HCL(Hardware Compatibility Lay= er) Support") Signed-off-by: Jian Shen Signed-off-by: Jijie Shao Reviewed-by: Simon Horman --- drivers/net/ethernet/hisilicon/hns3/hns3vf/hclgevf_main.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/net/ethernet/hisilicon/hns3/hns3vf/hclgevf_main.c b/dr= ivers/net/ethernet/hisilicon/hns3/hns3vf/hclgevf_main.c index 8fcf220a120d..70327a73dee3 100644 --- a/drivers/net/ethernet/hisilicon/hns3/hns3vf/hclgevf_main.c +++ b/drivers/net/ethernet/hisilicon/hns3/hns3vf/hclgevf_main.c @@ -368,12 +368,12 @@ static int hclgevf_knic_setup(struct hclgevf_dev *hde= v) new_tqps =3D kinfo->rss_size * num_tc; kinfo->num_tqps =3D min(new_tqps, hdev->num_tqps); =20 - kinfo->tqp =3D devm_kcalloc(&hdev->pdev->dev, kinfo->num_tqps, + kinfo->tqp =3D devm_kcalloc(&hdev->pdev->dev, hdev->num_tqps, sizeof(struct hnae3_queue *), GFP_KERNEL); if (!kinfo->tqp) return -ENOMEM; =20 - for (i =3D 0; i < kinfo->num_tqps; i++) { + for (i =3D 0; i < hdev->num_tqps; i++) { hdev->htqp[i].q.handle =3D &hdev->nic; hdev->htqp[i].q.tqp_index =3D i; kinfo->tqp[i] =3D &hdev->htqp[i].q; --=20 2.33.0 From nobody Fri Dec 19 09:44:47 2025 Received: from canpmsgout09.his.huawei.com (canpmsgout09.his.huawei.com [113.46.200.224]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id AA1B1320A3B; Tue, 9 Dec 2025 13:39:36 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=113.46.200.224 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1765287578; cv=none; b=Y04OVq2yVVNdeJcYFz5vrkXp2eapSWhHUmpZfOhYO8jZaTvmSF7Coo576D1gwXuESyM64WAVnpb51apcfNUZYp/57FNikP57PU7/mbOmHwgU4oXdAX8a2BBaEgbwTP0YFi/8tDcWYvFC0pkZxOo5E7U8f40DcXI/tWQqgyctAGk= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1765287578; c=relaxed/simple; bh=VB8+cxSqfMtpQil+MMBj+qqbZ0Icly7VPQpiKSY7rVU=; h=From:To:CC:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=hvE9dJXkgetaMzWFg2XHFKgwjYYoE7iNSmODePVh8uOOkwytCocCQuP5d6oomiLueNkfHy6pYTnUQthgx3RifZaYNgEAjZLcaAgvk2NaOO8Wxk9edtrlKIuU5AaNJ9aed8+gk2dicHSJyM/G/y8OISGpdg9AYxDLoH1Q/1DoD6s= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=huawei.com; spf=pass smtp.mailfrom=huawei.com; dkim=pass (1024-bit key) header.d=huawei.com header.i=@huawei.com header.b=Y0cjGTio; arc=none smtp.client-ip=113.46.200.224 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=huawei.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=huawei.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=huawei.com header.i=@huawei.com header.b="Y0cjGTio" dkim-signature: v=1; a=rsa-sha256; d=huawei.com; s=dkim; c=relaxed/relaxed; q=dns/txt; h=From; bh=MdH3++3W4bys0UrCphvQHTDq/H/Rp7gzPD0YSU9c3aU=; b=Y0cjGTio/6hEb24YhPZ0waB0U+HeYf2gIDdlWuonL8UCtGukzIpehl0VLoF5dJ8HX5Rp5+a4X 1/pCBz4SvsEngb7i2CP9DIMHw4E3wBRhEJU4TDWoMI44izJb64bjcoqXg0218dWJQzWcyws0UwT IprWK2PukuGJCtVFkhqL4/0= Received: from mail.maildlp.com (unknown [172.19.163.44]) by canpmsgout09.his.huawei.com (SkyGuard) with ESMTPS id 4dQfzj5blgz1cyPb; Tue, 9 Dec 2025 21:37:37 +0800 (CST) Received: from kwepemk100013.china.huawei.com (unknown [7.202.194.61]) by mail.maildlp.com (Postfix) with ESMTPS id 0E18C14013B; Tue, 9 Dec 2025 21:39:34 +0800 (CST) Received: from localhost.localdomain (10.90.31.46) by kwepemk100013.china.huawei.com (7.202.194.61) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.1544.11; Tue, 9 Dec 2025 21:39:33 +0800 From: Jijie Shao To: , , , , , CC: , , , , , , , , , , Subject: [PATCH net 2/3] net: hns3: using the num_tqps to check whether tqp_index is out of range when vf get ring info from mbx Date: Tue, 9 Dec 2025 21:38:24 +0800 Message-ID: <20251209133825.3577343-3-shaojijie@huawei.com> X-Mailer: git-send-email 2.30.0 In-Reply-To: <20251209133825.3577343-1-shaojijie@huawei.com> References: <20251209133825.3577343-1-shaojijie@huawei.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: kwepems200002.china.huawei.com (7.221.188.68) To kwepemk100013.china.huawei.com (7.202.194.61) Content-Type: text/plain; charset="utf-8" From: Jian Shen Currently, rss_size =3D num_tqps / tc_num. If tc_num is 1, then num_tqps equals rss_size. However, if the tc_num is greater than 1, then rss_size will be less than num_tqps, causing the tqp_index check for subsequent TCs using rss_size to always fail. This patch uses the num_tqps to check whether tqp_index is out of range, instead of rss_size. Fixes: 326334aad024 ("net: hns3: add a check for tqp_index in hclge_get_rin= g_chain_from_mbx()") Signed-off-by: Jian Shen Signed-off-by: Jijie Shao Reviewed-by: Simon Horman --- drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_mbx.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_mbx.c b/drive= rs/net/ethernet/hisilicon/hns3/hns3pf/hclge_mbx.c index c7ff12a6c076..b7d4e06a55d4 100644 --- a/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_mbx.c +++ b/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_mbx.c @@ -193,10 +193,10 @@ static int hclge_get_ring_chain_from_mbx( return -EINVAL; =20 for (i =3D 0; i < ring_num; i++) { - if (req->msg.param[i].tqp_index >=3D vport->nic.kinfo.rss_size) { + if (req->msg.param[i].tqp_index >=3D vport->nic.kinfo.num_tqps) { dev_err(&hdev->pdev->dev, "tqp index(%u) is out of range(0-%u)\n", req->msg.param[i].tqp_index, - vport->nic.kinfo.rss_size - 1U); + vport->nic.kinfo.num_tqps - 1U); return -EINVAL; } } --=20 2.33.0 From nobody Fri Dec 19 09:44:47 2025 Received: from canpmsgout01.his.huawei.com (canpmsgout01.his.huawei.com [113.46.200.216]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id D1D5B32E68F; Tue, 9 Dec 2025 13:39:37 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=113.46.200.216 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1765287580; cv=none; b=tvDQqeJKrBrbCGRbc7r9g4oDw0PflM++oxG+4jjSSWLOyDU5o7uP7RxWrFow4lXAAJmDmUOPTd7O36xP15+P1rrWOK5oitjr0I/wEAH00xeGoC/lIDWQqy0olw2o5bp3WWDZKUlYJ8Wvvq68HW5KQCoca5tUD1T//UI8P0J8rKM= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1765287580; c=relaxed/simple; bh=zi/CHuYpDOHVfno5zf7h6Uw8jW/PFOJ0urKlP+UCSvQ=; h=From:To:CC:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=KBClPz7gbG/RWoBLTkHM6C832jbvIBUp4hFlIzVeOkMuOTB9Tegf1TQW6wHgBrAfLDxBLPWS2hcSdjZyPPRm3qeteU+2DqaoXEFcWSb3+NjOnZFNhwnnNYyJkln/Rph8zk4o0oSxJw+8TIJ+Aat/UVUNwa+BHgywifyNXUubPYg= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=huawei.com; spf=pass smtp.mailfrom=huawei.com; dkim=pass (1024-bit key) header.d=huawei.com header.i=@huawei.com header.b=VMfrziEz; arc=none smtp.client-ip=113.46.200.216 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=huawei.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=huawei.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=huawei.com header.i=@huawei.com header.b="VMfrziEz" dkim-signature: v=1; a=rsa-sha256; d=huawei.com; s=dkim; c=relaxed/relaxed; q=dns/txt; h=From; bh=DGZOeQlV0A3mhwAwX2SZ1xAaly3ZzKR6+7S2neuG5zc=; b=VMfrziEzv8jN7F91p+zZNI5c5/CKWlVH678OIni2zikbPVlwAWQ+gfuz1NV5PZly0KRXc13Jo jw3dPTs0BR0tZqRNFYV5PUaWtuRdtPh6yNJh0cSbCf1vxJqcsVMO9ZvQIl919PuUVqfBQaZ4hsi joiRLpT8fJwG7Laui5lxuzA= Received: from mail.maildlp.com (unknown [172.19.163.252]) by canpmsgout01.his.huawei.com (SkyGuard) with ESMTPS id 4dQfzd38Q6z1T4G3; Tue, 9 Dec 2025 21:37:33 +0800 (CST) Received: from kwepemk100013.china.huawei.com (unknown [7.202.194.61]) by mail.maildlp.com (Postfix) with ESMTPS id 950AB180BD5; Tue, 9 Dec 2025 21:39:34 +0800 (CST) Received: from localhost.localdomain (10.90.31.46) by kwepemk100013.china.huawei.com (7.202.194.61) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.1544.11; Tue, 9 Dec 2025 21:39:33 +0800 From: Jijie Shao To: , , , , , CC: , , , , , , , , , , Subject: [PATCH net 3/3] net: hns3: add VLAN id validation before using Date: Tue, 9 Dec 2025 21:38:25 +0800 Message-ID: <20251209133825.3577343-4-shaojijie@huawei.com> X-Mailer: git-send-email 2.30.0 In-Reply-To: <20251209133825.3577343-1-shaojijie@huawei.com> References: <20251209133825.3577343-1-shaojijie@huawei.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: kwepems200002.china.huawei.com (7.221.188.68) To kwepemk100013.china.huawei.com (7.202.194.61) Content-Type: text/plain; charset="utf-8" From: Jian Shen Currently, the VLAN id may be used without validation when receive a VLAN configuration mailbox from VF. It may cause out-of-bounds memory access once the VLAN id is bigger than 4095. Fixes: fe4144d47eef ("net: hns3: sync VLAN filter entries when kill VLAN ID= failed") Signed-off-by: Jian Shen Signed-off-by: Jijie Shao Reviewed-by: Simon Horman --- drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.c b/driv= ers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.c index cf8abbe01840..c589baea7c77 100644 --- a/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.c +++ b/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.c @@ -10555,6 +10555,9 @@ int hclge_set_vlan_filter(struct hnae3_handle *hand= le, __be16 proto, bool writen_to_tbl =3D false; int ret =3D 0; =20 + if (vlan_id >=3D VLAN_N_VID) + return -EINVAL; + /* When device is resetting or reset failed, firmware is unable to * handle mailbox. Just record the vlan id, and remove it after * reset finished. --=20 2.33.0