From nobody Mon Nov 17 13:47:22 2025 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=1604548301; cv=none; d=zohomail.com; s=zohoarc; b=Bx+Yg+5xlASFwaDfxF7uIPw2EtXgG0dmWfHfdW+p1xRDvr43QyvTsN+aD64osojhE52pyvtfT+s8VlHDg4FQwmSWv18TUnMGnIcAH6ouTlKeQR0tJ/MTAt5IitFV9H/UlfSP5WtEQNswzwEOGeho5mradAR6Bc77h3s2vVijriM= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1604548301; 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=kkWtVWfLAFOQ4PuGxXX29yIerJyjQiVRR+ybcKxtAW4=; b=D6JnLulxr8J9xilygttyz4UIotznSpAtInsvD2xT5V8y7KmnAfznSS/G06VpbVtrKY7aOwzqezY8XXyHMUbEetNReYhBJAmAuhb5A18UNXMHM76CY92nN1XP2CGxBW8aU8Zgn/Yoh5U0hR96+/RvTvmWAWri4h4YZV/SBHvp+po= 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 1604548301636159.0350720283277; Wed, 4 Nov 2020 19:51:41 -0800 (PST) Received: from localhost ([::1]:37440 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kaWJI-000708-BW for importer@patchew.org; Wed, 04 Nov 2020 22:51:40 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:35066) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kaWHO-0005Nr-NA; Wed, 04 Nov 2020 22:49:42 -0500 Received: from bilbo.ozlabs.org ([203.11.71.1]:33859 helo=ozlabs.org) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kaWHL-0003wV-Fj; Wed, 04 Nov 2020 22:49:42 -0500 Received: by ozlabs.org (Postfix, from userid 1007) id 4CRTzb1KK7z9sRR; Thu, 5 Nov 2020 14:49:31 +1100 (AEDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gibson.dropbear.id.au; s=201602; t=1604548171; bh=zUzX5zu57Y2d4gMRLtDx5hcrmHkeL5+qsA7DiyUMmzk=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=P79qUpqq44edjnFaHGT0hSVcXqHeFz2nkQC2jhLaCTeCJ6Y/aKdQtLVZLrGI1uG1D 93hi61qNZ7FE/kGLwn0KMQxdqQsw8xVi25UH5a0OUbgUa89mWxGTwlULmzlINJvY4s lC/IcbKIG5u7+rtgJ3Dh+DauZgzMK5cHKTLKwIMU= From: David Gibson To: peter.maydell@linaro.org Subject: [PULL 1/3] target/ppc/excp_helper: Add a fallthrough for fix compiler warning Date: Thu, 5 Nov 2020 14:49:17 +1100 Message-Id: <20201105034919.393653-2-david@gibson.dropbear.id.au> X-Mailer: git-send-email 2.28.0 In-Reply-To: <20201105034919.393653-1-david@gibson.dropbear.id.au> References: <20201105034919.393653-1-david@gibson.dropbear.id.au> MIME-Version: 1.0 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=203.11.71.1; envelope-from=dgibson@ozlabs.org; helo=ozlabs.org X-detected-operating-system: by eggs.gnu.org: First seen = 2020/11/04 22:49:31 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] X-Spam_score_int: -17 X-Spam_score: -1.8 X-Spam_bar: - X-Spam_report: (-1.8 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, HEADER_FROM_DIFFERENT_DOMAINS=0.25, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001 autolearn=no autolearn_force=no X-Spam_action: no action 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: qemu-devel@nongnu.org, groug@kaod.org, qemu-ppc@nongnu.org, Euler Robot , Chen Qun , David Gibson Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) From: Chen Qun When using -Wimplicit-fallthrough in our CFLAGS, the compiler showed warnin= g: ../target/ppc/excp_helper.c: In function =E2=80=98powerpc_excp=E2=80=99: ../target/ppc/excp_helper.c:529:13: warning: this statement may fall throug= h [-Wimplicit-fallthrough=3D] 529 | msr |=3D env->error_code; | ~~~~^~~~~~~~~~~~~~~~~~ ../target/ppc/excp_helper.c:530:5: note: here 530 | case POWERPC_EXCP_HDECR: /* Hypervisor decrementer exceptio= n */ | ^~~~ Add the corresponding "fall through" comment to fix it. Reported-by: Euler Robot Signed-off-by: Chen Qun Message-Id: <20201028055107.2170401-1-kuhn.chenqun@huawei.com> Signed-off-by: David Gibson --- target/ppc/excp_helper.c | 1 + 1 file changed, 1 insertion(+) diff --git a/target/ppc/excp_helper.c b/target/ppc/excp_helper.c index d7411bcc81..ad0612555d 100644 --- a/target/ppc/excp_helper.c +++ b/target/ppc/excp_helper.c @@ -527,6 +527,7 @@ static inline void powerpc_excp(PowerPCCPU *cpu, int ex= cp_model, int excp) break; case POWERPC_EXCP_HISI: /* Hypervisor instruction storage excepti= on */ msr |=3D env->error_code; + /* fall through */ case POWERPC_EXCP_HDECR: /* Hypervisor decrementer exception = */ case POWERPC_EXCP_HDSI: /* Hypervisor data storage exception = */ case POWERPC_EXCP_HDSEG: /* Hypervisor data segment exception = */ --=20 2.28.0 From nobody Mon Nov 17 13:47:22 2025 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=1604548289; cv=none; d=zohomail.com; s=zohoarc; b=cvgGmX1VmCBEPLVdNL6tfBY/keT8Hjwa+nuJByvpyEFm2+Ho2A54P4n3LJIZyO0xfLoO493EkK+cubBGwR+8atnHJ3Dwo5ZtARC/9UKrvTCFh/5RDroVI/j9xEE1F9Xf8BgoO3P0kCGewgE4hkbrC5fsUyaXSRUe13JKysr9cg4= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1604548289; h=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=fj0bSLP+YTHKA2kvnr5uP23+oupLSNgAZTH2s2qXmL0=; b=NEtwCSITKlyjf+yqGLGYhjGThnlZH+RgoGZvsV+lTyCTfx4jodSiHRBVi8WoRXyqkgDnKFT9vbnlA8tWVUQ4x+v1SBFqxi4rB1nKXJwI0PHYg3Kd9ihS/Tcr68oTSOUHJ4J4QR3/4H8ISgu8YTLyjp2/HOhwRRITS/Bu/k7rAXg= 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 1604548289098242.7417856777489; Wed, 4 Nov 2020 19:51:29 -0800 (PST) Received: from localhost ([::1]:36678 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kaWJ6-0006hV-2Y for importer@patchew.org; Wed, 04 Nov 2020 22:51:28 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:35046) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kaWHN-0005NY-Ih; Wed, 04 Nov 2020 22:49:41 -0500 Received: from bilbo.ozlabs.org ([2401:3900:2:1::2]:42279 helo=ozlabs.org) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kaWHL-0003wX-DQ; Wed, 04 Nov 2020 22:49:41 -0500 Received: by ozlabs.org (Postfix, from userid 1007) id 4CRTzb2bsCz9sTD; Thu, 5 Nov 2020 14:49:31 +1100 (AEDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gibson.dropbear.id.au; s=201602; t=1604548171; bh=OjxTdqml0JkNTFyhEHrZhmtd+j41envfmwID7MLyDvw=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=RVNE6zxv4ioloRbaj6RzMDQEAtIg0vhNR3CB7nSkLfDn/pU4kXOU+e1rAJUVqN5Kt J8/Q3+QcLYEWRL52FQNXkS4R9WLSM+nmlwQhQ/Oo6DtwhoAvHt9r3nMS5cNcI19m3q Y+mrSZMT7mD3Z2py7X7EqdS8sAeySfRbJAdGwx0c= From: David Gibson To: peter.maydell@linaro.org Subject: [PULL 2/3] spapr: Drop dead code in spapr_reallocate_hpt() Date: Thu, 5 Nov 2020 14:49:18 +1100 Message-Id: <20201105034919.393653-3-david@gibson.dropbear.id.au> X-Mailer: git-send-email 2.28.0 In-Reply-To: <20201105034919.393653-1-david@gibson.dropbear.id.au> References: <20201105034919.393653-1-david@gibson.dropbear.id.au> MIME-Version: 1.0 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=2401:3900:2:1::2; envelope-from=dgibson@ozlabs.org; helo=ozlabs.org X-detected-operating-system: by eggs.gnu.org: No matching host in p0f cache. That's all we know. X-Spam_score_int: -17 X-Spam_score: -1.8 X-Spam_bar: - X-Spam_report: (-1.8 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, HEADER_FROM_DIFFERENT_DOMAINS=0.25, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001 autolearn=no autolearn_force=no X-Spam_action: no action 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: David Gibson , qemu-ppc@nongnu.org, qemu-devel@nongnu.org, groug@kaod.org Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Type: text/plain; charset="utf-8" From: Greg Kurz Sometimes QEMU needs to allocate the HPT in userspace, namely with TCG or PR KVM. This is performed with qemu_memalign() because of alignment requirements. Like glib's allocators, its behaviour is to abort on OOM instead of returning NULL. This could be changed to qemu_try_memalign(), but in the specific case of spapr_reallocate_hpt(), the outcome would be to terminate QEMU anyway since no HPT means no MMU for the guest. Drop the dead code instead. Signed-off-by: Greg Kurz Message-Id: <160398562892.32380.15006707861753544263.stgit@bahia.lan> Signed-off-by: David Gibson --- hw/ppc/spapr.c | 6 ------ 1 file changed, 6 deletions(-) diff --git a/hw/ppc/spapr.c b/hw/ppc/spapr.c index 227075103e..12a012d9dd 100644 --- a/hw/ppc/spapr.c +++ b/hw/ppc/spapr.c @@ -1522,12 +1522,6 @@ int spapr_reallocate_hpt(SpaprMachineState *spapr, i= nt shift, Error **errp) int i; =20 spapr->htab =3D qemu_memalign(size, size); - if (!spapr->htab) { - error_setg_errno(errp, errno, - "Could not allocate HPT of order %d", shift); - return -ENOMEM; - } - memset(spapr->htab, 0, size); spapr->htab_shift =3D shift; =20 --=20 2.28.0 From nobody Mon Nov 17 13:47:22 2025 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=1604548289; cv=none; d=zohomail.com; s=zohoarc; b=nVzEn7F/fgGShESSeghJCbTnLbzRFKvdTmA86qE6bs5JepqMDeQEyxALrGTUAQkwJrarNNmfLDxqUsqeks9JgHE+YDN0K9DROxkkXR0xrT6NohLkg9PdJ4s7cdZDqwgS65lMbO5pJ82CwSw0FK75pWrjGxrjIwTXQUT3Sied65U= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1604548289; h=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=f3hKZF73/YoTlDUQzOZZBrDgHRYeOYYONQCQiXRT8ZQ=; b=HO/sR6fv2B9yyAhD7RiCsuW1FivI1KmVzbnqnv+JEcGOhbawI+pG8V5NGsv60YAw3VT6tDhgAk+wnamyGLQbqioWDx/2hzjDebDDXMTKQ/b/AcqDdpBuDoj1alSJvSfbTJPz2DtDByKFR9J56IdJLNKQGtl6nkyXre6i0VIcu98= 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 16045482888931015.3785550933578; Wed, 4 Nov 2020 19:51:28 -0800 (PST) Received: from localhost ([::1]:36708 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kaWJ5-0006i9-Sz for importer@patchew.org; Wed, 04 Nov 2020 22:51:27 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:35048) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kaWHN-0005NZ-KR; Wed, 04 Nov 2020 22:49:41 -0500 Received: from bilbo.ozlabs.org ([2401:3900:2:1::2]:57625 helo=ozlabs.org) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kaWHL-0003wY-9p; Wed, 04 Nov 2020 22:49:41 -0500 Received: by ozlabs.org (Postfix, from userid 1007) id 4CRTzb3HnLz9sTL; Thu, 5 Nov 2020 14:49:31 +1100 (AEDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gibson.dropbear.id.au; s=201602; t=1604548171; bh=h9uWSlyNbwH/ldEkW6U/uD3o+yRhPlC7O+nq4loYpmE=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=MgH6i6/cte9FID8DtM3qPcGauqNXCdIAfE0z9kdQJrOAsQSa2QPPIQNX9nIZRw/6K 2kmofWjWyESp6xGQUJKb44Y5dPDgu9dCJUNQ7JisKJhKb/gRkIqZy+YSTmiBJgaq7+ EolkFlRJ3zeXLHsxu34NHq5/gdIxJgx6EUzsh3qw= From: David Gibson To: peter.maydell@linaro.org Subject: [PULL 3/3] spapr: Convert hpt_prepare_thread() to use qemu_try_memalign() Date: Thu, 5 Nov 2020 14:49:19 +1100 Message-Id: <20201105034919.393653-4-david@gibson.dropbear.id.au> X-Mailer: git-send-email 2.28.0 In-Reply-To: <20201105034919.393653-1-david@gibson.dropbear.id.au> References: <20201105034919.393653-1-david@gibson.dropbear.id.au> MIME-Version: 1.0 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=2401:3900:2:1::2; envelope-from=dgibson@ozlabs.org; helo=ozlabs.org X-detected-operating-system: by eggs.gnu.org: No matching host in p0f cache. That's all we know. X-Spam_score_int: -17 X-Spam_score: -1.8 X-Spam_bar: - X-Spam_report: (-1.8 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, HEADER_FROM_DIFFERENT_DOMAINS=0.25, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001 autolearn=no autolearn_force=no X-Spam_action: no action 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: David Gibson , qemu-ppc@nongnu.org, qemu-devel@nongnu.org, groug@kaod.org Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Type: text/plain; charset="utf-8" From: Greg Kurz HPT resizing is asynchronous: the guest first kicks off the creation of a new HPT, then it waits for that new HPT to be actually created and finally it asks the current HPT to be replaced by the new one. In the case of a userland allocated HPT, this currently relies on calling qemu_memalign() which aborts on OOM and never returns NULL. Since we seem to have path to report the failure to the guest with an H_NO_MEM return value, use qemu_try_memalign() instead of qemu_memalign(). Signed-off-by: Greg Kurz Message-Id: <160398563636.32380.1747166034877173994.stgit@bahia.lan> Signed-off-by: David Gibson --- hw/ppc/spapr_hcall.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hw/ppc/spapr_hcall.c b/hw/ppc/spapr_hcall.c index 607740150f..1d8e8e6a88 100644 --- a/hw/ppc/spapr_hcall.c +++ b/hw/ppc/spapr_hcall.c @@ -360,7 +360,7 @@ static void *hpt_prepare_thread(void *opaque) SpaprPendingHpt *pending =3D opaque; size_t size =3D 1ULL << pending->shift; =20 - pending->hpt =3D qemu_memalign(size, size); + pending->hpt =3D qemu_try_memalign(size, size); if (pending->hpt) { memset(pending->hpt, 0, size); pending->ret =3D H_SUCCESS; --=20 2.28.0