Skip to contentSkip to conversation

Fix a memnory leak bug due to malloc unproperly.

PATCH In review AndyPei 6 participants 16 messages Dec 13, 2018 – Jan 17, 2019

lore
Share & tools
lore

AndyPei

author
#0 lore raw

PATCH 1/1 Fix a memnory leak bug due to malloc unproperly.

---
 drivers/raw/ifpga_rawdev/base/opae_hw_api.c | 30 ++++++++++++++++++++++++-----
 drivers/raw/ifpga_rawdev/base/opae_hw_api.h |  2 ++
 drivers/raw/ifpga_rawdev/ifpga_rawdev.c     |  7 +++----
 3 files changed, 30 insertions(+), 9 deletions(-)
drivers/raw/ifpga_rawdev/base/opae_hw_api.c +25 -5
index a533dfe..b9cca65 100644
@@ -303,7 +303,29 @@ static struct opae_adapter_ops *match_ops(struct opae_adapter *adapter)
 }
 
 /**
- * opae_adapter_data_alloc - alloc opae_adapter_data data structure
+ * opae_adapter_init - init opae_adapter data structure
+ * @adpdate: pointer of opae_adater data structure
+ * @name: adapter name.
+ * @data: private data of this adapter.
+ *
+ * Return: 0 on success.
+ */
+int opae_adapter_init(struct opae_adapter *adapter,
+		const char *name, void *data)
+{
+	if (!adapter)
+		return -ENOMEM;
+
+	TAILQ_INIT(&adapter->acc_list);
+	adapter->data = data;
+	adapter->name = name;
+	adapter->ops = match_ops(adapter);
+
+	return 0;
+}
+
+/**
+ * opae_adapter_alloc - alloc opae_adapter data structure
  * @name: adapter name.
  * @data: private data of this adapter.
  *
@@ -316,10 +338,8 @@ struct opae_adapter *opae_adapter_alloc(const char *name, void *data)
 	if (!adapter)
 		return NULL;
 
-	TAILQ_INIT(&adapter->acc_list);
-	adapter->data = data;
-	adapter->name = name;
-	adapter->ops = match_ops(adapter);
+	if (opae_adapter_init(adapter, name, data))
+		return NULL;
 
 	return adapter;
 }
drivers/raw/ifpga_rawdev/base/opae_hw_api.h +2 -0
index 4bbc9df..86ca771 100644
@@ -225,6 +225,8 @@ struct opae_adapter {
 void *opae_adapter_data_alloc(enum opae_adapter_type type);
 #define opae_adapter_data_free(data) opae_free(data)
 
+int opae_adapter_init(struct opae_adapter *adapter,
+		const char *name, void *data);
 struct opae_adapter *opae_adapter_alloc(const char *name, void *data);
 #define opae_adapter_free(adapter) opae_free(adapter)
 
drivers/raw/ifpga_rawdev/ifpga_rawdev.c +3 -4
index 32e318f..d433091 100644
@@ -409,9 +409,10 @@
 	data->device_id = pci_dev->id.device_id;
 	data->vendor_id = pci_dev->id.vendor_id;
 
+	adapter = rawdev->dev_private;
 	/* create a opae_adapter based on above device data */
