GitHub-Mirror/Star64_linux
2
0
Fork 0
mirror of https://github.com/Fishwaldo/Star64_linux.git synced 2025-07-23 07:12:09 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

RDMA/device: Call ib_cache_release_one() only from ib_device_release()

Browse source 
Instead of complicated logic about when this memory is freed, always free
it during device release(). All the cache pointers start out as NULL, so
it is safe to call this before the cache is initialized.

This makes for a simpler error unwind flow, and a simpler understanding of
the lifetime of the memory allocations inside the struct ib_device.

Signed-off-by: Jason Gunthorpe <jgg@mellanox.com>
This commit is contained in:
Jason Gunthorpe 2019-02-06 22:41:49 -07:00
parent b34b269ad8
commit d45f89d59b
2 changed files with 15 additions and 29 deletions
Download patch file Download diff file Expand all files Collapse all files

3
drivers/infiniband/core/cache.c
View file

@ -1460,6 +1460,9 @@ void ib_cache_release_one(struct ib_device *device)
{ {
int p; int p;
if (!device->cache.ports)
return;
/* /*
* The release function frees all the cache elements. * The release function frees all the cache elements.
* This function should be called as part of freeing * This function should be called as part of freeing

41
drivers/infiniband/core/device.c
View file

@ -244,17 +244,10 @@ static void ib_device_release(struct device *device)
struct ib_device *dev = container_of(device, struct ib_device, dev); struct ib_device *dev = container_of(device, struct ib_device, dev);
WARN_ON(dev->reg_state == IB_DEV_REGISTERED); WARN_ON(dev->reg_state == IB_DEV_REGISTERED);
if (dev->reg_state == IB_DEV_UNREGISTERED) { ib_cache_release_one(dev);
/*
* In IB_DEV_UNINITIALIZED state, cache or port table
* is not even created. Free cache and port table only when
* device reaches UNREGISTERED state.
*/
ib_cache_release_one(dev);
kfree(dev->port_immutable);
}
ib_security_release_port_pkey_list(dev); ib_security_release_port_pkey_list(dev);
kfree(dev->port_pkey_list); kfree(dev->port_pkey_list);
kfree(dev->port_immutable);
kfree(dev); kfree(dev);
} }
@ -520,13 +513,6 @@ static void setup_dma_device(struct ib_device *device)
} }
} }
static void cleanup_device(struct ib_device *device)
{
ib_cache_cleanup_one(device);
ib_cache_release_one(device);
kfree(device->port_immutable);
}
static int setup_device(struct ib_device *device) static int setup_device(struct ib_device *device)
{ {
struct ib_udata uhw = {.outlen = 0, .inlen = 0}; struct ib_udata uhw = {.outlen = 0, .inlen = 0};
@ -548,26 +534,16 @@ static int setup_device(struct ib_device *device)
if (ret) { if (ret) {
dev_warn(&device->dev, dev_warn(&device->dev,
"Couldn't query the device attributes\n"); "Couldn't query the device attributes\n");
goto port_cleanup; return ret;
} }
ret = setup_port_pkey_list(device); ret = setup_port_pkey_list(device);
if (ret) { if (ret) {
dev_warn(&device->dev, "Couldn't create per port_pkey_list\n"); dev_warn(&device->dev, "Couldn't create per port_pkey_list\n");
goto port_cleanup;
}
ret = ib_cache_setup_one(device);
if (ret) {
dev_warn(&device->dev,
"Couldn't set up InfiniBand P_Key/GID cache\n");
return ret; return ret;
} }
return 0;
port_cleanup: return 0;
kfree(device->port_immutable);
return ret;
} }
/** /**
@ -607,6 +583,13 @@ int ib_register_device(struct ib_device *device, const char *name)
if (ret) if (ret)
goto out; goto out;
ret = ib_cache_setup_one(device);
if (ret) {
dev_warn(&device->dev,
"Couldn't set up InfiniBand P_Key/GID cache\n");
goto out;
}
device->index = __dev_new_index(); device->index = __dev_new_index();
ib_device_register_rdmacg(device); ib_device_register_rdmacg(device);
@ -633,7 +616,7 @@ int ib_register_device(struct ib_device *device, const char *name)
cg_cleanup: cg_cleanup:
ib_device_unregister_rdmacg(device); ib_device_unregister_rdmacg(device);
cleanup_device(device); ib_cache_cleanup_one(device);
out: out:
mutex_unlock(&device_mutex); mutex_unlock(&device_mutex);
return ret; return ret;