From patchwork Mon Oct 18 16:04:36 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Warner Losh X-Patchwork-Id: 12567375 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 31FDCC433F5 for ; Mon, 18 Oct 2021 16:08:19 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id DDEA46103D for ; Mon, 18 Oct 2021 16:08:18 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.1 mail.kernel.org DDEA46103D Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=bsdimp.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=nongnu.org Received: from localhost ([::1]:38388 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mcVBS-0004H4-0g for qemu-devel@archiver.kernel.org; Mon, 18 Oct 2021 12:08:18 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:57910) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mcV8e-0007e9-20 for qemu-devel@nongnu.org; Mon, 18 Oct 2021 12:05:25 -0400 Received: from mail-il1-x136.google.com ([2607:f8b0:4864:20::136]:38472) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mcV8b-0007pl-6K for qemu-devel@nongnu.org; Mon, 18 Oct 2021 12:05:23 -0400 Received: by mail-il1-x136.google.com with SMTP id h27so9682289ila.5 for ; Mon, 18 Oct 2021 09:05:17 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bsdimp-com.20210112.gappssmtp.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=oK8OdzI3+mMf4vVbNx2oZhOXbhyBiMQd575mcLOjFB0=; b=Z63aA+vnX0ivSX6b4sc7hABGqhsOZ7qOqY/eJQtznatjMvjtOs+yYVKIfz+XIPqZTX KodfK3C0+1irE1kbgff3zZrHOW8rZpM0RbHFObpv4pjnxXnrM/K0YtFX5FxerdIBndbD qGS/6XtyIQ988sG/FMOXQG7jfVea02bMlTNOiYsXLv0qG7YaCS6I6L2Fq2ZZdB19F9xk j90BZClbqJj1Pe9uCeFimcd0OXGiloGauVC6HprDY+ycjVqW4EgFJEtWjBItFdvZkuhc UGAkl62H/yWBa9MtE6q1pqYEuWczOqpw/sIoKcDamgzIczY7YxsO45BlpLRj0Rg0VCkN eK7w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=oK8OdzI3+mMf4vVbNx2oZhOXbhyBiMQd575mcLOjFB0=; b=XmTrMUEtJ5I6oxbCnsiPYe0CFuhnOo2TQeX6WgoDm+IeuEBs9HSd2XmJVMWg7nxpGr LitDlXMf2F9+h99BmxmWq/iFP2EkhLLqnOcOmisCZW6QNrxcbnZLW8NZyqWU7u3+UdYp NVn4hjnvk9ovNuvq19Ax3PPIlLSE5GSSdRagk4RICI2pIe7Rsrq73rpvVVtXrzQalJEK jazHA80kt/mS6uMSgzy16pN4aYpFB8vGr6z9d9QpG5HmcyCE6UGhYPbAiLmaixEJGp94 xYDqT2rJcMMNXbG+Mj7rkQKaVr/d2QnR101B7U44mYJktmqSv/2XAu2cof0dV6ShCzD5 i3+Q== X-Gm-Message-State: AOAM531HZMvZ2x8bWF/TlETFtRbRcmh4IuZ1LecOuVxA20WuPuOSkNLO cWrBKQ3FKeyp6M0RhW0ggray4Mk75PdfCg== X-Google-Smtp-Source: ABdhPJwR9jq9dmXrWEnXZ9+ylQc9+RH1tC+mSAxkG4Vs5+CQkNZh6oivce1Flde5dz5lydHJPYKGfQ== X-Received: by 2002:a92:ca0f:: with SMTP id j15mr14948481ils.251.1634573115965; Mon, 18 Oct 2021 09:05:15 -0700 (PDT) Received: from dune.bsdimp.com (50-253-99-174-static.hfc.comcastbusiness.net. [50.253.99.174]) by smtp.gmail.com with ESMTPSA id a4sm7240936ild.52.2021.10.18.09.05.15 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 18 Oct 2021 09:05:15 -0700 (PDT) From: Warner Losh To: qemu-devel@nongnu.org Subject: [PULL 01/23] bsd-user/mmap.c: Always zero MAP_ANONYMOUS memory in mmap_frag() Date: Mon, 18 Oct 2021 10:04:36 -0600 Message-Id: <20211018160458.1976-2-imp@bsdimp.com> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20211018160458.1976-1-imp@bsdimp.com> References: <20211018160458.1976-1-imp@bsdimp.com> MIME-Version: 1.0 Received-SPF: none client-ip=2607:f8b0:4864:20::136; envelope-from=imp@bsdimp.com; helo=mail-il1-x136.google.com X-Spam_score_int: -18 X-Spam_score: -1.9 X-Spam_bar: - X-Spam_report: (-1.9 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_NONE=0.001 autolearn=ham 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: Kyle Evans , Richard Henderson , =?utf-8?q?Mika=C3=ABl_Ura?= =?utf-8?q?nkar?= , Laurent Vivier , Warner Losh Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" From: Mikaël Urankar Similar to the equivalent linux-user commit e6deac9cf99 When mapping MAP_ANONYMOUS memory fragments, still need notice about to set it zero, or it will cause issues. Signed-off-by: Mikaël Urankar Signed-off-by: Warner Losh Reviewed-by: Richard Henderson Reviewed-by: Kyle Evans --- bsd-user/mmap.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/bsd-user/mmap.c b/bsd-user/mmap.c index b40ab9045f..fc3c1480f5 100644 --- a/bsd-user/mmap.c +++ b/bsd-user/mmap.c @@ -180,10 +180,12 @@ static int mmap_frag(abi_ulong real_start, if (prot_new != (prot1 | PROT_WRITE)) mprotect(host_start, qemu_host_page_size, prot_new); } else { - /* just update the protection */ if (prot_new != prot1) { mprotect(host_start, qemu_host_page_size, prot_new); } + if (prot_new & PROT_WRITE) { + memset(g2h_untagged(start), 0, end - start); + } } return 0; } From patchwork Mon Oct 18 16:04:37 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Warner Losh X-Patchwork-Id: 12567393 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 99E8FC433EF for ; Mon, 18 Oct 2021 16:14:49 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 4137461074 for ; Mon, 18 Oct 2021 16:14:49 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.1 mail.kernel.org 4137461074 Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=bsdimp.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=nongnu.org Received: from localhost ([::1]:58592 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mcVHk-0000vE-9q for qemu-devel@archiver.kernel.org; Mon, 18 Oct 2021 12:14:48 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:57918) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mcV8e-0007eA-Dg for qemu-devel@nongnu.org; Mon, 18 Oct 2021 12:05:25 -0400 Received: from mail-il1-x129.google.com ([2607:f8b0:4864:20::129]:44723) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mcV8b-0007r0-6t for qemu-devel@nongnu.org; Mon, 18 Oct 2021 12:05:24 -0400 Received: by mail-il1-x129.google.com with SMTP id j8so15400641ila.11 for ; Mon, 18 Oct 2021 09:05:17 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bsdimp-com.20210112.gappssmtp.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=/esxzvTZAXy1d5qeSy++Yncrcqbi68O1hcQTBHEcYg0=; b=topXQk2fuK3yIIdzuuReNfSpJOlV3rEKJu5AdfTfjBwkyO/Cnc2+L0/L5ZZezzw/j2 iSZFTih/HZXVaY1AvSdHAxHHbKQZp1h7CoF0pJ4ya8YLiYjKynlNWcJtc102jBmnZ3ok edbkwA/bDINCSrXP6Od6DxCz0t+JrZPXTrypdZ6HoSyZvOkXnPCCp1PwGfj/hj0+RrK6 cO+euWwTsFHg5sBtYwcQQVme8cWU3OrddmT+Ol+fFLA4vKUnyYNm7aDRYNshTvlhO3nj UbaE4pGx+xQgTbbV1W5NkbxmuOIhX7tn3Pj0RxiVX2aOOEi7Xq91hvZ+Rt4cRAF6P6hk Gj5Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=/esxzvTZAXy1d5qeSy++Yncrcqbi68O1hcQTBHEcYg0=; b=4rCvDApzle1Ii3hKHHbcu5/hTMaYUsst0BHw3NyC8XvRmEoj7pfXyc+t75tQYoc54b w/x24ouZLgdIsl7oUrNjnqWPTNAhHZpCvMvYQtE1Wl2mgbsIRziDZpZt+KTktrE2/IlE YVM1Op+1tE3gIelTKUaXKSxn4rEWP0wuLqHxkM0rLxJKI2PYWFv4x0O6lQWR3rt/utgq lHmehBnDxkMIng3spKNHDN+gxn2k77BmaSQK/CiHTfIWG8/eOU8SY4QHbPn+LP5WOyaN Y9gsbmhoskpxbti5XNmIE1v6HuMOebZhR0OLLkz6c40R4VFEf1sjMyiNEF36whrxxLK4 IQ2Q== X-Gm-Message-State: AOAM531Qlu3GsNCNkMkyYTnR97AFl7NNyINWDcH67u85LCjEA5vTdf1Z sMRO0/iSXFak5CTsBaa4h5mRlcZY7Pc6UQ== X-Google-Smtp-Source: ABdhPJy7uPW9JFP15a9PKfSJLqgh0/N1Q8DzSagVh9hFuPVeYTJXXUgNfJ5+I3oS+x0ocbGKQBfXrg== X-Received: by 2002:a05:6e02:1a86:: with SMTP id k6mr14874081ilv.192.1634573116963; Mon, 18 Oct 2021 09:05:16 -0700 (PDT) Received: from dune.bsdimp.com (50-253-99-174-static.hfc.comcastbusiness.net. [50.253.99.174]) by smtp.gmail.com with ESMTPSA id a4sm7240936ild.52.2021.10.18.09.05.16 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 18 Oct 2021 09:05:16 -0700 (PDT) From: Warner Losh To: qemu-devel@nongnu.org Subject: [PULL 02/23] bsd-user/mmap.c: check pread's return value to fix warnings with _FORTIFY_SOURCE Date: Mon, 18 Oct 2021 10:04:37 -0600 Message-Id: <20211018160458.1976-3-imp@bsdimp.com> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20211018160458.1976-1-imp@bsdimp.com> References: <20211018160458.1976-1-imp@bsdimp.com> MIME-Version: 1.0 Received-SPF: none client-ip=2607:f8b0:4864:20::129; envelope-from=imp@bsdimp.com; helo=mail-il1-x129.google.com X-Spam_score_int: -18 X-Spam_score: -1.9 X-Spam_bar: - X-Spam_report: (-1.9 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_NONE=0.001 autolearn=ham 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: Kyle Evans , Richard Henderson , Laurent Vivier , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Warner Losh , =?utf-8?q?Mika=C3=ABl_Urankar?= Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" From: Mikaël Urankar Simmilar to the equivalent linux-user: commit fb7e378cf9c, which added checking to pread's return value. Update to current qemu standards with {} around the if statement. Signed-off-by: Mikaël Urankar Signed-off-by: Warner Losh Reviewed-by: Richard Henderson Reviewed-by: Philippe Mathieu-Daudé Reviewed-by: Kyle Evans --- bsd-user/mmap.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/bsd-user/mmap.c b/bsd-user/mmap.c index fc3c1480f5..4f4fa3ab46 100644 --- a/bsd-user/mmap.c +++ b/bsd-user/mmap.c @@ -174,7 +174,9 @@ static int mmap_frag(abi_ulong real_start, mprotect(host_start, qemu_host_page_size, prot1 | PROT_WRITE); /* read the corresponding file data */ - pread(fd, g2h_untagged(start), end - start, offset); + if (pread(fd, g2h_untagged(start), end - start, offset) == -1) { + return -1; + } /* put final protection */ if (prot_new != (prot1 | PROT_WRITE)) @@ -593,7 +595,9 @@ abi_long target_mmap(abi_ulong start, abi_ulong len, int prot, -1, 0); if (retaddr == -1) goto fail; - pread(fd, g2h_untagged(start), len, offset); + if (pread(fd, g2h_untagged(start), len, offset) == -1) { + goto fail; + } if (!(prot & PROT_WRITE)) { ret = target_mprotect(start, len, prot); if (ret != 0) { From patchwork Mon Oct 18 16:04:38 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Warner Losh X-Patchwork-Id: 12567367 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 3973BC433EF for ; Mon, 18 Oct 2021 16:07:37 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 9DF0761027 for ; Mon, 18 Oct 2021 16:07:36 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.1 mail.kernel.org 9DF0761027 Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=bsdimp.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=nongnu.org Received: from localhost ([::1]:35596 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mcVAl-0002RD-Er for qemu-devel@archiver.kernel.org; Mon, 18 Oct 2021 12:07:35 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:57984) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mcV8o-0007gM-Kn for qemu-devel@nongnu.org; Mon, 18 Oct 2021 12:05:37 -0400 Received: from mail-io1-xd34.google.com ([2607:f8b0:4864:20::d34]:33737) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mcV8b-0007rB-6Q for qemu-devel@nongnu.org; Mon, 18 Oct 2021 12:05:27 -0400 Received: by mail-io1-xd34.google.com with SMTP id n7so16965561iod.0 for ; Mon, 18 Oct 2021 09:05:19 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bsdimp-com.20210112.gappssmtp.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=PY6MV6MerQjsFge0//XqvVk7s3rubPiFJX6U1DaTO60=; b=Zyr0eiQ5krDMHRM2AtzGgYtHeaenICKyTifpupdrdnO0tIGtazX2MiLEq8gAMQDEt0 hxyMfJSq3DgU/FheP480iV6w2buHUoJcuM3GS9Wr0JaWLy0qvUuIEgCN4Lm4/lh+54rg XnkUmY3LVkT8Maes1BGd6lX8IWu7ngsbRivWh5U1jsCsC6PCZUBjWelDylwe3dxnZUI4 xTY7oVdc5gOxAIBF/RU+RD2p95IrxPxzuvyBhWSbI4aDmXzYxnidekfqDzQw2XBxjDRT 4EqcnXuv2HgNNOn0dVCe7XncCauSpIx3y+eOvX6QZcwW0Oat5MtBahwO0PqSaEpLPFbP zPVw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=PY6MV6MerQjsFge0//XqvVk7s3rubPiFJX6U1DaTO60=; b=JA6MRfZ5/nV7q2A6TZfars3YxsHnNyLa0jv1Qqd2OYRjHv7Sh2Xw5FVkCFisMw6k7D sU4FsB1TQYbk2ABDVZWh4e3A4dsvOWdXIpXAld5F015PwGlN8CMolJvPJorH3W99XZI7 lUHYPNfRgoych9r/Ign89jiFS3O9e92j8WNapqplOhLeVZygNHhjA88nEAkymVNSmLGC 2BbDwSP9R8O1KAup8TpbaFyiXk4WzUkyzQhEqhesHUb+Pq/YBbsAd9pP8GFdEp8PKm1/ f+d9vyODIOZdBis5HBNnm5i/i0Yd6KQfLhE1vYw6U6dxgKnWdULxyxXg8doFE+aBmFix xqSg== X-Gm-Message-State: AOAM531mVi7/d/s8dl1GWCjqfTwKEh/dona2pjB0GUKrb1C2EBpVycwk NHzUdOKhpc1Dw0Moigj+MKlaaI0VrJKqDQ== X-Google-Smtp-Source: ABdhPJz64PJGXAHYOSKJ+TqCnp32TuVl9SAd2cFmQJC74Xi+ZUGE4gJYdKVbQr7SaBWqcACFPLTIAQ== X-Received: by 2002:a5d:9d82:: with SMTP id ay2mr14927512iob.128.1634573118064; Mon, 18 Oct 2021 09:05:18 -0700 (PDT) Received: from dune.bsdimp.com (50-253-99-174-static.hfc.comcastbusiness.net. [50.253.99.174]) by smtp.gmail.com with ESMTPSA id a4sm7240936ild.52.2021.10.18.09.05.17 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 18 Oct 2021 09:05:17 -0700 (PDT) From: Warner Losh To: qemu-devel@nongnu.org Subject: [PULL 03/23] bsd-user/mmap.c: MAP_ symbols are defined, so no need for ifdefs Date: Mon, 18 Oct 2021 10:04:38 -0600 Message-Id: <20211018160458.1976-4-imp@bsdimp.com> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20211018160458.1976-1-imp@bsdimp.com> References: <20211018160458.1976-1-imp@bsdimp.com> MIME-Version: 1.0 Received-SPF: none client-ip=2607:f8b0:4864:20::d34; envelope-from=imp@bsdimp.com; helo=mail-io1-xd34.google.com X-Spam_score_int: -18 X-Spam_score: -1.9 X-Spam_bar: - X-Spam_report: (-1.9 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_NONE=0.001 autolearn=ham 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: Kyle Evans , Richard Henderson , Laurent Vivier , Warner Losh , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" All these MAP_ symbols are always defined on supported FreeBSD versions (12.2 and newer), so remove the #ifdefs since they aren't needed. Signed-off-by: Warner Losh Reviewed-by: Philippe Mathieu-Daudé Acked-by: Richard Henderson Reviewed-by: Kyle Evans --- bsd-user/mmap.c | 14 -------------- 1 file changed, 14 deletions(-) diff --git a/bsd-user/mmap.c b/bsd-user/mmap.c index 4f4fa3ab46..6f33aec58b 100644 --- a/bsd-user/mmap.c +++ b/bsd-user/mmap.c @@ -286,13 +286,9 @@ static abi_ulong mmap_find_vma_aligned(abi_ulong start, abi_ulong size, wrapped = repeat = 0; prev = 0; flags = MAP_ANONYMOUS | MAP_PRIVATE; -#ifdef MAP_ALIGNED if (alignment != 0) { flags |= MAP_ALIGNED(alignment); } -#else - /* XXX TODO */ -#endif for (;; prev = ptr) { /* @@ -407,22 +403,18 @@ abi_long target_mmap(abi_ulong start, abi_ulong len, int prot, printf("MAP_ALIGNED(%u) ", (flags & MAP_ALIGNMENT_MASK) >> MAP_ALIGNMENT_SHIFT); } -#if MAP_GUARD if (flags & MAP_GUARD) { printf("MAP_GUARD "); } -#endif if (flags & MAP_FIXED) { printf("MAP_FIXED "); } if (flags & MAP_ANONYMOUS) { printf("MAP_ANON "); } -#ifdef MAP_EXCL if (flags & MAP_EXCL) { printf("MAP_EXCL "); } -#endif if (flags & MAP_PRIVATE) { printf("MAP_PRIVATE "); } @@ -432,11 +424,9 @@ abi_long target_mmap(abi_ulong start, abi_ulong len, int prot, if (flags & MAP_NOCORE) { printf("MAP_NOCORE "); } -#ifdef MAP_STACK if (flags & MAP_STACK) { printf("MAP_STACK "); } -#endif printf("fd=%d offset=0x%llx\n", fd, offset); } #endif @@ -445,7 +435,6 @@ abi_long target_mmap(abi_ulong start, abi_ulong len, int prot, errno = EINVAL; goto fail; } -#ifdef MAP_STACK if (flags & MAP_STACK) { if ((fd != -1) || ((prot & (PROT_READ | PROT_WRITE)) != (PROT_READ | PROT_WRITE))) { @@ -453,8 +442,6 @@ abi_long target_mmap(abi_ulong start, abi_ulong len, int prot, goto fail; } } -#endif /* MAP_STACK */ -#ifdef MAP_GUARD if ((flags & MAP_GUARD) && (prot != PROT_NONE || fd != -1 || offset != 0 || (flags & (MAP_SHARED | MAP_PRIVATE | /* MAP_PREFAULT | */ /* MAP_PREFAULT not in mman.h */ @@ -462,7 +449,6 @@ abi_long target_mmap(abi_ulong start, abi_ulong len, int prot, errno = EINVAL; goto fail; } -#endif if (offset & ~TARGET_PAGE_MASK) { errno = EINVAL; From patchwork Mon Oct 18 16:04:39 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Warner Losh X-Patchwork-Id: 12567385 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 270FFC433EF for ; Mon, 18 Oct 2021 16:12:25 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id C6A8360C51 for ; Mon, 18 Oct 2021 16:12:24 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.1 mail.kernel.org C6A8360C51 Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=bsdimp.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=nongnu.org Received: from localhost ([::1]:50152 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mcVFP-0003jB-TL for qemu-devel@archiver.kernel.org; Mon, 18 Oct 2021 12:12:23 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:57874) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mcV8d-0007dC-1L for qemu-devel@nongnu.org; Mon, 18 Oct 2021 12:05:23 -0400 Received: from mail-io1-xd2a.google.com ([2607:f8b0:4864:20::d2a]:45675) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mcV8b-0007sy-8M for qemu-devel@nongnu.org; Mon, 18 Oct 2021 12:05:22 -0400 Received: by mail-io1-xd2a.google.com with SMTP id 188so16851568iou.12 for ; Mon, 18 Oct 2021 09:05:20 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bsdimp-com.20210112.gappssmtp.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=RLjwrAOhbaeXdkBQmG2ODKBch/v6AHtkj1VQlFfA1Pk=; b=gZOUy86Sfnfor1v7qzJqKgFhJKa3hfjyHJ7y1sJ93Wk7sdrCleb8akGGjmStl9zsR9 menI3ZZ2N2G2cVgyx+MzUnpYd+yDGlzzDCik/5BEHObahj3tbCoae4FMcijrKuGMwLPZ aAl/KgNnsl90RmagvhUaRTy6o5ck/eTavFf08WT1N1de16TyP1W2sD8xZk2Q2q/WCr3M uU81+huejEQjsjlDLuLRS1aou/yXsY3474cAdwJ9hqxAyPhRglb3FTLQwpkZprn8kTO4 XjusvakPB8resmr6DOo6h2rPFE3Qq+dhTmBEqO9IoeSW7n67xCJvOOuNdwERS6B0mC8N UT0w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=RLjwrAOhbaeXdkBQmG2ODKBch/v6AHtkj1VQlFfA1Pk=; b=TpHsVtDJ61SIvDjsthvgOne7qM4ODktyRNNc8LtLPVLRjg6xHVWF2W5B5ubH1bDNGx RbF2mIxV2UyzLBoc0ZQM7G6c9EjVBLiPxdQP0Ug7ukelfYstioT7vhcKHkotFKyBIYPH jE6B6YyTU39LCtCGpjVjOe2OR6G/qVYOWk2Hd+pHVBbYpTS1ziPjhuH1BW8xMqvCBhZ9 NeXRu4GHvrrfM7l+pG+THMJAJD+8UCH/DPHwaoh/l+r578rXTUWRAtzrph/WzWayiDX2 1+ZeQbota4ocRaEIADltepYTULJRrpGBRRexYLD2koqjr8c+92PxpI0Ruz7FWqWRtJEY +bdg== X-Gm-Message-State: AOAM531NDpyT87ZIf8L3X2F9hq2a1TIoc1dgDdE87wck8F+EVbY8YwKg YxGiJvZEOCL2z06MELms5zYflKMh+mc5iw== X-Google-Smtp-Source: ABdhPJz6fIRfKFjwTg0GH3oyGqFzzsR15KcH/BUplDQu0xlrFP1I/PPOLvBapaGGQzaCR54DQcNI+g== X-Received: by 2002:a02:cac6:: with SMTP id f6mr444876jap.81.1634573119218; Mon, 18 Oct 2021 09:05:19 -0700 (PDT) Received: from dune.bsdimp.com (50-253-99-174-static.hfc.comcastbusiness.net. [50.253.99.174]) by smtp.gmail.com with ESMTPSA id a4sm7240936ild.52.2021.10.18.09.05.18 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 18 Oct 2021 09:05:18 -0700 (PDT) From: Warner Losh To: qemu-devel@nongnu.org Subject: [PULL 04/23] bsd-user/mmap.c: mmap return ENOMEM on overflow Date: Mon, 18 Oct 2021 10:04:39 -0600 Message-Id: <20211018160458.1976-5-imp@bsdimp.com> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20211018160458.1976-1-imp@bsdimp.com> References: <20211018160458.1976-1-imp@bsdimp.com> MIME-Version: 1.0 Received-SPF: none client-ip=2607:f8b0:4864:20::d2a; envelope-from=imp@bsdimp.com; helo=mail-io1-xd2a.google.com X-Spam_score_int: -18 X-Spam_score: -1.9 X-Spam_bar: - X-Spam_report: (-1.9 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_NONE=0.001 autolearn=ham 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: Kyle Evans , Richard Henderson , Laurent Vivier , Warner Losh , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" mmap should return ENOMEM on len overflow rather than EINVAL. Return EINVAL when len == 0 and ENOMEM when the rounded to a page length is 0. Found by make check-tcg. Signed-off-by: Warner Losh Reviewed-by: Richard Henderson Reviewed-by: Philippe Mathieu-Daudé Reviewed-by: Kyle Evans --- bsd-user/mmap.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/bsd-user/mmap.c b/bsd-user/mmap.c index 6f33aec58b..f0be3b12cf 100644 --- a/bsd-user/mmap.c +++ b/bsd-user/mmap.c @@ -455,11 +455,18 @@ abi_long target_mmap(abi_ulong start, abi_ulong len, int prot, goto fail; } - len = TARGET_PAGE_ALIGN(len); if (len == 0) { errno = EINVAL; goto fail; } + + /* Check for overflows */ + len = TARGET_PAGE_ALIGN(len); + if (len == 0) { + errno = ENOMEM; + goto fail; + } + real_start = start & qemu_host_page_mask; host_offset = offset & qemu_host_page_mask; From patchwork Mon Oct 18 16:04:40 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Warner Losh X-Patchwork-Id: 12567401 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id E110FC433F5 for ; Mon, 18 Oct 2021 16:17:57 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id A5C0860F9E for ; Mon, 18 Oct 2021 16:17:57 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.1 mail.kernel.org A5C0860F9E Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=bsdimp.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=nongnu.org Received: from localhost ([::1]:38714 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mcVKm-0006Z7-QX for qemu-devel@archiver.kernel.org; Mon, 18 Oct 2021 12:17:56 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:57988) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mcV8o-0007gU-N1 for qemu-devel@nongnu.org; Mon, 18 Oct 2021 12:05:37 -0400 Received: from mail-io1-xd2b.google.com ([2607:f8b0:4864:20::d2b]:41525) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mcV8b-0007tf-HT for qemu-devel@nongnu.org; Mon, 18 Oct 2021 12:05:29 -0400 Received: by mail-io1-xd2b.google.com with SMTP id b188so11986303iof.8 for ; Mon, 18 Oct 2021 09:05:21 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bsdimp-com.20210112.gappssmtp.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=n6tmE54VM8mlyUNU6p5wy5fgl7zVk2jzyumM2Xh8/fM=; b=Yqnsc2lf+H3NT/f0tYyyzOXxMF6IpBG5/dMZUiGb4sMQfXzktLsg/RWDEPvjvyDO33 KCuujcPvOowq2mNo2qpmGHLWW0/IxJNUwysVdlxr+Qgezx0bis223mwaBDVDXhOqEjuX iSxij2GhbJtXU8LzsF8djF5yVG5sMET7cIfcDQ6rK8/ACyOIsOwN34bLKchq/dglR2f5 /Hp5ROM5wP2kP8F9qLfdsgUTA1qKUpWPg5w3g3vdEymqLjxSzaWXomSktB9oFNMDbcSS uR8KvN332dBwRXwehP1IHZwjutkwOIIbyssO7PXbAntYKkLIT5LXqI6xC/oTFIXCd5ou /C9Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=n6tmE54VM8mlyUNU6p5wy5fgl7zVk2jzyumM2Xh8/fM=; b=I4Drk0z257A0qwHlb8FMHxSZzy08NxTAwzK8/eV3iR2i9ZElEkEpUCUTA6s8hySnoI DduDNEMyYxedxraO1f47evczOiGZtYFNUW6odp7+LH5Hze8gjZhaZ+VAZPzWSud4g+Ts qqCi6fklaGceKBVWuYV0LxYCIVb+39Pc/PGjn3Dytdzy3KJL5TbatcUo2bK31baMyac9 uQpa1WbQIe5tATUTKCSLdiCRcIlg6o+4/GtT4HDvYbP5N8Ble/pS42nDwbXJPiiFybm0 bRAZB1T/Tg62lxPZxbN+7I2VvrhDShMDB6EfLtS9QntrrdRuAkg4Qdmh7KvS5NhhOXlg U9NA== X-Gm-Message-State: AOAM533u005+zmj82moe8i3fIH8W3RTqpErFjupI/DRvox7U8+slDumk t545LSkRf+e/XuapDxJUTY3oHAkXODsFcg== X-Google-Smtp-Source: ABdhPJx2c5Qpq59Chi1Vd8Efzpd8odo8vvFHvRuA5eAceEWcLInf/EWZAvD365bhpLwnphep+8S+5g== X-Received: by 2002:a5d:844b:: with SMTP id w11mr15159228ior.209.1634573120172; Mon, 18 Oct 2021 09:05:20 -0700 (PDT) Received: from dune.bsdimp.com (50-253-99-174-static.hfc.comcastbusiness.net. [50.253.99.174]) by smtp.gmail.com with ESMTPSA id a4sm7240936ild.52.2021.10.18.09.05.19 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 18 Oct 2021 09:05:19 -0700 (PDT) From: Warner Losh To: qemu-devel@nongnu.org Subject: [PULL 05/23] bsd-user/mmap.c: mmap prefer MAP_ANON for BSD Date: Mon, 18 Oct 2021 10:04:40 -0600 Message-Id: <20211018160458.1976-6-imp@bsdimp.com> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20211018160458.1976-1-imp@bsdimp.com> References: <20211018160458.1976-1-imp@bsdimp.com> MIME-Version: 1.0 Received-SPF: none client-ip=2607:f8b0:4864:20::d2b; envelope-from=imp@bsdimp.com; helo=mail-io1-xd2b.google.com X-Spam_score_int: -18 X-Spam_score: -1.9 X-Spam_bar: - X-Spam_report: (-1.9 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_NONE=0.001 autolearn=ham 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: Kyle Evans , Richard Henderson , Laurent Vivier , Warner Losh , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" MAP_ANON and MAP_ANONYMOUS are identical. Prefer MAP_ANON for BSD since the file is now a confusing mix of the two. Signed-off-by: Warner Losh Reviewed-by: Philippe Mathieu-Daudé Reviewed-by: Richard Henderson Reviewed-by: Kyle Evans --- bsd-user/mmap.c | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/bsd-user/mmap.c b/bsd-user/mmap.c index f0be3b12cf..301108ed25 100644 --- a/bsd-user/mmap.c +++ b/bsd-user/mmap.c @@ -285,7 +285,7 @@ static abi_ulong mmap_find_vma_aligned(abi_ulong start, abi_ulong size, addr = start; wrapped = repeat = 0; prev = 0; - flags = MAP_ANONYMOUS | MAP_PRIVATE; + flags = MAP_ANON | MAP_PRIVATE; if (alignment != 0) { flags |= MAP_ALIGNED(alignment); } @@ -409,7 +409,7 @@ abi_long target_mmap(abi_ulong start, abi_ulong len, int prot, if (flags & MAP_FIXED) { printf("MAP_FIXED "); } - if (flags & MAP_ANONYMOUS) { + if (flags & MAP_ANON) { printf("MAP_ANON "); } if (flags & MAP_EXCL) { @@ -431,7 +431,7 @@ abi_long target_mmap(abi_ulong start, abi_ulong len, int prot, } #endif - if ((flags & MAP_ANONYMOUS) && fd != -1) { + if ((flags & MAP_ANON) && fd != -1) { errno = EINVAL; goto fail; } @@ -533,7 +533,7 @@ abi_long target_mmap(abi_ulong start, abi_ulong len, int prot, * qemu_real_host_page_size */ p = mmap(g2h_untagged(start), host_len, prot, - flags | MAP_FIXED | ((fd != -1) ? MAP_ANONYMOUS : 0), -1, 0); + flags | MAP_FIXED | ((fd != -1) ? MAP_ANON : 0), -1, 0); if (p == MAP_FAILED) goto fail; /* update start so that it points to the file position at 'offset' */ @@ -696,8 +696,7 @@ static void mmap_reserve(abi_ulong start, abi_ulong size) } if (real_start != real_end) { mmap(g2h_untagged(real_start), real_end - real_start, PROT_NONE, - MAP_FIXED | MAP_ANONYMOUS | MAP_PRIVATE, - -1, 0); + MAP_FIXED | MAP_ANON | MAP_PRIVATE, -1, 0); } } From patchwork Mon Oct 18 16:04:41 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Warner Losh X-Patchwork-Id: 12567377 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 2B5FCC433EF for ; Mon, 18 Oct 2021 16:08:22 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 8C02D61050 for ; Mon, 18 Oct 2021 16:08:21 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.1 mail.kernel.org 8C02D61050 Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=bsdimp.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=nongnu.org Received: from localhost ([::1]:38594 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mcVBU-0004P3-M2 for qemu-devel@archiver.kernel.org; Mon, 18 Oct 2021 12:08:20 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:57954) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mcV8i-0007fA-5N for qemu-devel@nongnu.org; Mon, 18 Oct 2021 12:05:31 -0400 Received: from mail-io1-xd2d.google.com ([2607:f8b0:4864:20::d2d]:42964) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mcV8c-0007ts-GU for qemu-devel@nongnu.org; Mon, 18 Oct 2021 12:05:26 -0400 Received: by mail-io1-xd2d.google.com with SMTP id z69so13762434iof.9 for ; Mon, 18 Oct 2021 09:05:22 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bsdimp-com.20210112.gappssmtp.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=3+hkcIrPIEq/hVOR/fQcllD286AqVcvMxGgF/eXAbnk=; b=fUxFfMdU4oNYq4DuNlcflQhIK3nKkbCfxA2kG2Sm3K76DIkyJLi63QIbgp/6lVWWWt HDWrq5qlKOgtY8Xa3gz7Bm+smvGIyqKxE+FNeAvqhf9C8ggIyzkRNLcPBaos7O5i2huL 916Oo2Age9vhhj0u4f/eqDqBltS4JXxjZPb2lN3UibyqM87UcZilsONeJVVPmUtvDibU DFH3jCDiVq9YlEsh49kG/Zl+JSDwd8ZM2/XOSppfCXOUWxPTmuKtN+dctjJupudHKqp0 upHNXQyxv+JBXBR3RQuXRFSi4wR3mxAHxV9WLdHD70JAKGIxxa3u1SUvKq5myXu107l6 rpcQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=3+hkcIrPIEq/hVOR/fQcllD286AqVcvMxGgF/eXAbnk=; b=TZp4CYT1wlno++oFQonwX5xEJOVX2nxrvgzsJopEnze66ZJtYy+m4hhAdPAT3gVg7X cYpobF8AeB+bTP9aoblfDojBW0B27426LId4IJsgjx2Z9Jlf+RVaOOq4Yrl416JXvpqx Bstm7dpYifgRzgc/GusSAWbaUM02G41ikUkP4GZVHbnT5roVMwADGyRBq10SuKA0TeoR Dm2c2Z3ITEHmtOudxNwH7odeuQUuH7zTYSaAH1a44JQssnMUCFuiEJh2GGLyKtCA8giD blrEq+yCVBDsJmBc3LKVwp7RDCU6aOHKcMtkK/IXRSACJtRKw502QH2o4ejIDeL4xahY pX1A== X-Gm-Message-State: AOAM532wGhLsn1kt+moQTZXh/JoybuMEMb27T/3D/xTj1yYZouyUeWI5 0CYknCaov3m5QDO78wy4sXBknzqxcAzFYg== X-Google-Smtp-Source: ABdhPJySrXtxrdF2ntBmouaHUbpvqOlASqaFBCCJ5qG6YoRhcxIPLuwnCmFSq8MINtTmYOe+lzHK6w== X-Received: by 2002:a05:6602:27ce:: with SMTP id l14mr14601168ios.193.1634573121102; Mon, 18 Oct 2021 09:05:21 -0700 (PDT) Received: from dune.bsdimp.com (50-253-99-174-static.hfc.comcastbusiness.net. [50.253.99.174]) by smtp.gmail.com with ESMTPSA id a4sm7240936ild.52.2021.10.18.09.05.20 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 18 Oct 2021 09:05:20 -0700 (PDT) From: Warner Losh To: qemu-devel@nongnu.org Subject: [PULL 06/23] bsd-user/mmap.c: Convert to qemu_log logging for mmap debugging Date: Mon, 18 Oct 2021 10:04:41 -0600 Message-Id: <20211018160458.1976-7-imp@bsdimp.com> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20211018160458.1976-1-imp@bsdimp.com> References: <20211018160458.1976-1-imp@bsdimp.com> MIME-Version: 1.0 Received-SPF: none client-ip=2607:f8b0:4864:20::d2d; envelope-from=imp@bsdimp.com; helo=mail-io1-xd2d.google.com X-Spam_score_int: -18 X-Spam_score: -1.9 X-Spam_bar: - X-Spam_report: (-1.9 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_NONE=0.001 autolearn=ham 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: Kyle Evans , Richard Henderson , Laurent Vivier , Warner Losh , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" Convert DEBUG_MMAP to qemu_log CPU_LOG_PAGE. Signed-off-by: Warner Losh Reviewed-by: Richard Henderson Reviewed-by: Philippe Mathieu-Daudé Reviewed-by: Kyle Evans --- bsd-user/mmap.c | 53 +++++++++++++++++++++---------------------------- 1 file changed, 23 insertions(+), 30 deletions(-) diff --git a/bsd-user/mmap.c b/bsd-user/mmap.c index 301108ed25..face98573f 100644 --- a/bsd-user/mmap.c +++ b/bsd-user/mmap.c @@ -21,8 +21,6 @@ #include "qemu.h" #include "qemu-common.h" -//#define DEBUG_MMAP - static pthread_mutex_t mmap_mutex = PTHREAD_MUTEX_INITIALIZER; static __thread int mmap_lock_count; @@ -67,14 +65,11 @@ int target_mprotect(abi_ulong start, abi_ulong len, int prot) abi_ulong end, host_start, host_end, addr; int prot1, ret; -#ifdef DEBUG_MMAP - printf("mprotect: start=0x" TARGET_ABI_FMT_lx - "len=0x" TARGET_ABI_FMT_lx " prot=%c%c%c\n", start, len, - prot & PROT_READ ? 'r' : '-', - prot & PROT_WRITE ? 'w' : '-', - prot & PROT_EXEC ? 'x' : '-'); -#endif - + qemu_log_mask(CPU_LOG_PAGE, "mprotect: start=0x" TARGET_ABI_FMT_lx + " len=0x" TARGET_ABI_FMT_lx " prot=%c%c%c\n", start, len, + prot & PROT_READ ? 'r' : '-', + prot & PROT_WRITE ? 'w' : '-', + prot & PROT_EXEC ? 'x' : '-'); if ((start & ~TARGET_PAGE_MASK) != 0) return -EINVAL; len = TARGET_PAGE_ALIGN(len); @@ -391,45 +386,43 @@ abi_long target_mmap(abi_ulong start, abi_ulong len, int prot, abi_ulong ret, end, real_start, real_end, retaddr, host_offset, host_len; mmap_lock(); -#ifdef DEBUG_MMAP - { - printf("mmap: start=0x" TARGET_ABI_FMT_lx - " len=0x" TARGET_ABI_FMT_lx " prot=%c%c%c flags=", - start, len, - prot & PROT_READ ? 'r' : '-', - prot & PROT_WRITE ? 'w' : '-', - prot & PROT_EXEC ? 'x' : '-'); + if (qemu_loglevel_mask(CPU_LOG_PAGE)) { + qemu_log("mmap: start=0x" TARGET_ABI_FMT_lx + " len=0x" TARGET_ABI_FMT_lx " prot=%c%c%c flags=", + start, len, + prot & PROT_READ ? 'r' : '-', + prot & PROT_WRITE ? 'w' : '-', + prot & PROT_EXEC ? 'x' : '-'); if (flags & MAP_ALIGNMENT_MASK) { - printf("MAP_ALIGNED(%u) ", (flags & MAP_ALIGNMENT_MASK) - >> MAP_ALIGNMENT_SHIFT); + qemu_log("MAP_ALIGNED(%u) ", + (flags & MAP_ALIGNMENT_MASK) >> MAP_ALIGNMENT_SHIFT); } if (flags & MAP_GUARD) { - printf("MAP_GUARD "); + qemu_log("MAP_GUARD "); } if (flags & MAP_FIXED) { - printf("MAP_FIXED "); + qemu_log("MAP_FIXED "); } if (flags & MAP_ANON) { - printf("MAP_ANON "); + qemu_log("MAP_ANON "); } if (flags & MAP_EXCL) { - printf("MAP_EXCL "); + qemu_log("MAP_EXCL "); } if (flags & MAP_PRIVATE) { - printf("MAP_PRIVATE "); + qemu_log("MAP_PRIVATE "); } if (flags & MAP_SHARED) { - printf("MAP_SHARED "); + qemu_log("MAP_SHARED "); } if (flags & MAP_NOCORE) { - printf("MAP_NOCORE "); + qemu_log("MAP_NOCORE "); } if (flags & MAP_STACK) { - printf("MAP_STACK "); + qemu_log("MAP_STACK "); } - printf("fd=%d offset=0x%llx\n", fd, offset); + qemu_log("fd=%d offset=0x%lx\n", fd, offset); } -#endif if ((flags & MAP_ANON) && fd != -1) { errno = EINVAL; From patchwork Mon Oct 18 16:04:42 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Warner Losh X-Patchwork-Id: 12567395 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 096FCC433EF for ; Mon, 18 Oct 2021 16:15:58 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 7295F61074 for ; Mon, 18 Oct 2021 16:15:57 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.1 mail.kernel.org 7295F61074 Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=bsdimp.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=nongnu.org Received: from localhost ([::1]:33114 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mcVIq-0002k3-Io for qemu-devel@archiver.kernel.org; Mon, 18 Oct 2021 12:15:56 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:58034) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mcV8r-0007h2-JA for qemu-devel@nongnu.org; Mon, 18 Oct 2021 12:05:40 -0400 Received: from mail-io1-xd2f.google.com ([2607:f8b0:4864:20::d2f]:38893) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mcV8d-0007v4-9b for qemu-devel@nongnu.org; Mon, 18 Oct 2021 12:05:34 -0400 Received: by mail-io1-xd2f.google.com with SMTP id d125so16902570iof.5 for ; Mon, 18 Oct 2021 09:05:22 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bsdimp-com.20210112.gappssmtp.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=HtwVDX1R8x/iIkXmhDg1eKqW+vr6lINlT34yLQI9FPs=; b=dXaOrdvzjnUwMtC3iP30dzPASMqwZC7jXA71r83ajvmtAu6NlAnVI3idmbCqbRTouT HTRlp5dQnS8N0CVIImTSIewwA4uE4Yji1yleA7ozXqlc9m+nEFaN8ql0K0dIdQ9M9f7Z vUhaE7vcNAN/fBY66CWle3GOjWwLxs7v/ae8MnwFiNLqQvy4kKAGYP4Xbq98qbLKN1SQ K3bVqwIweggo9lAjD+9Ae5061O7yjPKLJSsX6A+b0d0jYwAeKXpXQ4FYT8WmoFa+aAT6 BHQQK5DatalsImm6dlfXUFolnK0bn/x4vOuW4mG1AuHjiW+gYOxfXdGD+LmwpwyPUm0e IDYA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=HtwVDX1R8x/iIkXmhDg1eKqW+vr6lINlT34yLQI9FPs=; b=TXkE/W3hCPUsEQWNt1qi7TBG0ZNeQ+SvZaq8iYB3ENuEWbNgBosirRb665sYw3q+uM 8j5SLfmmN50JUJIaIa0icr+1p1vZ1+8bQ/bAUmR1KbqfQZTokUlUAR+nTDl19gu4Lurb PsSPRJ7KlB25pOHuTHsfOkXFqghgJ2kEf8kcoSBh57qsxCaEMnQObSOGZncy0UTQD+kQ gOexOLArvlTTPkbqWtcAPEx155tXZm8K+ucwWN77lw2+52bU9dKh0oYrEw0EDY2cT2ai rs/Hg0F7RlgTuVWlk2xBc8X+U+uu5rzpzdNPUvgGDFRUlItF0d7lzJneKJx8o4heou/F UKeQ== X-Gm-Message-State: AOAM533DkoX/n50uw349A9LEi3JWCQMR02jV4iBxTJ4qkiufAI6Wj8nO fZYnjAYybbEZuvXzt9WSz5NOt44g/FNYvw== X-Google-Smtp-Source: ABdhPJx18RoolZCa1rM8qZjbZroq1p6JJoNHpm+CmvJZcZkY9H5+VQOgaZ78v4S6d0e208nhtroqvA== X-Received: by 2002:a05:6602:2e95:: with SMTP id m21mr15244226iow.21.1634573121960; Mon, 18 Oct 2021 09:05:21 -0700 (PDT) Received: from dune.bsdimp.com (50-253-99-174-static.hfc.comcastbusiness.net. [50.253.99.174]) by smtp.gmail.com with ESMTPSA id a4sm7240936ild.52.2021.10.18.09.05.21 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 18 Oct 2021 09:05:21 -0700 (PDT) From: Warner Losh To: qemu-devel@nongnu.org Subject: [PULL 07/23] bsd-user/mmap.c: Don't mmap fd == -1 independently from MAP_ANON flag Date: Mon, 18 Oct 2021 10:04:42 -0600 Message-Id: <20211018160458.1976-8-imp@bsdimp.com> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20211018160458.1976-1-imp@bsdimp.com> References: <20211018160458.1976-1-imp@bsdimp.com> MIME-Version: 1.0 Received-SPF: none client-ip=2607:f8b0:4864:20::d2f; envelope-from=imp@bsdimp.com; helo=mail-io1-xd2f.google.com X-Spam_score_int: -18 X-Spam_score: -1.9 X-Spam_bar: - X-Spam_report: (-1.9 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_NONE=0.001 autolearn=ham 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: Kyle Evans , Richard Henderson , Guy Yur , Laurent Vivier , Warner Losh Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" From: Guy Yur Switch checks for !(flags & MAP_ANONYMOUS) with checks for fd != -1. MAP_STACK and MAP_GUARD both require fd == -1 and don't require mapping the fd either. Add analysis from Guy Yur detailing the different cases for MAP_GUARD and MAP_STACK. Signed-off-by: Guy Yur [ partially merged before, finishing the job and documenting origin] Signed-off-by: Warner Losh Reviewed-by: Richard Henderson Reviewed-by: Kyle Evans --- bsd-user/mmap.c | 30 +++++++++++++++++++++++++----- roms/seabios-hppa | 2 +- 2 files changed, 26 insertions(+), 6 deletions(-) diff --git a/bsd-user/mmap.c b/bsd-user/mmap.c index face98573f..4ecd949a10 100644 --- a/bsd-user/mmap.c +++ b/bsd-user/mmap.c @@ -127,7 +127,27 @@ error: return ret; } -/* map an incomplete host page */ +/* + * map an incomplete host page + * + * mmap_frag can be called with a valid fd, if flags doesn't contain one of + * MAP_ANON, MAP_STACK, MAP_GUARD. If we need to map a page in those cases, we + * pass fd == -1. However, if flags contains MAP_GUARD then MAP_ANON cannot be + * added. + * + * * If fd is valid (not -1) we want to map the pages with MAP_ANON. + * * If flags contains MAP_GUARD we don't want to add MAP_ANON because it + * will be rejected. See kern_mmap's enforcing of constraints for MAP_GUARD + * in sys/vm/vm_mmap.c. + * * If flags contains MAP_ANON it doesn't matter if we add it or not. + * * If flags contains MAP_STACK, mmap adds MAP_ANON when called so doesn't + * matter if we add it or not either. See enforcing of constraints for + * MAP_STACK in kern_mmap. + * + * Don't add MAP_ANON for the flags that use fd == -1 without specifying the + * flags directly, with the assumption that future flags that require fd == -1 + * will also not require MAP_ANON. + */ static int mmap_frag(abi_ulong real_start, abi_ulong start, abi_ulong end, int prot, int flags, int fd, abi_ulong offset) @@ -147,9 +167,9 @@ static int mmap_frag(abi_ulong real_start, } if (prot1 == 0) { - /* no page was there, so we allocate one */ + /* no page was there, so we allocate one. See also above. */ void *p = mmap(host_start, qemu_host_page_size, prot, - flags | MAP_ANON, -1, 0); + flags | ((fd != -1) ? MAP_ANON : 0), -1, 0); if (p == MAP_FAILED) return -1; prot1 = prot; @@ -157,7 +177,7 @@ static int mmap_frag(abi_ulong real_start, prot1 &= PAGE_BITS; prot_new = prot | prot1; - if (!(flags & MAP_ANON)) { + if (fd != -1) { /* msync() won't work here, so we return an error if write is possible while it is a shared mapping */ if ((flags & TARGET_BSD_MAP_FLAGMASK) == MAP_SHARED && @@ -565,7 +585,7 @@ abi_long target_mmap(abi_ulong start, abi_ulong len, int prot, * worst case: we cannot map the file because the offset is not * aligned, so we read it */ - if (!(flags & MAP_ANON) && + if (fd != -1 && (offset & ~qemu_host_page_mask) != (start & ~qemu_host_page_mask)) { /* * msync() won't work here, so we return an error if write is diff --git a/roms/seabios-hppa b/roms/seabios-hppa index b12acac4be..73b740f771 160000 --- a/roms/seabios-hppa +++ b/roms/seabios-hppa @@ -1 +1 @@ -Subproject commit b12acac4be27b6d5d9fbe48c4be1286dcc245fbb +Subproject commit 73b740f77190643b2ada5ee97a9a108c6ef2a37b From patchwork Mon Oct 18 16:04:43 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Warner Losh X-Patchwork-Id: 12567379 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id ACEDBC433F5 for ; Mon, 18 Oct 2021 16:09:43 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 613076054E for ; Mon, 18 Oct 2021 16:09:43 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.1 mail.kernel.org 613076054E Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=bsdimp.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=nongnu.org Received: from localhost ([::1]:44138 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mcVCo-00084g-Fk for qemu-devel@archiver.kernel.org; Mon, 18 Oct 2021 12:09:42 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:58038) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mcV8r-0007h6-KA for qemu-devel@nongnu.org; Mon, 18 Oct 2021 12:05:40 -0400 Received: from mail-io1-xd2b.google.com ([2607:f8b0:4864:20::d2b]:44607) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mcV8e-0007wh-9K for qemu-devel@nongnu.org; Mon, 18 Oct 2021 12:05:34 -0400 Received: by mail-io1-xd2b.google.com with SMTP id r134so16869800iod.11 for ; Mon, 18 Oct 2021 09:05:23 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bsdimp-com.20210112.gappssmtp.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=mTIN4b3FESvsd1eFe8zoLs4gxknToUOMeY0gNeMUPFs=; b=PAugW3vWzIgeTbPyHglxYhbhRMX8CbAtT1rFTS3Kvb7YHXYCgENuf6TDLpxE7BiTAb cAgHW8xSjiyeaDivBvMoSsU7SnIl2W7M301LGDbWTpH5TQJ/hsiGGkpi8LBllxrfR2uT JSN0Jrc2roVnfFV4oJfxGOHsIQRWNS+x42BYAit3MVe5Lza6aigGSF+Fc3iQ/QRp+Dd4 40THmAJm930+1qy6Qe+HSNw9c3LtWUe0T+XzWU11WPRUSKWYLy8ossJX5tg5PkVrPSUh LMGAarYaO0juSA7mwJKgWqC4IqU8lTbX3qNoX9fPORNZz+EjNqBnoxGzi3Lgh04RgX0K XCtQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=mTIN4b3FESvsd1eFe8zoLs4gxknToUOMeY0gNeMUPFs=; b=JjKLqzgQnb8xDad3rdza621045relH2K1tORTUqpSsW3O9xfVdX4V+RjJYhi5UivsP h6DHrwLq0u5jWp5vxp+1p4SDaZfQFTQOkDMBzVj8prK7x0/QiggRxb8PU48GkcbMMpe5 L1I1oiR3lHHcqRP2sK6Y9knkEitOTpXlffQ+0eHAMWPSjZDVf+ViIvDfPJ58f2Gotu3d w3bAuvcnTFpS6p4Xtgqdj/vIlbUEAaBLgy1UOwiBHybUzGHyT8/M3hlbACfkw3lSnc2Z FUjmDuR016gT9tO8GdMmHiGUw9rjibg7aoUfheR+mO/goh4WJD3LTfnSGbx26ieGo24z VqMQ== X-Gm-Message-State: AOAM5310jUOIWgmsRZVcM+0S4JnqaJrspbbHYQvHWGUu3RwImwdhQ94E sKCZfrGEkd63lsAi1tYpwabrhmChWYOovA== X-Google-Smtp-Source: ABdhPJxy8+igDKIUhDBm5kXtd7Ko7ePOoYGg4YdYQ5Py7DpUMPQ9Bm3woCCmq4OgaixUJ4BkywcLpA== X-Received: by 2002:a05:6602:15d3:: with SMTP id f19mr15162905iow.161.1634573122954; Mon, 18 Oct 2021 09:05:22 -0700 (PDT) Received: from dune.bsdimp.com (50-253-99-174-static.hfc.comcastbusiness.net. [50.253.99.174]) by smtp.gmail.com with ESMTPSA id a4sm7240936ild.52.2021.10.18.09.05.22 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 18 Oct 2021 09:05:22 -0700 (PDT) From: Warner Losh To: qemu-devel@nongnu.org Subject: [PULL 08/23] bsd-user/mmap.c: Implement MAP_EXCL, required by jemalloc in head Date: Mon, 18 Oct 2021 10:04:43 -0600 Message-Id: <20211018160458.1976-9-imp@bsdimp.com> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20211018160458.1976-1-imp@bsdimp.com> References: <20211018160458.1976-1-imp@bsdimp.com> MIME-Version: 1.0 Received-SPF: none client-ip=2607:f8b0:4864:20::d2b; envelope-from=imp@bsdimp.com; helo=mail-io1-xd2b.google.com X-Spam_score_int: -18 X-Spam_score: -1.9 X-Spam_bar: - X-Spam_report: (-1.9 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_NONE=0.001 autolearn=ham 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: Kyle Evans , Richard Henderson , Laurent Vivier , Warner Losh Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" From: Kyle Evans jemalloc requires a working MAP_EXCL. Ensure that no page is double mapped when specified. In addition, use guest_range_valid_untagged to test for valid ranges of pages rather than an incomplete inlined version of the test that might be wrong. Signed-off-by: Kyle Evans Signed-off-by: Warner Losh Reviewed-by: Richard Henderson --- bsd-user/mmap.c | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/bsd-user/mmap.c b/bsd-user/mmap.c index 4ecd949a10..5b6ed5eed1 100644 --- a/bsd-user/mmap.c +++ b/bsd-user/mmap.c @@ -574,12 +574,10 @@ abi_long target_mmap(abi_ulong start, abi_ulong len, int prot, * It can fail only on 64-bit host with 32-bit target. * On any other target/host host mmap() handles this error correctly. */ -#if TARGET_ABI_BITS == 32 && HOST_LONG_BITS == 64 - if ((unsigned long)start + len - 1 > (abi_ulong) -1) { + if (!guest_range_valid_untagged(start, len)) { errno = EINVAL; goto fail; } -#endif /* * worst case: we cannot map the file because the offset is not @@ -614,6 +612,12 @@ abi_long target_mmap(abi_ulong start, abi_ulong len, int prot, goto the_end; } + /* Reject the mapping if any page within the range is mapped */ + if ((flags & MAP_EXCL) && page_check_range(start, len, 0) < 0) { + errno = EINVAL; + goto fail; + } + /* handle the start of the mapping */ if (start > real_start) { if (real_end == real_start + qemu_host_page_size) { From patchwork Mon Oct 18 16:04:44 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Warner Losh X-Patchwork-Id: 12567381 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id B9DD0C433F5 for ; Mon, 18 Oct 2021 16:11:05 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 7978461002 for ; Mon, 18 Oct 2021 16:11:05 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.1 mail.kernel.org 7978461002 Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=bsdimp.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=nongnu.org Received: from localhost ([::1]:46814 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mcVE8-0001Oy-Gf for qemu-devel@archiver.kernel.org; Mon, 18 Oct 2021 12:11:04 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:58054) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mcV8s-0007hS-EQ for qemu-devel@nongnu.org; Mon, 18 Oct 2021 12:05:40 -0400 Received: from mail-io1-xd2e.google.com ([2607:f8b0:4864:20::d2e]:36671) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mcV8f-0007wz-7Y for qemu-devel@nongnu.org; Mon, 18 Oct 2021 12:05:37 -0400 Received: by mail-io1-xd2e.google.com with SMTP id e144so16916801iof.3 for ; Mon, 18 Oct 2021 09:05:24 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bsdimp-com.20210112.gappssmtp.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=9sPvBFZ/l7G/BxNY+/vUQPWPx/ls2ZmbDpMNIy8JAO0=; b=ZDGhRqnB5UV9mlGsKlyrRrb+tlO8YkuFns0n/gA9WplsEn4Nh2zNJPPSGDT/eMHPhe aytzgxf5IvqmMg02Ko9IcKxmUXZ+xXswyZez36DK33tRdYeqP3pBNHAqCQs668B5xKwm 1j2h/NbgXgRWBztrD0uA8ho7jHMGyM/Z7Ejk0OXlV5lB4/PrKzUSg533sk0DgEXc+Ay8 vJFBO9uPUFH1mtFTmfRdZ6Vec1/0u9OQJYjDIINaa/JcLdWfdZ5NiMH+1rgD7SqsKZaa Y4ejg8BpR81tqZPthgstIReL/ma5X6VMKyJHaIzNddENqS7oba3lQzfuZJHXyouXnwLO yUAQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=9sPvBFZ/l7G/BxNY+/vUQPWPx/ls2ZmbDpMNIy8JAO0=; b=p+JQEBcqGX2l0KiQ0/CrhZpINdakz0URyIbQfgv2GE8UHCYmTDiZhBvDenwEf9ZwlW FfAc5Xne9DEQphsgZyLg2ta+ZbciG10ErWn9k1b8JFNbhgEOtfD4PB+9pzMqS2SP8CVq So0NY3fAtzzjNFQBJz1+DjxyXgW9kVymt8NAat34HkbfzbWbywNT9qiZpM+AfzTs09FM qA4i70ExiKnscVCHoZyUWRzrU+1SRaxjEPMW+idPikRfdGUMPEovfP3YgImw54nl9yDf 96B1y+7YQPbHk7OCFS04h2rEq9wv3d+htlF7J8JJNhP9muK2fiAEwawO42qsxLaWDNcl Xpew== X-Gm-Message-State: AOAM533a8zTuesYzOAbFpJQtBbFTaQnWCiNtNfRJyjxidcYAtN3yjJ++ drr4O0yuDKZ+sX5/RH4oegisTU8qJrO8qA== X-Google-Smtp-Source: ABdhPJyeuBcCPhjX3rQ5VJ7UqwOBBfE/VqFUH4I4XrCV9RnxQuXkAA5xPH+4VHaM63BTaHCi+HKNSQ== X-Received: by 2002:a05:6602:1651:: with SMTP id y17mr15139026iow.114.1634573123848; Mon, 18 Oct 2021 09:05:23 -0700 (PDT) Received: from dune.bsdimp.com (50-253-99-174-static.hfc.comcastbusiness.net. [50.253.99.174]) by smtp.gmail.com with ESMTPSA id a4sm7240936ild.52.2021.10.18.09.05.23 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 18 Oct 2021 09:05:23 -0700 (PDT) From: Warner Losh To: qemu-devel@nongnu.org Subject: [PULL 09/23] bsd-user/mmap.c: assert that target_mprotect cannot fail Date: Mon, 18 Oct 2021 10:04:44 -0600 Message-Id: <20211018160458.1976-10-imp@bsdimp.com> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20211018160458.1976-1-imp@bsdimp.com> References: <20211018160458.1976-1-imp@bsdimp.com> MIME-Version: 1.0 Received-SPF: none client-ip=2607:f8b0:4864:20::d2e; envelope-from=imp@bsdimp.com; helo=mail-io1-xd2e.google.com X-Spam_score_int: -18 X-Spam_score: -1.9 X-Spam_bar: - X-Spam_report: (-1.9 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_NONE=0.001 autolearn=ham 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: Kyle Evans , Richard Henderson , Laurent Vivier , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Warner Losh , =?utf-8?q?Mika=C3=ABl_Urankar?= Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" Similar to the equivalent linux-user change 86abac06c14. All error conditions that target_mprotect checks are also checked by target_mmap. EACCESS cannot happen because we are just removing PROT_WRITE. ENOMEM should not happen because we are modifying a whole VMA (and we have bigger problems anyway if it happens). Fixes a Coverity false positive, where Coverity complains about target_mprotect's return value being passed to tb_invalidate_phys_range. Signed-off-by: Mikaël Urankar Signed-off-by: Warner Losh Reviewed-by: Richard Henderson Reviewed-by: Philippe Mathieu-Daudé Reviewed-by: Kyle Evans --- bsd-user/mmap.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/bsd-user/mmap.c b/bsd-user/mmap.c index 5b6ed5eed1..13cb32dba1 100644 --- a/bsd-user/mmap.c +++ b/bsd-user/mmap.c @@ -604,10 +604,7 @@ abi_long target_mmap(abi_ulong start, abi_ulong len, int prot, } if (!(prot & PROT_WRITE)) { ret = target_mprotect(start, len, prot); - if (ret != 0) { - start = ret; - goto the_end; - } + assert(ret == 0); } goto the_end; } From patchwork Mon Oct 18 16:04:45 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Warner Losh X-Patchwork-Id: 12567409 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 8F518C433EF for ; Mon, 18 Oct 2021 16:21:41 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 3CD596103D for ; Mon, 18 Oct 2021 16:21:41 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.1 mail.kernel.org 3CD596103D Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=bsdimp.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=nongnu.org Received: from localhost ([::1]:50018 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mcVON-0005x1-DF for qemu-devel@archiver.kernel.org; Mon, 18 Oct 2021 12:21:39 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:58096) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mcV8z-0007iy-11 for qemu-devel@nongnu.org; Mon, 18 Oct 2021 12:05:46 -0400 Received: from mail-io1-xd36.google.com ([2607:f8b0:4864:20::d36]:35564) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mcV8g-0007xv-3h for qemu-devel@nongnu.org; Mon, 18 Oct 2021 12:05:40 -0400 Received: by mail-io1-xd36.google.com with SMTP id h196so16920594iof.2 for ; Mon, 18 Oct 2021 09:05:25 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bsdimp-com.20210112.gappssmtp.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=g/r2gH9ObhuBG8UYqMNl21ZIK0oU8t5H0kqWj19D/1o=; b=AtNOY2GfiNPa52gkLxYZmac/IxHN8i79U3kBgAkedRrtqXOS/b6+JXElSvyQGpDukP sneyDvv57kXg/8pbM3iHHI+rukoN2ClrjpLa3pP5YMloypjrrNFkAs79Vmw+s7e0klbg TorhgRgG83+ho7PlldfJ8MIKY89ZZEHSGSeFuDxryVTjNAyf9obmQ8T8AUJjeTOn4ZUr lad8FrIfJTDfKQp0K/oP/+MgKXYrrTQQzQzGz6VhRwgQGz6WYIxvW5aDPGTtVHxQV90E 2SieJhIiKY6gSsNRoK/feHCD/+vPHQtJgGs63jxXnOeKs8HDrT9VHiJ0OnHq3Emn/lQw e+Fw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=g/r2gH9ObhuBG8UYqMNl21ZIK0oU8t5H0kqWj19D/1o=; b=d+hSXIN7QVv2PlTYLL7i/LVdb9wCCZRQR8h4emt1la5nNmCRQwIhBa3sf1IAJIpnEf rvNWmHtmS3bV4O2BKmvPcPmpvmPE90klppTGbBYi4HU9DZB39zdOBjmcz0RrFVmQRU/d 4BmDE5GF/mVlJmqLE8fGXsEbkm5+6IeIYu2m4joc80B9yrSxBlJwGytYOlrzTQ2SC9ov ziD8FcUv7dr8fFwJmz+W8r5bzC/7IRxnt0BATUkVz9JzNLJV9oYOH3G/I8pL3IIrY8Cq cHB6PRJLCFNJzq7zt5tC7wtBNuAYJD3bNGZ1QA/h9pj57Cw7SKJI6lwuSfmudlFp2dm1 QbGQ== X-Gm-Message-State: AOAM533i38s/lFf/k2sMNzWTEtCg1X1e9lrMiMvAecR8fdBswE9iqSVO cFsvK0rTXx43ccndC/FVfoavSskYSuU= X-Google-Smtp-Source: ABdhPJxjB+0zxO6xL6RyfoCMLOVPVUDkZoBLGFRIItXKdbF0SDkrcy/xYDlxzy+hXMWPZDlHPPu6iQ== X-Received: by 2002:a05:6638:204a:: with SMTP id t10mr477816jaj.62.1634573124795; Mon, 18 Oct 2021 09:05:24 -0700 (PDT) Received: from dune.bsdimp.com (50-253-99-174-static.hfc.comcastbusiness.net. [50.253.99.174]) by smtp.gmail.com with ESMTPSA id a4sm7240936ild.52.2021.10.18.09.05.23 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 18 Oct 2021 09:05:24 -0700 (PDT) From: Warner Losh To: qemu-devel@nongnu.org Subject: [PULL 10/23] meson: *-user: only descend into *-user when configured Date: Mon, 18 Oct 2021 10:04:45 -0600 Message-Id: <20211018160458.1976-11-imp@bsdimp.com> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20211018160458.1976-1-imp@bsdimp.com> References: <20211018160458.1976-1-imp@bsdimp.com> MIME-Version: 1.0 Received-SPF: none client-ip=2607:f8b0:4864:20::d36; envelope-from=imp@bsdimp.com; helo=mail-io1-xd36.google.com X-Spam_score_int: -18 X-Spam_score: -1.9 X-Spam_bar: - X-Spam_report: (-1.9 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_NONE=0.001 autolearn=ham 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: Kyle Evans , Laurent Vivier , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Paolo Bonzini , Warner Losh , Warner Losh Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" To increase flexibility, only descend into *-user when that is configured. This allows *-user to selectively include directories based on the host OS which may not exist on all hosts. Adopt Paolo's suggestion of checking the configuration in the directories that know about the configuration. Message-Id: <20210926220103.1721355-2-f4bug@amsat.org> Message-Id: <20210926220103.1721355-3-f4bug@amsat.org> Signed-off-by: Philippe Mathieu-Daudé Signed-off-by: Warner Losh Acked-by: Paolo Bonzini Reviewed-by: Kyle Evans --- bsd-user/meson.build | 4 ++++ linux-user/meson.build | 4 ++++ meson.build | 12 ++++++++---- 3 files changed, 16 insertions(+), 4 deletions(-) diff --git a/bsd-user/meson.build b/bsd-user/meson.build index 0369549340..5378f56f71 100644 --- a/bsd-user/meson.build +++ b/bsd-user/meson.build @@ -1,3 +1,7 @@ +if not have_bsd_user + subdir_done() +endif + bsd_user_ss.add(files( 'bsdload.c', 'elfload.c', diff --git a/linux-user/meson.build b/linux-user/meson.build index 9549f81682..bf62c13e37 100644 --- a/linux-user/meson.build +++ b/linux-user/meson.build @@ -1,3 +1,7 @@ +if not have_linux_user + subdir_done() +endif + linux_user_ss.add(files( 'elfload.c', 'exit.c', diff --git a/meson.build b/meson.build index 6b7487b725..5e7946776d 100644 --- a/meson.build +++ b/meson.build @@ -40,12 +40,15 @@ config_host_data = configuration_data() genh = [] target_dirs = config_host['TARGET_DIRS'].split() -have_user = false +have_linux_user = false +have_bsd_user = false have_system = false foreach target : target_dirs - have_user = have_user or target.endswith('-user') + have_linux_user = have_linux_user or target.endswith('linux-user') + have_bsd_user = have_bsd_user or target.endswith('bsd-user') have_system = have_system or target.endswith('-softmmu') endforeach +have_user = have_linux_user or have_bsd_user have_tools = 'CONFIG_TOOLS' in config_host have_block = have_system or have_tools @@ -2595,10 +2598,11 @@ subdir('bsd-user') subdir('linux-user') subdir('ebpf') -bsd_user_ss.add(files('gdbstub.c')) +common_ss.add(libbpf) + specific_ss.add_all(when: 'CONFIG_BSD_USER', if_true: bsd_user_ss) -linux_user_ss.add(files('gdbstub.c', 'thunk.c')) +linux_user_ss.add(files('thunk.c')) specific_ss.add_all(when: 'CONFIG_LINUX_USER', if_true: linux_user_ss) # needed for fuzzing binaries From patchwork Mon Oct 18 16:04:46 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Warner Losh X-Patchwork-Id: 12567403 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 3A08EC433EF for ; Mon, 18 Oct 2021 16:18:35 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id CBC8E61027 for ; Mon, 18 Oct 2021 16:18:34 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.1 mail.kernel.org CBC8E61027 Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=bsdimp.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=nongnu.org Received: from localhost ([::1]:41832 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mcVLN-0000Cm-U4 for qemu-devel@archiver.kernel.org; Mon, 18 Oct 2021 12:18:33 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:58112) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mcV8z-0007j1-Ht for qemu-devel@nongnu.org; Mon, 18 Oct 2021 12:05:46 -0400 Received: from mail-io1-xd2c.google.com ([2607:f8b0:4864:20::d2c]:34752) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mcV8m-0007zF-1H for qemu-devel@nongnu.org; Mon, 18 Oct 2021 12:05:44 -0400 Received: by mail-io1-xd2c.google.com with SMTP id i189so16939088ioa.1 for ; Mon, 18 Oct 2021 09:05:26 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bsdimp-com.20210112.gappssmtp.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=Ak526YkqxWQ0k6zUzWsBpTYOajinFPk8HM2YsPPgGjk=; b=r0bubObGcyzJn/Ft78jwf4++hMYX0ze0wkoowb60204SL1pJ2wVqG9rMhuzx5sOvKx 9kBAMYWN3BKr0fXZxX45pFAuQRMwTXFA6qZFU5AJlGzcLDgZrp5F+vyZ7yGBzGLIN90B uFj8wjnpA0g8zrkZZjRFSMh+7SSR8L6pEmPKa/u1LOy1IjMdkJRMAYPAUoH04iyUhUIh iPwHD81roFhX5qSnmx0D7xnWn9deA0luHdSeuSxwtl9FlzI7sBQsibqEFnUdegOo16tr eRVdBiPsj+Zno7LII7Bw1b6mRUonOG+hb+MM9gN7fJET8165GEtTsYpdua7L6i8T7VMv v+pw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=Ak526YkqxWQ0k6zUzWsBpTYOajinFPk8HM2YsPPgGjk=; b=iBogPMZcs0LkMuOVEPoqd5ls85VSEuH5vA9oJMeHBZdClvt2tU0qFPxviZDCCwtG25 +RabQJF8PsclWapq1T3ykdfdbkiL+2GsbY3CnxrSEqaeJ2GEzdGTNw03yEvvFkHRdLvD gFg/C7s6+JYZS8DN5OU4R3YK5jgZ+BWPBw7voTIkskDOvP0ElnQG/ipj8kWiWZtGWo1n wLpycm6CQ2TczZiAN0J0PtipOMjAEO+VPcCdrj55R1KUQ1TH/UfIwv0l813mZwF22QQ8 luUdBI6MM/uvKhZdlqzW5NYARQWJ6xjZKegse68+4yRycgAA3JJ4hPBpz03Nkvesc3eZ XdCg== X-Gm-Message-State: AOAM533OHh0aTpcCwNSod25df4QM1nPuOJ0Ej9vevGFy9YNs9Vo5Gd+Z tw36MgTvVx7ewe4j282p0AQ/HXxqMPARrQ== X-Google-Smtp-Source: ABdhPJzitzmzQpPyNcoleagtie3APbRp4DR6GYi12H6EIQ4JVK+0aGWZjNZjl31yXKkzVOfw4WeDxA== X-Received: by 2002:a02:23c3:: with SMTP id u186mr485072jau.34.1634573125679; Mon, 18 Oct 2021 09:05:25 -0700 (PDT) Received: from dune.bsdimp.com (50-253-99-174-static.hfc.comcastbusiness.net. [50.253.99.174]) by smtp.gmail.com with ESMTPSA id a4sm7240936ild.52.2021.10.18.09.05.24 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 18 Oct 2021 09:05:25 -0700 (PDT) From: Warner Losh To: qemu-devel@nongnu.org Subject: [PULL 11/23] bsd-user/target_os-user.h: Remove support for FreeBSD older than 12.0 Date: Mon, 18 Oct 2021 10:04:46 -0600 Message-Id: <20211018160458.1976-12-imp@bsdimp.com> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20211018160458.1976-1-imp@bsdimp.com> References: <20211018160458.1976-1-imp@bsdimp.com> MIME-Version: 1.0 Received-SPF: none client-ip=2607:f8b0:4864:20::d2c; envelope-from=imp@bsdimp.com; helo=mail-io1-xd2c.google.com X-Spam_score_int: -18 X-Spam_score: -1.9 X-Spam_bar: - X-Spam_report: (-1.9 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_NONE=0.001 autolearn=ham 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: Kyle Evans , Richard Henderson , Laurent Vivier , Warner Losh Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" Signed-off-by: Warner Losh Reviewed-by: Richard Henderson Reviewed-by: Kyle Evans --- bsd-user/freebsd/target_os_user.h | 100 +----------------------------- 1 file changed, 1 insertion(+), 99 deletions(-) diff --git a/bsd-user/freebsd/target_os_user.h b/bsd-user/freebsd/target_os_user.h index 95b1fa9f99..19892c5071 100644 --- a/bsd-user/freebsd/target_os_user.h +++ b/bsd-user/freebsd/target_os_user.h @@ -61,15 +61,7 @@ struct target_sockaddr_storage { /* * from sys/user.h */ -#if defined(__FreeBSD_version) && __FreeBSD_version >= 1200031 #define TARGET_KI_NSPARE_INT 2 -#elif defined(__FreeBSD_version) && __FreeBSD_version >= 1100000 -#define TARGET_KI_NSPARE_INT 4 -#elif defined(__FreeBSD_version) && __FreeBSD_version >= 1000000 -#define TARGET_KI_NSPARE_INT 7 -#else -#define TARGET_KI_NSPARE_INT 9 -#endif /* ! __FreeBSD_version >= 1000000 */ #define TARGET_KI_NSPARE_LONG 12 #define TARGET_KI_NSPARE_PTR 6 @@ -116,11 +108,7 @@ struct target_kinfo_proc { int32_t ki_tsid; /* Terminal session ID */ int16_t ki_jobc; /* job control counter */ int16_t ki_spare_short1; /* unused (just here for alignment) */ -#if defined(__FreeBSD_version) && __FreeBSD_version >= 1200031 int32_t ki_tdev__freebsd11; /* controlling tty dev */ -#else - int32_t ki_tdev; /* controlling tty dev */ -#endif target_sigset_t ki_siglist; /* Signals arrived but not delivered */ target_sigset_t ki_sigmask; /* Current signal mask */ target_sigset_t ki_sigignore; /* Signals being ignored */ @@ -164,45 +152,24 @@ struct target_kinfo_proc { int8_t ki_nice; /* Process "nice" value */ char ki_lock; /* Process lock (prevent swap) count */ char ki_rqindex; /* Run queue index */ -#if defined(__FreeBSD_version) && __FreeBSD_version >= 1100000 u_char ki_oncpu_old; /* Which cpu we are on (legacy) */ u_char ki_lastcpu_old; /* Last cpu we were on (legacy) */ -#else - u_char ki_oncpu; /* Which cpu we are on */ - u_char ki_lastcpu; /* Last cpu we were on */ -#endif /* ! __FreeBSD_version >= 1100000 */ -#if defined(__FreeBSD_version) && __FreeBSD_version >= 900000 char ki_tdname[TARGET_TDNAMLEN + 1]; /* thread name */ -#else - char ki_ocomm[TARGET_TDNAMLEN + 1]; /* thread name */ -#endif /* ! __FreeBSD_version >= 900000 */ char ki_wmesg[TARGET_WMESGLEN + 1]; /* wchan message */ char ki_login[TARGET_LOGNAMELEN + 1]; /* setlogin name */ char ki_lockname[TARGET_LOCKNAMELEN + 1]; /* lock name */ char ki_comm[TARGET_COMMLEN + 1]; /* command name */ char ki_emul[TARGET_KI_EMULNAMELEN + 1]; /* emulation name */ -#if defined(__FreeBSD_version) && __FreeBSD_version >= 900000 char ki_loginclass[TARGET_LOGINCLASSLEN + 1]; /* login class */ -#endif /* ! __FreeBSD_version >= 900000 */ -#if defined(__FreeBSD_version) && __FreeBSD_version >= 900000 char ki_sparestrings[50]; /* spare string space */ -#else - char ki_sparestrings[68]; /* spare string space */ -#endif /* ! __FreeBSD_version >= 900000 */ int32_t ki_spareints[TARGET_KI_NSPARE_INT]; /* spare room for growth */ -#if defined(__FreeBSD_version) && __FreeBSD_version >= 1200031 - uint64_t ki_tdev; /* controlling tty dev */ -#endif -#if defined(__FreeBSD_version) && __FreeBSD_version >= 1100000 + uint64_t ki_tdev; /* controlling tty dev */ int32_t ki_oncpu; /* Which cpu we are on */ int32_t ki_lastcpu; /* Last cpu we were on */ int32_t ki_tracer; /* Pid of tracing process */ -#endif /* __FreeBSD_version >= 1100000 */ -#if defined(__FreeBSD_version) && __FreeBSD_version >= 900000 int32_t ki_flag2; /* P2_* flags */ int32_t ki_fibnum; /* Default FIB number */ -#endif /* ! __FreeBSD_version >= 900000 */ uint32_t ki_cr_flags; /* Credential flags */ int32_t ki_jid; /* Process jail ID */ int32_t ki_numthreads; /* XXXKSE number of threads in total */ @@ -234,18 +201,8 @@ struct target_kinfo_file { int32_t kf_flags; /* Flags. */ int32_t kf_pad0; /* Round to 64 bit alignment. */ int64_t kf_offset; /* Seek location. */ -#if defined(__FreeBSD_version) && __FreeBSD_version < 1200031 - int32_t kf_vnode_type; /* Vnode type. */ - int32_t kf_sock_domain; /* Socket domain. */ - int32_t kf_sock_type; /* Socket type. */ - int32_t kf_sock_protocol; /* Socket protocol. */ - struct target_sockaddr_storage kf_sa_local; /* Socket address. */ - struct target_sockaddr_storage kf_sa_peer; /* Peer address. */ -#endif -#if defined(__FreeBSD_version) && __FreeBSD_version >= 900000 union { struct { -#if defined(__FreeBSD_version) && __FreeBSD_version >= 1200031 uint32_t kf_spareint; /* Socket domain. */ int kf_sock_domain0; @@ -257,7 +214,6 @@ struct target_kinfo_file { struct sockaddr_storage kf_sa_local; /* Peer address. */ struct sockaddr_storage kf_sa_peer; -#endif /* Address of so_pcb. */ uint64_t kf_sock_pcb; /* Address of inp_ppcb. */ @@ -272,7 +228,6 @@ struct target_kinfo_file { uint32_t kf_sock_pad0; } kf_sock; struct { -#if defined(__FreeBSD_version) && __FreeBSD_version >= 1200031 /* Vnode type. */ int kf_file_type; /* Space for future use */ @@ -290,16 +245,6 @@ struct target_kinfo_file { uint32_t kf_file_fsid_freebsd11; /* File device, FreeBSD 11 compat. */ uint32_t kf_file_rdev_freebsd11; -#else - /* Global file id. */ - uint64_t kf_file_fileid; - /* File size. */ - uint64_t kf_file_size; - /* Vnode filesystem id. */ - uint32_t kf_file_fsid; - /* File device. */ - uint32_t kf_file_rdev; -#endif /* File mode. */ uint16_t kf_file_mode; /* Round to 64 bit alignment. */ @@ -307,18 +252,14 @@ struct target_kinfo_file { uint32_t kf_file_pad1; } kf_file; struct { -#if defined(__FreeBSD_version) && __FreeBSD_version >= 1200031 uint32_t kf_spareint[4]; uint64_t kf_spareint64[32]; -#endif uint32_t kf_sem_value; uint16_t kf_sem_mode; } kf_sem; struct { -#if defined(__FreeBSD_version) && __FreeBSD_version >= 1200031 uint32_t kf_spareint[4]; uint64_t kf_spareint64[32]; -#endif uint64_t kf_pipe_addr; uint64_t kf_pipe_peer; uint32_t kf_pipe_buffer_cnt; @@ -326,7 +267,6 @@ struct target_kinfo_file { uint32_t kf_pipe_pad0[3]; } kf_pipe; struct { -#if defined(__FreeBSD_version) && __FreeBSD_version >= 1200031 uint32_t kf_spareint[4]; uint64_t kf_spareint64[32]; uint32_t kf_pts_dev_freebsd11; @@ -334,34 +274,18 @@ struct target_kinfo_file { uint64_t kf_pts_dev; /* Round to 64 bit alignment. */ uint32_t kf_pts_pad1[4]; -#else - uint32_t kf_pts_dev; - /* Round to 64 bit alignment. */ - uint32_t kf_pts_pad0[7]; -#endif } kf_pts; struct { -#if defined(__FreeBSD_version) && __FreeBSD_version >= 1200031 uint32_t kf_spareint[4]; uint64_t kf_spareint64[32]; -#endif int32_t kf_pid; } kf_proc; } kf_un; uint16_t kf_status; /* Status flags. */ uint16_t kf_pad1; /* Round to 32 bit alignment. */ int32_t _kf_ispare0; /* Space for more stuff. */ -#if defined(__FreeBSD_version) && __FreeBSD_version >= 1000000 target_cap_rights_t kf_cap_rights; /* Capability rights. */ uint64_t _kf_cap_spare; /* Space for future cap_rights_t. */ -#else /* ! __FreeBSD_version >= 1000000 */ - uint64_t kf_cap_rights; - int _kf_ispare[4]; -#endif /* ! __FreeBSD_version >= 1000000 */ - -#else /* ! __FreeBSD_version >= 900000 */ - int _kf_ispare[16]; -#endif /* ! __FreeBSD_version >= 900000 */ /* Truncated before copyout in sysctl */ char kf_path[PATH_MAX]; /* Path to file, if any. */ }; @@ -372,34 +296,19 @@ struct target_kinfo_vmentry { uint64_t kve_start; /* Starting address. */ uint64_t kve_end; /* Finishing address. */ uint64_t kve_offset; /* Mapping offset in object */ -#if defined(__FreeBSD_version) && __FreeBSD_version >= 900000 uint64_t kve_vn_fileid; /* inode number if vnode */ -#if defined(__FreeBSD_version) && __FreeBSD_version >= 1200031 uint32_t kve_vn_fsid_freebsd11; /* dev_t of vnode location */ -#else - uint32_t kve_vn_fsid; /* dev_t of vnode location */ -#endif -#else /* ! __FreeBSD_version >= 900000 */ - uint64_t kve_fileid; /* inode number if vnode */ - uint32_t kve_fsid; /* dev_t of vnode location */ -#endif /* ! __FreeBSD_version >= 900000 */ int32_t kve_flags; /* Flags on map entry. */ int32_t kve_resident; /* Number of resident pages. */ int32_t kve_private_resident; /* Number of private pages. */ int32_t kve_protection; /* Protection bitmask. */ int32_t kve_ref_count; /* VM obj ref count. */ int32_t kve_shadow_count; /* VM obj shadow count. */ -#if defined(__FreeBSD_version) && __FreeBSD_version >= 900000 int32_t kve_vn_type; /* Vnode type. */ uint64_t kve_vn_size; /* File size. */ -#if defined(__FreeBSD_version) && __FreeBSD_version >= 1200031 uint32_t kve_vn_rdev_freebsd11; /* Device id if device. */ -#else - uint32_t kve_vn_rdev; /* Device id if device. */ -#endif uint16_t kve_vn_mode; /* File mode. */ uint16_t kve_status; /* Status flags. */ -#if defined(__FreeBSD_version) && __FreeBSD_version >= 1200031 #if (__FreeBSD_version >= 1300501 && __FreeBSD_version < 1400000) || \ __FreeBSD_version >= 1400009 union { @@ -413,13 +322,6 @@ struct target_kinfo_vmentry { #endif uint64_t kve_vn_rdev; /* Device id if device. */ int _kve_ispare[8]; /* Space for more stuff. */ -#else - int32_t _kve_ispare[12]; /* Space for more stuff. */ -#endif -#else /* ! __FreeBSD_version >= 900000 */ - int _kve_pad0; - int32_t _kve_ispare[16]; /* Space for more stuff. */ -#endif /* ! __FreeBSD_version >= 900000 */ /* Truncated before copyout in sysctl */ char kve_path[PATH_MAX]; /* Path to VM obj, if any. */ }; From patchwork Mon Oct 18 16:04:47 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Warner Losh X-Patchwork-Id: 12567407 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id DB8D6C433EF for ; Mon, 18 Oct 2021 16:19:52 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 9409E6103D for ; Mon, 18 Oct 2021 16:19:52 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.1 mail.kernel.org 9409E6103D Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=bsdimp.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=nongnu.org Received: from localhost ([::1]:46940 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mcVMd-0003iW-Pi for qemu-devel@archiver.kernel.org; Mon, 18 Oct 2021 12:19:51 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:58142) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mcV92-0007k0-Gm for qemu-devel@nongnu.org; Mon, 18 Oct 2021 12:05:48 -0400 Received: from mail-io1-xd2c.google.com ([2607:f8b0:4864:20::d2c]:38891) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mcV8p-000800-Eq for qemu-devel@nongnu.org; Mon, 18 Oct 2021 12:05:48 -0400 Received: by mail-io1-xd2c.google.com with SMTP id d125so16902873iof.5 for ; Mon, 18 Oct 2021 09:05:27 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bsdimp-com.20210112.gappssmtp.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=AiUs/VfZosBnQlunZsNdKJI8UF+bB22/U8lGhyrKVwU=; b=JgXeRP5XZ/g3f6ECBZhp0nlbEHP46YH4PL8VksIuIZItocPi5P4HXn1YMOKqQGKdh6 hv2V9f9knu/qzNROUaYZs8CvLCi+koqgV1cNWwgO9j18BKaHMxrTJwhs5JEs3B+3qBZL lDpMTF3SzSu1m12omYeTfPZYbyxW0L0cR4tgqwExqRrtfbxwKdnG5sdNNfXzgFgFLpAM g9TZMJ5yuOA7xz85IbfcwzemqzYBZvXIaPCYnQXymoUx0jkdf2K8SakGWylt+vrNnN4r kBKjozQgOER8CT8K3owW3caqKU//uTw6HqQGOq3RazG2VeLug1Akk9+g6IN4hTsV27DO LuNw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=AiUs/VfZosBnQlunZsNdKJI8UF+bB22/U8lGhyrKVwU=; b=GialVNUjf2mn8UYCiYersjcywqkNbax56E7qKzxhyY0vnbilUmfRPmxArIB4ZeBly+ iavcGQSL8lO8z97mVwRKjTfXr2/KZNRXsh9X5VYnfY9O5riFaWWzA9KZSyJ9hOsY6tGB uRduKlKHQwT663gPHjd00g5mLAW9zXzSFlsA06rBtyreQsXXJOEsSq+YoPq90wkjYycN S+4wZtL07h6XnCfpuc5hCBef0MQX9mi4aX0TRmlGQr05h/HnjEmJmiQyRWsp4proH4Cb WUbOdiLmqq86Bsz51osp/prog8AJoub8ZasSsUe7eOMHATjzAm9zh+7luoCroWiZC4PM 9mjg== X-Gm-Message-State: AOAM53173e8tv1Dx9gy7W2EWT6FGjOv3Bi/jcxmyBuLxUCrqLFt6EBgi GZT5TuEkvdTnHz4CNf2031zhKz1g80HYMA== X-Google-Smtp-Source: ABdhPJwFnJhCTzLxtRsSNP0Hz5yYXtnMzsNbVISU6UCHVks751K77WR0DCdk+ztkc0u5FUjgE+Au/w== X-Received: by 2002:a02:77cf:: with SMTP id g198mr499913jac.6.1634573126502; Mon, 18 Oct 2021 09:05:26 -0700 (PDT) Received: from dune.bsdimp.com (50-253-99-174-static.hfc.comcastbusiness.net. [50.253.99.174]) by smtp.gmail.com with ESMTPSA id a4sm7240936ild.52.2021.10.18.09.05.25 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 18 Oct 2021 09:05:25 -0700 (PDT) From: Warner Losh To: qemu-devel@nongnu.org Subject: [PULL 12/23] bsd-user/strace.list: Remove support for FreeBSD versions older than 12.0 Date: Mon, 18 Oct 2021 10:04:47 -0600 Message-Id: <20211018160458.1976-13-imp@bsdimp.com> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20211018160458.1976-1-imp@bsdimp.com> References: <20211018160458.1976-1-imp@bsdimp.com> MIME-Version: 1.0 Received-SPF: none client-ip=2607:f8b0:4864:20::d2c; envelope-from=imp@bsdimp.com; helo=mail-io1-xd2c.google.com X-Spam_score_int: -18 X-Spam_score: -1.9 X-Spam_bar: - X-Spam_report: (-1.9 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_NONE=0.001 autolearn=ham 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: Kyle Evans , Richard Henderson , Laurent Vivier , Warner Losh Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" Signed-off-by: Warner Losh Reviewed-by: Richard Henderson Reviewed-by: Kyle Evans --- bsd-user/freebsd/strace.list | 11 ----------- 1 file changed, 11 deletions(-) diff --git a/bsd-user/freebsd/strace.list b/bsd-user/freebsd/strace.list index b01b5f36e8..275d2dbe27 100644 --- a/bsd-user/freebsd/strace.list +++ b/bsd-user/freebsd/strace.list @@ -33,10 +33,6 @@ { TARGET_FREEBSD_NR___syscall, "__syscall", NULL, NULL, NULL }, { TARGET_FREEBSD_NR___sysctl, "__sysctl", NULL, print_sysctl, NULL }, { TARGET_FREEBSD_NR__umtx_op, "_umtx_op", "%s(%#x, %d, %d, %#x, %#x)", NULL, NULL }, -#if defined(__FreeBSD_version) && __FreeBSD_version < 1000000 -{ TARGET_FREEBSD_NR__umtx_lock, "__umtx_lock", NULL, NULL, NULL }, -{ TARGET_FREEBSD_NR__umtx_unlock, "__umtx_unlock", NULL, NULL, NULL }, -#endif { TARGET_FREEBSD_NR_accept, "accept", "%s(%d,%#x,%#x)", NULL, NULL }, { TARGET_FREEBSD_NR_accept4, "accept4", "%s(%d,%d,%#x,%#x)", NULL, NULL }, { TARGET_FREEBSD_NR_access, "access", "%s(\"%s\",%#o)", NULL, NULL }, @@ -49,10 +45,6 @@ { TARGET_FREEBSD_NR_cap_fcntls_get, "cap_fcntls_get", NULL, NULL, NULL }, { TARGET_FREEBSD_NR_cap_fcntls_limit, "cap_fcntls_limit", NULL, NULL, NULL }, { TARGET_FREEBSD_NR_cap_getmode, "cap_getmode", NULL, NULL, NULL }, -#if defined(__FreeBSD_version) && __FreeBSD_version < 1000000 -{ TARGET_FREEBSD_NR_cap_getrights, "cap_getrights", NULL, NULL, NULL }, -{ TARGET_FREEBSD_NR_cap_new, "cap_new", NULL, NULL, NULL }, -#endif { TARGET_FREEBSD_NR_cap_ioctls_get, "cap_ioctls_get", NULL, NULL, NULL }, { TARGET_FREEBSD_NR_cap_ioctls_limit, "cap_ioctls_limit", NULL, NULL, NULL }, { TARGET_FREEBSD_NR_cap_rights_limit, "cap_rights_limit", NULL, NULL, NULL }, @@ -146,9 +138,6 @@ { TARGET_FREEBSD_NR_freebsd11_kevent, "freebsd11_kevent", NULL, NULL, NULL }, { TARGET_FREEBSD_NR_kevent, "kevent", NULL, NULL, NULL }, { TARGET_FREEBSD_NR_kill, "kill", NULL, NULL, NULL }, -#if defined(__FreeBSD_version) && __FreeBSD_version < 1000000 -{ TARGET_FREEBSD_NR_killpg, "killpg", NULL, NULL, NULL }, -#endif { TARGET_FREEBSD_NR_kqueue, "kqueue", NULL, NULL, NULL }, { TARGET_FREEBSD_NR_ktrace, "ktrace", NULL, NULL, NULL }, { TARGET_FREEBSD_NR_lchown, "lchown", NULL, NULL, NULL }, From patchwork Mon Oct 18 16:04:48 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Warner Losh X-Patchwork-Id: 12567389 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 5E0C6C433EF for ; Mon, 18 Oct 2021 16:14:00 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id DEACF6108E for ; Mon, 18 Oct 2021 16:13:59 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.1 mail.kernel.org DEACF6108E Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=bsdimp.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=nongnu.org Received: from localhost ([::1]:55326 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mcVGv-0007BV-VY for qemu-devel@archiver.kernel.org; Mon, 18 Oct 2021 12:13:57 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:58098) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mcV8z-0007iz-1d for qemu-devel@nongnu.org; Mon, 18 Oct 2021 12:05:46 -0400 Received: from mail-io1-xd2c.google.com ([2607:f8b0:4864:20::d2c]:45678) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mcV8o-00080M-Ai for qemu-devel@nongnu.org; Mon, 18 Oct 2021 12:05:40 -0400 Received: by mail-io1-xd2c.google.com with SMTP id 188so16852127iou.12 for ; Mon, 18 Oct 2021 09:05:28 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bsdimp-com.20210112.gappssmtp.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=CIQatE8dg36Pa6PMFl/HPTB8wrbRocW2ZkkMxKhIlVw=; b=J3Hd0QxPP+BvFU76FcNWnm71H5+zSoT37RNY0qCn5n4q43UVNuACgO4Ef/RiFlNXTK Dpoj87wuJAu4b8tO7kl1KPE3AK96GJYRBECydh+MzfVzpQ7F2yqppnp3O8tGvrn+Y6Dg 7AW5I4g3SahCHUMq6N1wExivco4TbY7CGuIWP+BMsn6TfVTmMDcAwGHc2VpWW446qa7D /pWmAd0YE4F3I15S2096yiHFNziZga7CEA7Rj7VTyrCoqSLIS8ZBb+aMJiYA2kidls++ W0UW6GJNnnT+VujaMuYWu3YJ3s3gMw/N/2vOAX6tbbCz36xMUwq/yQijYsZNIaCxxal9 X2Ag== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=CIQatE8dg36Pa6PMFl/HPTB8wrbRocW2ZkkMxKhIlVw=; b=RMtP3+8Of11YY8ABKWD4apBnyy1Ti99uS5N6NrEm1TXvGGGHCYpkltefIcsmobgWWG C0PRrHHR6dIuPaLkRQIUmUOf7FP8wQzKF1BdKuihtwBYdVntpw8Ao7f+8x3E4RIoIHpy sOcJO4Pgo6X/GgNBhUpjRvZTbPQFsRj1Heapx6qjsjtXJ32/LhJKWrz2ZsDu8ybcqKMj 1jwmdU20ybvxB1es1SubuI0QDDzz+cpd4xiXSiXm+aXFqDWOvdIAkZK6FrZx9LeEmh1G 5r26BNlXHiIo3O5SvDFLX77eYurBxvKZzm6aXYpUJs6oSNg4fqJUJNaBn9zBl+5jIiTI vGhA== X-Gm-Message-State: AOAM533lqRY6Zjnu9JUzcCNgoFRVuph5CIX94nyHeLMenISq9s7t3EBe aTzbHyko3/kchymKPncq+P705F9HdPtn9g== X-Google-Smtp-Source: ABdhPJyleBmCvrQHxN1g7eX5m1nr2H2Pmy0vg1WY8I3LZtNWISxE8R4FODrT505VxkZPBugTqNxLcw== X-Received: by 2002:a05:6638:293:: with SMTP id c19mr462227jaq.21.1634573127751; Mon, 18 Oct 2021 09:05:27 -0700 (PDT) Received: from dune.bsdimp.com (50-253-99-174-static.hfc.comcastbusiness.net. [50.253.99.174]) by smtp.gmail.com with ESMTPSA id a4sm7240936ild.52.2021.10.18.09.05.26 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 18 Oct 2021 09:05:27 -0700 (PDT) From: Warner Losh To: qemu-devel@nongnu.org Subject: [PULL 13/23] bsd-user: TARGET_RESET define is unused, remove it Date: Mon, 18 Oct 2021 10:04:48 -0600 Message-Id: <20211018160458.1976-14-imp@bsdimp.com> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20211018160458.1976-1-imp@bsdimp.com> References: <20211018160458.1976-1-imp@bsdimp.com> MIME-Version: 1.0 Received-SPF: none client-ip=2607:f8b0:4864:20::d2c; envelope-from=imp@bsdimp.com; helo=mail-io1-xd2c.google.com X-Spam_score_int: -18 X-Spam_score: -1.9 X-Spam_bar: - X-Spam_report: (-1.9 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_NONE=0.001 autolearn=ham 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: Kyle Evans , Richard Henderson , Laurent Vivier , Warner Losh , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" Signed-off-by: Warner Losh Reviewed-by: Richard Henderson Reviewed-by: Philippe Mathieu-Daudé Reviewed-by: Kyle Evans --- bsd-user/i386/target_arch_cpu.h | 2 -- bsd-user/x86_64/target_arch_cpu.h | 2 -- 2 files changed, 4 deletions(-) diff --git a/bsd-user/i386/target_arch_cpu.h b/bsd-user/i386/target_arch_cpu.h index 978e8066af..b28602adbb 100644 --- a/bsd-user/i386/target_arch_cpu.h +++ b/bsd-user/i386/target_arch_cpu.h @@ -23,8 +23,6 @@ #define TARGET_DEFAULT_CPU_MODEL "qemu32" -#define TARGET_CPU_RESET(cpu) - static inline void target_cpu_init(CPUX86State *env, struct target_pt_regs *regs) { diff --git a/bsd-user/x86_64/target_arch_cpu.h b/bsd-user/x86_64/target_arch_cpu.h index 5f5ee602f9..5172b230f0 100644 --- a/bsd-user/x86_64/target_arch_cpu.h +++ b/bsd-user/x86_64/target_arch_cpu.h @@ -23,8 +23,6 @@ #define TARGET_DEFAULT_CPU_MODEL "qemu64" -#define TARGET_CPU_RESET(cpu) - static inline void target_cpu_init(CPUX86State *env, struct target_pt_regs *regs) { From patchwork Mon Oct 18 16:04:49 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Warner Losh X-Patchwork-Id: 12567405 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 4D78DC433EF for ; Mon, 18 Oct 2021 16:19:27 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id E30D46103D for ; Mon, 18 Oct 2021 16:19:26 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.1 mail.kernel.org E30D46103D Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=bsdimp.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=nongnu.org Received: from localhost ([::1]:45224 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mcVME-0002Yb-0F for qemu-devel@archiver.kernel.org; Mon, 18 Oct 2021 12:19:26 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:58094) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mcV8z-0007ix-0k for qemu-devel@nongnu.org; Mon, 18 Oct 2021 12:05:46 -0400 Received: from mail-io1-xd32.google.com ([2607:f8b0:4864:20::d32]:33737) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mcV8m-00081l-MR for qemu-devel@nongnu.org; Mon, 18 Oct 2021 12:05:39 -0400 Received: by mail-io1-xd32.google.com with SMTP id n7so16966236iod.0 for ; Mon, 18 Oct 2021 09:05:29 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bsdimp-com.20210112.gappssmtp.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=vJYc+d0t5Q+xLUHUW/ZgWS+rpFy2RSrgUaVL6ybl14c=; b=tDfhWSIofsP9YIW4wl78egNO+5a2y0hVHJsfwOqsAeip0oxEsPqmJLJZlV4wZU2qVT 3au2J2KpbxJ7eZu6ZdjalIl9OQG2mlE+bp6XRXet6kFwapIVb+8i7vwnR4educjvDhNB NbfBS0q4MFx0FaFgudW2cgj0cv0hC3prWV0aA1oEK5u6gm/XIgGzoliC/T7m3nJljmo8 izCCNkIrV8AXxOXT4jeiZO+rXyIpxxowVKwbv/G5y90nv75LlqLpi2dm1qryqyxzHdk6 ceUab4+Ith4eZOuONK91D9lUTmZJMLqBtzHmuACI9N6KI3ydGRQFBt7oJHN/xCs+id+B +Org== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=vJYc+d0t5Q+xLUHUW/ZgWS+rpFy2RSrgUaVL6ybl14c=; b=46hzTA1OdmkVRB0LFCSDRcD4oox+eTbzGoh1g5w/LRLyOKNsR45upQB6fy/2Tuz1OH sX2/SeSOqQphIOmRNPcZuFtvddn6vvTi+NDBKvzjsimeU6wnsCI6PxJkLSmhkef8Rjbl bxywodjLWOat2sSsKjG1ncGoSDSLpge4KsD7ez4BNOYkKeWTnmAz0+t6yeAfA1LIJtQh uGdMXgyPtLj28khTOQ44tgXxoYRziSl1ykvN2b3LQFOqjp1k7vbZRU4VEfZTCdtwl2Jc 7+xTkE83j2G//D4S/6nvuKyG2l898JAto3XTHE1zmY78Wx/ydtilLowFGnX+X9KyipoS FW8g== X-Gm-Message-State: AOAM531x6eVeojfKnSOGt28uSV/j1I484udr2fzEuy/iC0njOngC282r GZL5n5Op1BnhMK/ekC4fGUfe2N5xIub1ug== X-Google-Smtp-Source: ABdhPJzahoMKS3TEJnLZbRZdQQAhaEFHyLp2pggb8su6VJFGEReeL75k7XraA56XNrC0zXH5BDy2WA== X-Received: by 2002:a5e:d80a:: with SMTP id l10mr15311166iok.182.1634573128657; Mon, 18 Oct 2021 09:05:28 -0700 (PDT) Received: from dune.bsdimp.com (50-253-99-174-static.hfc.comcastbusiness.net. [50.253.99.174]) by smtp.gmail.com with ESMTPSA id a4sm7240936ild.52.2021.10.18.09.05.27 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 18 Oct 2021 09:05:28 -0700 (PDT) From: Warner Losh To: qemu-devel@nongnu.org Subject: [PULL 14/23] bsd-user: export get_errno and is_error from syscall.c Date: Mon, 18 Oct 2021 10:04:49 -0600 Message-Id: <20211018160458.1976-15-imp@bsdimp.com> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20211018160458.1976-1-imp@bsdimp.com> References: <20211018160458.1976-1-imp@bsdimp.com> MIME-Version: 1.0 Received-SPF: none client-ip=2607:f8b0:4864:20::d32; envelope-from=imp@bsdimp.com; helo=mail-io1-xd32.google.com X-Spam_score_int: -18 X-Spam_score: -1.9 X-Spam_bar: - X-Spam_report: (-1.9 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_NONE=0.001 autolearn=ham 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: Kyle Evans , Richard Henderson , Laurent Vivier , Warner Losh , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" Make get_errno and is_error global so files other than syscall.c can use them. Signed-off-by: Warner Losh Reviewed-by: Richard Henderson Reviewed-by: Philippe Mathieu-Daudé Reviewed-by: Kyle Evans --- bsd-user/qemu.h | 4 ++++ bsd-user/syscall.c | 10 +++++----- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/bsd-user/qemu.h b/bsd-user/qemu.h index 522d6c4031..3b8475394c 100644 --- a/bsd-user/qemu.h +++ b/bsd-user/qemu.h @@ -235,6 +235,10 @@ extern unsigned long target_dflssiz; extern unsigned long target_maxssiz; extern unsigned long target_sgrowsiz; +/* syscall.c */ +abi_long get_errno(abi_long ret); +bool is_error(abi_long ret); + /* user access */ #define VERIFY_READ PAGE_READ diff --git a/bsd-user/syscall.c b/bsd-user/syscall.c index 372836d44d..2fd2ba8330 100644 --- a/bsd-user/syscall.c +++ b/bsd-user/syscall.c @@ -33,18 +33,18 @@ static abi_ulong target_brk; static abi_ulong target_original_brk; -static inline abi_long get_errno(abi_long ret) +abi_long get_errno(abi_long ret) { - if (ret == -1) + if (ret == -1) { /* XXX need to translate host -> target errnos here */ return -(errno); - else - return ret; + } + return ret; } #define target_to_host_bitmask(x, tbl) (x) -static inline int is_error(abi_long ret) +bool is_error(abi_long ret) { return (abi_ulong)ret >= (abi_ulong)(-4096); } From patchwork Mon Oct 18 16:04:50 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Warner Losh X-Patchwork-Id: 12567413 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 6DF99C433EF for ; Mon, 18 Oct 2021 16:24:08 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 1FF7E61074 for ; Mon, 18 Oct 2021 16:24:08 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.1 mail.kernel.org 1FF7E61074 Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=bsdimp.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=nongnu.org Received: from localhost ([::1]:58284 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mcVQl-0003Ji-83 for qemu-devel@archiver.kernel.org; Mon, 18 Oct 2021 12:24:07 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:58180) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mcV93-0007kM-A4 for qemu-devel@nongnu.org; Mon, 18 Oct 2021 12:05:50 -0400 Received: from mail-il1-x135.google.com ([2607:f8b0:4864:20::135]:38473) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mcV8o-00082B-Ar for qemu-devel@nongnu.org; Mon, 18 Oct 2021 12:05:48 -0400 Received: by mail-il1-x135.google.com with SMTP id h27so9682965ila.5 for ; Mon, 18 Oct 2021 09:05:30 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bsdimp-com.20210112.gappssmtp.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=gBuwZiJ9BJDMY4BHAGpRW/Ll8SJFKvYBNDg389aCn34=; b=gFom44plfZkb4e+zWJBEB7EpZWKrpc/DGebOR7uH70gVPyNdylC0jQh1z/dohz84ZO ozQUwMVTy5ipuCGFQn9A0D3gF7A+mgOKWSxURRTvXBXPa4frBTJ68/1pnflAIt2jlQzM UFTIIst5k/pFBgBzyWtVtrcXGEjBB+8HYuQDIjwuSW69YN3exHr8WnPeGsjxASibiPBT mHPCoTLuId2Y5dDUv2lUHmCLDdodpSfUEI8qG6MDYFcrqmzwvt0Hi1qrjSEnZgDpKqTD 7SVL9CYTdLBzuXTTKpOzLtn9y6ygX0MxJdbFzXI/5Dc7Okt8wOa5Xvtbno77kv7RqVHk 7SJQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=gBuwZiJ9BJDMY4BHAGpRW/Ll8SJFKvYBNDg389aCn34=; b=wZlZJfFefuYQQJ1yHxZv9cAfsxdZQIabf/yU+yPcGCUPpiVcM8AN/tWiiGYpfZIAu0 +Miwb6m/cDX9fcONV+kYtzpKLCgg86a2LrfgEpDkIJPYiVFbU40zY4Y4algcSd7JPot8 Fb/qeOD6yNhRE+JiMUuleRb6m9+sqbaGs+6q3hg0XEiXTBkL+Znn+Csnss/1R8Blvyhf t9xUq/G9t8FxKpzB8OzQ36CAwSx7k9/M8TH6ftP6qT+DgDfoVXyxbNktZlu3iASmCQvp UvyXofGuhhZEpBElL3XeyGJv2jXhToMeMaIQl7oV+TGiF4XAsEflfIifioWoIgtWlJmm p2Qw== X-Gm-Message-State: AOAM533oHSoX0X+3F2+p8/k/0EatyoSrE2bD49wTj6vYbuoaMttsf5MZ 5BwBKHdCdA5JGXdsV3VMibj7CwHLMR7eTQ== X-Google-Smtp-Source: ABdhPJxYBtCPZCrCpfxsh7LBNt3XhRBDL4m6dQZ+av5YEIjHEPnJ8IZSPsV5WYbUc7ixTtQeM2Y6Fw== X-Received: by 2002:a92:c563:: with SMTP id b3mr14973064ilj.227.1634573129422; Mon, 18 Oct 2021 09:05:29 -0700 (PDT) Received: from dune.bsdimp.com (50-253-99-174-static.hfc.comcastbusiness.net. [50.253.99.174]) by smtp.gmail.com with ESMTPSA id a4sm7240936ild.52.2021.10.18.09.05.28 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 18 Oct 2021 09:05:29 -0700 (PDT) From: Warner Losh To: qemu-devel@nongnu.org Subject: [PULL 15/23] bsd-user/errno_defs.h: Add internal error numbers Date: Mon, 18 Oct 2021 10:04:50 -0600 Message-Id: <20211018160458.1976-16-imp@bsdimp.com> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20211018160458.1976-1-imp@bsdimp.com> References: <20211018160458.1976-1-imp@bsdimp.com> MIME-Version: 1.0 Received-SPF: none client-ip=2607:f8b0:4864:20::135; envelope-from=imp@bsdimp.com; helo=mail-il1-x135.google.com X-Spam_score_int: -18 X-Spam_score: -1.9 X-Spam_bar: - X-Spam_report: (-1.9 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_NONE=0.001 autolearn=ham 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: Kyle Evans , Richard Henderson , Stacey Son , Laurent Vivier , Warner Losh Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" From: Stacey Son To emulate signals and interrupted system calls, we need to have the same mechanisms we have in the kernel, including these errno values. Signed-off-by: Stacey Son Signed-off-by: Warner Losh Reviewed-by: Richard Henderson Reviewed-by: Kyle Evans --- bsd-user/errno_defs.h | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/bsd-user/errno_defs.h b/bsd-user/errno_defs.h index 1efa502a12..832671354f 100644 --- a/bsd-user/errno_defs.h +++ b/bsd-user/errno_defs.h @@ -1,6 +1,3 @@ -/* $OpenBSD: errno.h,v 1.20 2007/09/03 14:37:52 millert Exp $ */ -/* $NetBSD: errno.h,v 1.10 1996/01/20 01:33:53 jtc Exp $ */ - /* * Copyright (c) 1982, 1986, 1989, 1993 * The Regents of the University of California. All rights reserved. @@ -37,6 +34,9 @@ * @(#)errno.h 8.5 (Berkeley) 1/21/94 */ +#ifndef _ERRNO_DEFS_H_ +#define _ERRNO_DEFS_H_ + #define TARGET_EPERM 1 /* Operation not permitted */ #define TARGET_ENOENT 2 /* No such file or directory */ #define TARGET_ESRCH 3 /* No such process */ @@ -147,3 +147,10 @@ #define TARGET_EIDRM 89 /* Identifier removed */ #define TARGET_ENOMSG 90 /* No message of desired type */ #define TARGET_ELAST 90 /* Must be equal largest errno */ + +/* Internal errors: */ +#define TARGET_EJUSTRETURN 254 /* Just return without modifing regs */ +#define TARGET_ERESTART 255 /* Restart syscall */ +#define TARGET_ERESTARTSYS TARGET_ERESTART /* Linux compat */ + +#endif /* ! _ERRNO_DEFS_H_ */ From patchwork Mon Oct 18 16:04:51 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Warner Losh X-Patchwork-Id: 12567383 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id EA7FBC433F5 for ; Mon, 18 Oct 2021 16:11:15 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id A983361002 for ; Mon, 18 Oct 2021 16:11:15 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.1 mail.kernel.org A983361002 Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=bsdimp.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=nongnu.org Received: from localhost ([::1]:47232 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mcVEI-0001fp-H3 for qemu-devel@archiver.kernel.org; Mon, 18 Oct 2021 12:11:14 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:58116) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mcV91-0007jP-5Q for qemu-devel@nongnu.org; Mon, 18 Oct 2021 12:05:48 -0400 Received: from mail-il1-x129.google.com ([2607:f8b0:4864:20::129]:33494) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mcV8r-00082F-BE for qemu-devel@nongnu.org; Mon, 18 Oct 2021 12:05:46 -0400 Received: by mail-il1-x129.google.com with SMTP id s3so15537712ild.0 for ; Mon, 18 Oct 2021 09:05:31 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bsdimp-com.20210112.gappssmtp.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=vE4GJOojXPt/WEFBXi9UzAgsNYJONi1/f2Ovar658Qo=; b=kUaOQZKGPiSv88v96VVdldiHsGg68RuhuKnH/G7Qef07csOWFU24Fhl7Um2lugxwW+ 5/nsSyngG6dpf+MfXd3m/XpSyKijHJtOvkqJuTE1h0Zz6xr/p5AhnX6NGbnlaFWmjQrM LwjmP69W/rwlb7rj9EMx1YHpOGMnNkocEp+/+ygkW0JCTfl1gjYozuMPspIWQXyh0o/3 kTn8FEfkVNescBdux5h5grH2ZMyT00Qocl4VDVHFjFjxTWkooZwP9unE8lSotFPfz3GE Qwevu3FZskSGuS6uNK47Z30AhbuLMK3KeGZG5tvvXouN5h3MQ27vAm4N+78XQn4lT3rw nLqw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=vE4GJOojXPt/WEFBXi9UzAgsNYJONi1/f2Ovar658Qo=; b=lERRtv94CLOatkIdiCQpJSTZPTHbB3GLCBTrgMAOQWINK81oJUriCJVMUgTNnlou6H fbcc2yV+oxAVvxAHJNpqlWcN0DvZBjUIpup7v/EF8jooJF9dXX9+5d+cQIJa4Tj6sitl KJQCxuftdU71O467QvIbDWz2sVyknRyItb5Saey3JFkTChEzKQeZQI15mRAhWw8uBjs4 g4rX2wPydLYIVcS4Vsa6BP4nYO31MO9vMHSu2zyVX38aJviHNi0vdcGxOCMuTstl60+V ZH2UcOhgMFa3N1qy0G/0pmnbcIXCkZxNyqdw1ioMl6QMtz9Zs8B0/LZtUJK1mJ4Xe7NV 2qiQ== X-Gm-Message-State: AOAM533Sk/yUzgc5YPDbWh5zm9Xh5wQ9Ao2+MegImXBalYI5EknsohYE PxzPcvmHqwAQwMPR37tGyLuLFxtTuMMO8A== X-Google-Smtp-Source: ABdhPJx0fO1riXgKwsYMbIayJ0FH38whEoF7aWVAwnspdM5EKlukL5S/rHFsbEHqKyy5kiDXiT04LA== X-Received: by 2002:a05:6e02:dc3:: with SMTP id l3mr9070153ilj.177.1634573130434; Mon, 18 Oct 2021 09:05:30 -0700 (PDT) Received: from dune.bsdimp.com (50-253-99-174-static.hfc.comcastbusiness.net. [50.253.99.174]) by smtp.gmail.com with ESMTPSA id a4sm7240936ild.52.2021.10.18.09.05.29 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 18 Oct 2021 09:05:30 -0700 (PDT) From: Warner Losh To: qemu-devel@nongnu.org Subject: [PULL 16/23] bsd-user: move TARGET_MC_GET_CLEAR_RET to target_os_signal.h Date: Mon, 18 Oct 2021 10:04:51 -0600 Message-Id: <20211018160458.1976-17-imp@bsdimp.com> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20211018160458.1976-1-imp@bsdimp.com> References: <20211018160458.1976-1-imp@bsdimp.com> MIME-Version: 1.0 Received-SPF: none client-ip=2607:f8b0:4864:20::129; envelope-from=imp@bsdimp.com; helo=mail-il1-x129.google.com X-Spam_score_int: -18 X-Spam_score: -1.9 X-Spam_bar: - X-Spam_report: (-1.9 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_NONE=0.001 autolearn=ham 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: Kyle Evans , Richard Henderson , Laurent Vivier , Warner Losh , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" Move TARGET_MC_GET_CLEAR_RET to freebsd/target_os_signal.h since it's architecture agnostic on FreeBSD. Signed-off-by: Warner Losh Reviewed-by: Richard Henderson Reviewed-by: Philippe Mathieu-Daudé Reviewed-by: Kyle Evans --- bsd-user/freebsd/target_os_signal.h | 3 +++ bsd-user/i386/target_arch_signal.h | 2 -- bsd-user/x86_64/target_arch_signal.h | 2 -- 3 files changed, 3 insertions(+), 4 deletions(-) diff --git a/bsd-user/freebsd/target_os_signal.h b/bsd-user/freebsd/target_os_signal.h index 3ed454e086..1a4c5faf19 100644 --- a/bsd-user/freebsd/target_os_signal.h +++ b/bsd-user/freebsd/target_os_signal.h @@ -1,6 +1,9 @@ #ifndef _TARGET_OS_SIGNAL_H_ #define _TARGET_OS_SIGNAL_H_ +/* FreeBSD's sys/ucontext.h defines this */ +#define TARGET_MC_GET_CLEAR_RET 0x0001 + #include "target_os_siginfo.h" #include "target_arch_signal.h" diff --git a/bsd-user/i386/target_arch_signal.h b/bsd-user/i386/target_arch_signal.h index 9812c6b034..a90750d602 100644 --- a/bsd-user/i386/target_arch_signal.h +++ b/bsd-user/i386/target_arch_signal.h @@ -27,8 +27,6 @@ #define TARGET_MINSIGSTKSZ (512 * 4) /* min sig stack size */ #define TARGET_SIGSTKSZ (MINSIGSTKSZ + 32768) /* recommended size */ -#define TARGET_MC_GET_CLEAR_RET 0x0001 - struct target_sigcontext { /* to be added */ }; diff --git a/bsd-user/x86_64/target_arch_signal.h b/bsd-user/x86_64/target_arch_signal.h index 4c1ff0e5ba..4bb753b08b 100644 --- a/bsd-user/x86_64/target_arch_signal.h +++ b/bsd-user/x86_64/target_arch_signal.h @@ -27,8 +27,6 @@ #define TARGET_MINSIGSTKSZ (512 * 4) /* min sig stack size */ #define TARGET_SIGSTKSZ (MINSIGSTKSZ + 32768) /* recommended size */ -#define TARGET_MC_GET_CLEAR_RET 0x0001 - struct target_sigcontext { /* to be added */ }; From patchwork Mon Oct 18 16:04:52 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Warner Losh X-Patchwork-Id: 12567419 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 9B77AC433F5 for ; Mon, 18 Oct 2021 16:27:44 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 45AE660E0C for ; Mon, 18 Oct 2021 16:27:44 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.1 mail.kernel.org 45AE660E0C Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=bsdimp.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=nongnu.org Received: from localhost ([::1]:38798 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mcVUF-00014Y-9f for qemu-devel@archiver.kernel.org; Mon, 18 Oct 2021 12:27:43 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:58178) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mcV93-0007kL-96 for qemu-devel@nongnu.org; Mon, 18 Oct 2021 12:05:50 -0400 Received: from mail-il1-x135.google.com ([2607:f8b0:4864:20::135]:41857) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mcV8o-00082M-At for qemu-devel@nongnu.org; Mon, 18 Oct 2021 12:05:48 -0400 Received: by mail-il1-x135.google.com with SMTP id l7so2107316iln.8 for ; Mon, 18 Oct 2021 09:05:32 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bsdimp-com.20210112.gappssmtp.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=laLU0XX8CdBP2//L0jChpwkHQR7NdHyxMB0d78r5Vqk=; b=ZPbpmCBDWOPGalSpIbsw32CCSxtJO28n+eI/fjgTIFRLCFvLzWfzcFO/SIYHehlibM kqwISHlddB3aO2p0eBUKazrgo4WfmlXhnz559GhdWfLqyckMkqemZ2FLy0dP4eSZSTiy VN3UU5Q8NDFRDHDuCd57w1322E3GpaOorefaBw6waWeBeMZc+nG5epaidsKwA4T6vMB0 Tl3D+3NSiEAqZhlZBWk9HdPA6ri2E8JpDLLzBq+CYYXGW/w7mAKACO9rgksQgUeIgYe/ vBahfJowa4H4T09za6rXr4CU9WQWu3ap+8+03m1VWrugCCxkKva3MkugRc28Mhkm3s7i mVNA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=laLU0XX8CdBP2//L0jChpwkHQR7NdHyxMB0d78r5Vqk=; b=R6rp2xNYasXKJOBCSk6NDvl0+4pJP8qNdq1MeIiKYahaQAVmSCKmdJba2tPwC9jFUg pa+plscEDdWk0raR3Ggreku6H8sLDpHZewVpn1KNsyCyyToqxulze2XAUsjqqu6zq9Ub hGGG48CwZuRXSlSS3Ph0fe+rKPEdoaDEAs/N2NHJgV/x4Iuyh1LAeUjT1y4aPELjuEqW MavdJ8xjBHKSbmPOfYRXyB7qQymoWWXRaMUpy53fjB8EV/mYiSFsJycBldO5epZLCe0v 2L/WjXT+pbs6lOVi685aDdmMjM1kCr0QzaFOVuAZoO3GZ3LkUleqZ3VTm0I9VQCAC88D jgcQ== X-Gm-Message-State: AOAM5313wKX6NjE+IyH0zuZ8mbWb6nwoOFj+0vBr3BF+m3mWjJX+cKMD ptKoGNdxbli/6V9fVU4clPp+W1cCaV8= X-Google-Smtp-Source: ABdhPJwAznuDJSTLPpgi9aIrTYMFG8K4xlAqSgKyp2xdeBEc0/LAGBnLe+nEH7rdZevTZERj0aQ+0g== X-Received: by 2002:a92:cd8e:: with SMTP id r14mr14070331ilb.291.1634573131682; Mon, 18 Oct 2021 09:05:31 -0700 (PDT) Received: from dune.bsdimp.com (50-253-99-174-static.hfc.comcastbusiness.net. [50.253.99.174]) by smtp.gmail.com with ESMTPSA id a4sm7240936ild.52.2021.10.18.09.05.30 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 18 Oct 2021 09:05:31 -0700 (PDT) From: Warner Losh To: qemu-devel@nongnu.org Subject: [PULL 17/23] bsd-user/target_os_elf.h: Remove fallback ELF_HWCAP and reorder Date: Mon, 18 Oct 2021 10:04:52 -0600 Message-Id: <20211018160458.1976-18-imp@bsdimp.com> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20211018160458.1976-1-imp@bsdimp.com> References: <20211018160458.1976-1-imp@bsdimp.com> MIME-Version: 1.0 Received-SPF: none client-ip=2607:f8b0:4864:20::135; envelope-from=imp@bsdimp.com; helo=mail-il1-x135.google.com X-Spam_score_int: -18 X-Spam_score: -1.9 X-Spam_bar: - X-Spam_report: (-1.9 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_NONE=0.001 autolearn=ham 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: Kyle Evans , Richard Henderson , Laurent Vivier , Warner Losh , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" All architectures have a ELF_HWCAP, so remove the fallback ifdef. Place ELF_HWCAP in the same order as on native FreeBSD. Signed-off-by: Warner Losh Reviewed-by: Richard Henderson Reviewed-by: Philippe Mathieu-Daudé Reviewed-by: Kyle Evans --- bsd-user/freebsd/target_os_elf.h | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/bsd-user/freebsd/target_os_elf.h b/bsd-user/freebsd/target_os_elf.h index 2d03a883aa..adcffd1ddb 100644 --- a/bsd-user/freebsd/target_os_elf.h +++ b/bsd-user/freebsd/target_os_elf.h @@ -38,10 +38,6 @@ #define ELF_PLATFORM (NULL) #endif -#ifndef ELF_HWCAP -#define ELF_HWCAP 0 -#endif - /* XXX Look at the other conflicting AT_* values. */ #define FREEBSD_AT_NCPUS 19 #define FREEBSD_AT_HWCAP 25 @@ -114,12 +110,12 @@ static abi_ulong target_create_elf_tables(abi_ulong p, int argc, int envc, NEW_AUX_ENT(AT_FLAGS, (abi_ulong)0); NEW_AUX_ENT(FREEBSD_AT_NCPUS, (abi_ulong)bsd_get_ncpu()); NEW_AUX_ENT(AT_ENTRY, load_bias + exec->e_entry); + features = ELF_HWCAP; + NEW_AUX_ENT(FREEBSD_AT_HWCAP, features); NEW_AUX_ENT(AT_UID, (abi_ulong)getuid()); NEW_AUX_ENT(AT_EUID, (abi_ulong)geteuid()); NEW_AUX_ENT(AT_GID, (abi_ulong)getgid()); NEW_AUX_ENT(AT_EGID, (abi_ulong)getegid()); - features = ELF_HWCAP; - NEW_AUX_ENT(FREEBSD_AT_HWCAP, features); target_auxents = sp; /* Note where the aux entries are in the target */ #ifdef ARCH_DLINFO /* From patchwork Mon Oct 18 16:04:53 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Warner Losh X-Patchwork-Id: 12567397 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id B4E07C433F5 for ; Mon, 18 Oct 2021 16:17:21 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 7600560C41 for ; Mon, 18 Oct 2021 16:17:21 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.1 mail.kernel.org 7600560C41 Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=bsdimp.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=nongnu.org Received: from localhost ([::1]:35644 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mcVKC-0004Ws-Kr for qemu-devel@archiver.kernel.org; Mon, 18 Oct 2021 12:17:20 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:58120) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mcV91-0007jS-7e for qemu-devel@nongnu.org; Mon, 18 Oct 2021 12:05:48 -0400 Received: from mail-io1-xd2d.google.com ([2607:f8b0:4864:20::d2d]:43670) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mcV8r-00083R-BF for qemu-devel@nongnu.org; Mon, 18 Oct 2021 12:05:46 -0400 Received: by mail-io1-xd2d.google.com with SMTP id y67so16840917iof.10 for ; Mon, 18 Oct 2021 09:05:33 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bsdimp-com.20210112.gappssmtp.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=HPM2AzR8oxs4nLDPoDsk3u1X7tCQIZsDcwBBkLry0yo=; b=m2KfaWDiti4qVZd4bdat+efvu9hCsLSXRkXu5+ItglaQP6cp64jnfmTje5NS/zA3vJ jmlvFqWt7LLoG3NMHp/InHqHEwheQaimeyz2ewZ2uzvZckLsVe2fsYL+18NRa/FOigu2 rkhNB/px9r/mb8hHJzo2Xk5vOjlkQd147fjl3LO82+XkVwbQlFKS5pizQOhzkBK1Lm6p h2cyte5ZU4cagZ38le19b+ELCVwZy5ZRfeIfRFqlD+9Iz+MD79pElaemDr8aU4QHZtf4 xUuFl4zcN4CiO6Yfb5VbObDn5GezkY4wRqsuJNK1kFrKvDhlJt8IWfWnHLqp/R6IJiAL tNZw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=HPM2AzR8oxs4nLDPoDsk3u1X7tCQIZsDcwBBkLry0yo=; b=E+6G0JqjhBNFW46G/on8gqqloShm5nOHbAYWQqxMqxnc8M1HAKceQTKUiqIVB/7Sla osiR08Yznuu66Q7J2xcJMgYiyXfLB0zYh/gsVKG7ymmrTuHkJOwoeFm+SucsAApLkFMl MVz8jp2nHsub20hd/Q+l43WZwHihQWQ+QFIY7R6+VVMAKz194sg+PHV0EXzPEZh+yLGr xPso2DjnaWz+fS0kavTewDfyqX9yJi0oZ6fihjsjD+vxr7CIDi+Ysif7B+K9y+K6E/e/ DzKS+5VVjq+GVF3dU9pXyRYt/H/dhHWYzMwUMrkA1OfplVIvorGa57j9JkG0tgUZ/tc5 fUng== X-Gm-Message-State: AOAM531TOAGc8Sn8Bs+ndHhBuzEhkE7NoDqWJl9TH7tUNPkgn5RpyTdk GME24Ba7Sa2Y5D+sy0L6rgqKhROVaMVg+A== X-Google-Smtp-Source: ABdhPJxlbZybojS6WdItxOLrHJX3xXP7wpx4s0JojAd9XxXGJn7Blhh/3qGZnBv1xWP1/3Sur1teEQ== X-Received: by 2002:a05:6602:1591:: with SMTP id e17mr14616870iow.146.1634573132620; Mon, 18 Oct 2021 09:05:32 -0700 (PDT) Received: from dune.bsdimp.com (50-253-99-174-static.hfc.comcastbusiness.net. [50.253.99.174]) by smtp.gmail.com with ESMTPSA id a4sm7240936ild.52.2021.10.18.09.05.31 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 18 Oct 2021 09:05:32 -0700 (PDT) From: Warner Losh To: qemu-devel@nongnu.org Subject: [PULL 18/23] bsd-user/target_os_elf: If ELF_HWCAP2 is defined, publish it Date: Mon, 18 Oct 2021 10:04:53 -0600 Message-Id: <20211018160458.1976-19-imp@bsdimp.com> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20211018160458.1976-1-imp@bsdimp.com> References: <20211018160458.1976-1-imp@bsdimp.com> MIME-Version: 1.0 Received-SPF: none client-ip=2607:f8b0:4864:20::d2d; envelope-from=imp@bsdimp.com; helo=mail-io1-xd2d.google.com X-Spam_score_int: -18 X-Spam_score: -1.9 X-Spam_bar: - X-Spam_report: (-1.9 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_NONE=0.001 autolearn=ham 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: Kyle Evans , Richard Henderson , Laurent Vivier , Warner Losh , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" Some architectures publish AT_HWCAP2 as well as AT_HWCAP. Those architectures will define ELF_HWCAP2 in their target_arch_elf.h files for the value for this process. If it is defined, then publish it. Signed-off-by: Warner Losh Reviewed-by: Richard Henderson Reviewed-by: Philippe Mathieu-Daudé Reviewed-by: Kyle Evans --- bsd-user/freebsd/target_os_elf.h | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/bsd-user/freebsd/target_os_elf.h b/bsd-user/freebsd/target_os_elf.h index adcffd1ddb..e5ac8e8e50 100644 --- a/bsd-user/freebsd/target_os_elf.h +++ b/bsd-user/freebsd/target_os_elf.h @@ -112,6 +112,10 @@ static abi_ulong target_create_elf_tables(abi_ulong p, int argc, int envc, NEW_AUX_ENT(AT_ENTRY, load_bias + exec->e_entry); features = ELF_HWCAP; NEW_AUX_ENT(FREEBSD_AT_HWCAP, features); +#ifdef ELF_HWCAP2 + features = ELF_HWCAP2; + NEW_AUX_ENT(FREEBSD_AT_HWCAP2, features); +#endif NEW_AUX_ENT(AT_UID, (abi_ulong)getuid()); NEW_AUX_ENT(AT_EUID, (abi_ulong)geteuid()); NEW_AUX_ENT(AT_GID, (abi_ulong)getgid()); From patchwork Mon Oct 18 16:04:54 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Warner Losh X-Patchwork-Id: 12567399 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 4A566C433F5 for ; Mon, 18 Oct 2021 16:17:28 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 1089060C41 for ; Mon, 18 Oct 2021 16:17:28 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.1 mail.kernel.org 1089060C41 Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=bsdimp.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=nongnu.org Received: from localhost ([::1]:36048 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mcVKJ-0004n0-5V for qemu-devel@archiver.kernel.org; Mon, 18 Oct 2021 12:17:27 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:58224) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mcV97-0007l8-2W for qemu-devel@nongnu.org; Mon, 18 Oct 2021 12:05:55 -0400 Received: from mail-io1-xd2e.google.com ([2607:f8b0:4864:20::d2e]:40594) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mcV8w-00084q-8V for qemu-devel@nongnu.org; Mon, 18 Oct 2021 12:05:52 -0400 Received: by mail-io1-xd2e.google.com with SMTP id x1so16870517iof.7 for ; Mon, 18 Oct 2021 09:05:34 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bsdimp-com.20210112.gappssmtp.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=9dKXTIcJctOXE/jsCcOkT7BJa9rm6vlffSX8NI3ogMM=; b=TXTxRLKNqyLBRUAUKk6/CPiBnScfy4Ss1Vb+l8vDqUDaWf/x5H0rTLdS4QTzvwbe5g Iowkl/+38OOsMy2yBtzXoBCpyL/VkxUdm35KQ9QQBkWpvMcLhfK25cxEg8BNXcVBVxRW qrQdlRlQXmrEh0ZHAJWj9CtwWEWgnpd8WBOtWOawbrHdhpVab9TU3DMWACbguqywRiVO 43e1iXImAo6+2ZRicvBQS8k4lHYObmK5rTjCXa7OuTcOahL0iQ7zFjTD790NooN+uHgO uAjDGSIDH851rXbquaNrFve9qix9Vdpjb2YNm0+txEW231/tXjCUw+tcePe2nuIEa17w DNdQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=9dKXTIcJctOXE/jsCcOkT7BJa9rm6vlffSX8NI3ogMM=; b=eNp4E0mNhT/PySseMvpr5ZcMA/ukCwMSJI/2fJ+VFVPUdQ3Aj8wKCPTDO2ROHFG0KY vsuKaLIybX4m7Y0NB9rwBayVgPrZwJFgRQgIroTs74C+ycZtmjvu3lhWRA2vhI/VMm/l hBuLffLHgwjEX6pc8H+fVf4N+1WgS0ubI974BRrSRtDA3TKeLkrqoLUU99xDlbje3jkZ Hdiuh5Met11g0C7oDzxmhv5I70LX0avbgsEqzP9Urfw7n+MZ2lqBY8Ks0TPSqccd4wKk i1MccrITvGQbHEYFtFV0x6xQtI3EhGEhHjs6jFFhh0UDlsgzsMj/7MlmxFi5dPISCU6j MPIw== X-Gm-Message-State: AOAM532nHdGW2fZfY38wx+wibBcRYc7+MwMWuW8Wr9vnJMqksr6T/QLD fxCMMJ0AvhzM6u8OJTveUwjC5IK3gEdVgQ== X-Google-Smtp-Source: ABdhPJyc8jICMGvYRj2aYyS487+LpOqznX6oof8Se1cnGZnIhESY33Fgg564o71VSNsqHxyuPiHvzA== X-Received: by 2002:a05:6602:2e08:: with SMTP id o8mr15291207iow.10.1634573133390; Mon, 18 Oct 2021 09:05:33 -0700 (PDT) Received: from dune.bsdimp.com (50-253-99-174-static.hfc.comcastbusiness.net. [50.253.99.174]) by smtp.gmail.com with ESMTPSA id a4sm7240936ild.52.2021.10.18.09.05.32 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 18 Oct 2021 09:05:32 -0700 (PDT) From: Warner Losh To: qemu-devel@nongnu.org Subject: [PULL 19/23] bsd-user: Remove used from TaskState Date: Mon, 18 Oct 2021 10:04:54 -0600 Message-Id: <20211018160458.1976-20-imp@bsdimp.com> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20211018160458.1976-1-imp@bsdimp.com> References: <20211018160458.1976-1-imp@bsdimp.com> MIME-Version: 1.0 Received-SPF: none client-ip=2607:f8b0:4864:20::d2e; envelope-from=imp@bsdimp.com; helo=mail-io1-xd2e.google.com X-Spam_score_int: -18 X-Spam_score: -1.9 X-Spam_bar: - X-Spam_report: (-1.9 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_NONE=0.001 autolearn=ham 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: Kyle Evans , Richard Henderson , Laurent Vivier , Warner Losh , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" The 'used' field in TaskState is write only. Remove it from TaskState. Signed-off-by: Warner Losh Reviewed-by: Richard Henderson Reviewed-by: Philippe Mathieu-Daudé Reviewed-by: Kyle Evans --- bsd-user/main.c | 1 - bsd-user/qemu.h | 1 - 2 files changed, 2 deletions(-) diff --git a/bsd-user/main.c b/bsd-user/main.c index 48643eeabc..ee84554854 100644 --- a/bsd-user/main.c +++ b/bsd-user/main.c @@ -210,7 +210,6 @@ void init_task_state(TaskState *ts) { int i; - ts->used = 1; ts->first_free = ts->sigqueue_table; for (i = 0; i < MAX_SIGQUEUE_SIZE - 1; i++) { ts->sigqueue_table[i].next = &ts->sigqueue_table[i + 1]; diff --git a/bsd-user/qemu.h b/bsd-user/qemu.h index 3b8475394c..c1170f14d9 100644 --- a/bsd-user/qemu.h +++ b/bsd-user/qemu.h @@ -92,7 +92,6 @@ typedef struct TaskState { struct TaskState *next; struct bsd_binprm *bprm; - int used; /* non zero if used */ struct image_info *info; struct emulated_sigtable sigtab[TARGET_NSIG]; From patchwork Mon Oct 18 16:04:55 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Warner Losh X-Patchwork-Id: 12567411 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 21466C433FE for ; Mon, 18 Oct 2021 16:22:21 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id E207160EE5 for ; Mon, 18 Oct 2021 16:22:20 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.1 mail.kernel.org E207160EE5 Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=bsdimp.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=nongnu.org Received: from localhost ([::1]:53248 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mcVP1-0008Bj-SY for qemu-devel@archiver.kernel.org; Mon, 18 Oct 2021 12:22:19 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:58206) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mcV96-0007ku-4y for qemu-devel@nongnu.org; Mon, 18 Oct 2021 12:05:55 -0400 Received: from mail-io1-xd32.google.com ([2607:f8b0:4864:20::d32]:41534) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mcV8y-00085y-P5 for qemu-devel@nongnu.org; Mon, 18 Oct 2021 12:05:51 -0400 Received: by mail-io1-xd32.google.com with SMTP id b188so11987275iof.8 for ; Mon, 18 Oct 2021 09:05:35 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bsdimp-com.20210112.gappssmtp.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=gOB7gGX/i+XSfRneCtiATYoM7MpsErjYQkyIib0hZP8=; b=NOHg2L8DC0wSGPd5hhB3LkwfdNSTo19SQ9w33yULShgyqC3CcHHIcQ0TZLlevP9kKl r58qIBxrP1rM5IKtFommlfnmDOGUdDSwftZzN8huACK06qJu598Ee3xAGmvOrOzOUHdz XZ/WC5zPClb9k/lbqyC+R75d0QdV0r8YSFQ0OPqDbGmEBhxLJPPUWcmWAR/jxvJdQP3V neflVupBS9lW5MVEom07aCG3I6hLVVm+OOVqsE1dy/hjDO7Dxi21f2i2vGsnyIJRJlG8 GjM3x1EX2HSbFFNDLLdaNkE9KhLczNOcR1482ifQ9vZ9ADxMP7ax7LvhO9vZlb1JoAXE BZ/A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=gOB7gGX/i+XSfRneCtiATYoM7MpsErjYQkyIib0hZP8=; b=AKK9AoYdYZlfOetQu6y9+23ufY//qN/B3aYsgzJlWCsPO6de5pGEuDnxm8X6Jgbxrx UTbzbriK7p7LicLUihB91TMwCYr0fEKxn6PTLdKdSxgi2ZRQP7qp318AAroNMNuhJTUd Pe0n9tHyx5hlhV2wWeRbMJ3ndM45vYDMJkzxC7ocoTuhNfDvFPGl8DOma6C5HzYHLJSs 0X0AhChXfRWsdsks4bEG5EOGVJoujHAW8AYVtl+rnJlakY6ud5TU8jTT7+4JUEshRHDO ItLUeewcSwbdPr7saV//eKRqX0kj136iovOt3IQT8qx2vWHBeF6v5/sMo1Ybny3rxfsw PXeg== X-Gm-Message-State: AOAM532o3F566kjiKJpVS1VnntLgjG5Jq62S0rmG07Eyqv12bwxGG90D w4xxKk5TnAKomvqIlax17hSbisXzzxiFcw== X-Google-Smtp-Source: ABdhPJwLLS4YmZ1wNgE/mnsaqYRM4HkJsnpQdOSEdypGNzozornVl3ayu5hHC2Xh5AhtU5dT/mOYVQ== X-Received: by 2002:a05:6602:3417:: with SMTP id n23mr14917168ioz.205.1634573134255; Mon, 18 Oct 2021 09:05:34 -0700 (PDT) Received: from dune.bsdimp.com (50-253-99-174-static.hfc.comcastbusiness.net. [50.253.99.174]) by smtp.gmail.com with ESMTPSA id a4sm7240936ild.52.2021.10.18.09.05.33 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 18 Oct 2021 09:05:33 -0700 (PDT) From: Warner Losh To: qemu-devel@nongnu.org Subject: [PULL 20/23] bsd-user: Add stop_all_tasks Date: Mon, 18 Oct 2021 10:04:55 -0600 Message-Id: <20211018160458.1976-21-imp@bsdimp.com> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20211018160458.1976-1-imp@bsdimp.com> References: <20211018160458.1976-1-imp@bsdimp.com> MIME-Version: 1.0 Received-SPF: none client-ip=2607:f8b0:4864:20::d32; envelope-from=imp@bsdimp.com; helo=mail-io1-xd32.google.com X-Spam_score_int: -18 X-Spam_score: -1.9 X-Spam_bar: - X-Spam_report: (-1.9 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_NONE=0.001 autolearn=ham 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: Kyle Evans , Richard Henderson , Stacey Son , Laurent Vivier , Warner Losh Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" Similar to the same function in linux-user: this stops all the current tasks. Signed-off-by: Stacey Son Signed-off-by: Warner Losh Reviewed-by: Richard Henderson Reviewed-by: Kyle Evans --- bsd-user/main.c | 9 +++++++++ bsd-user/qemu.h | 1 + 2 files changed, 10 insertions(+) diff --git a/bsd-user/main.c b/bsd-user/main.c index ee84554854..cb5ea40236 100644 --- a/bsd-user/main.c +++ b/bsd-user/main.c @@ -195,6 +195,15 @@ static void usage(void) __thread CPUState *thread_cpu; +void stop_all_tasks(void) +{ + /* + * We trust when using NPTL (pthreads) start_exclusive() handles thread + * stopping correctly. + */ + start_exclusive(); +} + bool qemu_cpu_is_self(CPUState *cpu) { return thread_cpu == cpu; diff --git a/bsd-user/qemu.h b/bsd-user/qemu.h index c1170f14d9..cdb85140f4 100644 --- a/bsd-user/qemu.h +++ b/bsd-user/qemu.h @@ -103,6 +103,7 @@ typedef struct TaskState { } __attribute__((aligned(16))) TaskState; void init_task_state(TaskState *ts); +void stop_all_tasks(void); extern const char *qemu_uname_release; /* From patchwork Mon Oct 18 16:04:56 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Warner Losh X-Patchwork-Id: 12567417 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 2C7FAC433F5 for ; Mon, 18 Oct 2021 16:27:02 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id C4A7160F9E for ; Mon, 18 Oct 2021 16:27:01 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.1 mail.kernel.org C4A7160F9E Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=bsdimp.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=nongnu.org Received: from localhost ([::1]:37128 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mcVTY-0008LY-Qo for qemu-devel@archiver.kernel.org; Mon, 18 Oct 2021 12:27:00 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:58184) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mcV94-0007kS-D1 for qemu-devel@nongnu.org; Mon, 18 Oct 2021 12:05:52 -0400 Received: from mail-io1-xd29.google.com ([2607:f8b0:4864:20::d29]:39605) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mcV8s-00086l-6y for qemu-devel@nongnu.org; Mon, 18 Oct 2021 12:05:50 -0400 Received: by mail-io1-xd29.google.com with SMTP id o184so4901220iof.6 for ; Mon, 18 Oct 2021 09:05:36 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bsdimp-com.20210112.gappssmtp.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=G30MUb6lWC10SOxAq7yJXdYDan64XgWpt5jR9Uu/6d8=; b=nym2sN3oripiGovBJc0wOlJ/Bn629wppRhq+L0f5S2SHP48+mKPeB71QkCCUpZpqiR rfdnOBUviCPHZiadXgSjEJF2QMOe6tM0eKOipDYg4apgrnKspe8onUAO2tkSLlFjFgIY UA1imlIFcVBVnDd3ouuu8i4VPpWfGPJItGTp8TU7JTd75gKMbTnvcC5GGWZO0HGCI4yJ hE/oF71nD2y1WivEpkJBy4WHN1z3R7um2OvMxIF8xSkgaWf5GMp70JiD3L2MmUi2hCeY WzV347XKjzU5HCJDcnnMnfSlruRde6JOQSBEOqcDFdSyOpdOOyjZPNSYp/zpubC00iM9 anYg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=G30MUb6lWC10SOxAq7yJXdYDan64XgWpt5jR9Uu/6d8=; b=uc0oKmJ1L2JMSmY64XJIQ/rABEr0uvHU4GGmvapAfF8EI+ifWzdYHU6cnEzTHA/EML QpRgIpLu+l5gwXWB7q9BNDH9rZr8fmsbjv6ANPdfE91XefTsYQdNFvRdbNR4MS898X6F RMV1LtQwdVY/ZGr6JAXNCnZxhGWLtGddglz/yjQTSa5uLy3oxeEFg5eNiUfJxGL9RYXf to1iyH6E/QDon2ChCjqqE4bcHurajIWJwIolgeJucBW0HLYd5tzLrVIIqvBmydyjZZwK dNSoirV06315xv7bCSH5EH9HtxGsVmcLINj7iofABZUw1ehT0YdZbRHVKwwv48ZuOtQt ZaTQ== X-Gm-Message-State: AOAM532/FTjr4uaed41KGSJprclHKIdYQo0o11+oNDBjf+RkNDWeN47u TuaB5IqpGqSRLsWC1fad9u9EG98ntRV6ag== X-Google-Smtp-Source: ABdhPJxET78QUE9cnFxrBE+NrqGdoP53YYG86yFaZp5menkz/fje3CGxbNzqMiK6WvdMkA5CPA3RpQ== X-Received: by 2002:a05:6602:490:: with SMTP id y16mr14766166iov.169.1634573135321; Mon, 18 Oct 2021 09:05:35 -0700 (PDT) Received: from dune.bsdimp.com (50-253-99-174-static.hfc.comcastbusiness.net. [50.253.99.174]) by smtp.gmail.com with ESMTPSA id a4sm7240936ild.52.2021.10.18.09.05.34 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 18 Oct 2021 09:05:34 -0700 (PDT) From: Warner Losh To: qemu-devel@nongnu.org Subject: [PULL 21/23] bsd-user/sysarch: Move to using do_freebsd_arch_sysarch interface Date: Mon, 18 Oct 2021 10:04:56 -0600 Message-Id: <20211018160458.1976-22-imp@bsdimp.com> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20211018160458.1976-1-imp@bsdimp.com> References: <20211018160458.1976-1-imp@bsdimp.com> MIME-Version: 1.0 Received-SPF: none client-ip=2607:f8b0:4864:20::d29; envelope-from=imp@bsdimp.com; helo=mail-io1-xd29.google.com X-Spam_score_int: 0 X-Spam_score: 0.0 X-Spam_bar: / X-Spam_report: (0.0 / 5.0 requ) DKIM_SIGNED=0.1, DKIM_VALID=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_NONE=0.001 autolearn=ham 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: Kyle Evans , Richard Henderson , Laurent Vivier , Warner Losh Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" do_freebsd_arch_sysarch() exists in $ARCH/target_arch_sysarch.h for x86. Call it from do_freebsd_sysarch() and remove the mostly duplicate version in syscall.c. Future changes will move it to os-sys.c and support other architectures. Signed-off-by: Warner Losh Reviewed-by: Richard Henderson Reviewed-by: Kyle Evans --- bsd-user/freebsd/meson.build | 3 +++ bsd-user/freebsd/os-sys.c | 27 +++++++++++++++++++ bsd-user/meson.build | 3 +++ bsd-user/qemu.h | 3 +++ bsd-user/syscall.c | 50 ------------------------------------ 5 files changed, 36 insertions(+), 50 deletions(-) create mode 100644 bsd-user/freebsd/meson.build create mode 100644 bsd-user/freebsd/os-sys.c diff --git a/bsd-user/freebsd/meson.build b/bsd-user/freebsd/meson.build new file mode 100644 index 0000000000..4b69cca7b9 --- /dev/null +++ b/bsd-user/freebsd/meson.build @@ -0,0 +1,3 @@ +bsd_user_ss.add(files( + 'os-sys.c', +)) diff --git a/bsd-user/freebsd/os-sys.c b/bsd-user/freebsd/os-sys.c new file mode 100644 index 0000000000..309e27b9d6 --- /dev/null +++ b/bsd-user/freebsd/os-sys.c @@ -0,0 +1,27 @@ +/* + * FreeBSD sysctl() and sysarch() system call emulation + * + * Copyright (c) 2013-15 Stacey D. Son + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, see . + */ + +#include "qemu.h" +#include "target_arch_sysarch.h" + +/* sysarch() is architecture dependent. */ +abi_long do_freebsd_sysarch(void *cpu_env, abi_long arg1, abi_long arg2) +{ + return do_freebsd_arch_sysarch(cpu_env, arg1, arg2); +} diff --git a/bsd-user/meson.build b/bsd-user/meson.build index 5378f56f71..87885d91ed 100644 --- a/bsd-user/meson.build +++ b/bsd-user/meson.build @@ -12,3 +12,6 @@ bsd_user_ss.add(files( 'syscall.c', 'uaccess.c', )) + +# Pull in the OS-specific build glue, if any +subdir(targetos) diff --git a/bsd-user/qemu.h b/bsd-user/qemu.h index cdb85140f4..e65e41d53d 100644 --- a/bsd-user/qemu.h +++ b/bsd-user/qemu.h @@ -239,6 +239,9 @@ extern unsigned long target_sgrowsiz; abi_long get_errno(abi_long ret); bool is_error(abi_long ret); +/* os-sys.c */ +abi_long do_freebsd_sysarch(void *cpu_env, abi_long arg1, abi_long arg2); + /* user access */ #define VERIFY_READ PAGE_READ diff --git a/bsd-user/syscall.c b/bsd-user/syscall.c index 2fd2ba8330..d3322760f4 100644 --- a/bsd-user/syscall.c +++ b/bsd-user/syscall.c @@ -88,56 +88,6 @@ static abi_long do_obreak(abi_ulong new_brk) return 0; } -#if defined(TARGET_I386) -static abi_long do_freebsd_sysarch(CPUX86State *env, int op, abi_ulong parms) -{ - abi_long ret = 0; - abi_ulong val; - int idx; - - switch (op) { -#ifdef TARGET_ABI32 - case TARGET_FREEBSD_I386_SET_GSBASE: - case TARGET_FREEBSD_I386_SET_FSBASE: - if (op == TARGET_FREEBSD_I386_SET_GSBASE) -#else - case TARGET_FREEBSD_AMD64_SET_GSBASE: - case TARGET_FREEBSD_AMD64_SET_FSBASE: - if (op == TARGET_FREEBSD_AMD64_SET_GSBASE) -#endif - idx = R_GS; - else - idx = R_FS; - if (get_user(val, parms, abi_ulong)) - return -TARGET_EFAULT; - cpu_x86_load_seg(env, idx, 0); - env->segs[idx].base = val; - break; -#ifdef TARGET_ABI32 - case TARGET_FREEBSD_I386_GET_GSBASE: - case TARGET_FREEBSD_I386_GET_FSBASE: - if (op == TARGET_FREEBSD_I386_GET_GSBASE) -#else - case TARGET_FREEBSD_AMD64_GET_GSBASE: - case TARGET_FREEBSD_AMD64_GET_FSBASE: - if (op == TARGET_FREEBSD_AMD64_GET_GSBASE) -#endif - idx = R_GS; - else - idx = R_FS; - val = env->segs[idx].base; - if (put_user(val, parms, abi_ulong)) - return -TARGET_EFAULT; - break; - /* XXX handle the others... */ - default: - ret = -TARGET_EINVAL; - break; - } - return ret; -} -#endif - #ifdef __FreeBSD__ /* * XXX this uses the undocumented oidfmt interface to find the kind of From patchwork Mon Oct 18 16:04:57 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Warner Losh X-Patchwork-Id: 12567415 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 26052C433EF for ; Mon, 18 Oct 2021 16:25:17 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id D06B560F9E for ; Mon, 18 Oct 2021 16:25:16 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.1 mail.kernel.org D06B560F9E Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=bsdimp.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=nongnu.org Received: from localhost ([::1]:32786 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mcVRr-0005B1-7T for qemu-devel@archiver.kernel.org; Mon, 18 Oct 2021 12:25:15 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:58212) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mcV96-0007kv-5i for qemu-devel@nongnu.org; Mon, 18 Oct 2021 12:05:55 -0400 Received: from mail-io1-xd2b.google.com ([2607:f8b0:4864:20::d2b]:33732) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mcV8v-00088B-GP for qemu-devel@nongnu.org; Mon, 18 Oct 2021 12:05:51 -0400 Received: by mail-io1-xd2b.google.com with SMTP id n7so16966711iod.0 for ; Mon, 18 Oct 2021 09:05:37 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bsdimp-com.20210112.gappssmtp.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=jkxdthMQGPp9kZB9oWq7ZCkR2L8kWX3z9UnL4TGn9bM=; b=CI5KBPq5zOER23DtLBjNvD51J13CbeFXpn9unuHyaznDpg8/UmpecSUTayfx1OCQb4 sHk+Qk1nd7snAWjfSS2PMXS67aeH3n49W+Tsbgt2zKhbtji0rkejDHpJmkbZyNh+u70Q IEgDdllRNFMMJNpB1aUsldnlgzKWPn9H3rr5v6KC7M3L8/GcvlpInjrIRzzUObkruBKG 9XpxFcNDjf/Xs5VP8Q5RGSUyc+HeGTM1F01tSQMTKKWkrkTiN9iaNGmDeKjYCguskUl0 Om3KS/THg64NuHllcW2TCZ4+hq7KK+pnEbYvVK81D7ExGszeD15S8czi8bKEH9JR6Uin +Tcw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=jkxdthMQGPp9kZB9oWq7ZCkR2L8kWX3z9UnL4TGn9bM=; b=vR/kTxi9svWCKQCSPo1VzUdAFKk8XGz2/R/LmCoGvw04va03raEMIvgkEAEJeqa43V M9ePzuPD6rozQTlCup2TWhKatF8TKuCltilNRy79LA1NkUtKE5tRCy6bGN7zDJ+ShTai /DR17GYhtJ2uZ3NllBDV/o34n35m9cjJYSzZaepFRg7b6Gqg7+UeTeUpMJIjy0W8sckM 6rpwJTAhD5XZI5BY6FPY32Gk0yBk8KU7Gan3Fub6fNKl1SqPs+eQhDsvydXgby7AhJf3 8N+7C24je7kafOKdyUjzWNpUFXS1Emaz7Pxvvl7xTTDo52riCCSvrMz5x+aPeAZwS3mn ohtA== X-Gm-Message-State: AOAM531oj6Jlxro8snNa92Bx9eoYw6RTq0mygQtkEZmMHoBW6KbAaQo5 JN69IKq/5UmvZiX4iMvj5+V3IYKK2mVm/Q== X-Google-Smtp-Source: ABdhPJwYqpmpHTrnA4dRYzmC4RMvIjsxykp0dYeSkNxeIixF5xiHdol+IdFUEewsJU089c/tAI46ag== X-Received: by 2002:a6b:7a01:: with SMTP id h1mr14770033iom.55.1634573136394; Mon, 18 Oct 2021 09:05:36 -0700 (PDT) Received: from dune.bsdimp.com (50-253-99-174-static.hfc.comcastbusiness.net. [50.253.99.174]) by smtp.gmail.com with ESMTPSA id a4sm7240936ild.52.2021.10.18.09.05.35 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 18 Oct 2021 09:05:35 -0700 (PDT) From: Warner Losh To: qemu-devel@nongnu.org Subject: [PULL 22/23] bsd-user: Rename sigqueue to qemu_sigqueue Date: Mon, 18 Oct 2021 10:04:57 -0600 Message-Id: <20211018160458.1976-23-imp@bsdimp.com> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20211018160458.1976-1-imp@bsdimp.com> References: <20211018160458.1976-1-imp@bsdimp.com> MIME-Version: 1.0 Received-SPF: none client-ip=2607:f8b0:4864:20::d2b; envelope-from=imp@bsdimp.com; helo=mail-io1-xd2b.google.com X-Spam_score_int: -18 X-Spam_score: -1.9 X-Spam_bar: - X-Spam_report: (-1.9 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_NONE=0.001 autolearn=ham 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: Kyle Evans , Richard Henderson , Laurent Vivier , Warner Losh , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" To avoid a name clash with FreeBSD's sigqueue data structure in signalvar.h, rename sigqueue to qemu_sigqueue. This structure is currently defined, but unused. Signed-off-by: Warner Losh Reviewed-by: Richard Henderson Reviewed-by: Philippe Mathieu-Daudé Reviewed-by: Kyle Evans --- bsd-user/qemu.h | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/bsd-user/qemu.h b/bsd-user/qemu.h index e65e41d53d..ba15b1b56f 100644 --- a/bsd-user/qemu.h +++ b/bsd-user/qemu.h @@ -73,15 +73,15 @@ struct image_info { #define MAX_SIGQUEUE_SIZE 1024 -struct sigqueue { - struct sigqueue *next; +struct qemu_sigqueue { + struct qemu_sigqueue *next; + target_siginfo_t info; }; struct emulated_sigtable { int pending; /* true if signal is pending */ - struct sigqueue *first; - /* in order to always have memory for the first signal, we put it here */ - struct sigqueue info; + struct qemu_sigqueue *first; + struct qemu_sigqueue info; /* Put first signal info here */ }; /* @@ -95,8 +95,8 @@ typedef struct TaskState { struct image_info *info; struct emulated_sigtable sigtab[TARGET_NSIG]; - struct sigqueue sigqueue_table[MAX_SIGQUEUE_SIZE]; /* siginfo queue */ - struct sigqueue *first_free; /* first free siginfo queue entry */ + struct qemu_sigqueue sigqueue_table[MAX_SIGQUEUE_SIZE]; /* siginfo queue */ + struct qemu_sigqueue *first_free; /* first free siginfo queue entry */ int signal_pending; /* non zero if a signal may be pending */ uint8_t stack[]; From patchwork Mon Oct 18 16:04:58 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Warner Losh X-Patchwork-Id: 12567391 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id AB532C433EF for ; Mon, 18 Oct 2021 16:14:05 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 51B0360FD7 for ; Mon, 18 Oct 2021 16:14:05 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.1 mail.kernel.org 51B0360FD7 Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=bsdimp.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=nongnu.org Received: from localhost ([::1]:55778 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mcVH2-0007Tt-FU for qemu-devel@archiver.kernel.org; Mon, 18 Oct 2021 12:14:04 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:58144) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mcV92-0007k1-Ku for qemu-devel@nongnu.org; Mon, 18 Oct 2021 12:05:48 -0400 Received: from mail-io1-xd35.google.com ([2607:f8b0:4864:20::d35]:45688) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mcV8t-0008AE-6q for qemu-devel@nongnu.org; Mon, 18 Oct 2021 12:05:48 -0400 Received: by mail-io1-xd35.google.com with SMTP id 188so16852712iou.12 for ; Mon, 18 Oct 2021 09:05:38 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bsdimp-com.20210112.gappssmtp.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=U8eVRhdRDAX2Ff1OPrMk4PiZ7Kj1eOgqNZuEjvmZbbc=; b=fb74gzMuZSUM+s+RLVEsYfnGEt+okP1Oo43hCLRFOOrYoVDrB9MoAEG5aLZ6W4QMM0 XTg4k12H2jDlg4IAKC36MqF0PzQJ1KE5EuFKmgZCbsviLFrBG9I6FA/tRwMyvlc7667K qwPoeXm0ezb00Ogl1K3aLNct+zFa8FPoEwUym5lzjuZxreBdspygQDevYq1dAt1oqExf +PyK57uBwWa2GA33BNt3M4J2eaJC2i1YQGbVqA2saMj5yBc84PBAh6ka/EfOZxMsRM5E 8Q9l7KAUzIaOa/PapTdo1LRLwYvkUBcF5j4nOAU3iUxtIZFf7MgxRIRWj11GZBv8Oi8L ervw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=U8eVRhdRDAX2Ff1OPrMk4PiZ7Kj1eOgqNZuEjvmZbbc=; b=OK/VAsNqvYrjotI3AmWh91aUuPaw5fJxmfg3+t79mlBPRa0q7QuQfSr5r8haTJ08iD OYEmpOh3UhxHJmj8ij5xRh/vdBry+tzl2sQEVtHdszDIGgyt7KSwKgYqe0zfbdOfxvV/ FE0Ank4/L9TRRC0yRYo0yz/CGcikYz/XR5v4dSH8W06G8ODegZMIZ5K/7yDPiSB5HSg2 v+mcbQBIABGKoyBy5fJdeo+m8ft++a+lMm+UFWZTyUiqXDIuScRKsx6W+0ZhLJm/3HoT Vc+OFAyoGHV0yeS0KZ61TGJCHEWuj1M/Hb6LiLXefeADHpARmrFVdGnUcF7sCf0qKJ1B zjQw== X-Gm-Message-State: AOAM531MqKOMBQeclFjBR9lJ1jQ+1SXtwwuDn1y5Zq5p1KnrMroVEKXg 8C8Tb1CUAbxD+3CLo4uH1SnJlAhmwGW32A== X-Google-Smtp-Source: ABdhPJyyrHVR6mD20tI7/h3lfcrKznAQhrPVtG7u4fzButGjuEYYR+THZMIBPeRzwPDJVDxBHAiXiA== X-Received: by 2002:a6b:193:: with SMTP id 141mr14717839iob.7.1634573137392; Mon, 18 Oct 2021 09:05:37 -0700 (PDT) Received: from dune.bsdimp.com (50-253-99-174-static.hfc.comcastbusiness.net. [50.253.99.174]) by smtp.gmail.com with ESMTPSA id a4sm7240936ild.52.2021.10.18.09.05.36 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 18 Oct 2021 09:05:36 -0700 (PDT) From: Warner Losh To: qemu-devel@nongnu.org Subject: [PULL 23/23] bsd-user/signal: Create a dummy signal queueing function Date: Mon, 18 Oct 2021 10:04:58 -0600 Message-Id: <20211018160458.1976-24-imp@bsdimp.com> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20211018160458.1976-1-imp@bsdimp.com> References: <20211018160458.1976-1-imp@bsdimp.com> MIME-Version: 1.0 Received-SPF: none client-ip=2607:f8b0:4864:20::d35; envelope-from=imp@bsdimp.com; helo=mail-io1-xd35.google.com X-Spam_score_int: -18 X-Spam_score: -1.9 X-Spam_bar: - X-Spam_report: (-1.9 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_NONE=0.001 autolearn=ham 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: Kyle Evans , Richard Henderson , Laurent Vivier , Warner Losh Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" Create dummy signal queueing function so we can start to integrate other architectures (at the cost of signals remaining broken) to tame the dependency graph a bit and to bring in signals in a more controlled fashion. Log unimplemented events to it in the mean time. Signed-off-by: Warner Losh Reviewed-by: Richard Henderson Reviewed-by: Kyle Evans --- bsd-user/qemu.h | 2 +- bsd-user/signal.c | 11 ++++++++++- 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/bsd-user/qemu.h b/bsd-user/qemu.h index ba15b1b56f..1b3b974afe 100644 --- a/bsd-user/qemu.h +++ b/bsd-user/qemu.h @@ -17,7 +17,6 @@ #ifndef QEMU_H #define QEMU_H - #include "qemu/osdep.h" #include "cpu.h" #include "qemu/units.h" @@ -209,6 +208,7 @@ void process_pending_signals(CPUArchState *cpu_env); void signal_init(void); long do_sigreturn(CPUArchState *env); long do_rt_sigreturn(CPUArchState *env); +void queue_signal(CPUArchState *env, int sig, target_siginfo_t *info); abi_long do_sigaltstack(abi_ulong uss_addr, abi_ulong uoss_addr, abi_ulong sp); /* mmap.c */ diff --git a/bsd-user/signal.c b/bsd-user/signal.c index ad6d935569..0c1093deb1 100644 --- a/bsd-user/signal.c +++ b/bsd-user/signal.c @@ -16,10 +16,19 @@ * You should have received a copy of the GNU General Public License * along with this program; if not, see . */ -#include "qemu/osdep.h" +#include "qemu/osdep.h" #include "qemu.h" +/* + * Queue a signal so that it will be send to the virtual CPU as soon as + * possible. + */ +void queue_signal(CPUArchState *env, int sig, target_siginfo_t *info) +{ + qemu_log_mask(LOG_UNIMP, "No signal queueing, dropping signal %d\n", sig); +} + void signal_init(void) { }