net/af_packet: fix for stale sockets

Message ID 1566455136-8496-1-git-send-email-abhishek.sachan@altran.com (mailing list archive)
State Accepted, archived
Delegated to: Ferruh Yigit
Headers
Series net/af_packet: fix for stale sockets |

Checks

Context Check Description
ci/checkpatch success coding style OK
ci/iol-Compile-Testing success Compile Testing PASS
ci/intel-Performance-Testing success Performance Testing PASS
ci/Intel-compilation fail Compilation issues
ci/mellanox-Performance-Testing success Performance Testing PASS

Commit Message

Abhishek Sachan Aug. 22, 2019, 6:25 a.m. UTC
  af_packet driver is leaving stale socket after device is removed.
Ring buffers are memory mapped when device is added using rte_dev_probe.
There is no corresponding munmap call when device is removed/closed.
This commit fixes the issue by calling munmap
from rte_pmd_af_packet_remove().

Bugzilla ID: 339
Cc: stable@dpdk.org

Signed-off-by: Abhishek Sachan <abhishek.sachan@altran.com>
Reviewed-by: John W. Linville <linville@redhat.com>
---
 drivers/net/af_packet/rte_eth_af_packet.c | 4 ++++
 1 file changed, 4 insertions(+)
  

Comments

John W. Linville Aug. 23, 2019, 3:28 p.m. UTC | #1
On Thu, Aug 22, 2019 at 11:55:36AM +0530, Abhishek Sachan wrote:
> af_packet driver is leaving stale socket after device is removed.
> Ring buffers are memory mapped when device is added using rte_dev_probe.
> There is no corresponding munmap call when device is removed/closed.
> This commit fixes the issue by calling munmap
> from rte_pmd_af_packet_remove().
> 
> Bugzilla ID: 339
> Cc: stable@dpdk.org
> 
> Signed-off-by: Abhishek Sachan <abhishek.sachan@altran.com>
> Reviewed-by: John W. Linville <linville@redhat.com>

Confirmed...

Reviewed-by: John W. Linville <linville@redhat.com>

John
  
Ferruh Yigit Aug. 27, 2019, 1:37 p.m. UTC | #2
On 8/23/2019 4:28 PM, John W. Linville wrote:
> On Thu, Aug 22, 2019 at 11:55:36AM +0530, Abhishek Sachan wrote:
>> af_packet driver is leaving stale socket after device is removed.
>> Ring buffers are memory mapped when device is added using rte_dev_probe.
>> There is no corresponding munmap call when device is removed/closed.
>> This commit fixes the issue by calling munmap
>> from rte_pmd_af_packet_remove().
>>
>> Bugzilla ID: 339
>> Cc: stable@dpdk.org
>>
>> Signed-off-by: Abhishek Sachan <abhishek.sachan@altran.com>
>> Reviewed-by: John W. Linville <linville@redhat.com>
> 
> Confirmed...
> 
> Reviewed-by: John W. Linville <linville@redhat.com>

Applied to dpdk-next-net/master, thanks.
  

Patch

diff --git a/drivers/net/af_packet/rte_eth_af_packet.c b/drivers/net/af_packet/rte_eth_af_packet.c
index 82bf2cd..6df09f2 100644
--- a/drivers/net/af_packet/rte_eth_af_packet.c
+++ b/drivers/net/af_packet/rte_eth_af_packet.c
@@ -972,6 +972,7 @@  rte_pmd_af_packet_remove(struct rte_vdev_device *dev)
 {
 	struct rte_eth_dev *eth_dev = NULL;
 	struct pmd_internals *internals;
+	struct tpacket_req *req;
 	unsigned q;
 
 	PMD_LOG(INFO, "Closing AF_PACKET ethdev on numa socket %u",
@@ -992,7 +993,10 @@  rte_pmd_af_packet_remove(struct rte_vdev_device *dev)
 		return rte_eth_dev_release_port(eth_dev);
 
 	internals = eth_dev->data->dev_private;
+	req = &internals->req;
 	for (q = 0; q < internals->nb_queues; q++) {
+		munmap(internals->rx_queue[q].map,
+			2 * req->tp_block_size * req->tp_block_nr);
 		rte_free(internals->rx_queue[q].rd);
 		rte_free(internals->tx_queue[q].rd);
 	}