diff mbox series

[v2] examples/vhost: fix memory leak on forwarding packets

Message ID 20210827140037.3822-1-wenwux.ma@intel.com (mailing list archive)
State Changes Requested, archived
Delegated to: Maxime Coquelin
Headers
Series [v2] examples/vhost: fix memory leak on forwarding packets |

Checks

Context Check Description
ci/checkpatch success coding style OK
ci/github-robot: build success github build: passed
ci/iol-broadcom-Performance success Performance Testing PASS
ci/iol-broadcom-Functional success Functional Testing PASS
ci/iol-intel-Functional success Functional Testing PASS
ci/iol-intel-Performance success Performance Testing PASS
ci/iol-mellanox-Performance success Performance Testing PASS
ci/iol-x86_64-compile-testing success Testing PASS
ci/iol-aarch64-compile-testing success Testing PASS
ci/iol-x86_64-unit-testing success Testing PASS
ci/iol-aarch64-unit-testing fail Testing issues
ci/Intel-compilation success Compilation OK
ci/intel-Testing success Testing PASS

Commit Message

Ma, WenwuX Aug. 27, 2021, 2 p.m. UTC 
  In function virtio_tx_local(), when the device receiving the packet
is the same as the device to which the packet is forwarded,
or the device is removed, we return but not free the packet,
it will cause a memory leak.

Fixes: 4796ad63ba1f ("examples/vhost: import userspace vhost application")
Cc: stable@dpdk.org

v2:
- Delete '.' in the title.

Signed-off-by: Wenwu Ma <wenwux.ma@intel.com>
---
 examples/vhost/main.c | 2 ++
 1 file changed, 2 insertions(+)

Comments

Chenbo Xia Aug. 31, 2021, 5:50 a.m. UTC | #1 
Hi Wenwu,

> -----Original Message-----
> From: Ma, WenwuX <wenwux.ma@intel.com>
> Sent: Friday, August 27, 2021 10:01 PM
> To: dev@dpdk.org
> Cc: maxime.coquelin@redhat.com; Xia, Chenbo <chenbo.xia@intel.com>; Jiang,
> Cheng1 <cheng1.jiang@intel.com>; Hu, Jiayu <jiayu.hu@intel.com>; Ma, WenwuX
> <wenwux.ma@intel.com>; stable@dpdk.org
> Subject: [PATCH v2] examples/vhost: fix memory leak on forwarding packets
> 
> In function virtio_tx_local(), when the device receiving the packet
> is the same as the device to which the packet is forwarded,
> or the device is removed, we return but not free the packet,
> it will cause a memory leak.
> 
> Fixes: 4796ad63ba1f ("examples/vhost: import userspace vhost application")
> Cc: stable@dpdk.org
> 
> v2:
> - Delete '.' in the title.
> 
> Signed-off-by: Wenwu Ma <wenwux.ma@intel.com>

The version description should be after signed-off-by tag like:

Signed-off-by: Wenwu Ma <wenwux.ma@intel.com>
---

v2:XXX

---
examples/vhost/main.c | 2 ++

Please fix this to save Maxime's effort when applying.
And you missed the Acked-by/Reviewed-by tag of Jiayu/Cheng/Mine.

Thanks,
Chenbo