-	adapter = opae_adapter_alloc(pci_dev->device.name, data);
-	if (!adapter) {
+	ret = opae_adapter_init(adapter, pci_dev->device.name, data);
+	if (ret) {
 		ret = -ENOMEM;
 		goto free_adapter_data;
 	}
@@ -420,8 +421,6 @@
 	rawdev->device = &pci_dev->device;
 	rawdev->driver_name = pci_dev->device.driver->name;
 
-	rawdev->dev_private = adapter;
-
 	/* must enumerate the adapter before use it */
 	ret = opae_adapter_enumerate(adapter);
 	if (ret)
Signature · 1 line
1.8.3.1
#1 lore raw

Hi Andy,

The patch headline should say what the fix is for, e.g. raw/ifpga: fix this or that.

If this is fixing a bug, a Fixes: tag should also be present, indicating the original commit that introduced the issue. If this issue is present in earlier releases, a Cc: [email protected] should also be added, to ensure that older releases get this bugfix.

For more information, please refer to DPDK contribution guidelines: https://doc.dpdk.org/guides/contributing/patches.html

Quoted 2 lines · AndyPei

---

Signature · 2 lines
Thanks,
Anatoly
#2 lore raw
In reply to AndyPei

Hi,

Quoted 7 lines

-----Original Message-----
From: dev [mailto:[email protected]] On Behalf Of AndyPei
Sent: Friday, December 14, 2018 2:33
To: [email protected]
Cc: Pei, Andy <[email protected]>
Subject: [dpdk-dev] [PATCH] Fix a memnory leak bug due to malloc unproperly.

Miss some descriptions about this patch.

Quoted 1 line

It seems like this is a bug fix, so pls add fixline

Quoted 56 lines
---
 drivers/raw/ifpga_rawdev/base/opae_hw_api.c | 30
++++++++++++++++++++++++-----
drivers/raw/ifpga_rawdev/base/opae_hw_api.h |  2 ++
 drivers/raw/ifpga_rawdev/ifpga_rawdev.c     |  7 +++----
 3 files changed, 30 insertions(+), 9 deletions(-)
drivers/raw/ifpga_rawdev/base/opae_hw_api.c +25 -5
index a533dfe..b9cca65 100644
@@ -303,7 +303,29 @@ static struct opae_adapter_ops *match_ops(struct
 opae_adapter *adapter)  }
 
 /**
- * opae_adapter_data_alloc - alloc opae_adapter_data data structure
+ * opae_adapter_init - init opae_adapter data structure
+ * @adpdate: pointer of opae_adater data structure
+ * @name: adapter name.
+ * @data: private data of this adapter.
+ *
+ * Return: 0 on success.
+ */
+int opae_adapter_init(struct opae_adapter *adapter,
+		const char *name, void *data)
+{
+	if (!adapter)
+		return -ENOMEM;
+
+	TAILQ_INIT(&adapter->acc_list);
+	adapter->data = data;
+	adapter->name = name;
+	adapter->ops = match_ops(adapter);
+
+	return 0;
+}
+
+/**
+ * opae_adapter_alloc - alloc opae_adapter data structure
  * @name: adapter name.
  * @data: private data of this adapter.
  *
@@ -316,10 +338,8 @@ struct opae_adapter *opae_adapter_alloc(const
 char *name, void *data)
 	if (!adapter)
 		return NULL;
 
-	TAILQ_INIT(&adapter->acc_list);
-	adapter->data = data;
-	adapter->name = name;
-	adapter->ops = match_ops(adapter);
+	if (opae_adapter_init(adapter, name, data))
+		return NULL;
 
 	return adapter;
Quoted 1 line

}

The operations of opae_adapter_init() and opae_adapter_alloc() are same, could you merge these two functions?

Quoted 43 lines
drivers/raw/ifpga_rawdev/base/opae_hw_api.h +2 -0
index 4bbc9df..86ca771 100644
@@ -225,6 +225,8 @@ struct opae_adapter {  void
 *opae_adapter_data_alloc(enum opae_adapter_type type);  #define
 opae_adapter_data_free(data) opae_free(data)
 
+int opae_adapter_init(struct opae_adapter *adapter,
+		const char *name, void *data);
 struct opae_adapter *opae_adapter_alloc(const char *name, void *data);
 #define opae_adapter_free(adapter) opae_free(adapter)
 
drivers/raw/ifpga_rawdev/ifpga_rawdev.c +3 -5
index 32e318f..d433091 100644
@@ -409,9 +409,10 @@
 	data->device_id = pci_dev->id.device_id;
 	data->vendor_id = pci_dev->id.vendor_id;
 
+	adapter = rawdev->dev_private;
 	/* create a opae_adapter based on above device data */
-	adapter = opae_adapter_alloc(pci_dev->device.name, data);
-	if (!adapter) {
+	ret = opae_adapter_init(adapter, pci_dev->device.name, data);
+	if (ret) {
 		ret = -ENOMEM;
 		goto free_adapter_data;
 	}
@@ -420,8 +421,6 @@
 	rawdev->device = &pci_dev->device;
 	rawdev->driver_name = pci_dev->device.driver->name;
 
-	rawdev->dev_private = adapter;
-
 	/* must enumerate the adapter before use it */
 	ret = opae_adapter_enumerate(adapter);
 	if (ret)
--

1.8.3.1

author
#3 lore raw

PATCH v2 1/1 /driver/raw/ifpga_rawdev: fix a memory leak bug in ifpga

In reply to AndyPei

When ifpga_rawdev_create() allocate memory for a new rawdev, the original code allocate redundant memory for adapter, which is a member of the rawdev. What is actually necessary is the adapter to be initialized, not memory allocated.

Fixes ef1e8ede3da5
---
 drivers/raw/ifpga_rawdev/base/opae_hw_api.c | 32 ++++++++++++++++++++++++-----
 drivers/raw/ifpga_rawdev/base/opae_hw_api.h |  4 +++-
 drivers/raw/ifpga_rawdev/ifpga_rawdev.c     |  7 +++----
 3 files changed, 33 insertions(+), 10 deletions(-)
drivers/raw/ifpga_rawdev/base/opae_hw_api.c +27 -5
index a533dfe..50f6438 100644
@@ -303,12 +303,35 @@ static struct opae_adapter_ops *match_ops(struct opae_adapter *adapter)
 }
 
 /**
- * opae_adapter_data_alloc - alloc opae_adapter_data data structure
+ * opae_adapter_init - init opae_adapter data structure
+ * @adpdate: pointer of opae_adater data structure
+ * @name: adapter name.
+ * @data: private data of this adapter.
+ *
+ * Return: 0 on success.
+ */
+int opae_adapter_init(struct opae_adapter *adapter,
+		const char *name, void *data)
+{
+	if (!adapter)
+		return -ENOMEM;
+
+	TAILQ_INIT(&adapter->acc_list);
+	adapter->data = data;
+	adapter->name = name;
+	adapter->ops = match_ops(adapter);
+
+	return 0;
+}
+
+/**
+ * opae_adapter_alloc - alloc opae_adapter data structure
  * @name: adapter name.
  * @data: private data of this adapter.
  *
  * Return: opae_adapter on success, otherwise NULL.
  */
