From patchwork Tue Jan 15 19:47:53 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Emilio Cota X-Patchwork-Id: 10765047 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 0D29413B4 for ; Tue, 15 Jan 2019 19:51:37 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id F21AC2DB76 for ; Tue, 15 Jan 2019 19:51:36 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id E39492DB77; Tue, 15 Jan 2019 19:51:36 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-2.7 required=2.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI autolearn=ham version=3.3.1 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 8419D2B798 for ; Tue, 15 Jan 2019 19:51:36 +0000 (UTC) Received: from localhost ([127.0.0.1]:36969 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gjUkJ-0002N8-TR for patchwork-qemu-devel@patchwork.kernel.org; Tue, 15 Jan 2019 14:51:35 -0500 Received: from eggs.gnu.org ([209.51.188.92]:42594) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gjUh0-000896-OG for qemu-devel@nongnu.org; Tue, 15 Jan 2019 14:48:12 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gjUgy-0006y0-LP for qemu-devel@nongnu.org; Tue, 15 Jan 2019 14:48:10 -0500 Received: from out5-smtp.messagingengine.com ([66.111.4.29]:44323) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1gjUgx-0006wy-Dc for qemu-devel@nongnu.org; Tue, 15 Jan 2019 14:48:07 -0500 Received: from compute4.internal (compute4.nyi.internal [10.202.2.44]) by mailout.nyi.internal (Postfix) with ESMTP id B10A028950; Tue, 15 Jan 2019 14:48:05 -0500 (EST) Received: from mailfrontend1 ([10.202.2.162]) by compute4.internal (MEProxy); Tue, 15 Jan 2019 14:48:05 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=braap.org; h= from:to:cc:subject:date:message-id:in-reply-to:references; s= mesmtp; bh=gN5GlEXWmPdmFmr0aDDVVz23EWNCHWzxVnXT3LlUdSk=; b=iWkPF 0cztjsMABCvdmy9gpkqR8f0O4b7w7Zpp4ujNUXwayfIqo46sT6YeYCcQM1DhjXDp WdabUTRFhmCgUcIOtaSFnwAB7Tp6OQOPnmhoFeR1soTL+280YMzooPSl/+w8oJc4 GNEN3QoRH9ZU9/ZYIbG+nMwnH8ryspIDuegGRo= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:date:from:in-reply-to:message-id :references:subject:to:x-me-proxy:x-me-proxy:x-me-sender :x-me-sender:x-sasl-enc; s=fm1; bh=gN5GlEXWmPdmFmr0aDDVVz23EWNCH WzxVnXT3LlUdSk=; b=gJj5fEdvXenGoBG9k9vYKsffwCToQJhO9bT4KiAhOGbJn bwWWBtg6/6fQeqm+u73h8bobwq+R9tKMGR34BpZiDvAZhZqaASQNL7UnR1IYyiJ3 Rd6rB0O58wnJRyh3VjNojpJz/unZM6z6DU6UnMF86OH57+GrDkxsyWyCsTyjU0Pf WsKjtmoiSeAt0gvwiIh5NEpsJFZ87Po+7dU/nTOU8eKJXLxlCCSq5L1gEIUEc1FL J6V1/GYc2bARrASwcthplRn3NWy/K77iVjM+Uble84khxvq+ZU8EHXwdLWFCCZJA onxUN3S4xs6OYcFtzCKEAFHYxRQZ6voIPCy4jSwnQ== X-ME-Sender: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedtledrgeefgdduvdekucetufdoteggodetrfdotf fvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdfquhhtnecuuegrihhlohhuthemucef tddtnecusecvtfgvtghiphhivghnthhsucdlqddutddtmdenucfjughrpefhvffufffkof gjfhestddtredtredttdenucfhrhhomhepfdfgmhhilhhiohcuifdrucevohhtrgdfuceo tghothgrsegsrhgrrghprdhorhhgqeenucfkphepuddvkedrheelrddvtddrvdduieenuc frrghrrghmpehmrghilhhfrhhomheptghothgrsegsrhgrrghprdhorhhgnecuvehluhhs thgvrhfuihiivgeptd X-ME-Proxy: Received: from localhost (flamenco.cs.columbia.edu [128.59.20.216]) by mail.messagingengine.com (Postfix) with ESMTPA id 1A965E4394; Tue, 15 Jan 2019 14:48:05 -0500 (EST) From: "Emilio G. Cota" To: qemu-devel@nongnu.org Date: Tue, 15 Jan 2019 14:47:53 -0500 Message-Id: <20190115194754.7670-2-cota@braap.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20190115194754.7670-1-cota@braap.org> References: <20190115194754.7670-1-cota@braap.org> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 66.111.4.29 Subject: [Qemu-devel] [PATCH 1/2] cpu-exec: add assert_no_pages_locked() after longjmp X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Paolo Bonzini , Richard Henderson , Max Filippov Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" X-Virus-Scanned: ClamAV using ClamSMTP We forgot to add this check in faa9372c07 ("translate-all: introduce assert_no_pages_locked", 2018-06-15); we only added it after returning from a longjmp in cpu_exec_step_atomic. Fix it. Signed-off-by: Emilio G. Cota --- accel/tcg/cpu-exec.c | 1 + 1 file changed, 1 insertion(+) diff --git a/accel/tcg/cpu-exec.c b/accel/tcg/cpu-exec.c index 870027d435..55e0ca41c4 100644 --- a/accel/tcg/cpu-exec.c +++ b/accel/tcg/cpu-exec.c @@ -699,6 +699,7 @@ int cpu_exec(CPUState *cpu) if (qemu_mutex_iothread_locked()) { qemu_mutex_unlock_iothread(); } + assert_no_pages_locked(); } /* if an exception is pending, we execute it here */