From nobody Fri May 3 21:14:13 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1660843609; cv=none; d=zohomail.com; s=zohoarc; b=LjDUFlVzoATDifM4QsGFHs5lxyebRkZqWf/HuwMZUPe7GNI9CMKpxZOVUg7SnVxtFnJZaZxXhQNapbBttyQPO5odAqNXwxWY2qkIfC6v77rgOjKSbwESffnf1FsJ1bH4sNsffa2EbxwLcNvzZ8Tulv+AVDSxvfPTu1egdJhSKVI= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1660843609; h=Content-Type:Content-Transfer-Encoding:Date:From:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Sender:Subject:To; bh=/x5zfY4Hnz2TVjAGZn9AXxE8RUrNWwBIiW31HztdEo8=; b=JuOFjdM1YQmlThfkj5nYh2aajHvFpGvfvXtbNue4j1IKlakREhQG16OXfC8Hz/DPBo9Y2iIRM5OeXNjFUemH9v/KVwuP3+bxxexwWeqmeuxsC/Ihe/63AAnGQjlAfL3FamN4dyja9HTT7x2CkKvCeeUQT5pZLsfr5KgqzeYC5/8= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1660843609881806.2590630176911; Thu, 18 Aug 2022 10:26:49 -0700 (PDT) Received: from localhost ([::1]:36046 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1oOjI7-0007yI-0R for importer@patchew.org; Thu, 18 Aug 2022 13:26:47 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:56860) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oOjGn-0007HA-Q5 for qemu-devel@nongnu.org; Thu, 18 Aug 2022 13:25:26 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]:54096) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oOjGk-0006JG-81 for qemu-devel@nongnu.org; Thu, 18 Aug 2022 13:25:24 -0400 Received: from mail-ej1-f69.google.com (mail-ej1-f69.google.com [209.85.218.69]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_128_GCM_SHA256) id us-mta-382-KKCrhw1CPT2VZI9eWfyRvA-1; Thu, 18 Aug 2022 13:25:19 -0400 Received: by mail-ej1-f69.google.com with SMTP id go15-20020a1709070d8f00b00730ab9dd8c6so893757ejc.6 for ; Thu, 18 Aug 2022 10:25:19 -0700 (PDT) Received: from goa-sendmail ([93.56.160.208]) by smtp.gmail.com with ESMTPSA id h4-20020a170906398400b0073151ce7726sm1097033eje.100.2022.08.18.10.25.17 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 18 Aug 2022 10:25:17 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1660843521; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=/x5zfY4Hnz2TVjAGZn9AXxE8RUrNWwBIiW31HztdEo8=; b=KlVNv4fyc/swZSYpk+LGgtyEm9AToHlzq04UkFPIw0MC5g3Xgb0IBuJTIwXPSErn5uBYdJ w0oRuoFO/+pTANvlermRzIkq/vY+4OG7EW2cCU/rXWpU1By8sAffgaVu3SWxURfBclEyS/ wDbwh4ooPR9b2dlnicsPF0rurk5QK3c= X-MC-Unique: KKCrhw1CPT2VZI9eWfyRvA-1 X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:message-id:date:subject:to :from:x-gm-message-state:from:to:cc; bh=/x5zfY4Hnz2TVjAGZn9AXxE8RUrNWwBIiW31HztdEo8=; b=Jqrdkl66dLo8jwW0Au5TO3ID58EI9y31Mc3SMvtT7U1gwnBCeYT9+4Av2eqpzPEuIe dA/w8IsAtfcHiJLEoIrKtSR6B2OBMN0B44OKcRl1NFEa1TIoPrqn7ppcH2F4e3wz0CHq t+gTkMqMjxpzXdJauAbNfPp/LKRcT4CUMPB5em1wfvyp8RVCtkaxF0U9AMt/saXNTtjQ unvVjYKjBHDNh2jZfnORJxKkm5mPCG4wH9Jq+NEfQ8x4XrnhXxMd/k3/f8XodlwgGHoL u75yTHpLbRblODoujOoVVDvqRWnMdu0GipYlP/GaT3gkSBxZIGlFIdozCcfH6I15vDMK cxjg== X-Gm-Message-State: ACgBeo2swTBxN2QEcL2cvt6WFBVQW+xMwi9Slb3Fg+mr6Wg/kiCDq9PM KI9ufv8srl6mxN7wZuhBWVIBPFZzB74wt7AydaWCVYIV8ofFMmWX3mFnMhAe1zUN6VbMRMZRwf6 ZvIqYMYTSRe4WOVsUDA86f9amh9NmsLpYK4jeWmQ1JL/qQvUnZxBj3QnX6c2ye4PxMsQ= X-Received: by 2002:a05:6402:40c2:b0:440:4ecd:f75f with SMTP id z2-20020a05640240c200b004404ecdf75fmr2975963edb.405.1660843518586; Thu, 18 Aug 2022 10:25:18 -0700 (PDT) X-Google-Smtp-Source: AA6agR4JHJZO6/KuUdSLYKWiP8VHTIrHvJDqBhE4c+In/7klja2pBNX7uKM3ANDNcRBLZUbm/jDmDw== X-Received: by 2002:a05:6402:40c2:b0:440:4ecd:f75f with SMTP id z2-20020a05640240c200b004404ecdf75fmr2975942edb.405.1660843518228; Thu, 18 Aug 2022 10:25:18 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PATCH] kvm: fix segfault with query-stats-schemas and -M none Date: Thu, 18 Aug 2022 19:25:16 +0200 Message-Id: <20220818172516.135723-1-pbonzini@redhat.com> X-Mailer: git-send-email 2.37.1 MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=170.10.133.124; envelope-from=pbonzini@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -21 X-Spam_score: -2.2 X-Spam_bar: -- X-Spam_report: (-2.2 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.082, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1660843611939100001 Content-Type: text/plain; charset="utf-8" -M none creates a guest without a vCPU, causing the following error: $ ./qemu-system-x86_64 -qmp stdio -M none -accel kvm {execute:qmp_capabilities} {"return": {}} {execute: query-stats-schemas} Segmentation fault (core dumped) Fix it by not querying the vCPU stats if first_cpu is NULL. Signed-off-by: Paolo Bonzini --- accel/kvm/kvm-all.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/accel/kvm/kvm-all.c b/accel/kvm/kvm-all.c index 645f0a249a..8d81ab74de 100644 --- a/accel/kvm/kvm-all.c +++ b/accel/kvm/kvm-all.c @@ -4131,7 +4131,9 @@ void query_stats_schemas_cb(StatsSchemaList **result,= Error **errp) query_stats_schema(result, STATS_TARGET_VM, stats_fd, errp); close(stats_fd); =20 - stats_args.result.schema =3D result; - stats_args.errp =3D errp; - run_on_cpu(first_cpu, query_stats_schema_vcpu, RUN_ON_CPU_HOST_PTR(&st= ats_args)); + if (first_cpu) { + stats_args.result.schema =3D result; + stats_args.errp =3D errp; + run_on_cpu(first_cpu, query_stats_schema_vcpu, RUN_ON_CPU_HOST_PTR= (&stats_args)); + } } --=20 2.37.1