+ /**This function will no longer be called.
 struct opae_adapter *opae_adapter_alloc(const char *name, void *data)
 {
 	struct opae_adapter *adapter = opae_zmalloc(sizeof(*adapter));
@@ -316,13 +339,12 @@ struct opae_adapter *opae_adapter_alloc(const char *name, void *data)
 	if (!adapter)
 		return NULL;
 
-	TAILQ_INIT(&adapter->acc_list);
-	adapter->data = data;
-	adapter->name = name;
-	adapter->ops = match_ops(adapter);
+	if (opae_adapter_init(adapter, name, data))
+		return NULL;
 
 	return adapter;
 }
+**/
 
 /**
  * opae_adapter_enumerate - enumerate this adapter
drivers/raw/ifpga_rawdev/base/opae_hw_api.h +3 -1
index 4bbc9df..ac1941a 100644
@@ -225,7 +225,9 @@ struct opae_adapter {
 void *opae_adapter_data_alloc(enum opae_adapter_type type);
 #define opae_adapter_data_free(data) opae_free(data)
 
-struct opae_adapter *opae_adapter_alloc(const char *name, void *data);
+int opae_adapter_init(struct opae_adapter *adapter,
+		const char *name, void *data);
+//struct opae_adapter *opae_adapter_alloc(const char *name, void *data);
 #define opae_adapter_free(adapter) opae_free(adapter)
 
 int opae_adapter_enumerate(struct opae_adapter *adapter);
drivers/raw/ifpga_rawdev/ifpga_rawdev.c +3 -4
index 32e318f..d433091 100644
@@ -409,9 +409,10 @@
 	data->device_id = pci_dev->id.device_id;
 	data->vendor_id = pci_dev->id.vendor_id;
 
+	adapter = rawdev->dev_private;
 	/* create a opae_adapter based on above device data */
-	adapter = opae_adapter_alloc(pci_dev->device.name, data);
-	if (!adapter) {
+	ret = opae_adapter_init(adapter, pci_dev->device.name, data);
+	if (ret) {
 		ret = -ENOMEM;
 		goto free_adapter_data;
 	}
@@ -420,8 +421,6 @@
 	rawdev->device = &pci_dev->device;
 	rawdev->driver_name = pci_dev->device.driver->name;
 
-	rawdev->dev_private = adapter;
-
 	/* must enumerate the adapter before use it */
 	ret = opae_adapter_enumerate(adapter);
 	if (ret)
Signature · 1 line
1.8.3.1
#4 lore raw

Re: [PATCH v2]/driver/raw/ifpga_rawdev: fix a memory leak bug in ifpga

Hi Andy,

Quoted 70 lines

-----Original Message-----
From: Pei, Andy
Sent: Wednesday, December 19, 2018 3:35
To: [email protected]
Cc: Xu, Rosen <[email protected]>; Zhang, Tianfei <[email protected]>; Pei, Andy <[email protected]>
Subject: [PATCH v2]/driver/raw/ifpga_rawdev: fix a memory leak bug in ifpga

When ifpga_rawdev_create() allocate memory for a new rawdev, the original code allocate redundant memory for adapter, which is a member of the rawdev. What is actually necessary is the adapter to be initialized, not memory allocated.

Fixes ef1e8ede3da5
---
 drivers/raw/ifpga_rawdev/base/opae_hw_api.c | 32
++++++++++++++++++++++++-----
drivers/raw/ifpga_rawdev/base/opae_hw_api.h |  4 +++-
 drivers/raw/ifpga_rawdev/ifpga_rawdev.c     |  7 +++----
 3 files changed, 33 insertions(+), 10 deletions(-)
drivers/raw/ifpga_rawdev/base/opae_hw_api.c +24 -1
index a533dfe..50f6438 100644
@@ -303,12 +303,35 @@ static struct opae_adapter_ops *match_ops(struct
 opae_adapter *adapter)  }
 
 /**
- * opae_adapter_data_alloc - alloc opae_adapter_data data structure
+ * opae_adapter_init - init opae_adapter data structure
+ * @adpdate: pointer of opae_adater data structure
+ * @name: adapter name.
+ * @data: private data of this adapter.
+ *
+ * Return: 0 on success.
+ */
+int opae_adapter_init(struct opae_adapter *adapter,
+		const char *name, void *data)
+{
+	if (!adapter)
+		return -ENOMEM;
+
+	TAILQ_INIT(&adapter->acc_list);
+	adapter->data = data;
+	adapter->name = name;
+	adapter->ops = match_ops(adapter);
+
+	return 0;
+}
+
+/**
+ * opae_adapter_alloc - alloc opae_adapter data structure
  * @name: adapter name.
  * @data: private data of this adapter.
  *
  * Return: opae_adapter on success, otherwise NULL.
  */
