From nobody Tue Dec 16 16:38:48 2025 Received: from canpmsgout07.his.huawei.com (canpmsgout07.his.huawei.com [113.46.200.222]) (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 152B7223705; Thu, 11 Dec 2025 02:38:59 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=113.46.200.222 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1765420742; cv=none; b=mxVXq11aLULWEjuvWmYj1lIk6Y59dX9L1BIMTsIgRjdNwGSdcQESo7YblOKirw/MweFPJ3Bl2SY0xj62cjq3joGPFIdYP9sh1pwqAtd6MUq/qlZiww05rRvVN9T3ddYgchydaf2FCPv+r67ixtHUIoCXpivFLvCAPtZ2FNQZOXk= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1765420742; c=relaxed/simple; bh=Fs/ETSAwP5WSaxBg1LqvBTkcXyLghTmKNoognJyWMBw=; h=From:To:CC:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=GxMpAzWv1YWvMBoLogY6+4tjN1jPD9Wh0WikFTwgsFO1u5jnWhhuk1h2idAUI40tV5z/8yS3CPNM46nWAazE/A3YELesFqdmcvSQCDots76dh2TVfOXRubYTtK32BkO//YRkFJ9VudcJygR59g9uNlNyRgceuqBCg6Z5dhlEkt4= 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=iRRSdWon; arc=none smtp.client-ip=113.46.200.222 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="iRRSdWon" dkim-signature: v=1; a=rsa-sha256; d=huawei.com; s=dkim; c=relaxed/relaxed; q=dns/txt; h=From; bh=79uTi9ykoKshWNVQ9n4i3+AsUlVwH3rbZnGTwyENPyw=; b=iRRSdWonB1XD+0l1q9310kZHNFVhRM1zTds3ZJ7ygF7aWBwBxlPJ/HePWMmFPgpdKIBCVOcUz t25ZDHdC0d0crM5/RMa5tAvprTxjVkO/KbY+2gJJPSDrZcPf1byMeYJ3STHGAdhmR4FheoUx64G ph1YpyW9nzVpornt71bao78= Received: from mail.maildlp.com (unknown [172.19.162.112]) by canpmsgout07.his.huawei.com (SkyGuard) with ESMTPS id 4dRcDY1qYpzLlVn; Thu, 11 Dec 2025 10:37:01 +0800 (CST) Received: from kwepemk100013.china.huawei.com (unknown [7.202.194.61]) by mail.maildlp.com (Postfix) with ESMTPS id BA6D6140143; Thu, 11 Dec 2025 10:38:57 +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; Thu, 11 Dec 2025 10:38:56 +0800 From: Jijie Shao To: , , , , , CC: , , , , , , , , , , Subject: [PATCH V2 net 1/3] net: hns3: using the num_tqps in the vf driver to apply for resources Date: Thu, 11 Dec 2025 10:37:35 +0800 Message-ID: <20251211023737.2327018-2-shaojijie@huawei.com> X-Mailer: git-send-email 2.30.0 In-Reply-To: <20251211023737.2327018-1-shaojijie@huawei.com> References: <20251211023737.2327018-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: kwepems500001.china.huawei.com (7.221.188.70) 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 Tue Dec 16 16:38:48 2025 Received: from szxga01-in.huawei.com (szxga01-in.huawei.com [45.249.212.187]) (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 02D942BDC32; Thu, 11 Dec 2025 02:39:08 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=45.249.212.187 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1765420751; cv=none; b=OujGof4Vrg3qevLjfqAdqTTJNjP9rWFQAfNWjBhJbZ1fC5ENOR8iehDmb9rliM172M9t0YYei9croKUpdHCUkvs5TAvSJIcd+ajvkYM4ibXcmjLTLEz5PPre6wGro1tyeF2gWrXeRxJdcq1s63hbD5aHoJKPWmK807rpw4MlVMw= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1765420751; c=relaxed/simple; bh=haamQuVbfenYQko8OQnnHEaPL9CsrYxsGC/6C1fGNjQ=; h=From:To:CC:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=ryoYLA8nGW3sjozWg6GPDV7LJA/dfbnjecCD2RQkieJzoSICLPPWHZr5JCoflNiVPRRMW1M2MlGZLy0voH73W84ZwpbA8N98hiZwJgh0mHET5n3IrJa/YZ67r0D98vcVjLcVThwj7OrOpoZtK1Aou7QS+gngG3KKygHNuHJ8G3k= 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=PL6+6VDv; dkim=pass (1024-bit key) header.d=huawei.com header.i=@huawei.com header.b=PL6+6VDv; arc=none smtp.client-ip=45.249.212.187 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="PL6+6VDv"; dkim=pass (1024-bit key) header.d=huawei.com header.i=@huawei.com header.b="PL6+6VDv" dkim-signature: v=1; a=rsa-sha256; d=huawei.com; s=dkim; c=relaxed/relaxed; q=dns/txt; h=From; bh=Qi+GBLgDCR2z7fRSZb2mOHHpdy1LRN+xvpB0CYTqqYU=; b=PL6+6VDvsB5b1oAObOP9o1gjMggHrVK9UtdXTi/u47sy1+GiecdEQrLV9M/IkOmtN80+8QH93 zF/zadnqj0uFdh0Vh8CIeUNIXfHmK/OduXWisqyWaX4hoxoYdZJfnPC26Ve7bqZl4s3to6XlbeQ 2hb+u90cGe2YVPpN/N8u5qI= Received: from canpmsgout09.his.huawei.com (unknown [172.19.92.135]) by szxga01-in.huawei.com (SkyGuard) with ESMTPS id 4dRcGd48FMz1BG4v; Thu, 11 Dec 2025 10:38:49 +0800 (CST) dkim-signature: v=1; a=rsa-sha256; d=huawei.com; s=dkim; c=relaxed/relaxed; q=dns/txt; h=From; bh=Qi+GBLgDCR2z7fRSZb2mOHHpdy1LRN+xvpB0CYTqqYU=; b=PL6+6VDvsB5b1oAObOP9o1gjMggHrVK9UtdXTi/u47sy1+GiecdEQrLV9M/IkOmtN80+8QH93 zF/zadnqj0uFdh0Vh8CIeUNIXfHmK/OduXWisqyWaX4hoxoYdZJfnPC26Ve7bqZl4s3to6XlbeQ 2hb+u90cGe2YVPpN/N8u5qI= Received: from mail.maildlp.com (unknown [172.19.162.112]) by canpmsgout09.his.huawei.com (SkyGuard) with ESMTPS id 4dRcDY1hYyz1cyPb; Thu, 11 Dec 2025 10:37:01 +0800 (CST) Received: from kwepemk100013.china.huawei.com (unknown [7.202.194.61]) by mail.maildlp.com (Postfix) with ESMTPS id 6C426140143; Thu, 11 Dec 2025 10:38:58 +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; Thu, 11 Dec 2025 10:38:57 +0800 From: Jijie Shao To: , , , , , CC: , , , , , , , , , , Subject: [PATCH V2 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: Thu, 11 Dec 2025 10:37:36 +0800 Message-ID: <20251211023737.2327018-3-shaojijie@huawei.com> X-Mailer: git-send-email 2.30.0 In-Reply-To: <20251211023737.2327018-1-shaojijie@huawei.com> References: <20251211023737.2327018-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: kwepems500001.china.huawei.com (7.221.188.70) 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 Tue Dec 16 16:38:48 2025 Received: from canpmsgout04.his.huawei.com (canpmsgout04.his.huawei.com [113.46.200.219]) (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 76CE9236437; Thu, 11 Dec 2025 02:39:01 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=113.46.200.219 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1765420743; cv=none; b=Zw4LJ1YbeECP5okgO8IFtcwyyZWGa0bsRpWdMg/0fqJhRvn20KZHQBqIzwlV4AR5F+0IA671NGiHjIzbUR8pm4+sSUMY1V4pl+0I3jVgaCvgRDKWNzdzVRCsuwPvdwEHH6zrDSPw7JcC/wJlutOp4kthqR50jI5n6ZF3Yqz/qyY= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1765420743; c=relaxed/simple; bh=91UxQk5iVHvQ5j5NE2xvcTvOlNQnIZuHWSgJLSg6LIE=; h=From:To:CC:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=BA/uKFj2Q93v5MPN3P9+st+spRacLmMNhy4UiFXZREWX4Cfg9mLLbOk6+4bRxloc9nxQUIXbeVBE6TaBHlFu9JH+wS4H6RTyPUbgyJLu4MOfajnlH9qgt+6TSia1bpnmJL5PEm5dsBHS7JWY0rl83bo9YD32sIt8GOKljUfjmZQ= 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=Za3vyaqZ; arc=none smtp.client-ip=113.46.200.219 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="Za3vyaqZ" dkim-signature: v=1; a=rsa-sha256; d=huawei.com; s=dkim; c=relaxed/relaxed; q=dns/txt; h=From; bh=OMmqpjmMHhG/Mn4T7EXrUFgAMC8swBEd5sHzAzs21aA=; b=Za3vyaqZHzmQMFO4N3ggM8A4yTb+1DMsQNOpglRH/8pX3PsOZ/oPG+42v5jbbTt6RhYOd9pnY PBwWsiwZ6PDxXAR7R2a236Jaq9fOvcPbZRJNOJmdFRH1eW3Eg1xR+rLSG56xSC/cTph2VkJZ+tK g1iMLH5yTqjXbSlbT/B8mTc= Received: from mail.maildlp.com (unknown [172.19.163.48]) by canpmsgout04.his.huawei.com (SkyGuard) with ESMTPS id 4dRcDX6NTGz1prKr; Thu, 11 Dec 2025 10:37:00 +0800 (CST) Received: from kwepemk100013.china.huawei.com (unknown [7.202.194.61]) by mail.maildlp.com (Postfix) with ESMTPS id 14D97180471; Thu, 11 Dec 2025 10:38:59 +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; Thu, 11 Dec 2025 10:38:58 +0800 From: Jijie Shao To: , , , , , CC: , , , , , , , , , , Subject: [PATCH V2 net 3/3] net: hns3: add VLAN id validation before using Date: Thu, 11 Dec 2025 10:37:37 +0800 Message-ID: <20251211023737.2327018-4-shaojijie@huawei.com> X-Mailer: git-send-email 2.30.0 In-Reply-To: <20251211023737.2327018-1-shaojijie@huawei.com> References: <20251211023737.2327018-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: kwepems500001.china.huawei.com (7.221.188.70) 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. The length of vlan_del_fail_bmap is BITS_TO_LONGS(VLAN_N_VID). It may cause out-of-bounds memory access once the VLAN id is bigger than or equal to VLAN_N_VID. Therefore, VLAN id needs to be checked to ensure it is within the range of VLAN_N_VID. 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 --- v1-> v2: - Mentioning vlan_del_fail_bmap in commit message, suggested by Simon Hor= man. v1: https://lore.kernel.org/all/20251209133825.3577343-4-shaojijie@huawei= .com/ --- 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