From patchwork Tue Jan 24 18:01:22 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Alex_Benn=C3=A9e?= X-Patchwork-Id: 646053 Delivered-To: patch@linaro.org Received: by 2002:a17:522:b9de:b0:4b9:b062:db3b with SMTP id fj30csp341942pvb; Tue, 24 Jan 2023 10:09:03 -0800 (PST) X-Google-Smtp-Source: AMrXdXucYtDht2HGuNsEq5cvpVaDjlxO6NiYL3tZ4WBccUyJwOBRUHcIXOrCSCBJ9fTchAcYbpDn X-Received: by 2002:ac8:6605:0:b0:3b6:341c:9143 with SMTP id c5-20020ac86605000000b003b6341c9143mr38141000qtp.62.1674583743519; Tue, 24 Jan 2023 10:09:03 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1674583743; cv=none; d=google.com; s=arc-20160816; b=rSkDg4uOMDiBI04JqxPqG70ObshlHzLsaVIlhnn3XoiTkFfs8UnknT/Qw9qV0x0GLs Frz1WQzVaKZfDU9WxeacPJUpsWr3o7/nV3DnZaiXMP3BNV0z/7uVpU1XEWAFV+sctUqK xbNvYLmmRxucjeh/x7jNtLjT9jPusJL2RY2f672kUOyHEk2zalC0PabmBylUmjlLRha9 WQSyceEk6ijJpSstVRs5R8/Nr5F5jJ0Lzzjr0I3dreYONrj339TWTqxbpfgyYKHZX8O2 CgGPqinbZwlIB4nYOipaSq+uQ2zNXNuYTIkhlJEDLywL8wAs6Je9Zq7LTl4CIGFqr1OA aNew== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=ZB9Cc0xMOhCGJB6fTmQvTQEJUTVvHhHFvjiUGcRpH00=; b=OVM1nGJZ4VmYSEMkH4tgYtnEe74rrb0mClgm4y7hFB1tkgcknw6vwn/Lj7azfOD4uP /QM3zoGZEYnLNixWk9txKL8B9cl9U53PN6QgPaRrDg0G5ETLnO5jzYSWa1PS+rZVfcWy 9sYVA+jxOBUVcp5H5Q2qSi5BzXr8EPPMphJ++pSeEREJzXltFd0eJeWyqCkmXX4kBUYl qMQMUrdpzAdOeve7WK04QWx51qWF3rdnhaEd3yP7efVrlzaxBIgRYLRTQcQYDDQ78XRY EDUUU0HEc+Ad24BfAYcHzqEZPQ9PxELJFUlRQ/qP74l3RIvwIU97gzOw2SQchCsXPDJQ n9pg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=pe+95QOV; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id ay42-20020a05622a22aa00b003a58b44591csi2058063qtb.132.2023.01.24.10.09.03 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 24 Jan 2023 10:09:03 -0800 (PST) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=pe+95QOV; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pKNhd-0005Ro-DP; Tue, 24 Jan 2023 13:07:25 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pKNhI-000539-Lz for qemu-devel@nongnu.org; Tue, 24 Jan 2023 13:07:04 -0500 Received: from mail-wr1-x42f.google.com ([2a00:1450:4864:20::42f]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1pKNhD-00073p-HZ for qemu-devel@nongnu.org; Tue, 24 Jan 2023 13:07:04 -0500 Received: by mail-wr1-x42f.google.com with SMTP id r9so14715448wrw.4 for ; Tue, 24 Jan 2023 10:06:59 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=ZB9Cc0xMOhCGJB6fTmQvTQEJUTVvHhHFvjiUGcRpH00=; b=pe+95QOVsTjJ44EHeaoZcKhwMNh64ZUVrrrhXvIL68QiTALPRa1gp13KFKcb/nWFMO /iy/zqSUsQ+tdcK2dRIdWDe2UIcY0ATMV3tYxYU62sLN7LetwYJIfNVacwERvlmPoT+D pdpYe5P/Rjp+waAWefMCXRoID+2F3DwnMo/ykagBc334FBAesgUO9eTRwkQIOwq0HZwj keNslHqpWOJZV0oDWcRT8Qv6tx3zXziBA/YzP47+pqmWZhGclphJZME7UmQ+FQxzvw4k nxNIGv4wQd8wDd+pTfu1TjwSHjJ4jmYJK8sJ9iBxwhM1oqm5ffFX4XfrQpmofBoM5G4z o7mw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=ZB9Cc0xMOhCGJB6fTmQvTQEJUTVvHhHFvjiUGcRpH00=; b=68Nwksel3wJSR2euPEgCcKc8TSbFRHz2YBrn/UI/ewT8zbDEIbkbLkyV3DHY2dPfZ+ 6tyov0h4jzH5DEB1S6mTS1ZrGUSFzfD6h+KfWlMyJ0jzbzYbPWC2hmDjQflWV/tTvka+ 7lng1APE96CqOSW/pOoneaxkrvAyaSC6fFdGu6ztvc4NtSVENfvOxKpQeu3whMwOu/7H jXk8BKsYK4d9bMAp4OXSZXOgZdB0n4xwLwutWf1jKjGLZu56Z/a6s9FlmAfUh2F6uiyk PoVsqvKW8Y0TJ9d4gjz9eqyptl9YYW6Co3VF2wIUcUabAjVCs91xfvsQJTfbU+zWmGAV B96Q== X-Gm-Message-State: AFqh2kr3efK6XlIv2ujNzUYwnDXM0vaxCVdPuAa//lT/mYUaJcHNCHiu NFBqpMV1lz/WFkTyGDrG75vjdQ== X-Received: by 2002:adf:e883:0:b0:2be:4624:dd81 with SMTP id d3-20020adfe883000000b002be4624dd81mr16711968wrm.58.1674583617838; Tue, 24 Jan 2023 10:06:57 -0800 (PST) Received: from zen.linaroharston ([185.81.254.11]) by smtp.gmail.com with ESMTPSA id a5-20020a5d5705000000b002bdbde1d3absm2334319wrv.78.2023.01.24.10.06.56 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 24 Jan 2023 10:06:56 -0800 (PST) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 3AE4F1FFD1; Tue, 24 Jan 2023 18:01:31 +0000 (GMT) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: Richard Henderson , Ed Maste , Thomas Huth , Alexandre Iooss , Markus Armbruster , Jagannathan Raman , John G Johnson , Mahmoud Mandour , =?utf-8?q?Daniel_P=2E_Berrang?= =?utf-8?q?=C3=A9?= , Bandan Das , Elena Ufimtseva , Michael Roth , Eduardo Habkost , Beraldo Leal , =?utf-8?q?Alex_Benn=C3=A9e?= , =?utf-8?q?Marc-Andr?= =?utf-8?q?=C3=A9_Lureau?= , Qiuhao Li , Stefan Hajnoczi , Alexander Bulekov , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , John Snow , Paolo Bonzini , Darren Kenny , qemu-arm@nongnu.org, Yanan Wang , Cleber Rosa , Wainer dos Santos Moschetta , Marcel Apfelbaum , Li-Wen Hsu , Peter Maydell , Emilio Cota Subject: [PATCH v2 30/35] plugins: make qemu_plugin_user_exit's locking order consistent with fork_start's Date: Tue, 24 Jan 2023 18:01:22 +0000 Message-Id: <20230124180127.1881110-31-alex.bennee@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230124180127.1881110-1-alex.bennee@linaro.org> References: <20230124180127.1881110-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::42f; envelope-from=alex.bennee@linaro.org; helo=mail-wr1-x42f.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 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, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=unavailable autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org From: Emilio Cota To fix potential deadlocks as reported by tsan. Reviewed-by: Richard Henderson Reviewed-by: Philippe Mathieu-Daudé Signed-off-by: Emilio Cota Message-Id: <20230111151628.320011-6-cota@braap.org> Signed-off-by: Alex Bennée --- plugins/core.c | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/plugins/core.c b/plugins/core.c index ccb770a485..728bacef95 100644 --- a/plugins/core.c +++ b/plugins/core.c @@ -500,10 +500,17 @@ void qemu_plugin_user_exit(void) enum qemu_plugin_event ev; CPUState *cpu; - QEMU_LOCK_GUARD(&plugin.lock); - + /* + * Locking order: we must acquire locks in an order that is consistent + * with the one in fork_start(). That is: + * - start_exclusive(), which acquires qemu_cpu_list_lock, + * must be called before acquiring plugin.lock. + * - tb_flush(), which acquires mmap_lock(), must be called + * while plugin.lock is not held. + */ start_exclusive(); + qemu_rec_mutex_lock(&plugin.lock); /* un-register all callbacks except the final AT_EXIT one */ for (ev = 0; ev < QEMU_PLUGIN_EV_MAX; ev++) { if (ev != QEMU_PLUGIN_EV_ATEXIT) { @@ -513,13 +520,12 @@ void qemu_plugin_user_exit(void) } } } - - tb_flush(current_cpu); - CPU_FOREACH(cpu) { qemu_plugin_disable_mem_helpers(cpu); } + qemu_rec_mutex_unlock(&plugin.lock); + tb_flush(current_cpu); end_exclusive(); /* now it's safe to handle the exit case */