+ /**This function will no longer be called.
 struct opae_adapter *opae_adapter_alloc(const char *name, void *data)  {
 	struct opae_adapter *adapter = opae_zmalloc(sizeof(*adapter));
@@ -316,13 +339,12 @@ struct opae_adapter *opae_adapter_alloc(const
 char *name, void *data)
 	if (!adapter)
 		return NULL;

drivers/raw/ifpga_rawdev/base/opae_hw_api.c struct opae_adapter *opae_adapter_alloc(const · line 347

Quoted 10 lines
drivers/raw/ifpga_rawdev/base/opae_hw_api.c +2 -4
 
-	TAILQ_INIT(&adapter->acc_list);
-	adapter->data = data;
-	adapter->name = name;
-	adapter->ops = match_ops(adapter);
+	if (opae_adapter_init(adapter, name, data))
+		return NULL;
 
 	return adapter;
 }

To avoid redundancy, does this function useful?

Quoted 28 lines
drivers/raw/ifpga_rawdev/base/opae_hw_api.c +1 -0
+**/
 
 /**

* opae_adapter_enumerate - enumerate this adapter diff --git
a/drivers/raw/ifpga_rawdev/base/opae_hw_api.h b/drivers/raw/ifpga_rawdev/base/opae_hw_api.h
index 4bbc9df..ac1941a 100644

drivers/raw/ifpga_rawdev/base/opae_hw_api.h +4 -1
@@ -225,7 +225,9 @@ struct opae_adapter {  void
 *opae_adapter_data_alloc(enum opae_adapter_type type);  #define
 opae_adapter_data_free(data) opae_free(data)
 
-struct opae_adapter *opae_adapter_alloc(const char *name, void *data);
+int opae_adapter_init(struct opae_adapter *adapter,
+		const char *name, void *data);
+//struct opae_adapter *opae_adapter_alloc(const char *name, void
+*data);
 #define opae_adapter_free(adapter) opae_free(adapter)
 
 int opae_adapter_enumerate(struct opae_adapter *adapter); diff --git

a/drivers/raw/ifpga_rawdev/ifpga_rawdev.c
b/drivers/raw/ifpga_rawdev/ifpga_rawdev.c
index 32e318f..d433091 100644

drivers/raw/ifpga_rawdev/ifpga_rawdev.c +0 -0
@@ -409,9 +409,10 @@
 	data->device_id = pci_dev->id.device_id;

drivers/raw/ifpga_rawdev/ifpga_rawdev.c line 417

Quoted 10 lines
drivers/raw/ifpga_rawdev/ifpga_rawdev.c +3 -2
 	data->vendor_id = pci_dev->id.vendor_id;
 
+	adapter = rawdev->dev_private;
 	/* create a opae_adapter based on above device data */
-	adapter = opae_adapter_alloc(pci_dev->device.name, data);
-	if (!adapter) {
+	ret = opae_adapter_init(adapter, pci_dev->device.name, data);
+	if (ret) {
 		ret = -ENOMEM;
 		goto free_adapter_data;

Return error from opae_adapter_init() will cause free data? Do you need to free data?

Quoted 12 lines
drivers/raw/ifpga_rawdev/ifpga_rawdev.c +0 -3
 	}
@@ -420,8 +421,6 @@
 	rawdev->device = &pci_dev->device;
 	rawdev->driver_name = pci_dev->device.driver->name;
 
-	rawdev->dev_private = adapter;
-
 	/* must enumerate the adapter before use it */
 	ret = opae_adapter_enumerate(adapter);
 	if (ret)
--

1.8.3.1

author
#5 lore raw

Re: [PATCH v2]/driver/raw/ifpga_rawdev: fix a memory leak bug in ifpga

Hi, Tianfei,

After checking the code, I found that opae_adapter_alloc() function is no long called. So is it Ok to delete the function?

To:
I agree that the free is not necessary.

-----Original Message-----
From: Xu, Rosen
Sent: Wednesday, December 19, 2018 3:16 PM
To: Pei, Andy <[email protected]>; [email protected]
Cc: Zhang, Tianfei <[email protected]>
Subject: RE: [PATCH v2]/driver/raw/ifpga_rawdev: fix a memory leak bug in ifpga

Hi Andy,

Quoted 71 lines

-----Original Message-----
From: Pei, Andy
Sent: Wednesday, December 19, 2018 3:35
To: [email protected]
Cc: Xu, Rosen <[email protected]>; Zhang, Tianfei <[email protected]>; Pei, Andy <[email protected]>
Subject: [PATCH v2]/driver/raw/ifpga_rawdev: fix a memory leak bug in ifpga

When ifpga_rawdev_create() allocate memory for a new rawdev, the original code allocate redundant memory for adapter, which is a member of the rawdev. What is actually necessary is the adapter to be initialized, not memory allocated.

Fixes ef1e8ede3da5
---
 drivers/raw/ifpga_rawdev/base/opae_hw_api.c | 32
++++++++++++++++++++++++-----
drivers/raw/ifpga_rawdev/base/opae_hw_api.h |  4 +++-
 drivers/raw/ifpga_rawdev/ifpga_rawdev.c     |  7 +++----
 3 files changed, 33 insertions(+), 10 deletions(-)
drivers/raw/ifpga_rawdev/base/opae_hw_api.c +24 -2
index a533dfe..50f6438 100644
@@ -303,12 +303,35 @@ static struct opae_adapter_ops *match_ops(struct 
 opae_adapter *adapter)  }
 
 /**
- * opae_adapter_data_alloc - alloc opae_adapter_data data structure
+ * opae_adapter_init - init opae_adapter data structure
+ * @adpdate: pointer of opae_adater data structure
+ * @name: adapter name.
+ * @data: private data of this adapter.
+ *
+ * Return: 0 on success.
+ */
+int opae_adapter_init(struct opae_adapter *adapter,
+		const char *name, void *data)
+{
+	if (!adapter)
+		return -ENOMEM;
+
+	TAILQ_INIT(&adapter->acc_list);
+	adapter->data = data;
+	adapter->name = name;
+	adapter->ops = match_ops(adapter);
+
+	return 0;
+}
+
+/**
+ * opae_adapter_alloc - alloc opae_adapter data structure
  * @name: adapter name.
  * @data: private data of this adapter.
  *
  * Return: opae_adapter on success, otherwise NULL.
  */
