From nobody Fri May 17 08:39:47 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=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1694795638; cv=none; d=zohomail.com; s=zohoarc; b=dLlgHsFXDzRnswag2C4p6R9mfkORfy/Otz5pyrYq6+1KbhNsSCyf9bA962rxmHRB9N+1CZpxotaL7dX39mrkJL+SSQt4uwnHScbx/GGzBqHSJpbIhb3iH3+Az5IfBfPBaSDB5dIhJOc+qVYs6tEz5+BgzWCfO0rUDRBhl4COHbY= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1694795638; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=roQeQsya1pJNmaqO3L7g1proDq+Pgx0B2L/hs/vf2TU=; b=mwP6Z3vaxeg0BAteJeKIzvB+RtI3/TH8WBnkw/AXVG2pHQw602DvM6TChsycILS6rDdzWkpHeWesorMId7iKQlpkNCt12qJw3RFxi/yv3XO0YvE2oZGI6jbUCcFSA3MwpH/AhmuWEHXXcJ+gjq5ugRN/XmhB0PDypt36xLAMiiQ= 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 1694795638710965.9208660708924; Fri, 15 Sep 2023 09:33:58 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qhBkb-0008FM-VF; Fri, 15 Sep 2023 12:33:01 -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 1qhBka-0008EW-2T for qemu-devel@nongnu.org; Fri, 15 Sep 2023 12:33:00 -0400 Received: from mail-pf1-x430.google.com ([2607:f8b0:4864:20::430]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1qhBkY-00037H-Jm for qemu-devel@nongnu.org; Fri, 15 Sep 2023 12:32:59 -0400 Received: by mail-pf1-x430.google.com with SMTP id d2e1a72fcca58-68fc9e0e22eso1938327b3a.1 for ; Fri, 15 Sep 2023 09:32:58 -0700 (PDT) Received: from stoup.. ([71.212.131.115]) by smtp.gmail.com with ESMTPSA id z3-20020a637e03000000b0057754ae4eb7sm2958497pgc.39.2023.09.15.09.32.56 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 15 Sep 2023 09:32:56 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1694795577; x=1695400377; darn=nongnu.org; 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=roQeQsya1pJNmaqO3L7g1proDq+Pgx0B2L/hs/vf2TU=; b=BUb9ga6+9KOd60zUZ3WLPmCp6TwPWnMkhWqdJVtDUiKy526rNvT7NgfLK2Sj/e2CkL pkT+hlQx4pw/KCoMB6CbYHU+eYe8JCk81oRpd7W4WLPoAYbzUXsUUcSjGJBiq4ApE8Y/ /8eklMNysROvzwclCA6Pviq3WC4x/uS0jEV+Z6lEkgf/hvuSrodNsYRD8N5q0xdtl/OD WpCKB6UMH6VeLUTxoKBbbQM8FPK7Z66jzETr3jYHnM4Mzvr8LiGXjNlbnBb+6H/o89Do hFMmIXCvKrlmrMjIN2XFmhcSYiHHgYay/q4P9RW5SZA8DvTcT47ytFuE9oesaLh/pnmj 8/MA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1694795577; x=1695400377; 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=roQeQsya1pJNmaqO3L7g1proDq+Pgx0B2L/hs/vf2TU=; b=UmPB1WHXNiDxuimXwMjuTY3k8uUsE3t5zrcOuvmfJcaJBi1n4sShQT+LIShnHHUqYA h4Y3vSzQgnxzGCaolNs91CxtOBoDjHrOf7g6g3HW4mYlREi+Zg3p97i9OKp6sH5YKBbz z4LidGEv+xMHO362GK2fY7JMHTh5J8monAp3KmzORxda+gogtD+I9MTkXRSABGTMjl8P aca9uIWFZewGqwht4KtypIQtYeRXAnqBXQXtyIIeouqIjegMmf5uxaMSA4woGHwo1L+H /FcEk8lNO+MXwO/P0s27PrtByfxNlnH4mPAbv6mrQ8wXUhjxeWTBZK2ffVloZMtY5Lyb +scw== X-Gm-Message-State: AOJu0YzaA+bwbIsGJpEQqfyDcbsfToZ6QPJodylTItMhYOUziSzmfBv5 Be+6jp528zguPr0msyzpXmTTo3aotIjN5/BTfME= X-Google-Smtp-Source: AGHT+IGKI0YKamdN3yHj+xj8V0xVFvuA216Tz+cccLsnHVVcUg/eUa/3bhQQGuEiRM/maL3evvmaiQ== X-Received: by 2002:a05:6a20:12ce:b0:137:2f8c:fab0 with SMTP id v14-20020a056a2012ce00b001372f8cfab0mr2706822pzg.49.1694795576927; Fri, 15 Sep 2023 09:32:56 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Cc: philmd@linaro.org Subject: [PATCH v2 1/3] softmmu: Use cpu->created in tcg_commit Date: Fri, 15 Sep 2023 09:32:52 -0700 Message-Id: <20230915163254.123338-2-richard.henderson@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230915163254.123338-1-richard.henderson@linaro.org> References: <20230915163254.123338-1-richard.henderson@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2607:f8b0:4864:20::430; envelope-from=richard.henderson@linaro.org; helo=mail-pf1-x430.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: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @linaro.org) X-ZM-MESSAGEID: 1694795639073100001 Use created not halt_cond to test for cpu created. Fixes: 0d58c660689f ("softmmu: Use async_run_on_cpu in tcg_commit") Reported-by: Philippe Mathieu-Daud=C3=A9 Signed-off-by: Richard Henderson Reviewed-by: Philippe Mathieu-Daud=C3=A9 --- softmmu/physmem.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/softmmu/physmem.c b/softmmu/physmem.c index 18277ddd67..88fafec1da 100644 --- a/softmmu/physmem.c +++ b/softmmu/physmem.c @@ -2515,9 +2515,9 @@ static void tcg_commit(MemoryListener *listener) * the memory data structures. * * That said, the listener is also called during realize, before - * all of the tcg machinery for run-on is initialized: thus halt_cond. + * all of the tcg machinery for run-on is initialized: thus created. */ - if (cpu->halt_cond) { + if (cpu->created) { async_run_on_cpu(cpu, tcg_commit_cpu, RUN_ON_CPU_HOST_PTR(cpuas)); } else { tcg_commit_cpu(cpu, RUN_ON_CPU_HOST_PTR(cpuas)); --=20 2.34.1 From nobody Fri May 17 08:39:47 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=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1694795641; cv=none; d=zohomail.com; s=zohoarc; b=jJ6CRGXVHvyFMgGTHmAgqInaKIDWCOz5h3PXMITrhgYACJ/JQIaAKR/NRq63ERtC4g4uwIZ+XjvvKygZLLglE8n7D2rQJehZ3FXHvN0V8jhRTNAQwCq1qv3kQMtrfXBr5Z06N0cTniGm+mgh4ehwhTRlRGxQHSQ2cOyuGzlE6FI= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1694795641; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=iJ6Oywpvjr1xG7Guou9tEnbUmyP3OUnn4VhCnCRzKJY=; b=UaMcN8FlqI/Exy7Es5T39o3BPqa8HSfrK/PeIZBfJrgLgXJ2KxVBavEQo5yVEF7TwHMzLwKcGSsTilXCi0YmP6gARw0o4FElhvn9/UGGPvjvbzCYX373wwGkgEsKyvWlbSZ6iD/lvQPItvfBIbt+zdgFTJLWl1IeHYbpzHQr90Q= 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 1694795641949207.26138732123536; Fri, 15 Sep 2023 09:34:01 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qhBkc-0008FO-7J; Fri, 15 Sep 2023 12:33:02 -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 1qhBka-0008Ee-Sc for qemu-devel@nongnu.org; Fri, 15 Sep 2023 12:33:00 -0400 Received: from mail-pf1-x434.google.com ([2607:f8b0: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 1qhBkZ-00037L-7W for qemu-devel@nongnu.org; Fri, 15 Sep 2023 12:33:00 -0400 Received: by mail-pf1-x434.google.com with SMTP id d2e1a72fcca58-68fb79ef55eso2137444b3a.0 for ; Fri, 15 Sep 2023 09:32:58 -0700 (PDT) Received: from stoup.. ([71.212.131.115]) by smtp.gmail.com with ESMTPSA id z3-20020a637e03000000b0057754ae4eb7sm2958497pgc.39.2023.09.15.09.32.57 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 15 Sep 2023 09:32:57 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1694795578; x=1695400378; darn=nongnu.org; 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=iJ6Oywpvjr1xG7Guou9tEnbUmyP3OUnn4VhCnCRzKJY=; b=BoHXb9ezG57eYc6uny9thtZ+GyAvtvLAWsvuG7K3IA6JdWWE8iYKOcpa3pwq5uBKKU xTRtw9WvIQlADM1orag8E9Gd18zaPELz5PJ/vm7qYzat/ZqkxV5Wy2dWF7Fkpls/YN69 eQIGbbWTBQCPKOWGB+XNKW4k6XYgMIU+dxIjgOKHrIcYxq2JMy18jbL7xTscPfoOQD0N C5FvXKdkXQZLes3a3hg6C9wHtVHUsc74UGJLatmcToDl1CVCgiV2mWS8M322t/YXK7T8 89Uj22CyPNgETbdrwT3qhn2jYgH32Dx3jId9TSFMlCNOT88Q+MnehVGSTWI5w1qPRKV+ RA6w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1694795578; x=1695400378; 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=iJ6Oywpvjr1xG7Guou9tEnbUmyP3OUnn4VhCnCRzKJY=; b=gb4vYcHghb+K3wppA3VaK4RR4241nCam3uJm99q6yV+4aGxqJRjeTz17N05rDQjPcu AH0hJnRd2hHN7zkhCEYyIb+nRyRrpeFIR11VJRhv3SswcIzt2WxwA1fqCQngvl57S1Tm F875PsUObkAxRk3YC6TVAPtG3FqwXInFT3wPn2Df+IUfoPBpqYgt/Wstv8MnXjO4Tb+Z +G1Rjf54x3VDhgUx2pKkB4KbkTOgtN3pTT2VfncQC35EJAU6z2pxUnL6PwKb4vSdN7It RWQBgsY56XZgyZACJxFmPgzly4ox4ZRM0Te5IvyvpCGEPm7+RMYULalZ/XxlwAeMvMma YbVw== X-Gm-Message-State: AOJu0YxX28T++bMEPxNf7t4UEwa2gT9fTqd19dMRo05ARAfO5p94hFjg 0/bCi7pqI+ekJoGw2kjVI+uLnpoA0rBZBi0Cz+E= X-Google-Smtp-Source: AGHT+IHmBWeoqa475C9Bo6s5X6vPH5xf3QnpRGzSFb+/ImQCwZ/mfNMX1sfgbdg61SmgMpulVGHWjA== X-Received: by 2002:a05:6a21:18d:b0:129:d944:2e65 with SMTP id le13-20020a056a21018d00b00129d9442e65mr3105614pzb.13.1694795577935; Fri, 15 Sep 2023 09:32:57 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Cc: philmd@linaro.org Subject: [PATCH v2 2/3] softmmu: Introduce AddressSpaceDispatch generation numbers Date: Fri, 15 Sep 2023 09:32:53 -0700 Message-Id: <20230915163254.123338-3-richard.henderson@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230915163254.123338-1-richard.henderson@linaro.org> References: <20230915163254.123338-1-richard.henderson@linaro.org> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2607:f8b0:4864:20::434; envelope-from=richard.henderson@linaro.org; helo=mail-pf1-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: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @linaro.org) X-ZM-MESSAGEID: 1694795642191100001 Content-Type: text/plain; charset="utf-8" Allow the cpu to easily check if an address space update is required. The acquire/release semantics will be used by a subsequent patch. Signed-off-by: Richard Henderson --- softmmu/physmem.c | 22 +++++++++++++++++----- 1 file changed, 17 insertions(+), 5 deletions(-) diff --git a/softmmu/physmem.c b/softmmu/physmem.c index 88fafec1da..e1c535380a 100644 --- a/softmmu/physmem.c +++ b/softmmu/physmem.c @@ -163,6 +163,8 @@ struct CPUAddressSpace { AddressSpace *as; struct AddressSpaceDispatch *memory_dispatch; MemoryListener tcg_as_listener; + uint32_t commit_gen; + uint32_t layout_gen; }; =20 struct DirtyBitmapSnapshot { @@ -2486,14 +2488,23 @@ static void tcg_log_global_after_sync(MemoryListene= r *listener) } } =20 -static void tcg_commit_cpu(CPUState *cpu, run_on_cpu_data data) +static void tcg_commit_cpu_0(CPUState *cpu, CPUAddressSpace *cpuas) { - CPUAddressSpace *cpuas =3D data.host_ptr; - cpuas->memory_dispatch =3D address_space_to_dispatch(cpuas->as); tlb_flush(cpu); } =20 +static void tcg_commit_cpu_1(CPUState *cpu, run_on_cpu_data data) +{ + CPUAddressSpace *cpuas =3D data.host_ptr; + uint32_t gen =3D qatomic_load_acquire(&cpuas->layout_gen); + + if (cpuas->commit_gen !=3D gen) { + cpuas->commit_gen =3D gen; + tcg_commit_cpu_0(cpu, cpuas); + } +} + static void tcg_commit(MemoryListener *listener) { CPUAddressSpace *cpuas; @@ -2518,9 +2529,10 @@ static void tcg_commit(MemoryListener *listener) * all of the tcg machinery for run-on is initialized: thus created. */ if (cpu->created) { - async_run_on_cpu(cpu, tcg_commit_cpu, RUN_ON_CPU_HOST_PTR(cpuas)); + qatomic_store_release(&cpuas->layout_gen, cpuas->layout_gen + 1); + async_run_on_cpu(cpu, tcg_commit_cpu_1, RUN_ON_CPU_HOST_PTR(cpuas)= ); } else { - tcg_commit_cpu(cpu, RUN_ON_CPU_HOST_PTR(cpuas)); + tcg_commit_cpu_0(cpu, cpuas); } } =20 --=20 2.34.1 From nobody Fri May 17 08:39:47 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=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1694795633; cv=none; d=zohomail.com; s=zohoarc; b=ATF/vdybSw+oqrClVaDgUimiUROey3KiG0pPXnZkBWY14YWIeLeQT8hOaDwyhZh6RnB+aQ0i1cOLfPJR2Oxk6ydwYlv/j/aJiG1MrPs0mAhdLbiHsOJa0kQCVKp6aS3oP/mgC9jmta6JaDd/Tac47GJzIj3zJDp9HD+Jcv5HhTU= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1694795633; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=FATEL2ITPMFfLfw0D9PblDYxfW6TvM3iJL7m+a0EPeE=; b=HmvuGMnMqaKhqA4/yr1a+YxCrATyeZo3KDq3YbmFLoeyrxqHG7HpsgfX4FfWcMOUfsp3+5vdAxLhEYptsKoJU7fM8q5wAAcOSzGR4VFoEH1j31RKVPO+6qedvSH3nz11jMKcujZPsUcHstjOb1VIqaKwOZICnPmzVec9qQLmXUk= 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 1694795633106454.2041828739756; Fri, 15 Sep 2023 09:33:53 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qhBkd-0008Fa-Gk; Fri, 15 Sep 2023 12:33:03 -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 1qhBkc-0008FQ-9E for qemu-devel@nongnu.org; Fri, 15 Sep 2023 12:33:02 -0400 Received: from mail-pf1-x430.google.com ([2607:f8b0:4864:20::430]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1qhBka-00037U-Jr for qemu-devel@nongnu.org; Fri, 15 Sep 2023 12:33:02 -0400 Received: by mail-pf1-x430.google.com with SMTP id d2e1a72fcca58-69002ef0104so1941724b3a.1 for ; Fri, 15 Sep 2023 09:33:00 -0700 (PDT) Received: from stoup.. ([71.212.131.115]) by smtp.gmail.com with ESMTPSA id z3-20020a637e03000000b0057754ae4eb7sm2958497pgc.39.2023.09.15.09.32.58 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 15 Sep 2023 09:32:58 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1694795579; x=1695400379; darn=nongnu.org; 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=FATEL2ITPMFfLfw0D9PblDYxfW6TvM3iJL7m+a0EPeE=; b=b4DQFUMhJ6wI5PwL7uWxw2OwA1Su2n0UODw5utxrH9bhWuCIscONg9NHhKIsg07o5a 0vQ4YHlil9t5tur45Umici3oRXmqMwJVjojLbWZnV2C+OpcHE0zsA6wrAOLZAogI2ERG Ip0CZFp9U5qfDUijq9SAw8M+fSzr+TmLp8fr8Tvtm/Dv8t1Q7xtF789r7/zdl4JFKbAV AowlsJq2URKhW4eBgNCY10BN7wf+mzHxm+xZEzsxYmkGwuq1mSAMUnV5XzbDJjzJc+Fl ldd8sPoyzUG4krF4XB0Bk9K+Ha+1lapVK7iDdpgJxTIgR8ZcHz7QTRSSWXKOA65534gD NFWg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1694795579; x=1695400379; 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=FATEL2ITPMFfLfw0D9PblDYxfW6TvM3iJL7m+a0EPeE=; b=cT2C/c+Zh5VqbReiuuHNYknx7jebbQk/lAf4I0K7rZoCgsZ7GY6bNDFeeCBgnY/IXb Af56wGNn10UmYMxE7OJZl89G2W75CsJLB+Leo4hbWpAKzG1wUjxnu34mfE7ukMA1F8uP rVF9P2028gMKmFuHwvamyPVLQMiOIwPM1IZcjoBVFhPq6L/7i+iJ3O8vFBcCx0Ghne28 P6B2u9ADvprSxDBkmdWoidfp0lA5axEE7TW7CCAYSyrXowr2UDyHYsZFddLIskP+yziF xWSyzwle2Q0lSTn5ceHiNJfkYmknSD4eVUFsi9ia8207mTXBc+YMw6MrFdYKXnQg88t0 +0tw== X-Gm-Message-State: AOJu0YwaZcW03ln0XTf8dGa7IL7mrBJLJuoiRHcG8cOlUEsAhiJCwkmY Y2s2yPW/fYgOkw213SDTB93Wk7eUUyGK9QXggDA= X-Google-Smtp-Source: AGHT+IGpQ3ewsCL4kGaCylh9FGhP9PRVZQbtRmrmetD/LOXjmTnLAx5tvoPRt/AtVJy6RuaF9DNZJQ== X-Received: by 2002:a05:6a00:1397:b0:68c:3f2:5ff8 with SMTP id t23-20020a056a00139700b0068c03f25ff8mr2345537pfg.1.1694795578947; Fri, 15 Sep 2023 09:32:58 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Cc: philmd@linaro.org Subject: [PATCH v2 3/3] softmmu: Introduce cpu_address_space_sync Date: Fri, 15 Sep 2023 09:32:54 -0700 Message-Id: <20230915163254.123338-4-richard.henderson@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230915163254.123338-1-richard.henderson@linaro.org> References: <20230915163254.123338-1-richard.henderson@linaro.org> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2607:f8b0:4864:20::430; envelope-from=richard.henderson@linaro.org; helo=mail-pf1-x430.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: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @linaro.org) X-ZM-MESSAGEID: 1694795633624100005 Content-Type: text/plain; charset="utf-8" Synchronously check and update the address space for the current cpu for any slow path access. Resolves: https://gitlab.com/qemu-project/qemu/-/issues/1866 Signed-off-by: Richard Henderson --- include/exec/memory.h | 6 ++++++ accel/tcg/cputlb.c | 2 ++ softmmu/physmem.c | 20 ++++++++++++++++++++ 3 files changed, 28 insertions(+) diff --git a/include/exec/memory.h b/include/exec/memory.h index 68284428f8..7ec842076f 100644 --- a/include/exec/memory.h +++ b/include/exec/memory.h @@ -2780,6 +2780,12 @@ void address_space_cache_destroy(MemoryRegionCache *= cache); IOMMUTLBEntry address_space_get_iotlb_entry(AddressSpace *as, hwaddr addr, bool is_write, MemTxAttrs attr= s); =20 +/* + * Ensure all cpu address spaces are up-to-date. + * Return true if changes made and tlb flushed. + */ +void cpu_address_space_sync(CPUState *cpu); + /* address_space_translate: translate an address range into an address spa= ce * into a MemoryRegion and an address range into that section. Should be * called from an RCU critical section, to avoid that the last reference diff --git a/accel/tcg/cputlb.c b/accel/tcg/cputlb.c index 3270f65c20..91be3f3064 100644 --- a/accel/tcg/cputlb.c +++ b/accel/tcg/cputlb.c @@ -1827,6 +1827,8 @@ static bool mmu_lookup(CPUArchState *env, vaddr addr,= MemOpIdx oi, l->page[1].size =3D 0; crosspage =3D (addr ^ l->page[1].addr) & TARGET_PAGE_MASK; =20 + cpu_address_space_sync(env_cpu(env)); + if (likely(!crosspage)) { mmu_lookup1(env, &l->page[0], l->mmu_idx, type, ra); =20 diff --git a/softmmu/physmem.c b/softmmu/physmem.c index e1c535380a..5a89caa257 100644 --- a/softmmu/physmem.c +++ b/softmmu/physmem.c @@ -2536,6 +2536,26 @@ static void tcg_commit(MemoryListener *listener) } } =20 +void cpu_address_space_sync(CPUState *cpu) +{ + int i, n =3D cpu->num_ases; + bool need_flush =3D false; + + for (i =3D 0; i < n; ++i) { + CPUAddressSpace *cpuas =3D &cpu->cpu_ases[i]; + uint32_t gen =3D qatomic_load_acquire(&cpuas->layout_gen); + + if (cpuas->commit_gen !=3D gen) { + cpuas->commit_gen =3D gen; + cpuas->memory_dispatch =3D address_space_to_dispatch(cpuas->as= ); + need_flush =3D true; + } + } + if (need_flush) { + tlb_flush(cpu); + } +} + static void memory_map_init(void) { system_memory =3D g_malloc(sizeof(*system_memory)); --=20 2.34.1