> ---
>  examples/vhost/main.c | 2 ++
>  1 file changed, 2 insertions(+)
> 
> diff --git a/examples/vhost/main.c b/examples/vhost/main.c
> index bc3d71c898..07fd90ec64 100644
> --- a/examples/vhost/main.c
> +++ b/examples/vhost/main.c
> @@ -965,6 +965,7 @@ virtio_tx_local(struct vhost_dev *vdev, struct rte_mbuf *m)
>  		return -1;
> 
>  	if (vdev->vid == dst_vdev->vid) {
> +		rte_pktmbuf_free(m);
>  		RTE_LOG_DP(DEBUG, VHOST_DATA,
>  			"(%d) TX: src and dst MAC is same. Dropping packet.\n",
>  			vdev->vid);
> @@ -975,6 +976,7 @@ virtio_tx_local(struct vhost_dev *vdev, struct rte_mbuf *m)
>  		"(%d) TX: MAC address is local\n", dst_vdev->vid);
> 
>  	if (unlikely(dst_vdev->remove)) {
> +		rte_pktmbuf_free(m);
>  		RTE_LOG_DP(DEBUG, VHOST_DATA,
>  			"(%d) device is marked for removal\n", dst_vdev->vid);
>  		return 0;
> --
> 2.25.1
Yang, YvonneX Sept. 2, 2021, 6:50 a.m. UTC | #2 
> -----Original Message-----
> From: dev <dev-bounces@dpdk.org> On Behalf Of Wenwu Ma
> Sent: Friday, August 27, 2021 10:01 PM
> To: dev@dpdk.org
> Cc: maxime.coquelin@redhat.com; Xia, Chenbo <chenbo.xia@intel.com>;
> Jiang, Cheng1 <cheng1.jiang@intel.com>; Hu, Jiayu <jiayu.hu@intel.com>;
> Ma, WenwuX <wenwux.ma@intel.com>; stable@dpdk.org
> Subject: [dpdk-dev] [PATCH v2] examples/vhost: fix memory leak on
> forwarding packets
> 
> In function virtio_tx_local(), when the device receiving the packet is the
> same as the device to which the packet is forwarded, or the device is
> removed, we return but not free the packet, it will cause a memory leak.
> 
> Fixes: 4796ad63ba1f ("examples/vhost: import userspace vhost application")
> Cc: stable@dpdk.org
> 
> v2:
> - Delete '.' in the title.
> 
> Signed-off-by: Wenwu Ma <wenwux.ma@intel.com>
> ---
>  examples/vhost/main.c | 2 ++
>  1 file changed, 2 insertions(+)
> 
> diff --git a/examples/vhost/main.c b/examples/vhost/main.c index
> bc3d71c898..07fd90ec64 100644
> --- a/examples/vhost/main.c
> +++ b/examples/vhost/main.c
> @@ -965,6 +965,7 @@ virtio_tx_local(struct vhost_dev *vdev, struct
> rte_mbuf *m)
>  		return -1;
> 
>  	if (vdev->vid == dst_vdev->vid) {
> +		rte_pktmbuf_free(m);
>  		RTE_LOG_DP(DEBUG, VHOST_DATA,
>  			"(%d) TX: src and dst MAC is same. Dropping
> packet.\n",
>  			vdev->vid);
> @@ -975,6 +976,7 @@ virtio_tx_local(struct vhost_dev *vdev, struct
> rte_mbuf *m)
>  		"(%d) TX: MAC address is local\n", dst_vdev->vid);
> 
>  	if (unlikely(dst_vdev->remove)) {
> +		rte_pktmbuf_free(m);
>  		RTE_LOG_DP(DEBUG, VHOST_DATA,
>  			"(%d) device is marked for removal\n", dst_vdev-
> >vid);
>  		return 0;
> --
> 2.25.1

Tested-by: Yvonne Yang <yvonnex.yang@intel.com>
diff mbox series

Patch

diff --git a/examples/vhost/main.c b/examples/vhost/main.c
index bc3d71c898..07fd90ec64 100644
--- a/examples/vhost/main.c
+++ b/examples/vhost/main.c
@@ -965,6 +965,7 @@  virtio_tx_local(struct vhost_dev *vdev, struct rte_mbuf *m)
 		return -1;
 
 	if (vdev->vid == dst_vdev->vid) {
+		rte_pktmbuf_free(m);
 		RTE_LOG_DP(DEBUG, VHOST_DATA,
 			"(%d) TX: src and dst MAC is same. Dropping packet.\n",
 			vdev->vid);
@@ -975,6 +976,7 @@  virtio_tx_local(struct vhost_dev *vdev, struct rte_mbuf *m)
 		"(%d) TX: MAC address is local\n", dst_vdev->vid);
 
 	if (unlikely(dst_vdev->remove)) {
+		rte_pktmbuf_free(m);
 		RTE_LOG_DP(DEBUG, VHOST_DATA,
 			"(%d) device is marked for removal\n", dst_vdev->vid);
 		return 0;