From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id CD615C7618D for ; Mon, 20 Mar 2023 13:04:21 +0000 (UTC) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1peFBO-0001Mg-3u; Mon, 20 Mar 2023 09:04:14 -0400 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 1peFBH-0001Ke-9H for qemu-devel@nongnu.org; Mon, 20 Mar 2023 09:04:07 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.129.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1peFBF-0006Lp-8n for qemu-devel@nongnu.org; Mon, 20 Mar 2023 09:04:06 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1679317444; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=5X+8oAkTsNpFQXdC8yAlHVgHqpbucrRL3yhevs6aLBI=; b=CYxpiRfIT9Vk0BOTM++IpTQhS8Ip8g3rA8699wLrTPheU8UUmi7JyebI99kXVzD/CT8Sqt lytJC8iViLZs8nIKObAGdloFfeDzzXZVI7P043HGdXjNaRyIjOwy7ZLr3khR++8yC8ydpk B1y/GyPKZv4YUhFGVGQUcgJUBJsJRN8= Received: from mimecast-mx02.redhat.com (mx3-rdu2.redhat.com [66.187.233.73]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-323--4MjQhd9NACI3-iDCsIaYA-1; Mon, 20 Mar 2023 09:04:01 -0400 X-MC-Unique: -4MjQhd9NACI3-iDCsIaYA-1 Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.rdu2.redhat.com [10.11.54.8]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 9B4CF1C05AB2; Mon, 20 Mar 2023 13:04:00 +0000 (UTC) Received: from thuth.com (unknown [10.39.193.77]) by smtp.corp.redhat.com (Postfix) with ESMTP id A753AC15BA0; Mon, 20 Mar 2023 13:03:59 +0000 (UTC) From: Thomas Huth To: Peter Maydell , qemu-devel@nongnu.org Cc: Richard Henderson , David Hildenbrand Subject: [PULL 21/24] target/s390x/tcg/mem_helper: Remove bad assert() statement Date: Mon, 20 Mar 2023 14:03:27 +0100 Message-Id: <20230320130330.406378-22-thuth@redhat.com> In-Reply-To: <20230320130330.406378-1-thuth@redhat.com> References: <20230320130330.406378-1-thuth@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Scanned-By: MIMEDefang 3.1 on 10.11.54.8 Received-SPF: pass client-ip=170.10.129.124; envelope-from=thuth@redhat.com; helo=us-smtp-delivery-124.mimecast.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, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H2=-0.001, 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+qemu-devel=archiver.kernel.org@nongnu.org Sender: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org The "assert(!nonfault)" statement can be triggered by running the "mvpg" s390x kvm-unit-test with TCG. According to Richard: "... the assert looks backward. We should only arrive there if nonfault was true for the probe (otherwise the probe would have raised the exception directly). I would think we could just remove the assert." Fixes: 4049431478 ("target/s390x: Fix s390_probe_access for user-only") Suggested-by: Richard Henderson Message-Id: <20230317135737.597570-1-thuth@redhat.com> Reviewed-by: Richard Henderson Reviewed-by: David Hildenbrand Signed-off-by: Thomas Huth --- target/s390x/tcg/mem_helper.c | 1 - 1 file changed, 1 deletion(-) diff --git a/target/s390x/tcg/mem_helper.c b/target/s390x/tcg/mem_helper.c index 96b8ef61b5..b93dbd3dad 100644 --- a/target/s390x/tcg/mem_helper.c +++ b/target/s390x/tcg/mem_helper.c @@ -149,7 +149,6 @@ static inline int s390_probe_access(CPUArchState *env, target_ulong addr, nonfault, phost, ra); if (unlikely(flags & TLB_INVALID_MASK)) { - assert(!nonfault); #ifdef CONFIG_USER_ONLY /* Address is in TEC in system mode; see s390_cpu_record_sigsegv. */ env->__excp_addr = addr & TARGET_PAGE_MASK; -- 2.31.1