mirrors/qemu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

io/channel-tls.c: make qio_channel_tls_shutdown thread-safe

Browse Source 
Make qio_channel_tls_shutdown thread-safe by using atomics when
accessing tioc->shutdown.

Signed-off-by: Lukas Straub <lukasstraub2@web.de>
Acked-by: Stefan Hajnoczi <stefanha@redhat.com>
Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>
Message-Id: <5bd8733f583f3558b32250fd0eb576b7aa756485.1609167865.git.lukasstraub2@web.de>
Signed-off-by: Markus Armbruster <armbru@redhat.com>
This commit is contained in:
Lukas Straub 2020-12-28 16:08:55 +01:00 committed by Markus Armbruster
parent b5eea99ec2
commit e4d2bfb170
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
io/channel-tls.c
View File

@ -23,6 +23,7 @@
#include "qemu/module.h" #include "qemu/module.h"
#include "io/channel-tls.h" #include "io/channel-tls.h"
#include "trace.h" #include "trace.h"
#include "qemu/atomic.h"
static ssize_t qio_channel_tls_write_handler(const char *buf, static ssize_t qio_channel_tls_write_handler(const char *buf,
@ -277,7 +278,8 @@ static ssize_t qio_channel_tls_readv(QIOChannel *ioc,
return QIO_CHANNEL_ERR_BLOCK; return QIO_CHANNEL_ERR_BLOCK;
} }
} else if (errno == ECONNABORTED && } else if (errno == ECONNABORTED &&
(tioc->shutdown & QIO_CHANNEL_SHUTDOWN_READ)) { (qatomic_load_acquire(&tioc->shutdown) &
QIO_CHANNEL_SHUTDOWN_READ)) {
return 0; return 0;
} }
@ -361,7 +363,7 @@ static int qio_channel_tls_shutdown(QIOChannel *ioc,
{ {
QIOChannelTLS *tioc = QIO_CHANNEL_TLS(ioc); QIOChannelTLS *tioc = QIO_CHANNEL_TLS(ioc);
tioc->shutdown |= how; qatomic_or(&tioc->shutdown, how);
return qio_channel_shutdown(tioc->master, how, errp); return qio_channel_shutdown(tioc->master, how, errp);
} }