[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v5 5/7] io/channel-tls.c: make qio_channel_tls_shutdown thread-sa
From: |
Lukas Straub |
Subject: |
[PATCH v5 5/7] io/channel-tls.c: make qio_channel_tls_shutdown thread-safe |
Date: |
Tue, 23 Jun 2020 16:42:56 +0200 |
Make qio_channel_tls_shutdown thread-safe by using atomics when
accessing tioc->shutdown.
Signed-off-by: Lukas Straub <lukasstraub2@web.de>
---
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 7ec8ceff2f..b350c84640 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)) {
+ (atomic_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;
+ atomic_or(&tioc->shutdown, how);
return qio_channel_shutdown(tioc->master, how, errp);
}
--
2.20.1
pgpW4C8n1bFT2.pgp
Description: OpenPGP digital signature
- [PATCH v5 0/7] Introduce 'yank' oob qmp command to recover from hanging qemu, Lukas Straub, 2020/06/23
- [PATCH v5 1/7] Introduce yank feature, Lukas Straub, 2020/06/23
- [PATCH v5 2/7] block/nbd.c: Add yank feature, Lukas Straub, 2020/06/23
- [PATCH v5 3/7] chardev/char-socket.c: Add yank feature, Lukas Straub, 2020/06/23
- [PATCH v5 4/7] migration: Add yank feature, Lukas Straub, 2020/06/23
- [PATCH v5 5/7] io/channel-tls.c: make qio_channel_tls_shutdown thread-safe,
Lukas Straub <=
- [PATCH v5 6/7] io: Document thread-safety of qio_channel_shutdown, Lukas Straub, 2020/06/23
- [PATCH v5 7/7] MAINTAINERS: Add myself as maintainer for yank feature, Lukas Straub, 2020/06/23
- Re: [PATCH v5 0/7] Introduce 'yank' oob qmp command to recover from hanging qemu, Lukas Straub, 2020/06/24