From nobody Sun May 19 00:42:54 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=amsat.org ARC-Seal: i=1; a=rsa-sha256; t=1588149062; cv=none; d=zohomail.com; s=zohoarc; b=ifP1qhXeZB4hKwZEPj35eUaeIMlrpTjHoM2xfZWueLl4YB6Lte9cpWAdfRy4CJL/wg8eOpNlM9RDVJLzK1gW7WE8Kf8bQzh+M4LMK4Ccqf1/R0bz5pVUkkiOr6ENnxztkQX57B5UbpZiUVtgbE0qf+KLvX0gtB6Friq+wupecpw= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1588149062; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=s3vuzfzHqrILA6RfaHqkgzWfKCZQlZmqp6m3sNft2FE=; b=M6erIsv9iMbJJqXsvuuol2bmmqkdo7sF8AyH3EFXxYIdUonxkCTROgP3ElIGaud6ebXSa2WQVhp5Fl7Xb5ytblt/K2u6Z4XJOVOD5BEAGxyfm1JNmcDjvTOW1ScnY+XRl4vinFGQhjKSAT+At1eLVRYUjnqZ1+wsQnpZeDyKpqc= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1588149062506752.8449484629865; Wed, 29 Apr 2020 01:31:02 -0700 (PDT) Received: from localhost ([::1]:49846 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jTi7Q-00056D-TP for importer@patchew.org; Wed, 29 Apr 2020 04:31:00 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:54622) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jTi5r-0003jV-05 for qemu-devel@nongnu.org; Wed, 29 Apr 2020 04:29:23 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.90_1) (envelope-from ) id 1jTi5q-0002JP-Kp for qemu-devel@nongnu.org; Wed, 29 Apr 2020 04:29:22 -0400 Received: from mail-wm1-x344.google.com ([2a00:1450:4864:20::344]:51205) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1jTi5q-0002JA-8t for qemu-devel@nongnu.org; Wed, 29 Apr 2020 04:29:22 -0400 Received: by mail-wm1-x344.google.com with SMTP id x4so1010817wmj.1 for ; Wed, 29 Apr 2020 01:29:21 -0700 (PDT) Received: from localhost.localdomain (137.red-88-21-205.staticip.rima-tde.net. [88.21.205.137]) by smtp.gmail.com with ESMTPSA id a9sm6373615wmm.38.2020.04.29.01.29.19 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 29 Apr 2020 01:29:20 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=s3vuzfzHqrILA6RfaHqkgzWfKCZQlZmqp6m3sNft2FE=; b=k/vWWwHyVmftdgJlHL/K5iRhDGaMTz9Y+ThIHtUE+fWLFZ4IKUcQmhWk2U3quCzr9q lDYfybt5tcclFPdqzytKPXy7HAEl8pnQ9rfuInmzzqov45UQsNBJzShYJLWi6BtU2r7y KG3Tu8Au1xvE5tfERWMj1qOZKqTS+a385p89hFXjRA9Pg0kdMHxZQUH7vSwc2mDHQ0oY ud3hP2+OUVfbXpJb8LSNdycO8T43Th0oRY0V7cdHDlpq8/9tW5mgHnigOiIJfFb8Hzw1 FSLHcwZkV7MWrCsdwT58GFWYcXWzVIBwBUhdcFTF2w509WYIyCF7zlWs7ScWp195nJnI 3LkQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=s3vuzfzHqrILA6RfaHqkgzWfKCZQlZmqp6m3sNft2FE=; b=hcX7Taf8UIBNSPkNhyT8OneP7LDAg2CmYVn2/FmOV/K79h55N1DAa4JCIR0zcEjJAp rhH4TK36mP/w5S1986zFollsIaXihvWK36oJ41yy6S5rn9u7PwtCizkmJjvVmq5K8AkJ HdtLj0GfshN4nK1aTkFUOuEtx6kEhtbC9+98zLawtYJoNR3bl+chfMvaa9rzNfi/KGcE P3ReBBSvO/sTEpDv7ZE1/q1g4KhHkUFmxNYkIVimmNi+2JZCm4GopnRCGcSavWYX+b8f ZqNYT9sF0SkWjwQH5fpub8kc2sL2rqb7sstgJhwjbJSGiVbi/ggACMWt9AiPpGXlGkxO 6yCw== X-Gm-Message-State: AGi0Pub6iy0dcIhFT+KlnutnFoIJfgyoPGmbrcpifeiIcPn8lNl2dfCC xiZkxyn/tO7BIhw0JRX+G9Nmd6vqQco= X-Google-Smtp-Source: APiQypK/ht8IopfGi2eiVWSwdJdodx7tXbgvXyqm7Sh0h+QxdQYFK3wpm/BHBJ5Uv4g6HRMVfywG0g== X-Received: by 2002:a7b:c390:: with SMTP id s16mr1857960wmj.14.1588148960788; Wed, 29 Apr 2020 01:29:20 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PATCH 1/2] hw/mips/mips_int: De-duplicate KVM interrupt delivery Date: Wed, 29 Apr 2020 10:29:15 +0200 Message-Id: <20200429082916.10669-2-f4bug@amsat.org> X-Mailer: git-send-email 2.21.1 In-Reply-To: <20200429082916.10669-1-f4bug@amsat.org> References: <20200429082916.10669-1-f4bug@amsat.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::344; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wm1-x344.google.com X-detected-operating-system: by eggs.gnu.org: Error: [-] PROGRAM ABORT : Malformed IPv6 address (bad octet value). Location : parse_addr6(), p0f-client.c:67 X-Received-From: 2a00:1450:4864:20::344 X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Huacai Chen , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Jiaxun Yang , Aleksandar Markovic , Huacai Chen , Aleksandar Rikalo , Aurelien Jarno Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Refactor duplicated code in a single place. Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Thomas Huth --- hw/mips/mips_int.c | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/hw/mips/mips_int.c b/hw/mips/mips_int.c index 796730b11d..4a1bf846da 100644 --- a/hw/mips/mips_int.c +++ b/hw/mips/mips_int.c @@ -47,17 +47,12 @@ static void cpu_mips_irq_request(void *opaque, int irq,= int level) =20 if (level) { env->CP0_Cause |=3D 1 << (irq + CP0Ca_IP); - - if (kvm_enabled() && irq =3D=3D 2) { - kvm_mips_set_interrupt(cpu, irq, level); - } - } else { env->CP0_Cause &=3D ~(1 << (irq + CP0Ca_IP)); + } =20 - if (kvm_enabled() && irq =3D=3D 2) { - kvm_mips_set_interrupt(cpu, irq, level); - } + if (kvm_enabled() && irq =3D=3D 2) { + kvm_mips_set_interrupt(cpu, irq, level); } =20 if (env->CP0_Cause & CP0Ca_IP_mask) { --=20 2.21.1 From nobody Sun May 19 00:42:54 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org ARC-Seal: i=1; a=rsa-sha256; t=1588149064; cv=none; d=zohomail.com; s=zohoarc; b=CujTSwrwesxc52COjkLI3dIWJhghgukYB1Mb6STpH32GMsElG+1a5O4f3nsbuf13ZNsR3OFEh2odpvHTUsflmqn/XwyOk2SAaR8rvPnRW7vAUTTZikGqS5uyQyw7wy7yqsW36KRO/6+VhJgYsRLucXBpzvVXpY15kbTtiBlKYhI= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1588149064; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=sGhpxna5aVKxU3TFJCrqD1PUkNzmXBTRq/95VopA0dc=; b=XlrAZSEmASpYScVVTvzYZDLIZMjJemhIG7KFVntZor+ARb6MuQhBsn9k1b+u9ucNyedxYt0Yxnybc1TFJcJM8XBX4imaCwPl5xiSuSUuEoBxDH0O4ONEgGFR+kZhh66F7wYEAkehEp0Pb34QoFtqgpfxORd+yFv8oOjUMs3d0Ws= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1588149064621713.9731420003175; Wed, 29 Apr 2020 01:31:04 -0700 (PDT) Received: from localhost ([::1]:50006 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jTi7T-0005Bw-1m for importer@patchew.org; Wed, 29 Apr 2020 04:31:03 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:54630) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jTi5s-0003lJ-GC for qemu-devel@nongnu.org; Wed, 29 Apr 2020 04:29:24 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.90_1) (envelope-from ) id 1jTi5s-0002Ji-4x for qemu-devel@nongnu.org; Wed, 29 Apr 2020 04:29:24 -0400 Received: from mail-wm1-x342.google.com ([2a00:1450:4864:20::342]:54720) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1jTi5r-0002JW-Pk for qemu-devel@nongnu.org; Wed, 29 Apr 2020 04:29:23 -0400 Received: by mail-wm1-x342.google.com with SMTP id h4so1006396wmb.4 for ; Wed, 29 Apr 2020 01:29:23 -0700 (PDT) Received: from localhost.localdomain (137.red-88-21-205.staticip.rima-tde.net. [88.21.205.137]) by smtp.gmail.com with ESMTPSA id a9sm6373615wmm.38.2020.04.29.01.29.20 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 29 Apr 2020 01:29:21 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=sGhpxna5aVKxU3TFJCrqD1PUkNzmXBTRq/95VopA0dc=; b=I+Ip6im6J0ttrRnJtAFcFOqGtWrJmdxdXZgKmSciXBFl6ypdgvlauBatSUGWDrMaHf NGYFSpq4lJ3ZjTZ2HSuC1SmNZ8eEzdotvxVBxQEq/uYij/QjS1cE1OmhAB3QU1CwOxIu 1y0Wa7EmSzYb+0JQG1DWtKOogueJkWmUexTOv+W1MM6kX5ycfWqANfNxwIMStLzi2vKL ueiru7IIQ5W5QUhsYbRDB5LOKtAXLAKsLrvZg42LpSaBZVnxaYGyEJaj1B1L28goXUxK 7kQuplwXrbQOTz4in11ro17zBLYr5+lU5bBKcSPuQ+ckdpkkSUcoEFGhV0xpl7zpFu75 BYbw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=sGhpxna5aVKxU3TFJCrqD1PUkNzmXBTRq/95VopA0dc=; b=lMveElD/N5exS1BdOFJyxW8jEqtNe/7A+Ry/4/05greLpFkpxBhCNQ0D6EpUVrAi0K /W/qBt/UDwUXqHFIdNUpdiGiDK3WHykgeo1vFx13+cU/e0JoyhxgmoIncsoH7tE6ZhUu mJbvRUYyXQdGPT3CwYFJhtqiqgYu4XLzUc0ndxJecPMPxtEasq/c1tdadwpT3xC2Z0pI hhpH3Y/+HA8A4xp28GoYmKq+o3GIWksYTugEqCVhKWWtF6ZdqBIJU+VVjMFzVswENSOb ev/9qKlPn6vpQofzf45QBVpPDr/wl4xQorxnnnmS+W7rcbEWlOs5ija7oSTpcRDRspKG hKRQ== X-Gm-Message-State: AGi0PuZ504Y8cPIPtpy7umFk4oVAMa3Klv/KGW6EYgE83rGTo69zBiRY /JX78s/gSP/iFPZnjGHezZo7y9AeBvE= X-Google-Smtp-Source: APiQypIS22DSdUmq9gopVwPMLuKL+vm0XplQsjg7mIEfPiGlqx23HqYx4rk3mMOuo5ywvaHSYca09A== X-Received: by 2002:a1c:1d92:: with SMTP id d140mr1870366wmd.67.1588148962236; Wed, 29 Apr 2020 01:29:22 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PATCH 2/2] target/mips/kvm: Assert unreachable code is not used Date: Wed, 29 Apr 2020 10:29:16 +0200 Message-Id: <20200429082916.10669-3-f4bug@amsat.org> X-Mailer: git-send-email 2.21.1 In-Reply-To: <20200429082916.10669-1-f4bug@amsat.org> References: <20200429082916.10669-1-f4bug@amsat.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::342; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wm1-x342.google.com X-detected-operating-system: by eggs.gnu.org: Error: [-] PROGRAM ABORT : Malformed IPv6 address (bad octet value). Location : parse_addr6(), p0f-client.c:67 X-Received-From: 2a00:1450:4864:20::342 X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Huacai Chen , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Jiaxun Yang , Aleksandar Markovic , Huacai Chen , Aleksandar Rikalo , Aurelien Jarno Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) This code must not be used outside of KVM. Abort if it is. Signed-off-by: Philippe Mathieu-Daud=C3=A9 Acked-by: Paolo Bonzini Reviewed-by: Huacai Chen --- target/mips/kvm.c | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/target/mips/kvm.c b/target/mips/kvm.c index de3e26ef1f..050bfbd7fa 100644 --- a/target/mips/kvm.c +++ b/target/mips/kvm.c @@ -196,9 +196,7 @@ int kvm_mips_set_interrupt(MIPSCPU *cpu, int irq, int l= evel) CPUState *cs =3D CPU(cpu); struct kvm_mips_interrupt intr; =20 - if (!kvm_enabled()) { - return 0; - } + assert(kvm_enabled()); =20 intr.cpu =3D -1; =20 @@ -219,9 +217,7 @@ int kvm_mips_set_ipi_interrupt(MIPSCPU *cpu, int irq, i= nt level) CPUState *dest_cs =3D CPU(cpu); struct kvm_mips_interrupt intr; =20 - if (!kvm_enabled()) { - return 0; - } + assert(kvm_enabled()); =20 intr.cpu =3D dest_cs->cpu_index; =20 --=20 2.21.1