+ /**This function will no longer be called.
 struct opae_adapter *opae_adapter_alloc(const char *name, void *data)  {
 	struct opae_adapter *adapter = opae_zmalloc(sizeof(*adapter)); @@ 
-316,13 +339,12 @@ struct opae_adapter *opae_adapter_alloc(const char 

*name, void *data)

drivers/raw/ifpga_rawdev/base/opae_hw_api.c +0 -0
 	if (!adapter)
 		return NULL;

drivers/raw/ifpga_rawdev/base/opae_hw_api.c struct opae_adapter *opae_adapter_alloc(const char *name, void *data) · line 346

Quoted 10 lines
drivers/raw/ifpga_rawdev/base/opae_hw_api.c +2 -4
 
-	TAILQ_INIT(&adapter->acc_list);
-	adapter->data = data;
-	adapter->name = name;
-	adapter->ops = match_ops(adapter);
+	if (opae_adapter_init(adapter, name, data))
+		return NULL;
 
 	return adapter;
 }

To avoid redundancy, does this function useful?

Quoted 29 lines

+**/

/**
* opae_adapter_enumerate - enumerate this adapter diff --git
a/drivers/raw/ifpga_rawdev/base/opae_hw_api.h b/drivers/raw/ifpga_rawdev/base/opae_hw_api.h
index 4bbc9df..ac1941a 100644

drivers/raw/ifpga_rawdev/base/opae_hw_api.h +4 -1
@@ -225,7 +225,9 @@ struct opae_adapter {  void 
 *opae_adapter_data_alloc(enum opae_adapter_type type);  #define
 opae_adapter_data_free(data) opae_free(data)
 
-struct opae_adapter *opae_adapter_alloc(const char *name, void 
 *data);
+int opae_adapter_init(struct opae_adapter *adapter,
+		const char *name, void *data);
+//struct opae_adapter *opae_adapter_alloc(const char *name, void 
+*data);
 #define opae_adapter_free(adapter) opae_free(adapter)
 
 int opae_adapter_enumerate(struct opae_adapter *adapter); diff --git 

a/drivers/raw/ifpga_rawdev/ifpga_rawdev.c
b/drivers/raw/ifpga_rawdev/ifpga_rawdev.c
index 32e318f..d433091 100644

drivers/raw/ifpga_rawdev/ifpga_rawdev.c +0 -0
@@ -409,9 +409,10 @@
 	data->device_id = pci_dev->id.device_id;

drivers/raw/ifpga_rawdev/ifpga_rawdev.c line 417

Quoted 10 lines
drivers/raw/ifpga_rawdev/ifpga_rawdev.c +3 -2
 	data->vendor_id = pci_dev->id.vendor_id;
 
+	adapter = rawdev->dev_private;
 	/* create a opae_adapter based on above device data */
-	adapter = opae_adapter_alloc(pci_dev->device.name, data);
-	if (!adapter) {
+	ret = opae_adapter_init(adapter, pci_dev->device.name, data);
+	if (ret) {
 		ret = -ENOMEM;
 		goto free_adapter_data;

Return error from opae_adapter_init() will cause free data? Do you need to free data?

Quoted 12 lines
drivers/raw/ifpga_rawdev/ifpga_rawdev.c +0 -3
 	}
@@ -420,8 +421,6 @@
 	rawdev->device = &pci_dev->device;
 	rawdev->driver_name = pci_dev->device.driver->name;
 
-	rawdev->dev_private = adapter;
-
 	/* must enumerate the adapter before use it */
 	ret = opae_adapter_enumerate(adapter);
 	if (ret)
--

1.8.3.1

author
#6 lore raw

PATCH v3 1/1 /driver/raw/ifpga_rawdev: fix a memory leak bug in ifpga

In reply to AndyPei

When ifpga_rawdev_create() allocate memory for a new rawdev, the original code allocate redundant memory for adapter, which is a member of the rawdev. What is actually necessary is the adapter to be initialized, not memory allocated.

What is different in v3 from v2 is that the adapter is no longer need to be freed.

Fixes ef1e8ede3da5
---
 drivers/raw/ifpga_rawdev/base/opae_hw_api.c | 32 ++++++++++++++++++++++++-----
 drivers/raw/ifpga_rawdev/base/opae_hw_api.h |  3 ++-
 drivers/raw/ifpga_rawdev/ifpga_rawdev.c     | 12 ++++-------
 3 files changed, 33 insertions(+), 14 deletions(-)
drivers/raw/ifpga_rawdev/base/opae_hw_api.c +27 -5
index a533dfe..50f6438 100644
@@ -303,12 +303,35 @@ static struct opae_adapter_ops *match_ops(struct opae_adapter *adapter)
 }
 
 /**
- * opae_adapter_data_alloc - alloc opae_adapter_data data structure
+ * opae_adapter_init - init opae_adapter data structure
+ * @adpdate: pointer of opae_adater data structure
+ * @name: adapter name.
+ * @data: private data of this adapter.
+ *
+ * Return: 0 on success.
+ */
+int opae_adapter_init(struct opae_adapter *adapter,
+		const char *name, void *data)
+{
+	if (!adapter)
+		return -ENOMEM;
+
+	TAILQ_INIT(&adapter->acc_list);
+	adapter->data = data;
+	adapter->name = name;
+	adapter->ops = match_ops(adapter);
+
+	return 0;
+}
+
+/**
+ * opae_adapter_alloc - alloc opae_adapter data structure
  * @name: adapter name.
  * @data: private data of this adapter.
  *
  * Return: opae_adapter on success, otherwise NULL.
  */
