xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
Fork 0
Koodi Ongelmat Pull-pyynnöt Actions Paketit Projektit Julkaisut Wiki Toiminta

IB/uverbs: Have the core code create the uverbs_root_spec

Selaa lähdekoodia 
There is no reason for drivers to do this, the core code should take of
everything. The drivers will provide their information from rodata to
describe their modifications to the core's base uapi specification.

The core uses this to build up the runtime uapi for each device.

Signed-off-by: Jason Gunthorpe <jgg@mellanox.com>
Reviewed-by: Michael J. Ruhl <michael.j.ruhl@intel.com>
Reviewed-by: Leon Romanovsky <leonro@mellanox.com>
This commit is contained in:
Jason Gunthorpe
2018-08-09 20:14:35 -06:00
vanhempi 922983c2a1
commit 7d96c9b176
6 muutettua tiedostoa jossa 51 lisäystä ja 50 poistoa
Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/infiniband/core/uverbs_ioctl_merge.c
Näytä tiedosto

@@ -556,7 +556,6 @@ void uverbs_free_spec_tree(struct uverbs_root_spec *root)
kfree(root);
}
EXPORT_SYMBOL(uverbs_free_spec_tree);
struct uverbs_root_spec *uverbs_alloc_spec_tree(unsigned int num_trees,
const struct uverbs_object_tree_def **trees)
@@ -661,4 +660,3 @@ free_root:
uverbs_free_spec_tree(root_spec);
return ERR_PTR(res);
}
EXPORT_SYMBOL(uverbs_alloc_spec_tree);

50
drivers/infiniband/core/uverbs_main.c
Näytä tiedosto

@@ -994,6 +994,36 @@ static DEVICE_ATTR(abi_version, S_IRUGO, show_dev_abi_version, NULL);
static CLASS_ATTR_STRING(abi_version, S_IRUGO,
__stringify(IB_USER_VERBS_ABI_VERSION));
static int ib_uverbs_create_uapi(struct ib_device *device,
struct ib_uverbs_device *uverbs_dev)
{
const struct uverbs_object_tree_def **specs;
struct uverbs_root_spec *specs_root;
unsigned int num_specs = 1;
unsigned int i;
if (device->driver_specs)
for (i = 0; device->driver_specs[i]; i++)
num_specs++;
specs = kmalloc_array(num_specs, sizeof(*specs), GFP_KERNEL);
if (!specs)
return -ENOMEM;
specs[0] = uverbs_default_get_objects();
if (device->driver_specs)
for (i = 0; device->driver_specs[i]; i++)
specs[i+1] = device->driver_specs[i];
specs_root = uverbs_alloc_spec_tree(num_specs, specs);
kfree(specs);
if (IS_ERR(specs_root))
return PTR_ERR(specs_root);
uverbs_dev->specs_root = specs_root;
return 0;
}
static void ib_uverbs_add_one(struct ib_device *device)
{
int devnum;
@@ -1036,6 +1066,9 @@ static void ib_uverbs_add_one(struct ib_device *device)
rcu_assign_pointer(uverbs_dev->ib_dev, device);
uverbs_dev->num_comp_vectors = device->num_comp_vectors;
if (ib_uverbs_create_uapi(device, uverbs_dev))
goto err;
cdev_init(&uverbs_dev->cdev, NULL);
uverbs_dev->cdev.owner = THIS_MODULE;
uverbs_dev->cdev.ops = device->mmap ? &uverbs_mmap_fops : &uverbs_fops;
@@ -1055,23 +1088,6 @@ static void ib_uverbs_add_one(struct ib_device *device)
if (device_create_file(uverbs_dev->dev, &dev_attr_abi_version))
goto err_class;
if (!device->driver_specs_root) {
const struct uverbs_object_tree_def *default_root[] = {
uverbs_default_get_objects()};
uverbs_dev->specs_root = uverbs_alloc_spec_tree(1,
default_root);
if (IS_ERR(uverbs_dev->specs_root))
goto err_class;
} else {
uverbs_dev->specs_root = device->driver_specs_root;
/*
* Take responsibility to free the specs allocated by the
* driver.
*/
device->driver_specs_root = NULL;
}
ib_set_client_data(device, &uverbs_client, uverbs_dev);
return;

1
drivers/infiniband/core/uverbs_std_types.c
Näytä tiedosto

@@ -316,4 +316,3 @@ const struct uverbs_object_tree_def *uverbs_default_get_objects(void)
{
return &uverbs_default_objects;
}
EXPORT_SYMBOL_GPL(uverbs_default_get_objects);