8b4b949144
When qemu close the unix socket fd of the vhostuser as a
server, and then immediately delete the vhostuser port on
openvswitch. There will be a deadlock.
A thread (fdset event thread): B thread:
1. fdset_event_dispatch rte_vhost_driver_unregister
2. set the fd busy to 1. lock vsocket->conn_mutex
3. vhost_user_read_cb fdset_del waits busy changed to 0.
4. vhost peer closed, remove the
conn from vsocket->conn_list:
lock vsocket->conn_mutex
5. set the fd busy to 0
Fixes: 65388b43f5
("vhost: fix fd leaks for vhost-user server mode")
Cc: stable@dpdk.org
Signed-off-by: Tonghao Zhang <xiangxia.m.yue@gmail.com>
Acked-by: Maxime Coquelin <maxime.coquelin@redhat.com>
58 lines
1.2 KiB
C
58 lines
1.2 KiB
C
/* SPDX-License-Identifier: BSD-3-Clause
|
|
* Copyright(c) 2010-2014 Intel Corporation
|
|
*/
|
|
|
|
#ifndef _FD_MAN_H_
|
|
#define _FD_MAN_H_
|
|
#include <stdint.h>
|
|
#include <pthread.h>
|
|
#include <poll.h>
|
|
|
|
#define MAX_FDS 1024
|
|
|
|
typedef void (*fd_cb)(int fd, void *dat, int *remove);
|
|
|
|
struct fdentry {
|
|
int fd; /* -1 indicates this entry is empty */
|
|
fd_cb rcb; /* callback when this fd is readable. */
|
|
fd_cb wcb; /* callback when this fd is writeable.*/
|
|
void *dat; /* fd context */
|
|
int busy; /* whether this entry is being used in cb. */
|
|
};
|
|
|
|
struct fdset {
|
|
struct pollfd rwfds[MAX_FDS];
|
|
struct fdentry fd[MAX_FDS];
|
|
pthread_mutex_t fd_mutex;
|
|
int num; /* current fd number of this fdset */
|
|
|
|
union pipefds {
|
|
struct {
|
|
int pipefd[2];
|
|
};
|
|
struct {
|
|
int readfd;
|
|
int writefd;
|
|
};
|
|
} u;
|
|
};
|
|
|
|
|
|
void fdset_init(struct fdset *pfdset);
|
|
|
|
int fdset_add(struct fdset *pfdset, int fd,
|
|
fd_cb rcb, fd_cb wcb, void *dat);
|
|
|
|
void *fdset_del(struct fdset *pfdset, int fd);
|
|
int fdset_try_del(struct fdset *pfdset, int fd);
|
|
|
|
void *fdset_event_dispatch(void *arg);
|
|
|
|
int fdset_pipe_init(struct fdset *fdset);
|
|
|
|
void fdset_pipe_uninit(struct fdset *fdset);
|
|
|
|
void fdset_pipe_notify(struct fdset *fdset);
|
|
|
|
#endif
|