Commit fc8d6870 authored by Yufeng Mo's avatar Yufeng Mo Committed by Yang Yingliang
Browse files

net: hns3: remove the useless debugfs file node cmd 



mainline inclusion
from mainline-v5.14-rc1
commit b4689aaf
category: feature
bugzilla: NA
CVE: NA

----------------------------

Currently, all debugfs commands have been reconstructed, and the
debugfs file node cmd is useless. So remove this debugfs file node.

Signed-off-by: default avatarYufeng Mo <moyufeng@huawei.com>
Signed-off-by: default avatarHuazhong Tan <tanhuazhong@huawei.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
Signed-off-by: default avatarYonglong Liu <liuyonglong@huawei.com>
Reviewed-by: default avatarJunxin Chen <chenjunxin1@huawei.com>
Signed-off-by: default avatarYang Yingliang <yangyingliang@huawei.com>
parent 1923b37c

drivers/net/ethernet/hisilicon/hns3/hnae3.h

+0 −1
Original line number Diff line number Diff line
@@ -593,7 +593,6 @@ struct hnae3_ae_ops { 
	void (*enable_fd)(struct hnae3_handle *handle, bool enable);

	int (*add_arfs_entry)(struct hnae3_handle *handle, u16 queue_id,

			      u16 flow_id, struct flow_keys *fkeys);

	int (*dbg_run_cmd)(struct hnae3_handle *handle, const char *cmd_buf);

	int (*dbg_read_cmd)(struct hnae3_handle *handle, enum hnae3_dbg_cmd cmd,

			    char *buf, int len);

	pci_ers_result_t (*handle_hw_ras_error)(struct hnae3_ae_dev *ae_dev);

drivers/net/ethernet/hisilicon/hns3/hns3_debugfs.c

+0 −98
Original line number Diff line number Diff line
@@ -727,94 +727,6 @@ static int hns3_dbg_tx_bd_info(struct hns3_dbg_data *d, char *buf, int len) 
	return 0;

}



static void hns3_dbg_help(struct hnae3_handle *h)

{

	dev_info(&h->pdev->dev, "available commands\n");

}



static ssize_t hns3_dbg_cmd_read(struct file *filp, char __user *buffer,

				 size_t count, loff_t *ppos)

{

	int uncopy_bytes;

	char *buf;

	int len;



	if (*ppos != 0)

		return 0;



	if (count < HNS3_DBG_READ_LEN)

		return -ENOSPC;



	buf = kzalloc(HNS3_DBG_READ_LEN, GFP_KERNEL);

	if (!buf)

		return -ENOMEM;



	len = scnprintf(buf, HNS3_DBG_READ_LEN, "%s\n",

			"Please echo help to cmd to get help information");

	uncopy_bytes = copy_to_user(buffer, buf, len);



	kfree(buf);



	if (uncopy_bytes)

		return -EFAULT;



	return (*ppos = len);

}



static ssize_t hns3_dbg_cmd_write(struct file *filp, const char __user *buffer,

				  size_t count, loff_t *ppos)

{

	struct hnae3_handle *handle = filp->private_data;

	struct hns3_nic_priv *priv  = handle->priv;

	char *cmd_buf, *cmd_buf_tmp;

	int uncopied_bytes;

	int ret = 0;



	if (*ppos != 0)

		return 0;



	/* Judge if the instance is being reset. */

	if (!test_bit(HNS3_NIC_STATE_INITED, &priv->state) ||

	    test_bit(HNS3_NIC_STATE_RESETTING, &priv->state))

		return 0;



	if (count > HNS3_DBG_WRITE_LEN)

		return -ENOSPC;



	cmd_buf = kzalloc(count + 1, GFP_KERNEL);

	if (!cmd_buf)

		return count;



	uncopied_bytes = copy_from_user(cmd_buf, buffer, count);

	if (uncopied_bytes) {

		kfree(cmd_buf);

		return -EFAULT;

	}



	cmd_buf[count] = '\0';



	cmd_buf_tmp = strchr(cmd_buf, '\n');

	if (cmd_buf_tmp) {

		*cmd_buf_tmp = '\0';

		count = cmd_buf_tmp - cmd_buf + 1;

	}



	if (strncmp(cmd_buf, "help", 4) == 0)

		hns3_dbg_help(handle);

	else if (handle->ae_algo->ops->dbg_run_cmd)

		ret = handle->ae_algo->ops->dbg_run_cmd(handle, cmd_buf);

	else

		ret = -EOPNOTSUPP;



	if (ret)

		hns3_dbg_help(handle);



	kfree(cmd_buf);

	cmd_buf = NULL;



	return count;

}



