From patchwork Mon Dec 28 15:08:55 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Lukas Straub X-Patchwork-Id: 1420905 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=web.de Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (1024-bit key; secure) header.d=web.de header.i=@web.de header.a=rsa-sha256 header.s=dbaedf251592 header.b=FD1Qyyqv; dkim-atps=neutral Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4D4LlC6BKgz9sVR for ; Tue, 29 Dec 2020 02:17:43 +1100 (AEDT) Received: from localhost ([::1]:35492 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ktuHF-00034f-SK for incoming@patchwork.ozlabs.org; Mon, 28 Dec 2020 10:17:41 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:49592) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1ktu8u-0004PJ-3e; Mon, 28 Dec 2020 10:09:04 -0500 Received: from mout.web.de ([212.227.15.3]:49809) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1ktu8s-0001EZ-HK; Mon, 28 Dec 2020 10:09:03 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=web.de; s=dbaedf251592; t=1609168137; bh=00EAiCU6NQFSqynFLpxVcMN9uW9kgzNco1ggwNTcC/0=; h=X-UI-Sender-Class:Date:From:To:Cc:Subject:In-Reply-To:References; b=FD1QyyqvkpHmfG+ONABG+oM+idtn4VWTxpZIZsUKAsFA/R8lYxL7pf1mkoEVm1aUv WQLLgknQ4TBeoUFk947aqT83jib71RqPpT9j3fp/h4RM65Qr9Dftiycm0rrvQJGCiL BmxIrpyClNojtA9BDm6I401BkuE4UtWEKqVB839I= X-UI-Sender-Class: c548c8c5-30a9-4db5-a2e7-cb6cb037b8f9 Received: from gecko.fritz.box ([94.134.180.94]) by smtp.web.de (mrweb001 [213.165.67.108]) with ESMTPSA (Nemesis) id 0Lb1rd-1k9Gj20MUD-00kfy2; Mon, 28 Dec 2020 16:08:57 +0100 Date: Mon, 28 Dec 2020 16:08:55 +0100 From: Lukas Straub To: qemu-devel Subject: [PATCH v14 5/7] io/channel-tls.c: make qio_channel_tls_shutdown thread-safe Message-ID: <5bd8733f583f3558b32250fd0eb576b7aa756485.1609167865.git.lukasstraub2@web.de> In-Reply-To: References: MIME-Version: 1.0 X-Provags-ID: V03:K1:2d5XceAMn6EOZVFtE96Uu08bfkSxIOyp+j1/HkD/WtBmqLtC5CE vNi9/QTsf962Yro6zEq8KGtJuA81vBrPMG8EH4QqDaNJsZyC88K6+lOTYcQ28X5IkOe80Gu +OvG28WFgG+Rd4a60ozsXjuPEH4r2MWQ/A9C9uyZ9UWQ3GcWy8epq2W6FIqJJvY0NMAxRQh TyWxgA3KHKcHyYP1VoKKg== X-UI-Out-Filterresults: notjunk:1;V03:K0:yv5WJ8ovZfg=:8a2H7BKV9qgHzZO+nzU9eT i+UFHFd/wVnfN2w6bBmuTdjypwxkFqonZrKvK601JUlU1oUbvdExQtiykZLbitPEJMm7hOiIE 4KCL3Gj4JbFQH8jB33KKv3ArAuZNfJuWq+fomgjby2bGO+QGOApWgvYEIUy4wB/GEBtetjJpY mY/z6pmoQ5TtXPb78VzSgZ8uvM2JG3yzXucCAkDV6X+0wwqSbaiDTXYI2nJYB/eiCCb0W69OZ o/9tsSBQood2PczvmFclxAHledQOUQ1VisYKTt24oEFHfqZ9AQTAcEtqeQBHqjaI69qMTGlLb e5c0zPbEzXq0Hevp+kGYjmEQniJZHDr7V2vQzJ9qKqZtXRHrEAqw0ECrAj5TktWHaQBf7etes LLHjhFfsiWtdI8KEwX+KO4QXSPRhNo0+3bIM597S7oYRtVgsLh6T1Sviq31olRZpV1JPcae4Z sBIplo9LnH9bzThrjcBurQBFpzkmTMcTPnLUYh7eTFgyVa4AfIF6TgH3k9yKJyz8C/mXHMns4 LBDHpjcAwOcBaL4Qa0YAbPyqJbdcEb9VfrFIpZqlLn+VjKOmgehhukD1xo2ireVuPbSmxkpGs bHIIqb+/sIo1Cn3uXrLEQhiPTw6GoD2xueloqb2Pb/5keGI8V3hS/3kA5mfqDEFOpKJCNe4Wo 6ViP07oZM352xtnTVdafb8EnbN2F6QS2f3Llmc4ClimfCYLuDh2uY7Ev+dSJeg3nWWiWz9sjk IUGro4J0FpuTyfQyR/VC7QKoKKU+4JJg4pFwGmy5CvuaFsaM2PXob5oPUIt7SG79eZGP0cCj3 62hABDuof42KA6SO5wTJsyORXmIbFYGtI2eJeJzPEgKdKE0ySdN4euZNdE5q4SDVoviyfnFKC TTU1ioDBq6Xvf9IFysIH+3V8oH+f8UGY+dZ6VCGzg= Received-SPF: pass client-ip=212.227.15.3; envelope-from=lukasstraub2@web.de; helo=mout.web.de X-Spam_score_int: -9 X-Spam_score: -1.0 X-Spam_bar: - X-Spam_report: (-1.0 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_ENVFROM_END_DIGIT=0.25, FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_LOW=-0.7, RCVD_IN_MSPIKE_H3=0.001, RCVD_IN_MSPIKE_WL=0.001, RCVD_IN_SORBS_WEB=1.5, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=no autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Kevin Wolf , "Daniel P. =?utf-8?q?Berrang=C3=A9=5C?= " , qemu-block , Juan Quintela , Markus Armbruster , "Dr. David Alan Gilbert" , Max Reitz , =?utf-8?q?Marc-Andr=C3=A9?= Lureau , Paolo Bonzini , =?utf-8?q?Marc-Andr=C3=A9?= Lureau Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" Make qio_channel_tls_shutdown thread-safe by using atomics when accessing tioc->shutdown. Signed-off-by: Lukas Straub Acked-by: Stefan Hajnoczi Reviewed-by: Daniel P. Berrangé --- io/channel-tls.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) -- 2.29.2 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); }