mirror of
https://github.com/torvalds/linux.git
synced 2026-04-18 14:53:58 -04:00
netdevsim: move max vf config to dev
max_vfs is a strange little beast because the file hangs off of nsim's debugfs, but it configures a field in the bus device. Move it to dev.c, let's look at it as if the device driver was imposing VF limit based on FW info (like pci_sriov_set_totalvfs()). Again, when moving refactor the function not to hold the vfs lock pointlessly while parsing the input. Wrap the access from the read side in READ_ONCE() to appease concurrency checkers. Do not check if return value from snprintf() is negative... Signed-off-by: Jakub Kicinski <kuba@kernel.org> Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
committed by
David S. Miller
parent
1c401078bc
commit
a3353ec325
@@ -227,6 +227,70 @@ static const struct file_operations nsim_dev_trap_fa_cookie_fops = {
|
||||
.owner = THIS_MODULE,
|
||||
};
|
||||
|
||||
static ssize_t nsim_bus_dev_max_vfs_read(struct file *file, char __user *data,
|
||||
size_t count, loff_t *ppos)
|
||||
{
|
||||
struct nsim_dev *nsim_dev = file->private_data;
|
||||
char buf[11];
|
||||
ssize_t len;
|
||||
|
||||
len = scnprintf(buf, sizeof(buf), "%u\n",
|
||||
READ_ONCE(nsim_dev->nsim_bus_dev->max_vfs));
|
||||
|
||||
return simple_read_from_buffer(data, count, ppos, buf, len);
|
||||
}
|
||||
|
||||
static ssize_t nsim_bus_dev_max_vfs_write(struct file *file,
|
||||
const char __user *data,
|
||||
size_t count, loff_t *ppos)
|
||||
{
|
||||
struct nsim_vf_config *vfconfigs;
|
||||
struct nsim_dev *nsim_dev;
|
||||
char buf[10];
|
||||
ssize_t ret;
|
||||
u32 val;
|
||||
|
||||
if (*ppos != 0)
|
||||
return 0;
|
||||
|
||||
if (count >= sizeof(buf))
|
||||
return -ENOSPC;
|
||||
|
||||
ret = copy_from_user(buf, data, count);
|
||||
if (ret)
|
||||
return -EFAULT;
|
||||
buf[count] = '\0';
|
||||
|
||||
ret = kstrtouint(buf, 10, &val);
|
||||
if (ret)
|
||||
return -EINVAL;
|
||||
|
||||
/* max_vfs limited by the maximum number of provided port indexes */
|
||||
if (val > NSIM_DEV_VF_PORT_INDEX_MAX - NSIM_DEV_VF_PORT_INDEX_BASE)
|
||||
return -ERANGE;
|
||||
|
||||
vfconfigs = kcalloc(val, sizeof(struct nsim_vf_config),
|
||||
GFP_KERNEL | __GFP_NOWARN);
|
||||
if (!vfconfigs)
|
||||
return -ENOMEM;
|
||||
|
||||
nsim_dev = file->private_data;
|
||||
mutex_lock(&nsim_dev->vfs_lock);
|
||||
/* Reject if VFs are configured */
|
||||
if (nsim_dev_get_vfs(nsim_dev)) {
|
||||
ret = -EBUSY;
|
||||
} else {
|
||||
swap(nsim_dev->vfconfigs, vfconfigs);
|
||||
WRITE_ONCE(nsim_dev->nsim_bus_dev->max_vfs, val);
|
||||
*ppos += count;
|
||||
ret = count;
|
||||
}
|
||||
mutex_unlock(&nsim_dev->vfs_lock);
|
||||
|
||||
kfree(vfconfigs);
|
||||
return ret;
|
||||
}
|
||||
|
||||
static const struct file_operations nsim_dev_max_vfs_fops = {
|
||||
.open = simple_open,
|
||||
.read = nsim_bus_dev_max_vfs_read,
|
||||
|
||||
Reference in New Issue
Block a user