static int hns3_dbg_get_cmd_index(struct hns3_dbg_data *dbg_data, u32 *index)

{

	u32 i;
@@ -937,13 +849,6 @@ static ssize_t hns3_dbg_read(struct file *filp, char __user *buffer, 
	return ret;

}



static const struct file_operations hns3_dbg_cmd_fops = {

	.owner = THIS_MODULE,

	.open  = simple_open,

	.read  = hns3_dbg_cmd_read,

	.write = hns3_dbg_cmd_write,

};



static const struct file_operations hns3_dbg_fops = {

	.owner = THIS_MODULE,

	.open  = simple_open,
@@ -1006,9 +911,6 @@ int hns3_dbg_init(struct hnae3_handle *handle) 
				debugfs_create_dir(name, hns3_dbgfs_root);

	handle->hnae3_dbgfs = hns3_dbg_dentry[HNS3_DBG_DENTRY_COMMON].dentry;



	debugfs_create_file("cmd", 0600, handle->hnae3_dbgfs, handle,

			    &hns3_dbg_cmd_fops);



	for (i = 0; i < HNS3_DBG_DENTRY_COMMON; i++)

		hns3_dbg_dentry[i].dentry =

			debugfs_create_dir(hns3_dbg_dentry[i].name,

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

+0 −9
Original line number Diff line number Diff line
@@ -2250,15 +2250,6 @@ static int hclge_dbg_dump_umv_info(struct hclge_dev *hdev, char *buf, int len) 
	return 0;

}



int hclge_dbg_run_cmd(struct hnae3_handle *handle, const char *cmd_buf)

{

	struct hclge_vport *vport = hclge_get_vport(handle);

	struct hclge_dev *hdev = vport->back;



	dev_info(&hdev->pdev->dev, "unknown command\n");

	return -EINVAL;

}



static const struct hclge_dbg_func hclge_dbg_cmd_func[] = {

	{

		.cmd = HNAE3_DBG_CMD_TM_PRI,

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

+0 −1
Original line number Diff line number Diff line
@@ -11639,7 +11639,6 @@ struct hnae3_ae_ops hclge_ops = { 
	.restore_fd_rules = hclge_restore_fd_entries,

	.enable_fd = hclge_enable_fd,

	.add_arfs_entry = hclge_add_fd_entry_by_arfs,

	.dbg_run_cmd = hclge_dbg_run_cmd,

	.dbg_read_cmd = hclge_dbg_read_cmd,

	.handle_hw_ras_error = hclge_handle_hw_ras_error,

	.get_hw_reset_stat = hclge_get_hw_reset_stat,

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

+0 −1
Original line number Diff line number Diff line
@@ -1045,7 +1045,6 @@ int hclge_func_reset_cmd(struct hclge_dev *hdev, int func_id); 
int hclge_vport_start(struct hclge_vport *vport);

void hclge_vport_stop(struct hclge_vport *vport);

int hclge_set_vport_mtu(struct hclge_vport *vport, int new_mtu);

int hclge_dbg_run_cmd(struct hnae3_handle *handle, const char *cmd_buf);

int hclge_dbg_read_cmd(struct hnae3_handle *handle, enum hnae3_dbg_cmd cmd,

		       char *buf, int len);

u16 hclge_covert_handle_qid_global(struct hnae3_handle *handle, u16 queue_id);