net: hns3: add debug information for flow table when failed (a3ca5e90) · Commits · 戴 / test

drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.c

+34 −11

Original line number	Diff line number	Diff line
		@@ -5381,22 +5381,32 @@ static int hclge_fd_check_ext_tuple(struct hclge_dev *hdev,
		u32 *unused_tuple)
		{
		if (fs->flow_type & FLOW_EXT) {
		if (fs->h_ext.vlan_etype)
		if (fs->h_ext.vlan_etype) {
		dev_err(&hdev->pdev->dev, "vlan-etype is not supported!\n");
		return -EOPNOTSUPP;
		}

		if (!fs->h_ext.vlan_tci)
		*unused_tuple \|= BIT(INNER_VLAN_TAG_FST);

		if (fs->m_ext.vlan_tci &&
		be16_to_cpu(fs->h_ext.vlan_tci) >= VLAN_N_VID)
		be16_to_cpu(fs->h_ext.vlan_tci) >= VLAN_N_VID) {
		dev_err(&hdev->pdev->dev,
		"failed to config vlan_tci, invalid vlan_tci: %u, max is %u.\n",
		ntohs(fs->h_ext.vlan_tci), VLAN_N_VID - 1);
		return -EINVAL;
		}
		} else {
		*unused_tuple \|= BIT(INNER_VLAN_TAG_FST);
		}

		if (fs->flow_type & FLOW_MAC_EXT) {
		if (hdev->fd_cfg.fd_mode !=
		HCLGE_FD_MODE_DEPTH_2K_WIDTH_400B_STAGE_1)
		HCLGE_FD_MODE_DEPTH_2K_WIDTH_400B_STAGE_1) {
		dev_err(&hdev->pdev->dev,
		"FLOW_MAC_EXT is not supported in current fd mode!\n");
		return -EOPNOTSUPP;
		}

		if (is_zero_ether_addr(fs->h_ext.h_dest))
		*unused_tuple \|= BIT(INNER_DST_MAC);
		@@ -5414,8 +5424,13 @@ static int hclge_fd_check_spec(struct hclge_dev *hdev,
		u32 flow_type;
		int ret;

		if (fs->location >= hdev->fd_cfg.rule_num[HCLGE_FD_STAGE_1])
		if (fs->location >= hdev->fd_cfg.rule_num[HCLGE_FD_STAGE_1]) {
		dev_err(&hdev->pdev->dev,
		"failed to config fd rules, invalid rule location: %u, max is %u\n.",
		fs->location,
		hdev->fd_cfg.rule_num[HCLGE_FD_STAGE_1] - 1);
		return -EINVAL;
		}

		if ((fs->flow_type & FLOW_EXT) &&
		(fs->h_ext.data[0] != 0 \|\| fs->h_ext.data[1] != 0)) {
		@@ -5457,11 +5472,18 @@ static int hclge_fd_check_spec(struct hclge_dev *hdev,
		unused_tuple);
		break;
		default:
		dev_err(&hdev->pdev->dev,
		"unsupported protocol type, protocol type = %#x\n",
		flow_type);
		return -EOPNOTSUPP;
		}

		if (ret)
		if (ret) {
		dev_err(&hdev->pdev->dev,
		"failed to check flow union tuple, ret = %d\n",
		ret);
		return ret;
		}

		return hclge_fd_check_ext_tuple(hdev, fs, unused_tuple);
		}
		@@ -5729,22 +5751,23 @@ static int hclge_add_fd_entry(struct hnae3_handle *handle,
		u8 action;
		int ret;

		if (!hnae3_dev_fd_supported(hdev))
		if (!hnae3_dev_fd_supported(hdev)) {
		dev_err(&hdev->pdev->dev,
		"flow table director is not supported\n");
		return -EOPNOTSUPP;
		}

		if (!hdev->fd_en) {
		dev_warn(&hdev->pdev->dev,
		"Please enable flow director first\n");
		dev_err(&hdev->pdev->dev,
		"please enable flow director first\n");
		return -EOPNOTSUPP;
		}

		fs = (struct ethtool_rx_flow_spec *)&cmd->fs;

		ret = hclge_fd_check_spec(hdev, fs, &unused);
		if (ret) {
		dev_err(&hdev->pdev->dev, "Check fd spec failed\n");
		if (ret)
		return ret;
		}

		if (fs->ring_cookie == RX_CLS_FLOW_DISC) {
		action = HCLGE_FD_ACTION_DROP_PACKET;

Admin message