From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:57255) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aqhkU-0003qA-7Q for qemu-devel@nongnu.org; Thu, 14 Apr 2016 09:55:59 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1aqhkQ-0005uR-4Z for qemu-devel@nongnu.org; Thu, 14 Apr 2016 09:55:58 -0400 Received: from mail-am1on0147.outbound.protection.outlook.com ([157.56.112.147]:28416 helo=emea01-am1-obe.outbound.protection.outlook.com) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aqhkP-0005tz-Gr for qemu-devel@nongnu.org; Thu, 14 Apr 2016 09:55:54 -0400 References: <1460629215-11567-1-git-send-email-den@openvz.org> <570F99C5.3050801@redhat.com> From: "Denis V. Lunev" Message-ID: <570F9DCF.1070502@openvz.org> Date: Thu, 14 Apr 2016 16:40:31 +0300 MIME-Version: 1.0 In-Reply-To: <570F99C5.3050801@redhat.com> Content-Type: text/plain; charset="windows-1252"; format=flowed Content-Transfer-Encoding: 7bit Subject: Re: [Qemu-devel] [PATCH for 2.6 1/1] nbd: fix assert() on qemu-nbd stop List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Paolo Bonzini , qemu-devel@nongnu.org Cc: Pavel Butsykin , Max Reitz , Kevin Wolf , Stefan Hajnoczi On 04/14/2016 04:23 PM, Paolo Bonzini wrote: > > On 14/04/2016 12:20, Denis V. Lunev wrote: >> From: Pavel Butsykin >> >> From time to time qemu-nbd is crashing on the following assert: >> assert(state == TERMINATING); >> nbd_export_closed >> nbd_export_put >> main >> and the state at the moment of the crash is evaluated to TERMINATE. >> >> During shutdown process of the client the nbd_client_thread thread sends >> SIGTERM signal and the main thread calls the nbd_client_closed callback. >> If the SIGTERM callback will be executed after change the state to >> TERMINATING, then the state will once again be TERMINATE. >> >> To solve the issue, we must change the state to TERMINATE only if the state >> is RUNNING. In the other case we are shutting down already. >> >> Signed-off-by: Pavel Butsykin >> Signed-off-by: Denis V. Lunev >> CC: Paolo Bonzini >> --- >> qemu-nbd.c | 2 +- >> 1 file changed, 1 insertion(+), 1 deletion(-) >> >> diff --git a/qemu-nbd.c b/qemu-nbd.c >> index ca4a724..956013f 100644 >> --- a/qemu-nbd.c >> +++ b/qemu-nbd.c >> @@ -213,7 +213,7 @@ static int find_partition(BlockBackend *blk, int partition, >> >> static void termsig_handler(int signum) >> { >> - state = TERMINATE; >> + atomic_cmpxchg(&state, RUNNING, TERMINATE); > Just a simple "if" is enough (the rest of the file is not using any of > atomic{mb_,}{read,set}. > > I'm not able to send further pull requests for 2.6, can the block > maintainers help? > > Paolo unfortunately, if () would be not enough. The race is with different thread which can run on the another CPU. Thus this OP should be atomic or some locking is required. Den P.S. Added more block guys...