[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 5/7] io/channel-tls.c: make qio_channel_tls_shutdown thread-safe
From: |
Markus Armbruster |
Subject: |
[PULL 5/7] io/channel-tls.c: make qio_channel_tls_shutdown thread-safe |
Date: |
Wed, 13 Jan 2021 10:30:59 +0100 |
From: Lukas Straub <lukasstraub2@web.de>
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>
---
io/channel-tls.c | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/io/channel-tls.c b/io/channel-tls.c
index 388f019977..2ae1b92fc0 100644
--- a/io/channel-tls.c
+++ b/io/channel-tls.c
@@ -23,6 +23,7 @@
#include "qemu/module.h"
#include "io/channel-tls.h"
#include "trace.h"
+#include "qemu/atomic.h"
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;
}
} else if (errno == ECONNABORTED &&
- (tioc->shutdown & QIO_CHANNEL_SHUTDOWN_READ)) {
+ (qatomic_load_acquire(&tioc->shutdown) &
+ QIO_CHANNEL_SHUTDOWN_READ)) {
return 0;
}
@@ -361,7 +363,7 @@ static int qio_channel_tls_shutdown(QIOChannel *ioc,
{
QIOChannelTLS *tioc = QIO_CHANNEL_TLS(ioc);
- tioc->shutdown |= how;
+ qatomic_or(&tioc->shutdown, how);
return qio_channel_shutdown(tioc->master, how, errp);
}
--
2.26.2
- [PULL 0/7] Yank patches patches for 2021-01-13, Markus Armbruster, 2021/01/13
- [PULL 6/7] io: Document qmp oob suitability of qio_channel_shutdown and io_shutdown, Markus Armbruster, 2021/01/13
- [PULL 5/7] io/channel-tls.c: make qio_channel_tls_shutdown thread-safe,
Markus Armbruster <=
- [PULL 4/7] migration: Add yank feature, Markus Armbruster, 2021/01/13
- [PULL 2/7] block/nbd.c: Add yank feature, Markus Armbruster, 2021/01/13
- [PULL 1/7] Introduce yank feature, Markus Armbruster, 2021/01/13
- [PULL 7/7] tests/test-char.c: Wait for the chardev to connect in char_socket_client_dupid_test, Markus Armbruster, 2021/01/13
- [PULL 3/7] chardev/char-socket.c: Add yank feature, Markus Armbruster, 2021/01/13
- Re: [PULL 0/7] Yank patches patches for 2021-01-13, Peter Maydell, 2021/01/13