From patchwork Thu Oct 27 18:36:34 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Alex_Benn=C3=A9e?= X-Patchwork-Id: 619225 Delivered-To: patch@linaro.org Received: by 2002:a17:522:c983:b0:460:3032:e3c4 with SMTP id kr3csp515150pvb; Thu, 27 Oct 2022 12:27:58 -0700 (PDT) X-Google-Smtp-Source: AMsMyM7VRZ+KOUPzQ0BTrOcDav+/04oxWW4/Pa632cLFVgI/abdRs392wBr5EZTNQJGeJ2Oxczp1 X-Received: by 2002:a05:620a:2945:b0:6ee:c2d2:a925 with SMTP id n5-20020a05620a294500b006eec2d2a925mr36973518qkp.498.1666898878289; Thu, 27 Oct 2022 12:27:58 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1666898878; cv=none; d=google.com; s=arc-20160816; b=K1wUSyM2vaZf+WMmVZusb0Co4f4Yvwrbd+TkkURFnYh53vmOe76BUomwYEvlZlBxJz 2cv0g9LkE1gcYrMIHe7hF6aujSk8WhsWhjjGPkUttwV1KX1mKoKNbSgcj8K4TceDb5mw nuyWfK5oQHlVfz9KGbZTWnh98Qb/13vvCT1ghrxu6FPLU/X40x7JuDFdk0/PhMtR1BG8 poQ5S9YH3/F/sVbvzl4ZUD5ZbqZlA+Ayqwjh+LFwu0ABIqTrG09BY6bnTIJEGeWou1tu toJWZjGMln6oE2S+GEAiBotVDubk3faAI+lG2aZOgHchGHI22S1WV2FHZ5mlB470Hw5K nE+A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=errors-to:sender:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=FLSLvPI5diE0vfct5cvufJQNAvAsRI7ZBMMMOLBJMAg=; b=eMYT7dk9gkwhyQGzbmoFJfcfr8V9OEyA0XcsmUrQmgwEVvDMWsq+3KNzIrcaybVBTe /2c4b/f/RaE+BNx2BFtm+V1qAolf0T0UDwDJ9Gji7TwJLzD+t5XqYwOhHFhyenrwr9AZ J3HWn2/1wALxeXKoCh/Dox5XYmMA1h/4FdBP02V8YzDrqA6xTdU8RtrnCK+JnGgM4gPE wNAWT/TZ+W0PQ+MaHUk3Cglg24TeQiQBls171tPFu59YSsZtEnpnRMqW3Chw8CUB/rgN 8CtkUJWGJqKQi/ObRIVaMJmTqPIEo4BJ/BrLl4fsgM2SfQlwcoH26NVC2krWq53rYBLd 2y4Q== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b="eF/8vFD7"; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id d7-20020ac851c7000000b003a4ef5c4cc0si1338550qtn.708.2022.10.27.12.27.58 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Thu, 27 Oct 2022 12:27:58 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b="eF/8vFD7"; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1oo7tV-0005t8-Vc; Thu, 27 Oct 2022 14:46:22 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oo7sO-0005WC-B3 for qemu-devel@nongnu.org; Thu, 27 Oct 2022 14:45:14 -0400 Received: from mail-wr1-x434.google.com ([2a00:1450:4864:20::434]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1oo7sB-0004lE-JH for qemu-devel@nongnu.org; Thu, 27 Oct 2022 14:45:11 -0400 Received: by mail-wr1-x434.google.com with SMTP id o4so3711364wrq.6 for ; Thu, 27 Oct 2022 11:44:59 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=FLSLvPI5diE0vfct5cvufJQNAvAsRI7ZBMMMOLBJMAg=; b=eF/8vFD7yvk4R1Jki1WtbZ7TzHrwCHeUE+9zmtbLFH0w7ir4FWAZxF6XfFS1UR9QUe OUBjTbSOgFt13d148Psz6lgJ3L/ttr3xWDhAb1iVnxnC9wKJb18/Wdxwum4dFZijffqL EmlbIkm/sNYJD1zRqJJ9qKO2EbIO7t3p3+Or4ZNldCOHBUTEN7Wl7vCwg+NG5emfekPu kKLMHiul2mphHhM0y8WYUxmCl5PEkx7GFoM30z8oq5oDrrb4GKW3PLs4pczDhzGVUa28 nYtbBpF/tQo5QxRiQOnfoY9Toi5FF6+F7KNKNL8voLahLHynwX14hgPWCWA8HMxlI/Zd N8ww== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=FLSLvPI5diE0vfct5cvufJQNAvAsRI7ZBMMMOLBJMAg=; b=Ua9TvXrW8IlLzJAu9gn6K4GBGm1l4VRJGySMasIRVZo9FLgN6aG21nySg2zhcqyKZ0 q0CIa2peHlawc7lEeKVidEkcViRbKw5Mf34mCWLzGDkbU8i2B/Ue6mx5/XXeYFKObenT 88vUaxv/EcIbHxboChblKE/LuACAgVxmCnWeZW66JZKpZtJHa1pbnafGrrZ9TwEmK9W+ 4WIPfFUnBIpdNc3lVYfAIaFEjM4/dbBSDpAoAWI1sCEo7/xE6IIME/XjPr0QsEaFZp4U EjPdMKXIq9RO+CH7vkeeQhjP1cYXJqEwCBeLeDPzDOkvieMB5CcvDN9ESWE9dLepkreu qKeQ== X-Gm-Message-State: ACrzQf3/r9krwF03xEGXBqWdFaxt6jZpxzgRGuOzV1F2IZtOSSy0pLFh Emb8BHnFop1JcuUw1bNAVGgNlg== X-Received: by 2002:a05:6000:1447:b0:22e:7b1d:cca2 with SMTP id v7-20020a056000144700b0022e7b1dcca2mr34094494wrx.276.1666896298059; Thu, 27 Oct 2022 11:44:58 -0700 (PDT) Received: from zen.linaroharston ([185.81.254.11]) by smtp.gmail.com with ESMTPSA id l17-20020a5d6751000000b00236488f62d6sm1797013wrw.79.2022.10.27.11.44.53 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 27 Oct 2022 11:44:54 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id EB04C1FFD2; Thu, 27 Oct 2022 19:36:39 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: fam@euphon.net, berrange@redhat.com, f4bug@amsat.org, aurelien@aurel32.net, pbonzini@redhat.com, stefanha@redhat.com, crosa@redhat.com, =?utf-8?q?Alex_Benn=C3=A9e?= , Alexandre Iooss , Mahmoud Mandour Subject: [PATCH v4 28/30] contrib/plugins: protect execlog's last_exec expansion Date: Thu, 27 Oct 2022 19:36:34 +0100 Message-Id: <20221027183637.2772968-29-alex.bennee@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20221027183637.2772968-1-alex.bennee@linaro.org> References: <20221027183637.2772968-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::434; envelope-from=alex.bennee@linaro.org; helo=mail-wr1-x434.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, 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 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: , Sender: "Qemu-devel" Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org We originally naively treated expansion as safe because we expected each new CPU/thread to appear in order. However the -M raspi2 model triggered a case where a new high cpu_index thread started executing just before a smaller one. Clean this up by converting the GArray into the simpler GPtrArray and then holding a lock for the expansion. Signed-off-by: Alex Bennée Cc: Alexandre Iooss Reviewed-by: Richard Henderson --- contrib/plugins/execlog.c | 38 ++++++++++++++++++++++++++++++-------- 1 file changed, 30 insertions(+), 8 deletions(-) diff --git a/contrib/plugins/execlog.c b/contrib/plugins/execlog.c index 1b3bb7ebba..e255bd21fd 100644 --- a/contrib/plugins/execlog.c +++ b/contrib/plugins/execlog.c @@ -18,11 +18,30 @@ QEMU_PLUGIN_EXPORT int qemu_plugin_version = QEMU_PLUGIN_VERSION; /* Store last executed instruction on each vCPU as a GString */ -GArray *last_exec; +static GPtrArray *last_exec; +static GMutex expand_array_lock; static GPtrArray *imatches; static GArray *amatches; +/* + * Expand last_exec array. + * + * As we could have multiple threads trying to do this we need to + * serialise the expansion under a lock. Threads accessing already + * created entries can continue without issue even if the ptr array + * gets reallocated during resize. + */ +static void expand_last_exec(int cpu_index) +{ + g_mutex_lock(&expand_array_lock); + while (cpu_index >= last_exec->len) { + GString *s = g_string_new(NULL); + g_ptr_array_add(last_exec, s); + } + g_mutex_unlock(&expand_array_lock); +} + /** * Add memory read or write information to current instruction log */ @@ -33,7 +52,7 @@ static void vcpu_mem(unsigned int cpu_index, qemu_plugin_meminfo_t info, /* Find vCPU in array */ g_assert(cpu_index < last_exec->len); - s = g_array_index(last_exec, GString *, cpu_index); + s = g_ptr_array_index(last_exec, cpu_index); /* Indicate type of memory access */ if (qemu_plugin_mem_is_store(info)) { @@ -61,11 +80,10 @@ static void vcpu_insn_exec(unsigned int cpu_index, void *udata) GString *s; /* Find or create vCPU in array */ - while (cpu_index >= last_exec->len) { - s = g_string_new(NULL); - g_array_append_val(last_exec, s); + if (cpu_index >= last_exec->len) { + expand_last_exec(cpu_index); } - s = g_array_index(last_exec, GString *, cpu_index); + s = g_ptr_array_index(last_exec, cpu_index); /* Print previous instruction in cache */ if (s->len) { @@ -163,7 +181,7 @@ static void plugin_exit(qemu_plugin_id_t id, void *p) guint i; GString *s; for (i = 0; i < last_exec->len; i++) { - s = g_array_index(last_exec, GString *, i); + s = g_ptr_array_index(last_exec, i); if (s->str) { qemu_plugin_outs(s->str); qemu_plugin_outs("\n"); @@ -201,7 +219,11 @@ QEMU_PLUGIN_EXPORT int qemu_plugin_install(qemu_plugin_id_t id, * Initialize dynamic array to cache vCPU instruction. In user mode * we don't know the size before emulation. */ - last_exec = g_array_new(FALSE, FALSE, sizeof(GString *)); + if (info->system_emulation) { + last_exec = g_ptr_array_sized_new(info->system.max_vcpus); + } else { + last_exec = g_ptr_array_new(); + } for (int i = 0; i < argc; i++) { char *opt = argv[i];