From patchwork Tue Aug 16 20:33:40 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 597513 Delivered-To: patch@linaro.org Received: by 2002:a05:7000:b345:0:0:0:0 with SMTP id w5csp2699386maz; Tue, 16 Aug 2022 13:46:45 -0700 (PDT) X-Google-Smtp-Source: AA6agR5/AB8mQgfJZnXF4NllNS+FUYD4jcsawlWoIR/rgFspPgbKVY0KgQ0AACOlAjzr4FONdXUl X-Received: by 2002:a05:620a:461f:b0:6b6:63a3:72dd with SMTP id br31-20020a05620a461f00b006b663a372ddmr15098960qkb.681.1660682805709; Tue, 16 Aug 2022 13:46:45 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1660682805; cv=none; d=google.com; s=arc-20160816; b=FkXHq9skzhXv0v5jDsm2YRAme7cSDC+Cx/lYKTDA5Akz6VzkBfOfoit4IV3DmDDmGB SjDs1ptDs3f0JSdWcGaJ3WyPW7Dp5eZYc5NOVLoLg3g5UQZ910t3eK/GiU95DcAzdYC7 2GqYfVEsFfFBAgpuhYP/96tn27q2u0fj3pTz9GFEAt7DZNtr6c1K+qlBmCBEwbi7A+gd gdD+7HejomVky8ggbTj07qBarcfVbLU6IK5/OOUXCTqDb8vf3yRTfpIkj2RUjw4Z+POX sExl/qkkOTG2kakFhlEW4+F8kSrzp16OzaCHVWyUlOjnlRj2TB6RbSBeLM6Wsbljw26W fARg== 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=21coxlkQNnNjbgRrssaJT5btbr5A+uXZSpoWQo/gmIc=; b=Ssms6bIBi1jVrjQGtTuYS+zU88Ko8xKHsTiPa8509uxaaOVzIqTatjCE7BE5mmxerf NiHXjqOI4SSIwr1om7LZOQqth4BP+5z/xgbXa+R0IgI8E9djOEuxgFv0u9JVev8xBomw ptIyoa/hRE046/szubnNI8Fph25qDVKkGIKiLpzlP5+L7BdH3Z0LrOI6tngZSf1V5Q3w QC0J3mTqJliZo/5PueCzIXphmSYAFwTjPyBXJ2jrh9Un/P9vYizMS6uVv39utDAkfT7h ONVXwh1uD0wKUa2/H78qOzbq8qC4+PMeL5skKTsjgxNpp/5MxKDVvERmgNUKYxumhw/F 3IuA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=RQ7cq6OQ; 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 bj41-20020a05620a192900b006bb4eaf0b96si2793052qkb.734.2022.08.16.13.46.45 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 16 Aug 2022 13:46:45 -0700 (PDT) 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=RQ7cq6OQ; 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]:35740 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1oO3SX-0003ov-5q for patch@linaro.org; Tue, 16 Aug 2022 16:46:45 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:39772) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oO3Gr-0004ss-4n for qemu-devel@nongnu.org; Tue, 16 Aug 2022 16:34:41 -0400 Received: from mail-oa1-x32.google.com ([2001:4860:4864:20::32]:36742) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1oO3Gm-0004Yg-VY for qemu-devel@nongnu.org; Tue, 16 Aug 2022 16:34:40 -0400 Received: by mail-oa1-x32.google.com with SMTP id 586e51a60fabf-10ea9ef5838so12958794fac.3 for ; Tue, 16 Aug 2022 13:34:36 -0700 (PDT) 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; bh=21coxlkQNnNjbgRrssaJT5btbr5A+uXZSpoWQo/gmIc=; b=RQ7cq6OQSyl/ZNAxxoMYMMxBRVuTnEGsudt5CU6TahwAPP60Fkj1V4qs4QuL3reGhn umbUv7vXzKp62soNbPTJ2lJhxRLco4DBjsDGkWoW3OTzOLZMm1ic24Mh9UPi9iA7GTR5 /WLlfNQJXsDNxL1gUI/ynPFpCupt/v0M9ZoOB06I+XKqkPFdNpxGLIb1mbZcmtMY0Swr uL0+bfx7UgyksctqS5IAry2HPgwoFOCwMT4OZ2c2Qn9SAp1PZ0w8jKyHgLuZBqDLV+cU DCJv6oWZOzXnmWM2lpXAVHwTO2YT07fx4VslNwNvRPQXLvNaK3n/lr3ZxwUBUxhEJCH1 p2Iw== 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; bh=21coxlkQNnNjbgRrssaJT5btbr5A+uXZSpoWQo/gmIc=; b=MxFtZFa+MjdQ3iciV1ySvNDb250om2KU9AiZNs5tYhqvpIvENT/yMvibTjqJtGwCqz d63RXq4zYW9CSKB3hfvUiidMYsLfflFMGwoGkNse7OVmsrgXHvbETqYYw26UGaiaw5df 3Mm2T++DwA+7fHb6m7INi1rihaYIaBLGvQeLDOJhDj46GsdoSU6kpUfrNBTHe76aIm/7 8sPPtHuiPC5yG7iSSQvYyOWZqOdkZ4v06fzY1atK1nUZfKN/0eG0SHnpBxltRbWjSozm 3W7uhYUIEerlZBRKfGTYivAhUBgf5O8kVO3lOidWP5Fk9tp7ohqZHFBDVYIxMNeDBxE4 kTIw== X-Gm-Message-State: ACgBeo1DF+M/Hg5LvNjQx6cU5XVLzd071kNE3Kvq66fMdPL/5LEGSUQL PgQjJpEzLFzxqiVheSS6BogcRZ7w4KKIJQ== X-Received: by 2002:a05:6870:d78a:b0:10e:45a6:a400 with SMTP id bd10-20020a056870d78a00b0010e45a6a400mr146048oab.27.1660682075902; Tue, 16 Aug 2022 13:34:35 -0700 (PDT) Received: from stoup.. ([2605:ef80:80f6:61fa:9bc2:5095:d612:5e22]) by smtp.gmail.com with ESMTPSA id y23-20020a056870b01700b0010ef8ccde67sm2285220oae.13.2022.08.16.13.34.34 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 16 Aug 2022 13:34:34 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Cc: qemu-arm@nongnu.org, alex.bennee@linaro.org, iii@linux.ibm.com Subject: [PATCH v2 13/33] accel/tcg: Unlock mmap_lock after longjmp Date: Tue, 16 Aug 2022 15:33:40 -0500 Message-Id: <20220816203400.161187-14-richard.henderson@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220816203400.161187-1-richard.henderson@linaro.org> References: <20220816203400.161187-1-richard.henderson@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2001:4860:4864:20::32; envelope-from=richard.henderson@linaro.org; helo=mail-oa1-x32.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, T_SCC_BODY_TEXT_LINE=-0.01 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" The mmap_lock is held around tb_gen_code. While the comment is correct that the lock is dropped when tb_gen_code runs out of memory, the lock is *not* dropped when an exception is raised reading code for translation. Signed-off-by: Richard Henderson --- accel/tcg/cpu-exec.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/accel/tcg/cpu-exec.c b/accel/tcg/cpu-exec.c index 711859d4d4..7887af6f45 100644 --- a/accel/tcg/cpu-exec.c +++ b/accel/tcg/cpu-exec.c @@ -523,13 +523,11 @@ void cpu_exec_step_atomic(CPUState *cpu) cpu_tb_exec(cpu, tb, &tb_exit); cpu_exec_exit(cpu); } else { - /* - * The mmap_lock is dropped by tb_gen_code if it runs out of - * memory. - */ #ifndef CONFIG_SOFTMMU clear_helper_retaddr(); - tcg_debug_assert(!have_mmap_lock()); + if (have_mmap_lock()) { + mmap_unlock(); + } #endif if (qemu_mutex_iothread_locked()) { qemu_mutex_unlock_iothread(); @@ -936,7 +934,9 @@ int cpu_exec(CPUState *cpu) #ifndef CONFIG_SOFTMMU clear_helper_retaddr(); - tcg_debug_assert(!have_mmap_lock()); + if (have_mmap_lock()) { + mmap_unlock(); + } #endif if (qemu_mutex_iothread_locked()) { qemu_mutex_unlock_iothread();