From nobody Sat Apr 11 21:28:56 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; 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=pass(p=quarantine dis=none) header.from=kernel.org ARC-Seal: i=1; a=rsa-sha256; t=1772991015; cv=none; d=zohomail.com; s=zohoarc; b=ntkQb7dwtk5bQLlwSCZp8LG78w73ucHVIGf2itFEJ5BDtYXezAfnvEY5QiLGCfWzShucpD0hPZII9FLBUoEVusb5JMqbiX7XrVbM2mq3dFIjlypYFs5YTID2pmZkubPhSooC+TMgQUPNufQJJO0FZnd671SNLLYFn2nqATiX844= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1772991015; h=Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=Fb0TIOdaFmlzIsBPQlzDkn06cB4T3grJ7EiQgq3S9Js=; b=GiKLhaU3HcOpLOumK4nednDWmSV97XTj9Vmbd6WU7Wg1LLaBWRsUElTgdZWYgLTRImBBNEDuYw2jJxlr0/wIOpVYKInVikQNgGkTH9/u7iXJXtyX9GkDlTvs4Zu8pCN3eBSCQkVxfciTLrS8OTlsGAE8sHIWYUk9gMnGC4Ko+GA= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; 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=pass header.from= (p=quarantine dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1772991015552329.72699184582586; Sun, 8 Mar 2026 10:30:15 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vzHwx-0003f6-Ex; Sun, 08 Mar 2026 13:29:57 -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 1vzHwq-0003eY-DD for qemu-devel@nongnu.org; Sun, 08 Mar 2026 13:29:48 -0400 Received: from sea.source.kernel.org ([2600:3c0a:e001:78e:0:1991:8:25]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1vzHwo-0003nK-Uz for qemu-devel@nongnu.org; Sun, 08 Mar 2026 13:29:48 -0400 Received: from smtp.kernel.org (transwarp.subspace.kernel.org [100.75.92.58]) by sea.source.kernel.org (Postfix) with ESMTP id 8076B42AC1; Sun, 8 Mar 2026 17:29:44 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id D848CC2BC86; Sun, 8 Mar 2026 17:29:40 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1772990983; bh=5T1LhH5J6f2Ao8dbBECeACv01ggKw++t/KA2Q4VUqbw=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=JcR/K77APKtIltX2KVF4twyulwUuA5yvLtk6YYihM+osTyX7d5NATDRMvNmytwcTM 78VLVTpSthqneBqKnQ1E3s9Je9qv/HWPaF1GeVL2q7INNEgcIcLGgEOKhG/NvkxmEp kdymZ5N3zlFG3lY3FVA4xyB9ityNbaViIIScLEGFjk4bkk7V/FveG/EhjXj+mj2jxk n3XsA8v7Nsy6zhIWrm5ux9IfWGuUtOMvoDcI6uBkTWrxcGIko8/a7oWp7oNuhdkhk3 DYxGeStDokoZlhjzrJqpdiAWwXCLp6XVMKIhIRsjfRNhGycKgthW8qgBkeHxkbBccG e1+E2BAZ12yxg== From: deller@kernel.org To: qemu-devel@nongnu.org Cc: Kyle Evans , Paolo Bonzini , =?UTF-8?q?Alex=20Benn=C3=A9e?= , Laurent Vivier , Warner Losh , =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , deller@gmx.de, Richard Henderson , Pierrick Bouvier Subject: [PULL 01/12] hw/hppa: Avoid leaking a diva-gsp device Date: Sun, 8 Mar 2026 18:29:25 +0100 Message-ID: <20260308172936.2835-2-deller@kernel.org> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260308172936.2835-1-deller@kernel.org> References: <20260308172936.2835-1-deller@kernel.org> 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=2600:3c0a:e001:78e:0:1991:8:25; envelope-from=deller@kernel.org; helo=sea.source.kernel.org 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, 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: qemu development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @kernel.org) X-ZM-MESSAGEID: 1772991018154154100 Content-Type: text/plain; charset="utf-8" From: Helge Deller Create a Diva-gsp unconditionally on all 64-bit PCI machines. The A400 usually comes with a Diva card. The C3700 has a built-in SUPERIO chip, which we haven't implemented yet, so running with an emulated Diva is the best we can do for now. Signed-off-by: Helge Deller Suggested-by: Peter Maydell Reviewed-by: Peter Maydell --- hw/hppa/machine.c | 19 ++++++++----------- 1 file changed, 8 insertions(+), 11 deletions(-) diff --git a/hw/hppa/machine.c b/hw/hppa/machine.c index f55e84529f..50ace81528 100644 --- a/hw/hppa/machine.c +++ b/hw/hppa/machine.c @@ -380,18 +380,15 @@ static void machine_HP_common_init_tail(MachineState = *machine, PCIBus *pci_bus, =20 if (pci_bus && hppa_is_pa20(&cpu[0]->env)) { /* BMC board: HP Diva GSP PCI card */ - dev =3D qdev_new("diva-gsp"); - if (dev && !object_property_get_bool(OBJECT(dev), "disable", NULL)= ) { - pci_dev =3D pci_new_multifunction(PCI_DEVFN(2, 0), "diva-gsp"); - if (!lasi_dev) { - /* bind default keyboard/serial to Diva card */ - qdev_prop_set_chr(DEVICE(pci_dev), "chardev1", serial_hd(0= )); - qdev_prop_set_chr(DEVICE(pci_dev), "chardev2", serial_hd(1= )); - qdev_prop_set_chr(DEVICE(pci_dev), "chardev3", serial_hd(2= )); - qdev_prop_set_chr(DEVICE(pci_dev), "chardev4", serial_hd(3= )); - } - pci_realize_and_unref(pci_dev, pci_bus, &error_fatal); + pci_dev =3D pci_new_multifunction(PCI_DEVFN(2, 0), "diva-gsp"); + if (!lasi_dev) { + /* bind default keyboard/serial to Diva card */ + qdev_prop_set_chr(DEVICE(pci_dev), "chardev1", serial_hd(0)); + qdev_prop_set_chr(DEVICE(pci_dev), "chardev2", serial_hd(1)); + qdev_prop_set_chr(DEVICE(pci_dev), "chardev3", serial_hd(2)); + qdev_prop_set_chr(DEVICE(pci_dev), "chardev4", serial_hd(3)); } + pci_realize_and_unref(pci_dev, pci_bus, &error_fatal); } =20 /* create USB OHCI controller for USB keyboard & mouse on Astro machin= es */ --=20 2.53.0 From nobody Sat Apr 11 21:28:56 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; 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=pass(p=quarantine dis=none) header.from=kernel.org ARC-Seal: i=1; a=rsa-sha256; t=1772991059; cv=none; d=zohomail.com; s=zohoarc; b=BAS6vpAZR1ae3uqSWB7TFxa6qdqjrLFbUwpOvEDMhIEtq1XESaKOZM/sJ4gs7f8qtwACvkW9rkxvLyX0hpOkMSTec/drJaFAk876LbHodwApOINXo/DN5kQn5+Zi12H4thjnm79NUd0HUc0cEYXV/D3XGGHNBejJfJzdKdGmlDE= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1772991059; h=Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=k46VEq0C27L5eafGpLC96KYtE6aW1SyvskxLsnjorUk=; b=gaQOXSmwBhXUHg7+uELUsDorfW7jnGDTIHAzTyxs0E6kFoQYVS9QYsdVkrrri/8KFstuilgTKuKnKsnTnyAIpWVjEB7v0iwyQrfmvJPN/oGxi/+MHXn5oN4jpm07PfTnkgjmk6+TIJ1ZvvaVcXhSt87cFFsEFicGa9RJq82qDTA= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; 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=pass header.from= (p=quarantine dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1772991059698275.5155615549353; Sun, 8 Mar 2026 10:30:59 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vzHx6-0003gU-7h; Sun, 08 Mar 2026 13:30:04 -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 1vzHwr-0003ek-Ob for qemu-devel@nongnu.org; Sun, 08 Mar 2026 13:29:50 -0400 Received: from tor.source.kernel.org ([2600:3c04:e001:324:0:1991:8:25]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1vzHwp-0003nL-1G for qemu-devel@nongnu.org; Sun, 08 Mar 2026 13:29:49 -0400 Received: from smtp.kernel.org (transwarp.subspace.kernel.org [100.75.92.58]) by tor.source.kernel.org (Postfix) with ESMTP id C3FE6600AE; Sun, 8 Mar 2026 17:29:45 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 64F97C116C6; Sun, 8 Mar 2026 17:29:43 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1772990985; bh=QIdUQ5ojIh6pUED378YIZDxyX5WSDR8KZ+KkV6/pMI4=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=NrGNfYrkD+9JGnxShLTLRbsCWesGkb4TT2+KWnc1B1PXsO/pk8mPFotI9zpeaUVzO 1dVzUaoV0pOzQZDKtc0PGMLxHpS18crA/ryZIxECEz7Er6+4ADQxBBxhJTigyxVhfZ 9GTOML4Jkb8inVNlibrYiYfywUi7Mt50CzYUcsza/tGsAxV0fnW0eEIiIZ35lnsuz1 AoGDGwJOMT2pNtKYTF/D8aJaGiRyUa1YP9+KcyYe9lAxUjsY9bsGc4qLkrQGT0G3vI CR0MAA6orJb/XpbdMJ+mhMtTXC2p5adqjwGgRTNknbBXZedVS1wOXJBeR6FSxjUVD7 agD4CTuRwONVw== From: deller@kernel.org To: qemu-devel@nongnu.org Cc: Kyle Evans , Paolo Bonzini , =?UTF-8?q?Alex=20Benn=C3=A9e?= , Laurent Vivier , Warner Losh , =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , deller@gmx.de, Richard Henderson , Pierrick Bouvier Subject: [PULL 02/12] hw/char: Drop disable property of Diva GSP card Date: Sun, 8 Mar 2026 18:29:26 +0100 Message-ID: <20260308172936.2835-3-deller@kernel.org> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260308172936.2835-1-deller@kernel.org> References: <20260308172936.2835-1-deller@kernel.org> 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=2600:3c04:e001:324:0:1991:8:25; envelope-from=deller@kernel.org; helo=tor.source.kernel.org 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, 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: qemu development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @kernel.org) X-ZM-MESSAGEID: 1772991062627154100 Content-Type: text/plain; charset="utf-8" From: Helge Deller The "disable" property is not used, so drop it. Suggested-by: Peter Maydell Reviewed-by: Peter Maydell Signed-off-by: Helge Deller --- hw/char/diva-gsp.c | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/hw/char/diva-gsp.c b/hw/char/diva-gsp.c index 280d0413c6..2be5183216 100644 --- a/hw/char/diva-gsp.c +++ b/hw/char/diva-gsp.c @@ -51,7 +51,6 @@ typedef struct PCIDivaSerialState { SerialState state[PCI_SERIAL_MAX_PORTS]; uint32_t level[PCI_SERIAL_MAX_PORTS]; qemu_irq *irqs; - bool disable; } PCIDivaSerialState; =20 static void diva_pci_exit(PCIDevice *dev) @@ -159,20 +158,18 @@ static void diva_pci_realize(PCIDevice *dev, Error **= errp) =20 static const VMStateDescription vmstate_pci_diva =3D { .name =3D "pci-diva-serial", - .version_id =3D 1, - .minimum_version_id =3D 1, + .version_id =3D 2, + .minimum_version_id =3D 2, .fields =3D (const VMStateField[]) { VMSTATE_PCI_DEVICE(dev, PCIDivaSerialState), VMSTATE_STRUCT_ARRAY(state, PCIDivaSerialState, PCI_SERIAL_MAX_POR= TS, 0, vmstate_serial, SerialState), VMSTATE_UINT32_ARRAY(level, PCIDivaSerialState, PCI_SERIAL_MAX_POR= TS), - VMSTATE_BOOL(disable, PCIDivaSerialState), VMSTATE_END_OF_LIST() } }; =20 static const Property diva_serial_properties[] =3D { - DEFINE_PROP_BOOL("disable", PCIDivaSerialState, disable, false), DEFINE_PROP_CHR("chardev1", PCIDivaSerialState, state[0].chr), DEFINE_PROP_CHR("chardev2", PCIDivaSerialState, state[1].chr), DEFINE_PROP_CHR("chardev3", PCIDivaSerialState, state[2].chr), --=20 2.53.0 From nobody Sat Apr 11 21:28:56 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; 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=pass(p=quarantine dis=none) header.from=kernel.org ARC-Seal: i=1; a=rsa-sha256; t=1772991020; cv=none; d=zohomail.com; s=zohoarc; b=nkygP5aAyeCYbqpysbkhE0/vTlKja/HPYtThjN0gh02WzFjhT1Pko0HO/ZjN9DNOooAF2EZ94O8BP0FUZHWUrgIfkNnb5VdhfOvNDSwc7liPE6sbezoQNmtqUdFXZfTL4JM79c3U1TH06zVK7g51o2aucwksUQurwPC+OnjCdAI= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1772991020; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=uSUoduXt1McMZ+xp4HI8Tm+6BrIMPYdhMvyXUl5DEIg=; b=QB7p4Ledpjhp9jH5fkJhqutijHqfGv1w5y8QBYLxxtHFjKQGsel2JIzmQprtPr+wCjzv8M2Nnw2I5c+ndbAFDfl8gGNQllPvwWN6yHlDa+qdy2E0GwHb/jal2xBos4Kmws/FiAaK2+qvDlNHp0HD9wqfvWcSbvrC4DI3TXpS5nI= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; 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=pass header.from= (p=quarantine dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1772991020328254.36709238418905; Sun, 8 Mar 2026 10:30:20 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vzHx7-0003hR-JY; Sun, 08 Mar 2026 13:30:06 -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 1vzHwu-0003f5-69 for qemu-devel@nongnu.org; Sun, 08 Mar 2026 13:29:54 -0400 Received: from sea.source.kernel.org ([2600:3c0a:e001:78e:0:1991:8:25]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1vzHws-0003ng-ED for qemu-devel@nongnu.org; Sun, 08 Mar 2026 13:29:51 -0400 Received: from smtp.kernel.org (transwarp.subspace.kernel.org [100.75.92.58]) by sea.source.kernel.org (Postfix) with ESMTP id 2E8204341E; Sun, 8 Mar 2026 17:29:48 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id E6E6AC116C6; Sun, 8 Mar 2026 17:29:45 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1772990988; bh=0nM1s+NQvWZ8mFk4qsfcfN21HkyWkiji/p4/PrOht4w=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=AziDDGDerWm1xBk/O+KjWJzrqd2US+WzXVAZNp/mGMI5v5XrksmNjNcBfIMGQU7lX yimX13tj2L0u6gR3WmnuwXZoAAF1j+iXH0LXk5JOvzJw2NNo7VFVakgiSYA/OFwjb5 7eYH2qofpZPwsCJUBSWtJEMJNADzdlhGFJ0XZTPXtMiTdntHdpAlibcCg56fZibaUK X4pwm4T/jp4ImfwRDWSf7cGSvbm7Sg7UszQoUow/53aSqUqJ5bfGSTZs8B0LylGyom CIAXCXhumvS9VD40aMAB07n6OV9b6dkyEu/8ulrPUjwmd6g3YqwaTQurjwMVsJguY+ J3+42/ExQDZMQ== From: deller@kernel.org To: qemu-devel@nongnu.org Cc: Kyle Evans , Paolo Bonzini , =?UTF-8?q?Alex=20Benn=C3=A9e?= , Laurent Vivier , Warner Losh , =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , deller@gmx.de, Richard Henderson , Pierrick Bouvier Subject: [PULL 03/12] linux-user/strace: fix printing of file offsets Date: Sun, 8 Mar 2026 18:29:27 +0100 Message-ID: <20260308172936.2835-4-deller@kernel.org> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260308172936.2835-1-deller@kernel.org> References: <20260308172936.2835-1-deller@kernel.org> 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=2600:3c0a:e001:78e:0:1991:8:25; envelope-from=deller@kernel.org; helo=sea.source.kernel.org 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, 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: qemu development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @kernel.org) X-ZM-MESSAGEID: 1772991022147158500 From: Jean-Christian C=C3=8ERSTEA Previously, 64-bit file offsets (loff_t) were printed using `print_raw_para= m()` function, which led to silent truncation of the upper part. This commit fix= es this issue by adding two helper functions: 1. print_file_offset32(): prints 32-bit file offsets (off_t) 2. print_file_offset64(): prints 64-bit file offsets (loff_t) Changelog v2: 1. Make `print_file_offset32()` static. 2. Use `last` parameter in `print_file_offset32()`. 3. Rename `low` and `high` parameters of `print_file_offset64()` to `word0`, `word1` respectively 4. Convert `last` to bool for `print_file_offset[32,64]()` 5. Use `PRId64` instead of `PRIu64` for `print_file_offset64()` 6. Fix `print__llseek()` Signed-off-by: Jean-Christian C=C3=8ERSTEA Reviewed-by: Helge Deller Signed-off-by: Helge Deller --- linux-user/strace.c | 43 +++++++++++++++++++++++++++++++------------ 1 file changed, 31 insertions(+), 12 deletions(-) diff --git a/linux-user/strace.c b/linux-user/strace.c index ca67cfd09d..d253b522bf 100644 --- a/linux-user/strace.c +++ b/linux-user/strace.c @@ -85,6 +85,10 @@ UNUSED static void print_enums(const struct enums *, abi= _long, int); UNUSED static void print_at_dirfd(abi_long, int); UNUSED static void print_file_mode(abi_long, int); UNUSED static void print_open_flags(abi_long, int); +UNUSED static void print_file_offset32(abi_long offset, bool last); +UNUSED static void print_file_offset64(abi_long word0, + abi_long word1, + bool last); UNUSED static void print_syscall_prologue(const struct syscallname *); UNUSED static void print_syscall_epilogue(const struct syscallname *); UNUSED static void print_string(abi_long, int); @@ -1664,6 +1668,20 @@ print_open_flags(abi_long flags, int last) print_flags(open_flags, flags, last); } =20 +/* Prints 32-bit file offset (off_t) */ +static void +print_file_offset32(abi_long offset, bool last) +{ + print_raw_param(TARGET_ABI_FMT_ld, offset, last); +} + +/* Prints 64-bit file offset (loff_t) */ +static void +print_file_offset64(abi_long word0, abi_long word1, bool last) +{ + print_raw_param64("%" PRId64, target_offset64(word0, word1), last); +} + static void print_syscall_prologue(const struct syscallname *sc) { @@ -2256,11 +2274,13 @@ print_fallocate(CPUArchState *cpu_env, const struct= syscallname *name, print_raw_param("%d", arg0, 0); print_flags(falloc_flags, arg1, 0); #if TARGET_ABI_BITS =3D=3D 32 - print_raw_param("%" PRIu64, target_offset64(arg2, arg3), 0); - print_raw_param("%" PRIu64, target_offset64(arg4, arg5), 1); + /* On 32-bit targets, two registers are used for `loff_t` */ + print_file_offset64(arg2, arg3, false); + print_file_offset64(arg4, arg5, true); #else - print_raw_param(TARGET_ABI_FMT_ld, arg2, 0); - print_raw_param(TARGET_ABI_FMT_ld, arg3, 1); + /* On 64-bit targets, one register is used for `loff_t` */ + print_file_offset64(arg2, 0, false); + print_file_offset64(arg3, 0, true); #endif print_syscall_epilogue(name); } @@ -2666,8 +2686,7 @@ print__llseek(CPUArchState *cpu_env, const struct sys= callname *name, const char *whence =3D "UNKNOWN"; print_syscall_prologue(name); print_raw_param("%d", arg0, 0); - print_raw_param("%ld", arg1, 0); - print_raw_param("%ld", arg2, 0); + print_file_offset64(arg1, arg2, false); print_pointer(arg3, 0); switch(arg4) { case SEEK_SET: whence =3D "SEEK_SET"; break; @@ -2688,7 +2707,7 @@ print_lseek(CPUArchState *cpu_env, const struct sysca= llname *name, { print_syscall_prologue(name); print_raw_param("%d", arg0, 0); - print_raw_param(TARGET_ABI_FMT_ld, arg1, 0); + print_file_offset32(arg1, false); switch (arg2) { case SEEK_SET: qemu_log("SEEK_SET"); break; @@ -2719,7 +2738,7 @@ print_truncate(CPUArchState *cpu_env, const struct sy= scallname *name, { print_syscall_prologue(name); print_string(arg0, 0); - print_raw_param(TARGET_ABI_FMT_ld, arg1, 1); + print_file_offset32(arg1, true); print_syscall_epilogue(name); } #endif @@ -2736,7 +2755,7 @@ print_truncate64(CPUArchState *cpu_env, const struct = syscallname *name, arg1 =3D arg2; arg2 =3D arg3; } - print_raw_param("%" PRIu64, target_offset64(arg1, arg2), 1); + print_file_offset64(arg1, arg2, true); print_syscall_epilogue(name); } #endif @@ -2753,7 +2772,7 @@ print_ftruncate64(CPUArchState *cpu_env, const struct= syscallname *name, arg1 =3D arg2; arg2 =3D arg3; } - print_raw_param("%" PRIu64, target_offset64(arg1, arg2), 1); + print_file_offset64(arg1, arg2, true); print_syscall_epilogue(name); } #endif @@ -3308,7 +3327,7 @@ print_stat(CPUArchState *cpu_env, const struct syscal= lname *name, print_syscall_epilogue(name); } #define print_lstat print_stat -#define print_stat64 print_stat +#define print_stat64 print_stat #define print_lstat64 print_stat #endif =20 @@ -4302,7 +4321,7 @@ print_pread64(CPUArchState *cpu_env, const struct sys= callname *name, print_raw_param("%d", arg0, 0); print_pointer(arg1, 0); print_raw_param("%d", arg2, 0); - print_raw_param("%" PRIu64, target_offset64(arg3, arg4), 1); + print_file_offset64(arg3, arg4, true); print_syscall_epilogue(name); } #endif --=20 2.53.0 From nobody Sat Apr 11 21:28:56 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; 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=pass(p=quarantine dis=none) header.from=kernel.org ARC-Seal: i=1; a=rsa-sha256; t=1772991118; cv=none; d=zohomail.com; s=zohoarc; b=j/RxSryDm4tWHY1XWKd4bN2yrUg8303nZFBqXeV0K4kMMhh+MJSs9AuBDUTSoXrTNtX6F/jkZ2oVVySYP3HeQ4pHWWKB87Ea+GQDC9yyYTtmjltTFz9IP0lqNCJ/Sm5zo21wqftqZSwsbNMaLpZMJ3+x9LkOhl3o6G3ZKKXKMY8= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1772991118; h=Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=OiWqY4jx9zgepgcKQ3oVVPBV7ndNOo28jF8CZifChgM=; b=bGHl12GgDwjMZ73APlfB9wrNohnl2y4WGQO0J+M0EgAJSvBPye7iuTHR6J9WO15SuIbIqMg2zSztuGeG0rzD6F3jPaXu1SaUZlQV3T7K4w26NpxLQ6ds34LhzL3owGpVg6A09h9VN/iQFXuomasXgIjYjG1j4rlVbg9mDmvuuM4= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; 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=pass header.from= (p=quarantine dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1772991118390105.12902425624827; Sun, 8 Mar 2026 10:31:58 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vzHxA-0003m1-UV; Sun, 08 Mar 2026 13:30: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 1vzHwy-0003fo-Iv for qemu-devel@nongnu.org; Sun, 08 Mar 2026 13:29:59 -0400 Received: from sea.source.kernel.org ([2600:3c0a:e001:78e:0:1991:8:25]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1vzHwu-0003nt-Be for qemu-devel@nongnu.org; Sun, 08 Mar 2026 13:29:53 -0400 Received: from smtp.kernel.org (transwarp.subspace.kernel.org [100.75.92.58]) by sea.source.kernel.org (Postfix) with ESMTP id C7D7B4393D; Sun, 8 Mar 2026 17:29:50 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 735DDC116C6; Sun, 8 Mar 2026 17:29:48 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1772990990; bh=Q/dSbHczdz4sFIvaB36AMEBCEZDprQsZ7Vlhqrv2Nk8=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=JsqpkA9cXFOWjC4PcmumM1GIYw8lPrZJ9DBewAyQqhmtlLazLRRzP3RZMcnymYr6C pNbPo3mTliUT+ku6io7h5u6WHnBp7G0cSC3Vdx0DuE4hwTWE8WMo7GRXYCXPPMHpdU +EbmYDTPqwlAHA+KLnrwy0g3uxS3CBmOTr8aQO/UjYyLxlCejww9eSZrw0wIZy4rBG ni27FUheeALEwgNSP3StQinHUDhkMfKqZHWOcBHPa5oH/XxNKbZSkr+gwuEig3gATb 1k3Mvm9FuUAFVOBGo4ldO63qO17cwRzlrNgzLJSIhAkhspv45vnMuq/019dKgt6PPZ DnJrEV7EoY2gA== From: deller@kernel.org To: qemu-devel@nongnu.org Cc: Kyle Evans , Paolo Bonzini , =?UTF-8?q?Alex=20Benn=C3=A9e?= , Laurent Vivier , Warner Losh , =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , deller@gmx.de, Richard Henderson , Pierrick Bouvier Subject: [PULL 04/12] linux-user: properly check flags in openat2 Date: Sun, 8 Mar 2026 18:29:28 +0100 Message-ID: <20260308172936.2835-5-deller@kernel.org> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260308172936.2835-1-deller@kernel.org> References: <20260308172936.2835-1-deller@kernel.org> 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=2600:3c0a:e001:78e:0:1991:8:25; envelope-from=deller@kernel.org; helo=sea.source.kernel.org 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, 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: qemu development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @kernel.org) X-ZM-MESSAGEID: 1772991119588154100 Content-Type: text/plain; charset="utf-8" From: Andreas Schwab target_to_host_bitmask truncates the bitmask to int. Check that the upper half of the flags do not have any bits set. Signed-off-by: Andreas Schwab Reviewed-by: Helge Deller Signed-off-by: Helge Deller --- linux-user/syscall.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/linux-user/syscall.c b/linux-user/syscall.c index 99e1ed97d9..064bc604c9 100644 --- a/linux-user/syscall.c +++ b/linux-user/syscall.c @@ -8831,6 +8831,10 @@ static int do_openat2(CPUArchState *cpu_env, abi_lon= g dirfd, } return ret; } + if (tswap64(how.flags) >> 32) { + return -TARGET_EINVAL; + } + pathname =3D lock_user_string(guest_pathname); if (!pathname) { return -TARGET_EFAULT; --=20 2.53.0 From nobody Sat Apr 11 21:28:56 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; 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=pass(p=quarantine dis=none) header.from=kernel.org ARC-Seal: i=1; a=rsa-sha256; t=1772991082; cv=none; d=zohomail.com; s=zohoarc; b=OVIPiZT0W6K6ELJh1gVBvkzCtpUaf5VnXFzGXnm1P0rXq2pVJzBSowyoZ1ac4cijCKCbOlTuc2onJwbCto4XUTsU5RYASWQbtWUTgXxVH6TaOw3NGhYw8HW1Ml4SM6oL1Xez8RFgjXMi9OOfyqG9YsIX9cvR6g8AC4oPVWhDsf8= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1772991082; h=Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=pOHD/F7f5VC0lspgxbEftxX6aKc1DYx6XC+H05Brb0s=; b=b8/GQkY94OVklLVw1K+V+1eas+DqH15AM2r9QwkL2q0k+mRE1G2Cwub7kizeHNZ/66HqgUMXsrtnn0xRS2HzHbTLhOK08GaXrmw7u/x+QUiX+7dsEYBCUViQ7vaNAOq4v4t7BZLZG/YXmz+3p93pvk4UNWkD5AE4R5ylmLsEcNU= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; 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=pass header.from= (p=quarantine dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1772991082668120.5809162601928; Sun, 8 Mar 2026 10:31:22 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vzHxx-0004D0-RD; Sun, 08 Mar 2026 13:30:58 -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 1vzHx3-0003gr-VF for qemu-devel@nongnu.org; Sun, 08 Mar 2026 13:30:04 -0400 Received: from tor.source.kernel.org ([2600:3c04:e001:324:0:1991:8:25]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1vzHwy-0003oA-00 for qemu-devel@nongnu.org; Sun, 08 Mar 2026 13:29:58 -0400 Received: from smtp.kernel.org (transwarp.subspace.kernel.org [100.75.92.58]) by tor.source.kernel.org (Postfix) with ESMTP id 63A2D600AD; Sun, 8 Mar 2026 17:29:53 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 0058EC2BC9E; Sun, 8 Mar 2026 17:29:50 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1772990993; bh=vm/aA9SwjzkHcfVSNxqZDO1EuMwbYIzCIFfKiGC9xog=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Hp29jsbhnogBYp3472Ch86f+XKMatfIc+VnfjusTFBmVPJ8ts6JznmUzDYymNcuxW mOmqpNPfb2Tg2KDO5H4SuOgOZcHAJMZVTu99RUWgm9jl0CoCM0pLHwRaDGIx8h65kZ yQYZapbNA1hRVuUL4u/60dilGFwwJybodzIBoLxYqbodu9b8+sy+ruYQVgHdGnVOVS vG3XbzOvyW6Gk1lzxrnTALZdAu9mMOv5HaQ/61rDFHwUiV4KBV+Y7GRCYbCvYymn5x kJmg4Fc/W/HCP0smpFr9UUABIgKSPYht5DRRfwtbq8CvyYw5+8qMhX4VOhY/kXLLuU OVw/NlgUoiMbg== From: deller@kernel.org To: qemu-devel@nongnu.org Cc: Kyle Evans , Paolo Bonzini , =?UTF-8?q?Alex=20Benn=C3=A9e?= , Laurent Vivier , Warner Losh , =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , deller@gmx.de, Richard Henderson , Pierrick Bouvier Subject: [PULL 05/12] linux-user: Check if RESOLVE_CACHED flag is defined before using it Date: Sun, 8 Mar 2026 18:29:29 +0100 Message-ID: <20260308172936.2835-6-deller@kernel.org> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260308172936.2835-1-deller@kernel.org> References: <20260308172936.2835-1-deller@kernel.org> 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=2600:3c04:e001:324:0:1991:8:25; envelope-from=deller@kernel.org; helo=tor.source.kernel.org 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, 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: qemu development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @kernel.org) X-ZM-MESSAGEID: 1772991085308154100 Content-Type: text/plain; charset="utf-8" From: Frank Chang openat2.h was introduced in Linux kernel 5.6. However, RESOLVE_CACHED flag was only added in kernel 5.12 and later. Therefore, we need to check if RESOLVE_CACHED flag is defined before using it. Signed-off-by: Frank Chang Reviewed-by: Helge Deller Signed-off-by: Helge Deller --- linux-user/strace.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/linux-user/strace.c b/linux-user/strace.c index d253b522bf..02d610a7f8 100644 --- a/linux-user/strace.c +++ b/linux-user/strace.c @@ -1129,7 +1129,9 @@ UNUSED static const struct flags openat2_resolve_flag= s[] =3D { FLAG_GENERIC(RESOLVE_NO_SYMLINKS), FLAG_GENERIC(RESOLVE_BENEATH), FLAG_GENERIC(RESOLVE_IN_ROOT), +#ifdef RESOLVE_CACHED FLAG_GENERIC(RESOLVE_CACHED), +#endif #endif FLAG_END, }; --=20 2.53.0 From nobody Sat Apr 11 21:28:56 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; 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=pass(p=quarantine dis=none) header.from=kernel.org ARC-Seal: i=1; a=rsa-sha256; t=1772991065; cv=none; d=zohomail.com; s=zohoarc; b=P/6Lgb0lqXO3c41u92myNNDiJCzRECOahyyuPzZCL+CWVq3ejMsOPYegUVr6MfSoJXR5N2m3zpJJ6h3a1LVvnuoCqD2wmKZzN4ZQiTim9zfGkTpmunVoCJTk4yyi8e0GM/ueGp6YAJFW7QsI6d/n02sBH9+NjIh7wE60SqI3UgI= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1772991065; h=Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=C60/E/IVj9dnvYUqWaAM/Zqf1/21G4/fN1AXYPsrhnI=; b=DGMUfRzIEUhTGN1Sa32wSz0INxyWt5VZXl9uxlppG1i/Hh/F1TuWky8rmnRDfbVD7eMK6v/DNvTHD2GML7WQrViVOz6tjNjruNc0FKedpM1ILadglgdmekTlkjiHzYzEz1Nc7yHRTT9sIV0QOAY2N75orw7PCtBWFkqR49dqqRs= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; 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=pass header.from= (p=quarantine dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1772991065584671.2788823635159; Sun, 8 Mar 2026 10:31:05 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vzHxK-0003my-8i; Sun, 08 Mar 2026 13:30:26 -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 1vzHx4-0003gs-05 for qemu-devel@nongnu.org; Sun, 08 Mar 2026 13:30:04 -0400 Received: from tor.source.kernel.org ([172.105.4.254]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1vzHwz-0003oP-SF for qemu-devel@nongnu.org; Sun, 08 Mar 2026 13:30:00 -0400 Received: from smtp.kernel.org (transwarp.subspace.kernel.org [100.75.92.58]) by tor.source.kernel.org (Postfix) with ESMTP id E2AE9600AE; Sun, 8 Mar 2026 17:29:55 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 83375C116C6; Sun, 8 Mar 2026 17:29:53 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1772990995; bh=yQjfyq4uMUjaesM0EhyZ3X0IrXyyB6Sp6uAxR9zq4is=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=MaltPUDf96x5QiTRn/Wxfn67H+Upu2aP92/UMbCDS0WPZGHQ94822XKRqATgkASCh PT9n3Qy/pDirYQHMobHz/uYdkdOEUMF1JRUkCR9LvPeGP87NN5UEyaif8dvIGEIV5J 7cHOg6gOZ3En/2As3hgT9558yGj9+WKLsK5O8KdnDhuNzeV2ySSV+PUSK2oUH5B8Re lBsAJu0dOCXYxEbCB9lyZ15SRXDHPt0mGNb+1Iew8DKZrDIkeVv5RoTv3qNl1kj/5r zwzZloeZ/zEKt7R19lKs2vr9rhrBAfpimBx452O+d1Ow99Zr/yGJViilGYNODV2moj 938t8ofvemzPQ== From: deller@kernel.org To: qemu-devel@nongnu.org Cc: Kyle Evans , Paolo Bonzini , =?UTF-8?q?Alex=20Benn=C3=A9e?= , Laurent Vivier , Warner Losh , =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , deller@gmx.de, Richard Henderson , Pierrick Bouvier Subject: [PULL 06/12] linux-user: fix matching ioctl numbers in print_ioctl Date: Sun, 8 Mar 2026 18:29:30 +0100 Message-ID: <20260308172936.2835-7-deller@kernel.org> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260308172936.2835-1-deller@kernel.org> References: <20260308172936.2835-1-deller@kernel.org> 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=172.105.4.254; envelope-from=deller@kernel.org; helo=tor.source.kernel.org X-Spam_score_int: -3 X-Spam_score: -0.4 X-Spam_bar: / X-Spam_report: (-0.4 / 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_VALIDITY_RPBL_BLOCKED=0.819, RCVD_IN_VALIDITY_SAFE_BLOCKED=0.903, SPF_HELO_NONE=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.29 Precedence: list List-Id: qemu development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @kernel.org) X-ZM-MESSAGEID: 1772991065888158500 Content-Type: text/plain; charset="utf-8" From: Andreas Schwab target_cmd in struct IOCTLEntry is a signed int. Make sure the ioctl cmd argument in the syscall is converted to int when matching, so that it works correctly with an ioctl cmd that has bit 31 set. Signed-off-by: Andreas Schwab Reviewed-by: Helge Deller Signed-off-by: Helge Deller --- linux-user/strace.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/linux-user/strace.c b/linux-user/strace.c index 02d610a7f8..2cbaf94c89 100644 --- a/linux-user/strace.c +++ b/linux-user/strace.c @@ -1021,12 +1021,12 @@ print_syscall_ret_ioctl(CPUArchState *cpu_env, cons= t struct syscallname *name, int target_size; =20 for (ie =3D ioctl_entries; ie->target_cmd !=3D 0; ie++) { - if (ie->target_cmd =3D=3D arg1) { + if (ie->target_cmd =3D=3D (int)arg1) { break; } } =20 - if (ie->target_cmd =3D=3D arg1 && + if (ie->target_cmd =3D=3D (int)arg1 && (ie->access =3D=3D IOC_R || ie->access =3D=3D IOC_RW)) { arg_type =3D ie->arg_type; qemu_log(" ("); @@ -4359,7 +4359,7 @@ print_ioctl(CPUArchState *cpu_env, const struct sysca= llname *name, int target_size; =20 for (ie =3D ioctl_entries; ie->target_cmd !=3D 0; ie++) { - if (ie->target_cmd =3D=3D arg1) { + if (ie->target_cmd =3D=3D (int)arg1) { break; } } --=20 2.53.0 From nobody Sat Apr 11 21:28:56 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; 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=pass(p=quarantine dis=none) header.from=kernel.org ARC-Seal: i=1; a=rsa-sha256; t=1772991096; cv=none; d=zohomail.com; s=zohoarc; b=YVYUbmj7wIMK+3Zj1UiElj4otA19+KlxnZC/xPwkj56MEwGEeoE2Lg6HQlgy/pFUSxPJ5FSgIlRdUEk0a2u+YXQw1OXIpK/4bSPR3DkgzsS8DhSZ5Opg3em+UueYPaDDZTw03v/a150vQMjzRmvXIXc7UthhTKxraBiD8Xh+Jwc= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1772991096; h=Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=0qxjUKHbGw3PUFw8IovST12B6LLBxwGdRlZxle8olbQ=; b=csrrWpjZyApPl9bYELJXaq3UU6IjRdN2Xpk1M17pqBWqMdgIisjbHCt9S3wILnwsD9Twy1oHQSk5BhzMSQaX6M9bp6V77cdbUVDyJterGLO1AN3DJXCiaNbcafMAA7cxZRzs3ZRM7ULwobHQOp2DcWxeK8DBzgXI8cKweZOGqjQ= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; 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=pass header.from= (p=quarantine dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1772991096470250.18659027544993; Sun, 8 Mar 2026 10:31:36 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vzHyQ-0004og-BS; Sun, 08 Mar 2026 13:31:26 -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 1vzHx7-0003i2-Nh for qemu-devel@nongnu.org; Sun, 08 Mar 2026 13:30:06 -0400 Received: from tor.source.kernel.org ([2600:3c04:e001:324:0:1991:8:25]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1vzHx2-0003oj-QR for qemu-devel@nongnu.org; Sun, 08 Mar 2026 13:30:02 -0400 Received: from smtp.kernel.org (transwarp.subspace.kernel.org [100.75.92.58]) by tor.source.kernel.org (Postfix) with ESMTP id 6FE0C600CB; Sun, 8 Mar 2026 17:29:58 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 0F4EFC116C6; Sun, 8 Mar 2026 17:29:55 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1772990998; bh=lUwAO9km4/S+zD0o1NtjbvrV7Uoam/HK5Wb+d30GVks=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=ZNqTUY8JIlvP8SFl2DhtBWSnz6r60oFCHRsXcRR5r5sNfcApvIaV6ESFjFt/F7b7p sZEBE5xZk4WAkc5Z0U+loUv66s+uKVTrgsfKpwckQETZiwC0IfAn5PLGzVd9lX2hrj 9ync9oY/RYr+L4a323fAaEskfyeMGU634QHiRNSeZlE3+npF5OFw1WVhxCrWon7FkC OurG/WA5Ikars53rce/01K4Fy9DuOak5JinG9Wt8MKH6pEuBM9gBnkD6aOZO23yKsu RQWgB5VoRs/7URcpgOvmQ2o9NF8ZvMt9iuj6+oyzJyBCEcx4naRVnHMBezcEwIFB2x D/5N1YLLHBoww== From: deller@kernel.org To: qemu-devel@nongnu.org Cc: Kyle Evans , Paolo Bonzini , =?UTF-8?q?Alex=20Benn=C3=A9e?= , Laurent Vivier , Warner Losh , =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , deller@gmx.de, Richard Henderson , Pierrick Bouvier Subject: [PULL 07/12] linux-user: fix TIOCGSID ioctl Date: Sun, 8 Mar 2026 18:29:31 +0100 Message-ID: <20260308172936.2835-8-deller@kernel.org> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260308172936.2835-1-deller@kernel.org> References: <20260308172936.2835-1-deller@kernel.org> 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=2600:3c04:e001:324:0:1991:8:25; envelope-from=deller@kernel.org; helo=tor.source.kernel.org 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, 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: qemu development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @kernel.org) X-ZM-MESSAGEID: 1772991097996158500 Content-Type: text/plain; charset="utf-8" From: Andreas Schwab TIOCGSID is IOC_R, not IOC_W. Signed-off-by: Andreas Schwab Reviewed-by: Helge Deller Signed-off-by: Helge Deller --- linux-user/ioctls.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/linux-user/ioctls.h b/linux-user/ioctls.h index 6ecfe6306e..5b7d00e92f 100644 --- a/linux-user/ioctls.h +++ b/linux-user/ioctls.h @@ -26,7 +26,7 @@ IOCTL(TIOCSCTTY, 0, TYPE_INT) IOCTL(TIOCGPGRP, IOC_R, MK_PTR(TYPE_INT)) IOCTL(TIOCSPGRP, IOC_W, MK_PTR(TYPE_INT)) - IOCTL(TIOCGSID, IOC_W, MK_PTR(TYPE_INT)) + IOCTL(TIOCGSID, IOC_R, MK_PTR(TYPE_INT)) IOCTL(TIOCOUTQ, IOC_R, MK_PTR(TYPE_INT)) IOCTL(TIOCSTI, IOC_W, MK_PTR(TYPE_INT)) IOCTL(TIOCMGET, IOC_R, MK_PTR(TYPE_INT)) --=20 2.53.0 From nobody Sat Apr 11 21:28:56 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; 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=pass(p=quarantine dis=none) header.from=kernel.org ARC-Seal: i=1; a=rsa-sha256; t=1772991098; cv=none; d=zohomail.com; s=zohoarc; b=US1Aw36GckHLFkjJUBrCG9mhLCDUsAxdL27MX4hu4mHQszuF94Y2AFzeCnqqu0fe5yvE3gLPcs9k49mB+0RB2R7oKlcE+wrZ6QT3jqjMp/ve6+n5Hg8Geij3ZVDH3ja0ZLzXomjdjLuVcJ4lwsNAlrDp2KOJhyBrRv+AN+P7OHQ= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1772991098; h=Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=SEUWDP+j9Tz0R+9Ke8orT8ktTOaSzEPXuiMbKnfZjYo=; b=GFeMu535iG997p4ZtdYCPrTdqR4Et2nkTUveS5imIrOZmA7KTuCtPYlhXoVXCS0Pk+8m4sf5nKtcIv8oZccjzca3q3P/ZaErBJgqSboqGd9md17T48m3RTYPFddTgA3V5G/llcEkZBvldPxx/Lam/5tOvQIydPhNJaZ3Bya0sDU= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; 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=pass header.from= (p=quarantine dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1772991098251547.7616789010715; Sun, 8 Mar 2026 10:31:38 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vzHyQ-0004lJ-8G; Sun, 08 Mar 2026 13:31:26 -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 1vzHxA-0003mP-VB for qemu-devel@nongnu.org; Sun, 08 Mar 2026 13:30:14 -0400 Received: from sea.source.kernel.org ([172.234.252.31]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1vzHx7-0003pN-HF for qemu-devel@nongnu.org; Sun, 08 Mar 2026 13:30:08 -0400 Received: from smtp.kernel.org (transwarp.subspace.kernel.org [100.75.92.58]) by sea.source.kernel.org (Postfix) with ESMTP id 72ACE44099; Sun, 8 Mar 2026 17:30:01 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 90CCCC116C6; Sun, 8 Mar 2026 17:29:58 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1772991000; bh=cXfFHAsd3SNFbK+y4uunPJeG053eQtIxwzALDggDNXs=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=d8NFl0DUgs4AI8pT3FP4SPFqSa4Lcqdr7Iybg3u2I5xWEhKmrbCgtPVcS2vgXiERj cvGiD7uDLurfPcdcTE8712x5PMcG8GzjQTVSELn5xjJiz9HyH3b/kQOIxWgoCxrN0j PytY58D9PURBmTMczPKHSAt2pcnFGir9jWYQM4mIh30j7Uz759rgXjR9uc64MJUVcV lAFT5X/qffhem5sIHcxo+1QjMXiwZKyJjjdhssYMEyMsi+94c1oANV956C0Jkqsiay eieyqubP2GKh4WP526eOehVKGmBdC3DPces1Iw4eaRosUcdEzrxRiytRNWM+4XVmkl nJ2YD3p0hQGEQ== From: deller@kernel.org To: qemu-devel@nongnu.org Cc: Kyle Evans , Paolo Bonzini , =?UTF-8?q?Alex=20Benn=C3=A9e?= , Laurent Vivier , Warner Losh , =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , deller@gmx.de, Richard Henderson , Pierrick Bouvier Subject: [PULL 08/12] linux-user: Deal with mmap where start > reserved_va Date: Sun, 8 Mar 2026 18:29:32 +0100 Message-ID: <20260308172936.2835-9-deller@kernel.org> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260308172936.2835-1-deller@kernel.org> References: <20260308172936.2835-1-deller@kernel.org> 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=172.234.252.31; envelope-from=deller@kernel.org; helo=sea.source.kernel.org X-Spam_score_int: -3 X-Spam_score: -0.4 X-Spam_bar: / X-Spam_report: (-0.4 / 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_VALIDITY_RPBL_BLOCKED=0.819, RCVD_IN_VALIDITY_SAFE_BLOCKED=0.903, SPF_HELO_NONE=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.29 Precedence: list List-Id: qemu development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @kernel.org) X-ZM-MESSAGEID: 1772991099126154100 Content-Type: text/plain; charset="utf-8" From: Bingwu Zhang Fixes: 4c13048e02d9 ("linux-user: Use page_find_range_empty for mmap_find_v= ma_reserved") Resolves: https://gitlab.com/qemu-project/qemu/-/issues/3310 Signed-off-by: Bingwu Zhang Reviewed-by: Helge Deller Signed-off-by: Helge Deller --- linux-user/mmap.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/linux-user/mmap.c b/linux-user/mmap.c index 07175e11d5..76978a56a8 100644 --- a/linux-user/mmap.c +++ b/linux-user/mmap.c @@ -423,12 +423,15 @@ abi_ulong mmap_next_start; static abi_ulong mmap_find_vma_reserved(abi_ulong start, abi_ulong size, abi_ulong align) { - target_ulong ret; + target_ulong ret =3D -1; =20 - ret =3D page_find_range_empty(start, reserved_va, size, align); + if (start <=3D reserved_va) { + ret =3D page_find_range_empty(start, reserved_va, size, align); + } if (ret =3D=3D -1 && start > mmap_min_addr) { /* Restart at the beginning of the address space. */ - ret =3D page_find_range_empty(mmap_min_addr, start - 1, size, alig= n); + ret =3D page_find_range_empty(mmap_min_addr, MIN(start - 1, reserv= ed_va), + size, align); } =20 return ret; --=20 2.53.0 From nobody Sat Apr 11 21:28:56 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; 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=pass(p=quarantine dis=none) header.from=kernel.org ARC-Seal: i=1; a=rsa-sha256; t=1772991096; cv=none; d=zohomail.com; s=zohoarc; b=XPe/SXTMuEH5cbg51suKjO3DH9QWU9Ct330x+bI6FofAAWikjUCQ3oSNGHvRpbeepKk/Hu1ZXyC0l2Xb4QGNNsM8sygLb5ofZoAw0pAMQzlil/bjlGH0Zm/SJtz46DKVS1hyQvziM+WkreV0yAjhRPlyOVduh5H9eNSWZkvDjvU= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1772991096; h=Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=lZkHo09QG/R+ynV6EnvVAVJAIGJKyd2kmZEk8HBv4BE=; b=NXi767YpJDWsqP+B8SmI42tSxWnIyIZugTXQC+tVsGo925rPRU6qEf3q9yF2mpXLZ/o8ml5GaySpf+NbIlIHripLNt2yfigYctHUUu4ODmrIB77CTeoSbCOgRzh25KtoRr6OcjBARcCJ1ak2JbTH5ve+1Z6j1olCU/GP1bnE+tc= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; 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=pass header.from= (p=quarantine dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1772991096378116.75085754735653; Sun, 8 Mar 2026 10:31:36 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vzHxy-0004KT-Uc; Sun, 08 Mar 2026 13:31:06 -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 1vzHxD-0003nK-9I for qemu-devel@nongnu.org; Sun, 08 Mar 2026 13:30:14 -0400 Received: from sea.source.kernel.org ([172.234.252.31]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1vzHx9-000415-Ec for qemu-devel@nongnu.org; Sun, 08 Mar 2026 13:30:09 -0400 Received: from smtp.kernel.org (transwarp.subspace.kernel.org [100.75.92.58]) by sea.source.kernel.org (Postfix) with ESMTP id 77E0C440A3; Sun, 8 Mar 2026 17:30:03 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 200D1C2BC9E; Sun, 8 Mar 2026 17:30:00 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1772991003; bh=OOKfroUsa/NmmKFDrQXJY1cwDi1GkvGCyavkONtRuAE=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=CzeYbz4nGF8qBiKqNz2xpa4OdJPdJ3zUqD9vXIgc4jb4MW26+vJaanZ88Gp8LmR4A +dDTNJ4Gri5YN4V1rz4Aj6mLfssPYWpeNg1suLTRh+t3KhZ+S6rPPyglVzJ4ADiVou XbJN95lw9oykexUznY1GYkl+SC19+c86/0wHJ6W85PKVkwBZ+IQas5Et8RZBjNsS0T mhRhj7yn0EdnSp6omdl2m8GHnyEkZgd2NeP35en24XJBbD6Q56+BrXtiUFJytRcNQq 7x/x2FnEHpoPdwUYGhbwADZfVA1KUwcTsR3rC4EBF4sZmHd2K02mxOwDMkoO3w65wq EDf59mJCmaGuQ== From: deller@kernel.org To: qemu-devel@nongnu.org Cc: Kyle Evans , Paolo Bonzini , =?UTF-8?q?Alex=20Benn=C3=A9e?= , Laurent Vivier , Warner Losh , =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , deller@gmx.de, Richard Henderson , Pierrick Bouvier Subject: [PULL 09/12] bsd-user: Deal with mmap where start > reserved_va Date: Sun, 8 Mar 2026 18:29:33 +0100 Message-ID: <20260308172936.2835-10-deller@kernel.org> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260308172936.2835-1-deller@kernel.org> References: <20260308172936.2835-1-deller@kernel.org> 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=172.234.252.31; envelope-from=deller@kernel.org; helo=sea.source.kernel.org X-Spam_score_int: -3 X-Spam_score: -0.4 X-Spam_bar: / X-Spam_report: (-0.4 / 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_VALIDITY_RPBL_BLOCKED=0.819, RCVD_IN_VALIDITY_SAFE_BLOCKED=0.903, SPF_HELO_NONE=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.29 Precedence: list List-Id: qemu development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @kernel.org) X-ZM-MESSAGEID: 1772991098001158500 Content-Type: text/plain; charset="utf-8" From: Bingwu Zhang Fixes: f12294b5bd21 ("bsd-user: Use page_find_range_empty for mmap_find_vma= _reserved") Signed-off-by: Bingwu Zhang Reviewed-by: Helge Deller Reviewed-by: Warner Losh Signed-off-by: Helge Deller --- bsd-user/mmap.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/bsd-user/mmap.c b/bsd-user/mmap.c index 24ba1728eb..fe77eceb48 100644 --- a/bsd-user/mmap.c +++ b/bsd-user/mmap.c @@ -258,12 +258,14 @@ abi_ulong mmap_next_start =3D TASK_UNMAPPED_BASE; static abi_ulong mmap_find_vma_reserved(abi_ulong start, abi_ulong size, abi_ulong alignment) { - abi_ulong ret; + abi_ulong ret =3D -1; =20 - ret =3D page_find_range_empty(start, reserved_va, size, alignment); + if (start <=3D reserved_va) { + ret =3D page_find_range_empty(start, reserved_va, size, alignment); + } if (ret =3D=3D -1 && start > TARGET_PAGE_SIZE) { /* Restart at the beginning of the address space. */ - ret =3D page_find_range_empty(TARGET_PAGE_SIZE, start - 1, + ret =3D page_find_range_empty(TARGET_PAGE_SIZE, MIN(start - 1, res= erved_va), size, alignment); } =20 --=20 2.53.0 From nobody Sat Apr 11 21:28:56 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; 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=pass(p=quarantine dis=none) header.from=kernel.org ARC-Seal: i=1; a=rsa-sha256; t=1772991096; cv=none; d=zohomail.com; s=zohoarc; b=mHdhZ81MjyAssxMbC+LVTAxETHuSRCaKZ6NGjgnkGbj54sRjgRbFLZrnCImEnUaJs82ETMW3+QGJhxEQ9H8GcGHcf3B4tza7JAkbN8m1i+O1xXkqwfeSKZEJ9UhsGNhyWyYZMld4FF4bYCJLRx/BseUJJov9907FyNSx3aGLzpQ= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1772991096; h=Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=YYO/v39xtS79zc8WhYQQKADBJqbyPNe6NOpE3+YREPs=; b=ICm7BrrJAf5S64aJZX/itmVJMs6+HWmdjLc3Jg4eK9pzMRJhl3hjQQ8hTMGjE9TTeak5EUNvA3ra9nXJnfCK14YX60VJ18T2SEfsPq3BXWql8zTYNxP6W0V5HburDDFNM9z5f+gqFaiv/CTRyQEHp37iQzscHWTvbCOJhf4fGnk= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; 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=pass header.from= (p=quarantine dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1772991096368605.5116981784646; Sun, 8 Mar 2026 10:31:36 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vzHyW-00051D-Hi; Sun, 08 Mar 2026 13:31:32 -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 1vzHxD-0003nL-AD for qemu-devel@nongnu.org; Sun, 08 Mar 2026 13:30:14 -0400 Received: from tor.source.kernel.org ([2600:3c04:e001:324:0:1991:8:25]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1vzHxA-00041W-JZ for qemu-devel@nongnu.org; Sun, 08 Mar 2026 13:30:10 -0400 Received: from smtp.kernel.org (transwarp.subspace.kernel.org [100.75.92.58]) by tor.source.kernel.org (Postfix) with ESMTP id 158C9600AD; Sun, 8 Mar 2026 17:30:06 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id A5806C116C6; Sun, 8 Mar 2026 17:30:03 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1772991005; bh=x2p9sfsUBTUAYtkqoTf6MRparRAy9QhO3P2K4BkAkCQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=ElbUlxsNNv6QykPXTQSu3rDwQNeFpcaBQHUHdzYk9XsHQ4TcE7hQxhkNb2kJyizq3 KMy0t2Tq95GjiuyZMPk95TNfa5oSJMQxRBoBrI/eDcsu1wIa3kELcDFkcc5RxgGhmb KVD221oi4nZxEfttBPz7gkBOfVBSVyk3DH939UEPgSY/v9E3jOmQ30gN0JdXQUfOZD Icl4elN7nOzIbwlr1cL2IV/tTQBCBIyFh2K/6Ax8wdA18JKtqJT4SFYLVkLvLaehuV XbAEJxbNLQdwrPmA4W1SvTE3J0mO0h8PizhQGC93+QzIR/P+HW14urJl2YMhDE/cpZ PcTY8s+UtqiJw== From: deller@kernel.org To: qemu-devel@nongnu.org Cc: Kyle Evans , Paolo Bonzini , =?UTF-8?q?Alex=20Benn=C3=A9e?= , Laurent Vivier , Warner Losh , =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , deller@gmx.de, Richard Henderson , Pierrick Bouvier Subject: [PULL 10/12] tests/tcg/multiarch/test-mmap: Print more details Date: Sun, 8 Mar 2026 18:29:34 +0100 Message-ID: <20260308172936.2835-11-deller@kernel.org> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260308172936.2835-1-deller@kernel.org> References: <20260308172936.2835-1-deller@kernel.org> 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=2600:3c04:e001:324:0:1991:8:25; envelope-from=deller@kernel.org; helo=tor.source.kernel.org 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, 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: qemu development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @kernel.org) X-ZM-MESSAGEID: 1772991098027158500 Content-Type: text/plain; charset="utf-8" From: Bingwu Zhang Useful for debugging Signed-off-by: Bingwu Zhang Signed-off-by: Helge Deller --- tests/tcg/multiarch/test-mmap.c | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/tests/tcg/multiarch/test-mmap.c b/tests/tcg/multiarch/test-mma= p.c index e297f4b1e9..88f7a04101 100644 --- a/tests/tcg/multiarch/test-mmap.c +++ b/tests/tcg/multiarch/test-mmap.c @@ -442,19 +442,19 @@ void check_invalid_mmaps(void) =20 /* Attempt to map a zero length page. */ addr =3D mmap(NULL, 0, PROT_READ, MAP_PRIVATE | MAP_ANONYMOUS, -1, 0); - fprintf(stdout, "%s addr=3D%p", __func__, (void *)addr); + fprintf(stdout, "%s addr=3D%p errno=3D%d\n", __func__, (void *)addr, e= rrno); fail_unless(addr =3D=3D MAP_FAILED); fail_unless(errno =3D=3D EINVAL); =20 /* Attempt to map a over length page. */ addr =3D mmap(NULL, -4, PROT_READ, MAP_PRIVATE | MAP_ANONYMOUS, -1, 0); - fprintf(stdout, "%s addr=3D%p", __func__, (void *)addr); + fprintf(stdout, "%s addr=3D%p errno=3D%d\n", __func__, (void *)addr, e= rrno); fail_unless(addr =3D=3D MAP_FAILED); fail_unless(errno =3D=3D ENOMEM); =20 /* Attempt to remap a region which exceeds the bounds of memory. */ addr =3D mremap((void *)((uintptr_t)pagesize * 10), SIZE_MAX & ~(size_= t)pagemask, pagesize, 0); - fprintf(stdout, "%s mremap addr=3D%p", __func__, (void *)addr); + fprintf(stdout, "%s mremap addr=3D%p errno=3D%d\n", __func__, (void *)= addr, errno); fail_unless(addr =3D=3D MAP_FAILED); fail_unless(errno =3D=3D EFAULT); =20 @@ -465,8 +465,11 @@ void check_shrink_mmaps(void) { unsigned char *a, *b, *c; a =3D mmap(NULL, pagesize * 2, PROT_READ, MAP_PRIVATE | MAP_ANONYMOUS,= -1, 0); + fprintf(stdout, "%s addr=3D%p errno=3D%d\n", __func__, (void *)a, errn= o); b =3D mmap(NULL, pagesize * 2, PROT_READ, MAP_PRIVATE | MAP_ANONYMOUS,= -1, 0); + fprintf(stdout, "%s addr=3D%p errno=3D%d\n", __func__, (void *)b, errn= o); c =3D mmap(NULL, pagesize * 2, PROT_READ, MAP_PRIVATE | MAP_ANONYMOUS,= -1, 0); + fprintf(stdout, "%s addr=3D%p errno=3D%d\n", __func__, (void *)c, errn= o); =20 fail_unless(a !=3D MAP_FAILED); fail_unless(b !=3D MAP_FAILED); @@ -479,6 +482,7 @@ void check_shrink_mmaps(void) =20 /* Shrink the middle mapping in-place; the others should be unaffected= */ b =3D mremap(b, pagesize * 2, pagesize, 0); + fprintf(stdout, "%s mremap addr=3D%p errno=3D%d\n", __func__, (void *)= b, errno); fail_unless(b !=3D MAP_FAILED); =20 /* Ensure we can still access all valid mappings */ @@ -489,6 +493,8 @@ void check_shrink_mmaps(void) munmap(a, 2 * pagesize); munmap(b, pagesize); munmap(c, 2 * pagesize); + + fprintf(stdout, " passed\n"); } =20 int main(int argc, char **argv) --=20 2.53.0 From nobody Sat Apr 11 21:28:56 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; 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=pass(p=quarantine dis=none) header.from=kernel.org ARC-Seal: i=1; a=rsa-sha256; t=1772991106; cv=none; d=zohomail.com; s=zohoarc; b=Tdc18r/IkrVES8d7kc95GCbiI+py3g00c/O21IPpDygseqaggQhfM6MGrQoe1yCRJWwMDC8zjfv8CInKM7GPqpTAw6r0Pn2Fkrm5Pwu4NKwZjD/Ppv4DUOm12h4j5+cQsAXD7DZgkXF6UdKSVbHeJPzSXv8EZdr5fFYPN8tsrV8= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1772991106; h=Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=UQ8oxzqfSkrIuJfoVQVH5xQ2TSlFySjuO0h6N4mKyuA=; b=NJKPn6HFOoTGVyxf/cg8q4nDzue5Mr/5DzPpOLOvXdBbgjb/jQT1zg7b7RxiSDQ4xn/I+2MH9ntRrDaSUgbY2/s+tIC63AtPch2tNtb5bDZ88GCkK6IRrSerRIiebtxc+JxKYkqC6nJ6fmUpoXsCxbHK3jw1ma22OFfNZgL15To= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; 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=pass header.from= (p=quarantine dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1772991105885829.6517872738311; Sun, 8 Mar 2026 10:31:45 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vzHyY-0005Kt-8X; Sun, 08 Mar 2026 13:31:34 -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 1vzHxG-0003na-Cz for qemu-devel@nongnu.org; Sun, 08 Mar 2026 13:30:15 -0400 Received: from tor.source.kernel.org ([172.105.4.254]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1vzHxB-00041m-NF for qemu-devel@nongnu.org; Sun, 08 Mar 2026 13:30:11 -0400 Received: from smtp.kernel.org (transwarp.subspace.kernel.org [100.75.92.58]) by tor.source.kernel.org (Postfix) with ESMTP id 93B15600AE; Sun, 8 Mar 2026 17:30:08 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 33DB7C116C6; Sun, 8 Mar 2026 17:30:06 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1772991008; bh=fGNhZhGwYx5O0WsKa+ya31k08B1YR0SmQJGqiNNdM0g=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=ssD8s+UuBlY5JD6gEBxm74gnSZh6a3kbxZPzVHQ87sVmG5JbxcM7XX94L37LBGs3C DS1UExBdbJkOuv+qyLrEjpqA9XaJwQeCwl9H/gdEgEb/+x4sN13uUbkg+poH8KJGQO dSrbgZ67NjtGJPrVFYfHAT2TV2fX5wOWQjvUVQfOs0u9B/efC6qkpUoglL08tU8rld snuGH/uoJfR/xmnSUFqCXwb8Woc7nUb/Vn8DooZaEULp9VVdphRzxDfRfyGs6CvB/J N890mew6Rf0N4AvXtbkP8XJydgyEDOYVwQCPxGnpOOpDY6OR6cex+2MxnssNbHVFPO +Ff2B2foaOx9g== From: deller@kernel.org To: qemu-devel@nongnu.org Cc: Kyle Evans , Paolo Bonzini , =?UTF-8?q?Alex=20Benn=C3=A9e?= , Laurent Vivier , Warner Losh , =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , deller@gmx.de, Richard Henderson , Pierrick Bouvier Subject: [PULL 11/12] tests/tcg/multiarch/test-mmap: Check mmaps beyond reserved_va Date: Sun, 8 Mar 2026 18:29:35 +0100 Message-ID: <20260308172936.2835-12-deller@kernel.org> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260308172936.2835-1-deller@kernel.org> References: <20260308172936.2835-1-deller@kernel.org> 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=172.105.4.254; envelope-from=deller@kernel.org; helo=tor.source.kernel.org X-Spam_score_int: -3 X-Spam_score: -0.4 X-Spam_bar: / X-Spam_report: (-0.4 / 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_VALIDITY_RPBL_BLOCKED=0.819, RCVD_IN_VALIDITY_SAFE_BLOCKED=0.903, SPF_HELO_NONE=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.29 Precedence: list List-Id: qemu development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @kernel.org) X-ZM-MESSAGEID: 1772991108027158500 Content-Type: text/plain; charset="utf-8" From: Bingwu Zhang Unfixed mmap calls where start > reserved_va or the max guest addr should have a valid result. Signed-off-by: Bingwu Zhang Signed-off-by: Helge Deller --- tests/tcg/multiarch/test-mmap.c | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/tests/tcg/multiarch/test-mmap.c b/tests/tcg/multiarch/test-mma= p.c index 88f7a04101..2bfa529127 100644 --- a/tests/tcg/multiarch/test-mmap.c +++ b/tests/tcg/multiarch/test-mmap.c @@ -497,6 +497,20 @@ void check_shrink_mmaps(void) fprintf(stdout, " passed\n"); } =20 +void check_mmaps_beyond_addr_space(void) +{ + unsigned char *addr; + addr =3D mmap((void *)(-(unsigned long)pagesize * 10), pagesize * 2, + PROT_READ, MAP_PRIVATE | MAP_ANONYMOUS, -1, 0); + fprintf(stdout, "%s addr=3D%p errno=3D%d", __func__, (void *)addr, err= no); + fail_unless(addr !=3D MAP_FAILED); + + memcpy(dummybuf, addr, 2 * pagesize); + munmap(addr, 2 * pagesize); + + fprintf(stdout, " passed\n"); +} + int main(int argc, char **argv) { char tempname[] =3D "/tmp/.cmmapXXXXXX"; @@ -540,6 +554,7 @@ int main(int argc, char **argv) check_file_unfixed_eof_mmaps(); check_invalid_mmaps(); check_shrink_mmaps(); + check_mmaps_beyond_addr_space(); =20 /* Fails at the moment. */ /* check_aligned_anonymous_fixed_mmaps_collide_with_host(); */ --=20 2.53.0 From nobody Sat Apr 11 21:28:56 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; 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=pass(p=quarantine dis=none) header.from=kernel.org ARC-Seal: i=1; a=rsa-sha256; t=1772991096; cv=none; d=zohomail.com; s=zohoarc; b=dURzvO4iMPUgOKUShx/VyiHyhwyB2zrSnpGmr2IJTijY++AYBiMZ7wrogiJ75N6v9Rans0ilFVaJ4saUDDwfHVrFHIWFsyP5Zz3RV7VHuuiU9ysvKJrryFlP51C4jsJSFBjzb5Vp8mEN2g03M2SoAU/vZxxnt0tuJRRXBQMX14E= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1772991096; h=Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=MFkqKX8H0z8PU9YstNKrghEdCWeme53WL7PKKatYagQ=; b=FZTBdP3oKdAP4pw+T7l/1POvB51oPJcPaeilWDt4sd7K+QzdqRFBzynfVx5+GPSov7j21mFV0UjfvtTQ2Nk6W59CDpqJCG5NelPVmnpbRAu2Q+iVIleX6GdzbkKaqSGr3mWPcWFYuRRjJYSxdyaTe3ZGjzBpEsPygjjFEzt8X8M= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; 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=pass header.from= (p=quarantine dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1772991096209215.73584846976314; Sun, 8 Mar 2026 10:31:36 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vzHyW-000513-Hn; Sun, 08 Mar 2026 13:31:32 -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 1vzHxH-0003qr-UU for qemu-devel@nongnu.org; Sun, 08 Mar 2026 13:30:23 -0400 Received: from sea.source.kernel.org ([2600:3c0a:e001:78e:0:1991:8:25]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1vzHxG-00042M-3D for qemu-devel@nongnu.org; Sun, 08 Mar 2026 13:30:15 -0400 Received: from smtp.kernel.org (transwarp.subspace.kernel.org [100.75.92.58]) by sea.source.kernel.org (Postfix) with ESMTP id 754E244099; Sun, 8 Mar 2026 17:30:11 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id B6605C116C6; Sun, 8 Mar 2026 17:30:08 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1772991010; bh=C+C82ybik9x9gjXt76xrkRauzAp/2YKwqHuKob5hmVE=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Dt/fMkJdITwV3L7QbwE9SbFLhNFqbgy6DtVFWVYdBloFfgisfwFsLtDSuGaA1uBQq nchEJwOIA41x4nNzv01OYkRTfvdh8SS+zKGFmvrmzTmFm3WPF4Vv+cojiGg71TLYVG P+5qFdGHZiRR4F2WJcUnBPug8tfRiz0MTqv+8dIM90SfytXrIhO5IoAZmUDN2V3I2H cwZ1Qmepcz6jGeHQUJEIgJ+qYUG5RQUY1n+LE2zo++BSp8Fsyvs2bgsb6eC1r2buoO dDibaxLJWW8Z1KHB/XiDgvmCj84wfyBy5+RuTXdapzm+RZucyBNFvCcHQouOWSJ39n /yQip/CnOhNsQ== From: deller@kernel.org To: qemu-devel@nongnu.org Cc: Kyle Evans , Paolo Bonzini , =?UTF-8?q?Alex=20Benn=C3=A9e?= , Laurent Vivier , Warner Losh , =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , deller@gmx.de, Richard Henderson , Pierrick Bouvier Subject: [PULL 12/12] linux-user: Improve formatting for mremap() Date: Sun, 8 Mar 2026 18:29:36 +0100 Message-ID: <20260308172936.2835-13-deller@kernel.org> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260308172936.2835-1-deller@kernel.org> References: <20260308172936.2835-1-deller@kernel.org> 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=2600:3c0a:e001:78e:0:1991:8:25; envelope-from=deller@kernel.org; helo=sea.source.kernel.org 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, 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: qemu development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @kernel.org) X-ZM-MESSAGEID: 1772991097144154100 Content-Type: text/plain; charset="utf-8" From: Helge Deller Improve slightly the strace output for mremap(). Print the old_address and new_address as hex values, old_size and new_size as unsigned, and the flags as integer. Signed-off-by: Helge Deller Reviewed-by: Pierrick Bouvier --- linux-user/strace.list | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/linux-user/strace.list b/linux-user/strace.list index 51b5ead969..35f001fecd 100644 --- a/linux-user/strace.list +++ b/linux-user/strace.list @@ -641,7 +641,7 @@ { TARGET_NR_mq_unlink, "mq_unlink" , NULL, print_mq_unlink, NULL }, #endif #ifdef TARGET_NR_mremap -{ TARGET_NR_mremap, "mremap" , NULL, NULL, NULL }, +{ TARGET_NR_mremap, "mremap" , "%s(%#x,%u,%u,%d,%#x)", NULL, NULL }, #endif #ifdef TARGET_NR_msgctl { TARGET_NR_msgctl, "msgctl" , NULL, NULL, NULL }, --=20 2.53.0