From patchwork Fri Dec 30 00:01:41 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 637819 Delivered-To: patch@linaro.org Received: by 2002:a17:522:c983:b0:460:3032:e3c4 with SMTP id kr3csp3177924pvb; Thu, 29 Dec 2022 16:04:53 -0800 (PST) X-Google-Smtp-Source: AMrXdXuYwMr8oEey1S1gJrmZfZ15HQkzLYjOCE1bVFhZB38VjYOZN4urz+er22B0NirgzJxtDyvd X-Received: by 2002:a0d:f446:0:b0:482:6b68:8dc3 with SMTP id d67-20020a0df446000000b004826b688dc3mr10477745ywf.50.1672358693713; Thu, 29 Dec 2022 16:04:53 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1672358693; cv=none; d=google.com; s=arc-20160816; b=iaEZhPaq6mlBBkc/OeTKZoharsqoyOJGocgX/6UNigVpKWE58CthBQWXCeVsab2gq6 z7Gn6vRmjcEV6YRL79luIiRVMzTezdAN5KvMoEnUksCc+tW4x3AyiFoqXkEq3gCyOak1 /11sG/p/b/WXahkp4o2n04fXFEZku3W6DPacZbAMRY3k6E/3qVfvGBnhIMgekiIMx/XL g7X3b2HrV2ZckaEaD9weSfpaz8WrzKU4h+DYfwJLDfLo8LH5uT4/4zr61E9M/GBMHlla N/KuzJQcj4uS3x32RB/wVKHMQuCWGCHm2gS6Kn184/+Rahule7JEWVpydqmkLrOoxaXf yeyg== 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=pj3A1RydZ5k++XJlvrH6d1P1H8txrpAYpf5yEofm078=; b=UK5ul8TbV46fbbdnWZRGURANmleTPnBOcMIC5Orzz6JFjP5qeE6fWFKs6z55AeDmNO ykMM60EbN49fnUyG+9CzSdlcM07CnqgIYpAoLfsw0p9hwbA8DgeTBPVAOIA6aHJADX/R uKXYKeBLphYmz4tblPvgve9zmRKBbrMRsbmUWL6Pt6A5FHxWiZar8DVwgvOHJc4OYip5 o4dcbJliuGtPQygJsJ38ZhXCh5MJXiHGSPF11CjXkUVvERT50TyXdCKbSqvVRJSXqc9W 2yB/go4sC2N16nrUcUkTtQqyZPcqNqVk9+gM4gKZgsrbXjwXNcKsR1p0i3Cru3x6JKAH nadA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=nmYI0B3A; 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 m20-20020a05620a24d400b006bb81d694dfsi9640192qkn.656.2022.12.29.16.04.53 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Thu, 29 Dec 2022 16:04:53 -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=nmYI0B3A; 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 1pB2r9-00031l-IR; Thu, 29 Dec 2022 19:02:39 -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 1pB2r4-0002xs-5h for qemu-devel@nongnu.org; Thu, 29 Dec 2022 19:02:34 -0500 Received: from mail-pj1-x1030.google.com ([2607:f8b0:4864:20::1030]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1pB2r0-0002fd-QT for qemu-devel@nongnu.org; Thu, 29 Dec 2022 19:02:33 -0500 Received: by mail-pj1-x1030.google.com with SMTP id hd14-20020a17090b458e00b0021909875bccso19548936pjb.1 for ; Thu, 29 Dec 2022 16:02:30 -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=pj3A1RydZ5k++XJlvrH6d1P1H8txrpAYpf5yEofm078=; b=nmYI0B3Ap4MGR4wiT/cEJEa7Rtq78hvBESKqEYgzNBBqbhyw2Pg9JFGOZ22T1GQZYf sK5BH9hrQcXqGVMlF6d6XHwh/f4IoNE59jPJ3OoH3EogmXJm/X1vIC9ZVPhJpLbeUn8+ +pHs1C0BE/opFqQkaN7kQ3LYfmhUyKnqiLIikt+/LP4uxZ3JZ1iex0L5Fr6sAfRQw9XK 26T5Ev1lbu1xMg/txI1grFfTdFVamgPefxICt67AKYhTCmJwZpBye6IC9pR7NGHrnnrY S//yfIPLMCVAkLrx/HP+5y00K93kQHQFbdT3OH/GuRQMScBfZfaYW1g1ZHeEJwgM783N 5kyg== 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=pj3A1RydZ5k++XJlvrH6d1P1H8txrpAYpf5yEofm078=; b=R8sWHBdctRg5AGcGIMMP9uzKVkruU+V2t8wUC5xmCs+OfQ3UYqZPIEkKCtAYRMszWQ inxNVbPyzMODK4ZUSg59OMiv9MAzH0fOMxd1cIQBr4vVf0hqvmZB3L2ZogZY7K+Fw5ir zwO2yhuEZS60MRmG6DQ/N8jIMrYUaSNYWDwahGJuoZAaRUt7IAqza82jo74l9buKO7ps puhu2ujStNsgUkU5rJ7vHoNw7ByvDIaTo2oLZYhZM2c3ETrlsiBLyvUSHZhFhVtP1OKy mIC0cUPeDix489GpTGG5IyPiDwKcWu2AHQqysNaLEBNerP6CJmLKZ/Q9MVO4yp2Fk67g Qcqw== X-Gm-Message-State: AFqh2ko3HqBUI2XPt8doYf1RhL3m1z/Lkbv594iMlf8jJrkoam/ONG/Y dpAADWAOPMEWjrjz3hI3SAPphg1sinkJmFtC X-Received: by 2002:a17:902:6a81:b0:191:3808:14b0 with SMTP id n1-20020a1709026a8100b00191380814b0mr32078596plk.4.1672358549519; Thu, 29 Dec 2022 16:02:29 -0800 (PST) Received: from stoup.. (76-14-210-194.or.wavecable.com. [76.14.210.194]) by smtp.gmail.com with ESMTPSA id j14-20020a170903028e00b00192849e1d0asm7343953plr.116.2022.12.29.16.02.28 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 29 Dec 2022 16:02:29 -0800 (PST) From: Richard Henderson To: qemu-devel@nongnu.org Cc: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Daniel Henrique Barboza Subject: [PULL 07/47] target/ppc: Use QEMU_IOTHREAD_LOCK_GUARD in ppc_maybe_interrupt Date: Thu, 29 Dec 2022 16:01:41 -0800 Message-Id: <20221230000221.2764875-8-richard.henderson@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20221230000221.2764875-1-richard.henderson@linaro.org> References: <20221230000221.2764875-1-richard.henderson@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2607:f8b0:4864:20::1030; envelope-from=richard.henderson@linaro.org; helo=mail-pj1-x1030.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=ham 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 Reviewed-by: Philippe Mathieu-Daudé Reviewed-by: Daniel Henrique Barboza Signed-off-by: Richard Henderson --- target/ppc/excp_helper.c | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-) diff --git a/target/ppc/excp_helper.c b/target/ppc/excp_helper.c index add4d54ae7..287659c74d 100644 --- a/target/ppc/excp_helper.c +++ b/target/ppc/excp_helper.c @@ -2163,22 +2163,13 @@ static int ppc_next_unmasked_interrupt(CPUPPCState *env) void ppc_maybe_interrupt(CPUPPCState *env) { CPUState *cs = env_cpu(env); - bool locked = false; - - if (!qemu_mutex_iothread_locked()) { - locked = true; - qemu_mutex_lock_iothread(); - } + QEMU_IOTHREAD_LOCK_GUARD(); if (ppc_next_unmasked_interrupt(env)) { cpu_interrupt(cs, CPU_INTERRUPT_HARD); } else { cpu_reset_interrupt(cs, CPU_INTERRUPT_HARD); } - - if (locked) { - qemu_mutex_unlock_iothread(); - } } #if defined(TARGET_PPC64)