+ /**This function will no longer be called.
 struct opae_adapter *opae_adapter_alloc(const char *name, void *data)
 {
 	struct opae_adapter *adapter = opae_zmalloc(sizeof(*adapter));
@@ -316,13 +339,12 @@ struct opae_adapter *opae_adapter_alloc(const char *name, void *data)
 	if (!adapter)
 		return NULL;
 
-	TAILQ_INIT(&adapter->acc_list);
-	adapter->data = data;
-	adapter->name = name;
-	adapter->ops = match_ops(adapter);
+	if (opae_adapter_init(adapter, name, data))
+		return NULL;
 
 	return adapter;
 }
+**/
 
 /**
  * opae_adapter_enumerate - enumerate this adapter
drivers/raw/ifpga_rawdev/base/opae_hw_api.h +2 -1
index 4bbc9df..332e0f3 100644
@@ -225,7 +225,8 @@ struct opae_adapter {
 void *opae_adapter_data_alloc(enum opae_adapter_type type);
 #define opae_adapter_data_free(data) opae_free(data)
 
-struct opae_adapter *opae_adapter_alloc(const char *name, void *data);
+int opae_adapter_init(struct opae_adapter *adapter,
+		const char *name, void *data);
 #define opae_adapter_free(adapter) opae_free(adapter)
 
 int opae_adapter_enumerate(struct opae_adapter *adapter);
drivers/raw/ifpga_rawdev/ifpga_rawdev.c +4 -8
index 32e318f..da772d0 100644
@@ -409,9 +409,10 @@
 	data->device_id = pci_dev->id.device_id;
 	data->vendor_id = pci_dev->id.vendor_id;
 
+	adapter = rawdev->dev_private;
 	/* create a opae_adapter based on above device data */
