Message ID | 20180516190720.11633-1-christophe.jaillet@wanadoo.fr (mailing list archive) |
---|---|
State | Not Applicable |
Headers | show |
T24gV2VkLCAyMDE4LTA1LTE2IGF0IDIxOjA3ICswMjAwLCBDaHJpc3RvcGhlIEpBSUxMRVQgd3Jv dGU6DQo+IFdoZW4gJ2t2emFsbG9jKCknIGlzIHVzZWQgdG8gYWxsb2NhdGUgbWVtb3J5LCAna3Zm cmVlKCknIG11c3QgYmUgdXNlZA0KPiB0bw0KPiBmcmVlIGl0Lg0KPiANCj4gRml4ZXM6IDFjYmU2 ZmM4NmNjZmUgKCJJQi9tbHg1OiBBZGQgc3VwcG9ydCBmb3IgQ1FFIGNvbXByZXNzaW5nIikNCj4g Rml4ZXM6IGZlZDljZTIyYmY4YWUgKCJuZXQvbWx4NTogRS1Td2l0Y2gsIEFkZCBBUEkgdG8gY3Jl YXRlIHZwb3J0IHJ4DQo+IHJ1bGVzIikNCj4gRml4ZXM6IDllZmE3NTI1NDU5M2QgKCJuZXQvbWx4 NV9jb3JlOiBJbnRyb2R1Y2UgYWNjZXNzIGZ1bmN0aW9ucyB0bw0KPiBxdWVyeSB2cG9ydCBSb0NF IGZpZWxkcyIpDQo+IFNpZ25lZC1vZmYtYnk6IENocmlzdG9waGUgSkFJTExFVCA8Y2hyaXN0b3Bo ZS5qYWlsbGV0QHdhbmFkb28uZnI+DQo+IC0tLQ0KPiB2MSAtPiB2MjogTW9yZSBwbGFjZXMgdG8g dXBkYXRlIGhhdmUgYmVlbiBhZGRlZCB0byB0aGUgcGF0Y2gNCj4gdjIgLT4gdjM6IEFkZCBGaXhl cyB0YWcNCj4gDQo+IDMgcGF0Y2hlcyB3aXRoIG9uZSBGaXhlcyB0YWcgZWFjaCBzaG91bGQgcHJv YmFibHkgYmUgYmV0dGVyLCBidXQNCj4gaG9uZXN0bHksIEkgd29uJ3Qgc2VuZCBhIHY0Lg0KPiBG aWxsIGZyZWUgdG8gc3BsaXQgaXQgaWYgbmVlZGVkLg0KDQpBcHBsaWVkIHRvIG1seDUtbmV4dCwg dGhhbmtzIENocmlzdG9waGUhDQoNCj4gLS0tDQo+ICBkcml2ZXJzL2luZmluaWJhbmQvaHcvbWx4 NS9jcS5jICAgICAgICAgICAgICAgICAgICAgICAgICAgIHwgMiArLQ0KPiAgZHJpdmVycy9uZXQv ZXRoZXJuZXQvbWVsbGFub3gvbWx4NS9jb3JlL2Vzd2l0Y2hfb2ZmbG9hZHMuYyB8IDIgKy0NCj4g IGRyaXZlcnMvbmV0L2V0aGVybmV0L21lbGxhbm94L21seDUvY29yZS92cG9ydC5jICAgICAgICAg ICAgfCA2ICsrKw0KPiAtLS0NCj4gIDMgZmlsZXMgY2hhbmdlZCwgNSBpbnNlcnRpb25zKCspLCA1 IGRlbGV0aW9ucygtKQ0KPiANCj4gZGlmZiAtLWdpdCBhL2RyaXZlcnMvaW5maW5pYmFuZC9ody9t bHg1L2NxLmMNCj4gYi9kcml2ZXJzL2luZmluaWJhbmQvaHcvbWx4NS9jcS5jDQo+IGluZGV4IDc3 ZDI1N2VjODk5Yi4uNmQ1MmVhMDM1NzRlIDEwMDY0NA0KPiAtLS0gYS9kcml2ZXJzL2luZmluaWJh bmQvaHcvbWx4NS9jcS5jDQo+ICsrKyBiL2RyaXZlcnMvaW5maW5pYmFuZC9ody9tbHg1L2NxLmMN Cj4gQEAgLTg0OSw3ICs4NDksNyBAQCBzdGF0aWMgaW50IGNyZWF0ZV9jcV91c2VyKHN0cnVjdCBt bHg1X2liX2Rldg0KPiAqZGV2LCBzdHJ1Y3QgaWJfdWRhdGEgKnVkYXRhLA0KPiAgCXJldHVybiAw Ow0KPiAgDQo+ICBlcnJfY3FiOg0KPiAtCWtmcmVlKCpjcWIpOw0KPiArCWt2ZnJlZSgqY3FiKTsN Cj4gIA0KPiAgZXJyX2RiOg0KPiAgCW1seDVfaWJfZGJfdW5tYXBfdXNlcih0b19tdWNvbnRleHQo Y29udGV4dCksICZjcS0+ZGIpOw0KPiBkaWZmIC0tZ2l0DQo+IGEvZHJpdmVycy9uZXQvZXRoZXJu ZXQvbWVsbGFub3gvbWx4NS9jb3JlL2Vzd2l0Y2hfb2ZmbG9hZHMuYw0KPiBiL2RyaXZlcnMvbmV0 L2V0aGVybmV0L21lbGxhbm94L21seDUvY29yZS9lc3dpdGNoX29mZmxvYWRzLmMNCj4gaW5kZXgg MzVlMjU2ZWIyZjZlLi5iMTIzZjhhNTJhZDggMTAwNjQ0DQo+IC0tLSBhL2RyaXZlcnMvbmV0L2V0 aGVybmV0L21lbGxhbm94L21seDUvY29yZS9lc3dpdGNoX29mZmxvYWRzLmMNCj4gKysrIGIvZHJp dmVycy9uZXQvZXRoZXJuZXQvbWVsbGFub3gvbWx4NS9jb3JlL2Vzd2l0Y2hfb2ZmbG9hZHMuYw0K PiBAQCAtNjYzLDcgKzY2Myw3IEBAIHN0YXRpYyBpbnQgZXN3X2NyZWF0ZV92cG9ydF9yeF9ncm91 cChzdHJ1Y3QNCj4gbWx4NV9lc3dpdGNoICplc3cpDQo+ICANCj4gIAllc3ctPm9mZmxvYWRzLnZw b3J0X3J4X2dyb3VwID0gZzsNCj4gIG91dDoNCj4gLQlrZnJlZShmbG93X2dyb3VwX2luKTsNCj4g KwlrdmZyZWUoZmxvd19ncm91cF9pbik7DQo+ICAJcmV0dXJuIGVycjsNCj4gIH0NCj4gIA0KPiBk aWZmIC0tZ2l0IGEvZHJpdmVycy9uZXQvZXRoZXJuZXQvbWVsbGFub3gvbWx4NS9jb3JlL3Zwb3J0 LmMNCj4gYi9kcml2ZXJzL25ldC9ldGhlcm5ldC9tZWxsYW5veC9tbHg1L2NvcmUvdnBvcnQuYw0K PiBpbmRleCAxNzdlMDc2YjhkMTcuLjcxOWNlY2IxODJjNiAxMDA2NDQNCj4gLS0tIGEvZHJpdmVy cy9uZXQvZXRoZXJuZXQvbWVsbGFub3gvbWx4NS9jb3JlL3Zwb3J0LmMNCj4gKysrIGIvZHJpdmVy cy9uZXQvZXRoZXJuZXQvbWVsbGFub3gvbWx4NS9jb3JlL3Zwb3J0LmMNCj4gQEAgLTUxMSw3ICs1 MTEsNyBAQCBpbnQgbWx4NV9xdWVyeV9uaWNfdnBvcnRfc3lzdGVtX2ltYWdlX2d1aWQoc3RydWN0 DQo+IG1seDVfY29yZV9kZXYgKm1kZXYsDQo+ICAJKnN5c3RlbV9pbWFnZV9ndWlkID0gTUxYNV9H RVQ2NChxdWVyeV9uaWNfdnBvcnRfY29udGV4dF9vdXQsDQo+IG91dCwNCj4gIAkJCQkJbmljX3Zw b3J0X2NvbnRleHQuc3lzdGVtX2ltYQ0KPiBnZV9ndWlkKTsNCj4gIA0KPiAtCWtmcmVlKG91dCk7 DQo+ICsJa3ZmcmVlKG91dCk7DQo+ICANCj4gIAlyZXR1cm4gMDsNCj4gIH0NCj4gQEAgLTUzMSw3 ICs1MzEsNyBAQCBpbnQgbWx4NV9xdWVyeV9uaWNfdnBvcnRfbm9kZV9ndWlkKHN0cnVjdA0KPiBt bHg1X2NvcmVfZGV2ICptZGV2LCB1NjQgKm5vZGVfZ3VpZCkNCj4gIAkqbm9kZV9ndWlkID0gTUxY NV9HRVQ2NChxdWVyeV9uaWNfdnBvcnRfY29udGV4dF9vdXQsIG91dCwNCj4gIAkJCQluaWNfdnBv cnRfY29udGV4dC5ub2RlX2d1aWQpOw0KPiAgDQo+IC0Ja2ZyZWUob3V0KTsNCj4gKwlrdmZyZWUo b3V0KTsNCj4gIA0KPiAgCXJldHVybiAwOw0KPiAgfQ0KPiBAQCAtNTg3LDcgKzU4Nyw3IEBAIGlu dCBtbHg1X3F1ZXJ5X25pY192cG9ydF9xa2V5X3Zpb2xfY250cihzdHJ1Y3QNCj4gbWx4NV9jb3Jl X2RldiAqbWRldiwNCj4gIAkqcWtleV92aW9sX2NudHIgPSBNTFg1X0dFVChxdWVyeV9uaWNfdnBv cnRfY29udGV4dF9vdXQsIG91dCwNCj4gIAkJCQkgICBuaWNfdnBvcnRfY29udGV4dC5xa2V5X3Zp b2xhdGlvbl8NCj4gY291bnRlcik7DQo+ICANCj4gLQlrZnJlZShvdXQpOw0KPiArCWt2ZnJlZShv dXQpOw0KPiAgDQo+ICAJcmV0dXJuIDA7DQo+ICB9 -- To unsubscribe from this list: send the line "unsubscribe linux-rdma" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/drivers/infiniband/hw/mlx5/cq.c b/drivers/infiniband/hw/mlx5/cq.c index 77d257ec899b..6d52ea03574e 100644 --- a/drivers/infiniband/hw/mlx5/cq.c +++ b/drivers/infiniband/hw/mlx5/cq.c @@ -849,7 +849,7 @@ static int create_cq_user(struct mlx5_ib_dev *dev, struct ib_udata *udata, return 0; err_cqb: - kfree(*cqb); + kvfree(*cqb); err_db: mlx5_ib_db_unmap_user(to_mucontext(context), &cq->db); diff --git a/drivers/net/ethernet/mellanox/mlx5/core/eswitch_offloads.c b/drivers/net/ethernet/mellanox/mlx5/core/eswitch_offloads.c index 35e256eb2f6e..b123f8a52ad8 100644 --- a/drivers/net/ethernet/mellanox/mlx5/core/eswitch_offloads.c +++ b/drivers/net/ethernet/mellanox/mlx5/core/eswitch_offloads.c @@ -663,7 +663,7 @@ static int esw_create_vport_rx_group(struct mlx5_eswitch *esw) esw->offloads.vport_rx_group = g; out: - kfree(flow_group_in); + kvfree(flow_group_in); return err; } diff --git a/drivers/net/ethernet/mellanox/mlx5/core/vport.c b/drivers/net/ethernet/mellanox/mlx5/core/vport.c index 177e076b8d17..719cecb182c6 100644 --- a/drivers/net/ethernet/mellanox/mlx5/core/vport.c +++ b/drivers/net/ethernet/mellanox/mlx5/core/vport.c @@ -511,7 +511,7 @@ int mlx5_query_nic_vport_system_image_guid(struct mlx5_core_dev *mdev, *system_image_guid = MLX5_GET64(query_nic_vport_context_out, out, nic_vport_context.system_image_guid); - kfree(out); + kvfree(out); return 0; } @@ -531,7 +531,7 @@ int mlx5_query_nic_vport_node_guid(struct mlx5_core_dev *mdev, u64 *node_guid) *node_guid = MLX5_GET64(query_nic_vport_context_out, out, nic_vport_context.node_guid); - kfree(out); + kvfree(out); return 0; } @@ -587,7 +587,7 @@ int mlx5_query_nic_vport_qkey_viol_cntr(struct mlx5_core_dev *mdev, *qkey_viol_cntr = MLX5_GET(query_nic_vport_context_out, out, nic_vport_context.qkey_violation_counter); - kfree(out); + kvfree(out); return 0; }
When 'kvzalloc()' is used to allocate memory, 'kvfree()' must be used to free it. Fixes: 1cbe6fc86ccfe ("IB/mlx5: Add support for CQE compressing") Fixes: fed9ce22bf8ae ("net/mlx5: E-Switch, Add API to create vport rx rules") Fixes: 9efa75254593d ("net/mlx5_core: Introduce access functions to query vport RoCE fields") Signed-off-by: Christophe JAILLET <christophe.jaillet@wanadoo.fr> --- v1 -> v2: More places to update have been added to the patch v2 -> v3: Add Fixes tag 3 patches with one Fixes tag each should probably be better, but honestly, I won't send a v4. Fill free to split it if needed. --- drivers/infiniband/hw/mlx5/cq.c | 2 +- drivers/net/ethernet/mellanox/mlx5/core/eswitch_offloads.c | 2 +- drivers/net/ethernet/mellanox/mlx5/core/vport.c | 6 +++--- 3 files changed, 5 insertions(+), 5 deletions(-)