-	adapter = opae_adapter_alloc(pci_dev->device.name, data);
-	if (!adapter) {
+	ret = opae_adapter_init(adapter, pci_dev->device.name, data);
+	if (ret) {
 		ret = -ENOMEM;
 		goto free_adapter_data;
 	}
@@ -420,12 +421,10 @@
 	rawdev->device = &pci_dev->device;
 	rawdev->driver_name = pci_dev->device.driver->name;
 
-	rawdev->dev_private = adapter;
-
 	/* must enumerate the adapter before use it */
 	ret = opae_adapter_enumerate(adapter);
 	if (ret)
-		goto free_adapter;
+		goto free_adapter_data;
 
 	/* get opae_manager to rawdev */
 	mgr = opae_adapter_get_mgr(adapter);
@@ -436,9 +435,6 @@
 
 	return ret;
 
-free_adapter:
-	if (adapter)
-		opae_adapter_free(adapter);
 free_adapter_data:
 	if (data)
 		opae_adapter_data_free(data);
Signature · 1 line
1.8.3.1
#7 lore raw

Re: [PATCH v3]/driver/raw/ifpga_rawdev: fix a memory leak bug in ifpga

Quoted 15 lines

-----Original Message-----
From: Pei, Andy
Sent: Tuesday, December 25, 2018 10:02 PM
To: [email protected]
Cc: Xu, Rosen <[email protected]>; Zhang, Tianfei <[email protected]>; Pei, Andy <[email protected]>
Subject: [PATCH v3]/driver/raw/ifpga_rawdev: fix a memory leak bug in ifpga

When ifpga_rawdev_create() allocate memory for a new rawdev, the original code allocate redundant memory for adapter, which is a member of the rawdev.
What is actually necessary is the adapter to be initialized, not memory allocated.

Quoted 6 lines

What is different in v3 from v2 is that the adapter is no longer need to be freed.

Fixes ef1e8ede3da5

It looks good for me, Acked-by: Tianfei zhang <[email protected]>

Acked-by on v3 1/1
#8 lore raw

Re: [PATCH v3]/driver/raw/ifpga_rawdev: fix a memory leak bug in ifpga

In reply to AndyPei

Hi,

Quoted 14 lines

-----Original Message-----
From: Pei, Andy
Sent: Tuesday, December 25, 2018 22:02
To: [email protected]
Cc: Xu, Rosen <[email protected]>; Zhang, Tianfei <[email protected]>; Pei, Andy <[email protected]>
Subject: [PATCH v3]/driver/raw/ifpga_rawdev: fix a memory leak bug in ifpga

When ifpga_rawdev_create() allocate memory for a new rawdev, the original code allocate redundant memory for adapter, which is a member of the rawdev.
What is actually necessary is the adapter to be initialized, not memory allocated.

Quoted 6 lines

What is different in v3 from v2 is that the adapter is no longer need to be freed.

Fixes ef1e8ede3da5
#9 lore raw

Re: [PATCH v3]/driver/raw/ifpga_rawdev: fix a memory leak bug in ifpga

In reply to AndyPei

Hi Andy,

I comment here for all your patches (4 are pending). They are your first patches for DPDK, welcome!
You may want to read the guides explaining how to contribute:
http://doc.dpdk.org/guides/contributing/patches.html

The title should be "raw/ifpga: fix memory leak in [area here]"

25/12/2018 15:02, AndyPei:

Quoted 5 lines

When ifpga_rawdev_create() allocate memory for a new rawdev, the original code allocate redundant memory for adapter, which is a member of the rawdev. What is actually necessary is the adapter to be initialized, not memory allocated.

What is different in v3 from v2 is that the adapter is no longer need to be freed.

The changelog is better located after --- below.

Quoted 3 lines
Fixes ef1e8ede3da5

The format should be a bit different.
Please use git log -1 --abbrev=12 --format='Fixes: %h (\"%s\")%nCc: %ae' and check with devtools/check-git-log.sh

Quoted 1 line

Should there be a space in your name as "Andy Pei"?

[...]

Quoted 6 lines

/**
- * opae_adapter_data_alloc - alloc opae_adapter_data data structure
+ * opae_adapter_init - init opae_adapter data structure
+ * @adpdate: pointer of opae_adater data structure
+ * @name: adapter name.
+ * @data: private data of this adapter.

The doxygen format is @param param_name param_description. It is also important to strictly match the name of the parameter. @adpdate is a typo (should be @param adapter).

You can build the doc with "make doc-api-html"
and check the result in your browser.

Quoted 5 lines

+ *
+ * Return: 0 on success.
+ */

drivers/raw/ifpga_rawdev/base/opae_hw_api.c +2 -0
+int opae_adapter_init(struct opae_adapter *adapter,
+		const char *name, void *data)
author
#10 lore raw

PATCH v4 1/1 raw/ifpga: fix a typo and delete code of unused function

In reply to AndyPei

fix a typo and delete code of unused function

Fixes 88c9eb7cb4b5 (\"fix a typo and delete code of unused function\")
---
 drivers/raw/ifpga_rawdev/base/opae_hw_api.c | 24 +-----------------------
 1 file changed, 1 insertion(+), 23 deletions(-)
drivers/raw/ifpga_rawdev/base/opae_hw_api.c +1 -23
index 50f6438..ea42757 100644
@@ -304,7 +304,7 @@ static struct opae_adapter_ops *match_ops(struct opae_adapter *adapter)
 
 /**
  * opae_adapter_init - init opae_adapter data structure
- * @adpdate: pointer of opae_adater data structure
+ * @adapter: pointer of opae_adater data structure
  * @name: adapter name.
  * @data: private data of this adapter.
  *
@@ -325,28 +325,6 @@ int opae_adapter_init(struct opae_adapter *adapter,
 }
 
 /**
- * opae_adapter_alloc - alloc opae_adapter data structure
- * @name: adapter name.
- * @data: private data of this adapter.
- *
- * Return: opae_adapter on success, otherwise NULL.
- */
- /**This function will no longer be called.
-struct opae_adapter *opae_adapter_alloc(const char *name, void *data)
-{
-	struct opae_adapter *adapter = opae_zmalloc(sizeof(*adapter));
-
-	if (!adapter)
-		return NULL;
-
-	if (opae_adapter_init(adapter, name, data))
-		return NULL;
-
-	return adapter;
-}
-**/
-
-/**
  * opae_adapter_enumerate - enumerate this adapter
  * @adapter: adapter to enumerate.
  *
Signature · 1 line
1.8.3.1
#11 lore raw

Re: [DPDK] [PATCH v4] raw/ifpga: fix a typo and delete code of unused function

Hi,

Pls don't use fixline if your patch code doesn't merged in community.

Quoted 66 lines

-----Original Message-----
From: Pei, Andy
Sent: Tuesday, January 15, 2019 13:38
To: [email protected]
Cc: Xu, Rosen <[email protected]>; Zhang, Tianfei <[email protected]>; Pei, Andy <[email protected]>
Subject: [DPDK] [PATCH v4] raw/ifpga: fix a typo and delete code of unused function

fix a typo and delete code of unused function

Fixes 88c9eb7cb4b5 (\"fix a typo and delete code of unused function\")
---
 drivers/raw/ifpga_rawdev/base/opae_hw_api.c | 24 +-----------------------
 1 file changed, 1 insertion(+), 23 deletions(-)
drivers/raw/ifpga_rawdev/base/opae_hw_api.c +1 -1
index 50f6438..ea42757 100644
@@ -304,7 +304,7 @@ static struct opae_adapter_ops *match_ops(struct
 opae_adapter *adapter)
 
 /**
  * opae_adapter_init - init opae_adapter data structure
- * @adpdate: pointer of opae_adater data structure
+ * @adapter: pointer of opae_adater data structure
  * @name: adapter name.
  * @data: private data of this adapter.

*

drivers/raw/ifpga_rawdev/base/opae_hw_api.c +0 -22
@@ -325,28 +325,6 @@ int opae_adapter_init(struct opae_adapter
 *adapter,  }
 
 /**
- * opae_adapter_alloc - alloc opae_adapter data structure
- * @name: adapter name.
- * @data: private data of this adapter.
- *
- * Return: opae_adapter on success, otherwise NULL.
- */
- /**This function will no longer be called.
-struct opae_adapter *opae_adapter_alloc(const char *name, void *data) -{
-	struct opae_adapter *adapter = opae_zmalloc(sizeof(*adapter));
-
-	if (!adapter)
-		return NULL;
-
-	if (opae_adapter_init(adapter, name, data))
-		return NULL;
-
-	return adapter;
-}
-**/
-
-/**
  * opae_adapter_enumerate - enumerate this adapter
  * @adapter: adapter to enumerate.
  *
--

1.8.3.1

author
#12 lore raw

[DPDK] raw/ifpga: fix a typo and delete code of unused function

In reply to Andy Pei

fix a typo and delete code of unused function

---
 drivers/raw/ifpga_rawdev/base/opae_hw_api.c | 24 +-----------------------
 1 file changed, 1 insertion(+), 23 deletions(-)
drivers/raw/ifpga_rawdev/base/opae_hw_api.c +1 -23
index 50f6438..ea42757 100644
@@ -304,7 +304,7 @@ static struct opae_adapter_ops *match_ops(struct opae_adapter *adapter)
 
 /**
  * opae_adapter_init - init opae_adapter data structure
- * @adpdate: pointer of opae_adater data structure
+ * @adapter: pointer of opae_adater data structure
  * @name: adapter name.
  * @data: private data of this adapter.
  *
@@ -325,28 +325,6 @@ int opae_adapter_init(struct opae_adapter *adapter,
 }
 
 /**
- * opae_adapter_alloc - alloc opae_adapter data structure
- * @name: adapter name.
- * @data: private data of this adapter.
- *
- * Return: opae_adapter on success, otherwise NULL.
- */
- /**This function will no longer be called.
-struct opae_adapter *opae_adapter_alloc(const char *name, void *data)
-{
-	struct opae_adapter *adapter = opae_zmalloc(sizeof(*adapter));
-
-	if (!adapter)
-		return NULL;
-
-	if (opae_adapter_init(adapter, name, data))
-		return NULL;
-
-	return adapter;
-}
-**/
-
-/**
  * opae_adapter_enumerate - enumerate this adapter
  * @adapter: adapter to enumerate.
  *
Signature · 1 line
1.8.3.1
#13 lore raw

Re: [DPDK] raw/ifpga: fix a typo and delete code of unused function

Quoted 16 lines · Andy Pei

fix a typo and delete code of unused function

---
drivers/raw/ifpga_rawdev/base/opae_hw_api.c | 24 +-----------------------

1 file changed, 1 insertion(+), 23 deletions(-)
drivers/raw/ifpga_rawdev/base/opae_hw_api.c +0 -0
index 50f6438..ea42757 100644

drivers/raw/ifpga_rawdev/base/opae_hw_api.c static struct opae_adapter_ops *match_ops(struct opae_adapter *adapter) · line 307

Quoted 5 lines
drivers/raw/ifpga_rawdev/base/opae_hw_api.c +1 -1
@@ -304,7 +304,7 @@ static struct opae_adapter_ops *match_ops(struct opae_adapter *adapter)
 
 /**
 * opae_adapter_init - init opae_adapter data structure
- * @adpdate: pointer of opae_adater data structure
+ * @adapter: pointer of opae_adater data structure

Seems there is another typo here, s/opae_adater/opae_adapter/

Thanks,
Xiaolong

Quoted 35 lines
drivers/raw/ifpga_rawdev/base/opae_hw_api.c +0 -22
 * @name: adapter name.
 * @data: private data of this adapter.
 *
@@ -325,28 +325,6 @@ int opae_adapter_init(struct opae_adapter *adapter,
 }
 
 /**
- * opae_adapter_alloc - alloc opae_adapter data structure
- * @name: adapter name.
- * @data: private data of this adapter.
- *
- * Return: opae_adapter on success, otherwise NULL.
- */
- /**This function will no longer be called.
-struct opae_adapter *opae_adapter_alloc(const char *name, void *data)
-{
-	struct opae_adapter *adapter = opae_zmalloc(sizeof(*adapter));
-
-	if (!adapter)
-		return NULL;
-
-	if (opae_adapter_init(adapter, name, data))
-		return NULL;
-
-	return adapter;
-}
-**/
-
-/**
 * opae_adapter_enumerate - enumerate this adapter
 * @adapter: adapter to enumerate.
 *
Signature · 1 line
1.8.3.1
author
#14 lore raw

[DPDK] raw/ifpga: fix a typo

In reply to Andy Pei

fix a typo

---
 drivers/raw/ifpga_rawdev/base/opae_hw_api.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/raw/ifpga_rawdev/base/opae_hw_api.c +1 -1
index ea42757..1541b67 100644
@@ -304,7 +304,7 @@ static struct opae_adapter_ops *match_ops(struct opae_adapter *adapter)
 
 /**
  * opae_adapter_init - init opae_adapter data structure
- * @adapter: pointer of opae_adater data structure
+ * @adapter: pointer of opae_adapter data structure
  * @name: adapter name.
  * @data: private data of this adapter.
  *
Signature · 1 line
1.8.3.1
#15 lore raw

Re: [DPDK] raw/ifpga: fix a typo

Hi,

Quoted 7 lines

-----Original Message-----
From: Pei, Andy
Sent: Thursday, January 17, 2019 14:40
To: [email protected]
Cc: Xu, Rosen <[email protected]>; Zhang, Tianfei <[email protected]>; Pei, Andy <[email protected]>
Subject: [DPDK] raw/ifpga: fix a typo

Which version number?

Quoted 1 line

fix a typo

Pls descript it in detail.

Quoted 3 lines

Miss fixline.

Quoted 22 lines
---
 drivers/raw/ifpga_rawdev/base/opae_hw_api.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/raw/ifpga_rawdev/base/opae_hw_api.c +1 -1
index ea42757..1541b67 100644
@@ -304,7 +304,7 @@ static struct opae_adapter_ops *match_ops(struct
 opae_adapter *adapter)
 
 /**
  * opae_adapter_init - init opae_adapter data structure
- * @adapter: pointer of opae_adater data structure
+ * @adapter: pointer of opae_adapter data structure
  * @name: adapter name.
  * @data: private data of this adapter.

*
--
1.8.3.1