From nobody Tue Feb 10 02:46:50 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=bu.edu ARC-Seal: i=1; a=rsa-sha256; t=1653669875; cv=none; d=zohomail.com; s=zohoarc; b=DAW91w7cSx5vv7E22DbvhRtusXWWVfj+5TUViu2lAFP2KfIIPjVWpnjq91eD+77vf9pccHtgHFQ1CiMiUMTRlYq8dx8ND9p5/LOCG9An/wZvyj3/SwJBvkt+b1/fZI3OInmjCwM6bPy5E0GzRYJY1mT45ZyqGiS1gUs+NTaXykE= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1653669875; 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=AdLGVPcZKgA+l0HAEpQh7s+OnX+vK+PiCgIEHryKUu4=; b=MYDarRsyCxqKvfP/yi0xh9qdjtNfRORUNXKaCeQD0zZcUO8KZ0Qe18WUT3rykDDq3TYn7NUeE8tcFLmTue93XB0OdisbYwKxo+ewWxSRobz5lJ0chA/Tzm0pNW5B/vTX35x6lQhE6YJq/mAKXq6AvSLS3lLvPgJiFbMSZaUZajg= 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 1653669874999174.13821174218594; Fri, 27 May 2022 09:44:34 -0700 (PDT) Received: from localhost ([::1]:35224 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nud4j-0006eb-JO for importer@patchew.org; Fri, 27 May 2022 12:44:33 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:46768) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nucgq-0005bi-Pg for qemu-devel@nongnu.org; Fri, 27 May 2022 12:19:53 -0400 Received: from esa1.hc2706-39.iphmx.com ([68.232.153.39]:31872) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nucgo-0000sY-9w for qemu-devel@nongnu.org; Fri, 27 May 2022 12:19:51 -0400 Received: from mail-qv1-f69.google.com ([209.85.219.69]) by ob1.hc2706-39.iphmx.com with ESMTP/TLS/ECDHE-RSA-AES128-GCM-SHA256; 27 May 2022 12:19:47 -0400 Received: by mail-qv1-f69.google.com with SMTP id i6-20020a0cd846000000b0046262337c65so3839917qvj.20 for ; Fri, 27 May 2022 09:19:47 -0700 (PDT) Received: from stormtrooper.vrmnet (pool-72-70-35-75.bstnma.fios.verizon.net. [72.70.35.75]) by smtp.gmail.com with ESMTPSA id x190-20020a3763c7000000b006a33c895d25sm2993777qkb.21.2022.05.27.09.19.44 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 27 May 2022 09:19:45 -0700 (PDT) X-IronPort-RemoteIP: 209.85.219.69 X-IronPort-MID: 203561255 X-IronPort-Reputation: None X-IronPort-Listener: OutgoingMail X-IronPort-SenderGroup: RELAY_GSUITE X-IronPort-MailFlowPolicy: $RELAYED IronPort-Data: A9a23:24zeO6/VXw8J9L9CAM5ZDrUDC3yTJUtcMsCJ2f8bNWPcYEJGY0x3z msfDDuCb6yMMWCneIwlPY/l/RkPucPWzNFjSAY6pXwxFiIbosf7XuiUfxz6V8+wwmwvb67FA +E2MISowBUcFyeEzvuVGuG96yE6j8lkf5KkYAL+EnkZqTRMFWFw0HqPp8Zj2tQy2YXjXFvW0 T/Pi5a31GGNimYc3l08tvrrRCNH5JwebxtB4zTSzdgS1LPvvyB94KA3fMldHFOhKmVgJdNWc s6YpF2PEsI1yD92Yj+tuu6TnkTn2dc+NyDX4pZdc/HKbhSvOkXee0v0XRYRQR4/ttmHozx+4 ItB7LCTRjkjAqPruMQtSShmKiBDN7ITrdcrIVDn2SCS50jPcn+p2us3SU9obMsX/eF4BWwI/ vsdQNwPRkrb1qTmnfThE7gq2JVLwMrDZevzvllpySHfAewOS42FTqnXjTNd9G1o3Z0QRKyDO qL1bxJeZyj5aEReGW4vVqkapOeLmXngSWZH/Qf9Sa0fpjK7IBZK+KHgNceQdtGUSMF9mEGeq WTbuWPjDXkn2Me3zDOE9je1mLaKk32qHo0VE7K8+7hhh1j7KnEvNSD6nGCT+ZGR4nNSkfoCQ 6DI0kLCdZQPyXE= IronPort-HdrOrdr: A9a23:BSeReayqQS8yjjmBQTvXKrPwF71zdoMgy1knxilNoH1uA7Wlfq WV98jzuiWE7wr5NEtQ+uxoQZPhfZq+z+8S3WByB9qftWDd0QPDEGgF1/qB/9SKIVybygcy79 YET0FIMrHN5IlB7PoTsWGDferJnrG8n5yVuQ== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bu.edu; s=s1gsbu; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=AdLGVPcZKgA+l0HAEpQh7s+OnX+vK+PiCgIEHryKUu4=; b=KNphNlHoeOkgP2b2eWvhOUikGhImY05w9tKI89l5igEsvxOhlGDkEzNXEkgA5jOgy3 dHFPyH0n/a0e3+AlAm7E2SJjBEDfb9jL1efcD/KC+LTh+s7ZzCFfeX9Makk2kFUuyn9T 1lUVXQIph3xtO1a6OerdF4QaCVn1FMIR4o9+IUjWRTHprMEIWdRFM4HXjFox+RSfJ2Ls cccaAa5F2ks0x+pFzWq4ugvzm09u5fmc6wdbzr77YVOh1RvXx2SoUusa2u/oZCWJvDNL LlTxzozAxTU2wDEaWKEljhO5BMePgb6YDYuBFNx8rwBmOtyXII4L6R0LHW5F8yCZQSwk iyIA== 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=AdLGVPcZKgA+l0HAEpQh7s+OnX+vK+PiCgIEHryKUu4=; b=chFEmkYzeWqn7EGEBMftEmDM1DmvgTHoaoQg9g/p1cXz3hxEttbChIGUSt9MIHBgPz sKHgGs+usynzTr8oBugIxoMK56YBmtDj4h8snyAUqvuDGum/x7qP8HTajxD2IFnlsWKb 6T8rw7fUXsST5QLBZN5ES5W353rXpYyrZ6DqLZyyOYi1PgWRLpNwTFhUdbjDhWc8JS6s ugytvek2WB5KCPhoOfXpM2vPcNl917h26t/FNj2RzSaK3Ki0uslaYGbeEJoXjDuG9oLr tF8YfDNRg7DDN50VkbsbcInM20vcd/S5wGHsQDf3+jfES7R/S7tK3Ajhd8ZGai8steuy GOdQ== X-Gm-Message-State: AOAM533BtdQmnrg8NbeZUfOjpWVORLaIuSdGLwu351lGM9fge3/XQrxD V7Fem6NRZnzuOBxsjJn+BibNEvPT7yDCB5XdgkDXRzdhLnVDYUr4Wl2qcwA4l5ETfAv5F26xNZ0 WrTGj73tlqlOkHijhYOtyezXeMu0OAw== X-Received: by 2002:a05:622a:1ca:b0:2f3:e805:5c36 with SMTP id t10-20020a05622a01ca00b002f3e8055c36mr34077923qtw.394.1653668386924; Fri, 27 May 2022 09:19:46 -0700 (PDT) X-Google-Smtp-Source: ABdhPJx7Uxl/B1RDgXmpc/232D40RyEGOKR0aqhhi9CYk2rGos3PAJWpYjkU69+xr1jgJXyIWdSNmQ== X-Received: by 2002:a05:622a:1ca:b0:2f3:e805:5c36 with SMTP id t10-20020a05622a01ca00b002f3e8055c36mr34077893qtw.394.1653668386647; Fri, 27 May 2022 09:19:46 -0700 (PDT) From: Alexander Bulekov To: qemu-devel@nongnu.org Cc: Alexander Bulekov , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Mauro Matteo Cascella , Qiuhao Li , Peter Xu , Jason Wang , David Hildenbrand , Gerd Hoffmann , Peter Maydell , Li Qiang , Thomas Huth , Laurent Vivier , Bandan Das , "Edgar E . Iglesias" , Darren Kenny , Bin Meng , Paolo Bonzini , Stefan Hajnoczi , =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= , Eduardo Habkost Subject: [PATCH v2 1/3] memory: Track whether a Device is engaged in IO Date: Fri, 27 May 2022 12:19:35 -0400 Message-Id: <20220527161937.328754-2-alxndr@bu.edu> X-Mailer: git-send-email 2.33.0 In-Reply-To: <20220527161937.328754-1-alxndr@bu.edu> References: <20220527161937.328754-1-alxndr@bu.edu> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-CES-GSUITE_AUTH: bf3aNvsZpxl8 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=68.232.153.39; envelope-from=alxndr@bu.edu; helo=esa1.hc2706-39.iphmx.com X-Spam_score_int: -7 X-Spam_score: -0.8 X-Spam_bar: / X-Spam_report: (-0.8 / 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, HK_RANDOM_ENVFROM=0.998, HK_RANDOM_FROM=0.998, RCVD_IN_DNSWL_LOW=-0.7, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=no autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: 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 @bu.edu) X-ZM-MESSAGEID: 1653669875785100001 Content-Type: text/plain; charset="utf-8" Add a flag to the DeviceState, when a device is engaged in PIO/MMIO/DMA. This flag should be set/checked prior to calling a device's MemoryRegion handlers, and set when device code initiates DMA. The purpose of this flag is to prevent DMA reentrancy issues. E.g.: sdhci pio -> dma write -> sdhci mmio nvme bh -> dma write -> nvme mmio These issues have led to problems such as stack-exhaustion and use-after-frees. Assumptions: * Devices do not interact with their own PIO/MMIO memory-regions using DMA. * There is now way for there to be multiple simultaneous accesses to a device's PIO/MMIO memory-regions, or for multiple threads to perform DMA accesses simultaneously on behalf of a single device. Signed-off-by: Alexander Bulekov --- include/hw/qdev-core.h | 3 +++ 1 file changed, 3 insertions(+) diff --git a/include/hw/qdev-core.h b/include/hw/qdev-core.h index 92c3d65208..6474dc51fa 100644 --- a/include/hw/qdev-core.h +++ b/include/hw/qdev-core.h @@ -193,6 +193,9 @@ struct DeviceState { int instance_id_alias; int alias_required_for_version; ResettableState reset; + + /* Is the device currently in mmio/pio/dma? Used to prevent re-entranc= y */ + int engaged_in_io; }; =20 struct DeviceListener { --=20 2.33.0 From nobody Tue Feb 10 02:46:50 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=bu.edu ARC-Seal: i=1; a=rsa-sha256; t=1653669621; cv=none; d=zohomail.com; s=zohoarc; b=OgcBZUTke2/mk9itYg4uJc8zKmcTA7gtQm8ybl5PPbPzbi0FX+n5Mu0X2M7W1BkesjBJSKyXeOf7bdGJhsEFTjjDSoHNfeExcoejv++xqmgND8WhcwSbG6MuL3Jfd0KkdeuMW9XtVeh7dDvqcK7VIHo3PTH8ulrYf32IM5dZVYc= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1653669621; 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=l7XtZsacMV05bRDC10NuSoJ7iik7K91pUwHSZfB6tS0=; b=LsD3xuO+cUscbeXO88WluNM+lG/hfcjCW0fnrCcWHgq7lzRDvvkf6FmSN9sbZPYcEZcYWKZFTb82cKcJctLgcAZRbCdEQoO7TKDM20DNn4p+vtzNWH8OUVIzSiO8e0tMjN97bYIpER3f0eBwTwKdJEZkhsExj/W9OEsFQos+tbY= 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 1653669621576708.5742004877046; Fri, 27 May 2022 09:40:21 -0700 (PDT) Received: from localhost ([::1]:56312 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nud0e-0001aI-2b for importer@patchew.org; Fri, 27 May 2022 12:40:20 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:46800) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nucgs-0005cE-N2 for qemu-devel@nongnu.org; Fri, 27 May 2022 12:19:54 -0400 Received: from esa9.hc2706-39.iphmx.com ([216.71.140.197]:15056) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nucgq-0000ss-WE for qemu-devel@nongnu.org; Fri, 27 May 2022 12:19:54 -0400 Received: from mail-qv1-f71.google.com ([209.85.219.71]) by ob1.hc2706-39.iphmx.com with ESMTP/TLS/ECDHE-RSA-AES128-GCM-SHA256; 27 May 2022 12:19:49 -0400 Received: by mail-qv1-f71.google.com with SMTP id kl23-20020a056214519700b0046200065604so3838020qvb.19 for ; Fri, 27 May 2022 09:19:49 -0700 (PDT) Received: from stormtrooper.vrmnet (pool-72-70-35-75.bstnma.fios.verizon.net. [72.70.35.75]) by smtp.gmail.com with ESMTPSA id x190-20020a3763c7000000b006a33c895d25sm2993777qkb.21.2022.05.27.09.19.46 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 27 May 2022 09:19:48 -0700 (PDT) X-IronPort-RemoteIP: 209.85.219.71 X-IronPort-MID: 202288507 X-IronPort-Reputation: None X-IronPort-Listener: OutgoingMail X-IronPort-SenderGroup: RELAY_GSUITE X-IronPort-MailFlowPolicy: $RELAYED IronPort-Data: A9a23:pPwajqggoO+uh3s7Py9036KBX1616xIKZh0ujC45NGQN5FlHY01je htvXm2Ab6qKZTb0LtxyYIm1oBkDuJbWzYBqQABt/iEzEHsW8JqUDtmndXv9bniYRiHhoOOLz Cm8hv3odp1coqr0/0/1WlTZhSAgk/nOHNIQMcacUsxLbVYMpBwJ1FQywobVvqYy2YLjW17X5 oupyyHiEATNNwBcYzp8B52r9UsHUMTa4Fv0aXRnOJinFHeH/5UkJMt3yZOZdhMUcaENdgKOf Nsv+Znilo/vE7bBPfv++lrzWhVirrc/pmFigFIPM0SpqkEqSiDfTs/XnRfTAKtao2zhojx/9 DlCnZOIeAZzObbCo7siTjNDLxhEOfxMw7CSdBBTseTLp6HHW37lwvErFV9veINHo6B4BmZB8 fFeIzcIBvyBr7jukfTrF68235Vlc5CD0IA34xmMyRnQCeYgTYrrSbiM6NNFtNs1rpoWR6yON 5dBNlKDajztOAVAN25LS64Pme2r3XC4Qj53mmq88P9fD2/7iVYZPKLWGMPYf8HPSchLk0Kwo GXA8GLkRBYAO7SiJSGt93utgqrWg3q+Vt1LUrK/8fFujRuYwWl75AAqaGZXaMKR0iaWM++z4 WREksbyhcDeLHCWc+Q= IronPort-HdrOrdr: A9a23:0EtXKKPG4LUiXMBcTsyjsMiBIKoaSvp037BN7TETdfU1SKylfq WV954mPHDP+VQssQ4b6LS90cW7LE80lqQV3WByB8bGYOCOggLBEGgF1+ffKlbbdREWmNQz6U 5oSdkYNOHN DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bu.edu; s=s1gsbu; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=l7XtZsacMV05bRDC10NuSoJ7iik7K91pUwHSZfB6tS0=; b=OXguDsr6C5UQ2pwRgL1FOhtuI0lRo16QmVgyoClUK9oOuhGhu6ZQ2d6xwh1DbD2fJ4 TOOJyyCQ+kOwQbF04St+spcoN1m2TwyBG7rgkYk7AMUoms39cIWWExThyO41Q54nZ+xu gZ+WuMLDXLuNHcjox8dNtDaDJ1qBIzBEFrSq4dwsHQGXhjLH4R5FNXGVAbxnXHtyOn/l 6Ws/1pzXCxtRAANngehy2wU0nQ0EXaHEm0y/rCos5R/ejWNJlEwoxz9wJYKA+lEw1sBo 4Yf9jn9hUcJLPVYgCg8ksx5goNq+tG3TksmPKPBcZ03xtUCwXCYvP0DLhMxWnokfF3SG zTPg== 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=l7XtZsacMV05bRDC10NuSoJ7iik7K91pUwHSZfB6tS0=; b=Hi4Fmfo9aR7N7LhNXr5CJ7s1NwpjA1oj8/jOp9fgPkg+sMYp2Q1kfMdkoINo5tU3ZI hpMr/BtS13b2CL8YxyzVAFnYKizFI/EbyACNYX/J+XFoIs3dpRrlzj2DCrdk/nbR1VkU R+VwBpCnHpXA0LGHsyViPDXEOzulvvOTClSwfjnXeerTtD4ZMUPENc4s0h3ViZMcvC3z U/m4RkU9axMd0rpaDlqsaYX4OeUecYMUhe7XB9TanFb4zt+dE3dRtaDEJthoN2AUHCDC DnSM1V3JeFVfkREw43dLX5CroDVKeaCZo6aDaOHaYv3C1qdH7QZ3IQMonNoFch4V8kpK ZN3Q== X-Gm-Message-State: AOAM5320tymzQGeJ7MGnLTuL4jDcrdztUkSmBjUoG8oe44+MydZAAjlA qoG1Np9KCsh11KWrQCp2H30PMpDDItTihyFuj/hA4D5tdXXDWwv+7JyjIAZgX7tzJ5whtiYCeyy yApVmmz0ucp/fB+TkDTroa32DzrWYxw== X-Received: by 2002:ac8:7e8c:0:b0:2f9:db5:614b with SMTP id w12-20020ac87e8c000000b002f90db5614bmr34012832qtj.602.1653668388930; Fri, 27 May 2022 09:19:48 -0700 (PDT) X-Google-Smtp-Source: ABdhPJytHyQwSfXi4LnPJgBrBRXgXwNP8wDwd42jkTXbPD1qXwpVbOUN75InPGcC5MaihO8TdEvJLA== X-Received: by 2002:ac8:7e8c:0:b0:2f9:db5:614b with SMTP id w12-20020ac87e8c000000b002f90db5614bmr34012798qtj.602.1653668388679; Fri, 27 May 2022 09:19:48 -0700 (PDT) From: Alexander Bulekov To: qemu-devel@nongnu.org Cc: Alexander Bulekov , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Mauro Matteo Cascella , Qiuhao Li , Peter Xu , Jason Wang , David Hildenbrand , Gerd Hoffmann , Peter Maydell , Li Qiang , Thomas Huth , Laurent Vivier , Bandan Das , "Edgar E . Iglesias" , Darren Kenny , Bin Meng , Paolo Bonzini , Stefan Hajnoczi Subject: [PATCH v2 2/3] memory: fix PIO/MMIO-initiated dma-reentracy issues Date: Fri, 27 May 2022 12:19:36 -0400 Message-Id: <20220527161937.328754-3-alxndr@bu.edu> X-Mailer: git-send-email 2.33.0 In-Reply-To: <20220527161937.328754-1-alxndr@bu.edu> References: <20220527161937.328754-1-alxndr@bu.edu> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-CES-GSUITE_AUTH: bf3aNvsZpxl8 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=216.71.140.197; envelope-from=alxndr@bu.edu; helo=esa9.hc2706-39.iphmx.com X-Spam_score_int: 0 X-Spam_score: -0.1 X-Spam_bar: / X-Spam_report: (-0.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, HK_RANDOM_ENVFROM=0.998, HK_RANDOM_FROM=0.998, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=no autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: 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 @bu.edu) X-ZM-MESSAGEID: 1653669622752100001 Content-Type: text/plain; charset="utf-8" Set/check the engaged_in_io DeviceState flag, prior to calling MemoryRegion handlers. Signed-off-by: Alexander Bulekov --- softmmu/memory.c | 15 +++++++++++++++ softmmu/trace-events | 1 + 2 files changed, 16 insertions(+) diff --git a/softmmu/memory.c b/softmmu/memory.c index 7ba2048836..44a14bb4f5 100644 --- a/softmmu/memory.c +++ b/softmmu/memory.c @@ -532,6 +532,7 @@ static MemTxResult access_with_adjusted_size(hwaddr add= r, uint64_t access_mask; unsigned access_size; unsigned i; + DeviceState *dev =3D NULL; MemTxResult r =3D MEMTX_OK; =20 if (!access_size_min) { @@ -541,6 +542,17 @@ static MemTxResult access_with_adjusted_size(hwaddr ad= dr, access_size_max =3D 4; } =20 + /* Do not allow more than one simultanous access to a device's IO Regi= ons */ + if (mr->owner && + !mr->ram_device && !mr->ram && !mr->rom_device && !mr->readonly) { + dev =3D (DeviceState *) object_dynamic_cast(mr->owner, TYPE_DEVICE= ); + if (dev->engaged_in_io) { + trace_memory_region_reentrant_io(get_cpu_index(), mr, addr, si= ze); + return MEMTX_ERROR; + } + dev->engaged_in_io =3D true; + } + /* FIXME: support unaligned access? */ access_size =3D MAX(MIN(size, access_size_max), access_size_min); access_mask =3D MAKE_64BIT_MASK(0, access_size * 8); @@ -555,6 +567,9 @@ static MemTxResult access_with_adjusted_size(hwaddr add= r, access_mask, attrs); } } + if (dev) { + dev->engaged_in_io =3D false; + } return r; } =20 diff --git a/softmmu/trace-events b/softmmu/trace-events index 9c88887b3c..d7228316db 100644 --- a/softmmu/trace-events +++ b/softmmu/trace-events @@ -13,6 +13,7 @@ memory_region_ops_read(int cpu_index, void *mr, uint64_t = addr, uint64_t value, u memory_region_ops_write(int cpu_index, void *mr, uint64_t addr, uint64_t v= alue, unsigned size, const char *name) "cpu %d mr %p addr 0x%"PRIx64" value= 0x%"PRIx64" size %u name '%s'" memory_region_subpage_read(int cpu_index, void *mr, uint64_t offset, uint6= 4_t value, unsigned size) "cpu %d mr %p offset 0x%"PRIx64" value 0x%"PRIx64= " size %u" memory_region_subpage_write(int cpu_index, void *mr, uint64_t offset, uint= 64_t value, unsigned size) "cpu %d mr %p offset 0x%"PRIx64" value 0x%"PRIx6= 4" size %u" +memory_region_reentrant_io(int cpu_index, void *mr, uint64_t offset, unsig= ned size) "cpu %d mr %p offset 0x%"PRIx64" size %u" memory_region_ram_device_read(int cpu_index, void *mr, uint64_t addr, uint= 64_t value, unsigned size) "cpu %d mr %p addr 0x%"PRIx64" value 0x%"PRIx64"= size %u" memory_region_ram_device_write(int cpu_index, void *mr, uint64_t addr, uin= t64_t value, unsigned size) "cpu %d mr %p addr 0x%"PRIx64" value 0x%"PRIx64= " size %u" memory_region_sync_dirty(const char *mr, const char *listener, int global)= "mr '%s' listener '%s' synced (global=3D%d)" --=20 2.33.0 From nobody Tue Feb 10 02:46:50 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=bu.edu ARC-Seal: i=1; a=rsa-sha256; t=1653668540; cv=none; d=zohomail.com; s=zohoarc; b=Z4LudApx6RQIjwLN1Lx6Z4/GO9hh0jvYxiG/Vm36taqopyb6/ydwKZXSqwTzDAs5o12n2ik+629ERPxWg4O9wekfC8Fx9OX3CSjuzprVHtOf+X6zU69MVgaswiXhyE4/AHg2gDy5F4EwJsyQkYOht7x799KF6hd3Ar6SoLvkyPs= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1653668540; 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=l6ibSFcAKzpFoUndDsjwlNGe/8TZpKz1WAMs2g5onDY=; b=HFDQ6c/iHYy65guyu6el/rHyHFn60Bb/Eey0zs1+X7jaQxHWcxsTaqCLsM/GDdc97vNKB5JHjFHs+PzO89sMGPvKgbGKIV4rF8xGvyIKX0+/YBB4SFF/fOp9lCwtWOluTewKWZ3NKP/VP84d7quLzrRZS/n8eTsNfrjY0RFwymE= 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 1653668540156416.48612409483076; Fri, 27 May 2022 09:22:20 -0700 (PDT) Received: from localhost ([::1]:47350 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nucjD-0000DB-4F for importer@patchew.org; Fri, 27 May 2022 12:22:19 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:46822) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nucgt-0005dc-SW for qemu-devel@nongnu.org; Fri, 27 May 2022 12:19:56 -0400 Received: from esa16.hc2706-39.iphmx.com ([216.71.140.205]:52679) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nucgs-0000st-1C for qemu-devel@nongnu.org; Fri, 27 May 2022 12:19:55 -0400 Received: from mail-qv1-f69.google.com ([209.85.219.69]) by ob1.hc2706-39.iphmx.com with ESMTP/TLS/ECDHE-RSA-AES128-GCM-SHA256; 27 May 2022 12:19:51 -0400 Received: by mail-qv1-f69.google.com with SMTP id e3-20020a056214110300b0045abb0e1760so3884206qvs.3 for ; Fri, 27 May 2022 09:19:51 -0700 (PDT) Received: from stormtrooper.vrmnet (pool-72-70-35-75.bstnma.fios.verizon.net. [72.70.35.75]) by smtp.gmail.com with ESMTPSA id x190-20020a3763c7000000b006a33c895d25sm2993777qkb.21.2022.05.27.09.19.48 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 27 May 2022 09:19:49 -0700 (PDT) X-IronPort-RemoteIP: 209.85.219.69 X-IronPort-MID: 200272541 X-IronPort-Reputation: None X-IronPort-Listener: OutgoingMail X-IronPort-SenderGroup: RELAY_GSUITE X-IronPort-MailFlowPolicy: $RELAYED IronPort-Data: A9a23:c8t3SalzSvhEZahc/18dlabo5gwKJERdPkR7XQ2eYbSJt1+Wr1Gzt xJMXWyCb6uNMzH0c993b9jl8h5TuJGAnIQ2QQRrrn02ES4T+ZvOCOrCEkqhZCn6wu8v7a5EA 2fyTvGacajYm1eF/k/F3oDJ9CU6jefSLlbFILas1hpZHGeIcw98z0M68wIFqtQw24LhXlnS4 YiaT/D3YzdJ5RYlagr41Ire8HuDjNyq0N/PlgVjDRzjlAa2e0g9VfrzF4noR5fLatA88tqBe gr25OrRElU1XvsaIojNfr7TKiXmS1NJVOSEoiM+t6OK23CuqsGuu0qS2TV1hUp/0l20c95NJ NpljpHgUTcrJ633nO0MajNbUD5xNrF5weqSSZS/mZT7I0zudnLtx7B3EhhzM9NJvOlwBm5K+ LoTLzVlghKr3brnhuLmDLM114J9faEHP6tG0p1k5TjdHfAqW7jJXuPH6cIwMDIY3JgWR6mEO pZAAdZpREmZZS8fJFw3M8odncuwpWa4ViZI9HvA8MLb5ECWlmSdyoPFKdfQZ5mGSNtYmm6eo WTJ+Xm/BQsVXOFz0hKA+3Oow/bRxGb1BtNUG7q/+fpnxlaUwwT/FSEraLdymtHh4mbWZj6VA xB8FvYGxUTqyHGWcw== IronPort-HdrOrdr: A9a23:QRyuOa9mjj/giU8N/6luk+AHI+orL9Y04lQ7vn2ZKCYlDvBw8v rEoB11737JYUkqKRcdcLy7VJVoAkmsjKKdmLNhR4tKBTOWxVdAT7sSkrcKoQeBJ8SkzJ8k6U 4IScEXYuEYa2IUsS+Q2mSF+rgbruVujciT9JzjJqNWPGNXg90J1XYfNu/iKDwUeOCwP+tcKH M03Lsjmwad DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bu.edu; s=s1gsbu; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=l6ibSFcAKzpFoUndDsjwlNGe/8TZpKz1WAMs2g5onDY=; b=ZniVgY8kbVk4noOgdND4x73abtrFX6cD8K3iQwroTaLCDrACqCq5r6rxiXr4gcCItM yPmW3yDIpwtotDzTE0TELqRU+xxV8thEVS/B4tmiy3F+JSCNywTcUPjrTDfKKweFiRLV bDp7tDmB/MUlHMO4CmHh/n4is7/U9j4fJ1fHOFlbBZ+bhYkHEakVkaiLInVvSLxXrsFh jufUBhB0C5Qp2GFoWFVAIX3wkJXOmVZ/Becx+xuGapyJJlZl3ap46hB4PIVl+Y6m3NBl sLQzjkyMlQtaZyiX2TIZFPBzav8mgdBM+FmIFIajz2jVxv7s+wBefx/nt+Z7cLPmT9ID rTrQ== 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=l6ibSFcAKzpFoUndDsjwlNGe/8TZpKz1WAMs2g5onDY=; b=ESE0byop0uzkfh8YWfKyxRR9pGgHrwhbYh/FNZ3Q/RMrS7OkOOAyppPbS2FwvoMeyK JgorBD27eg/FkoS7YvXrasOj8tCmu22qb1V4YYCweVikPSEcZqu2+BCGGKtXxz+Jrol+ YLpAKB9slMHRbDi/EosK8SAKcubp3K+1+9wWGxd1B2AySbTugI4GUHReXziygsQp7A6s h07WqL6eZTbHfUM7G6eWmgbsnsUQIEYCaocGJf9bvvmU9YLUNpMqWXloQtS5NOcNZF+2 rg6lGUG/1dKltCnBiFlGPFY0qwM1l9giEp/sowkA1SBfbv5sLHDYSAtvVCh8cFNEn6ev N9bQ== X-Gm-Message-State: AOAM533gibAaPydrRxJtSqpzxTtDdSOrvfunBv2bbmQo1pYxMOuVoTK0 2VxNvPacvw1JVD3tn1m8Ke5Y7hvT3CYykoJMD77PhJXey1zZGniQvXTjo3/a63KjZcp1n62ilmG DdTmlNL0nqyDCG+VrZIJXSzUWtP1s2A== X-Received: by 2002:a05:622a:199d:b0:2f3:cbbd:186f with SMTP id u29-20020a05622a199d00b002f3cbbd186fmr33957360qtc.92.1653668390673; Fri, 27 May 2022 09:19:50 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxPYr6P9QupYdD3nwSFPi1Aqg0JwJ0IxxYsn+V7gnzWG08Brm99q7NRVhQ9+ZbxdkU4ESh2nA== X-Received: by 2002:a05:622a:199d:b0:2f3:cbbd:186f with SMTP id u29-20020a05622a199d00b002f3cbbd186fmr33957332qtc.92.1653668390385; Fri, 27 May 2022 09:19:50 -0700 (PDT) From: Alexander Bulekov To: qemu-devel@nongnu.org Cc: Alexander Bulekov , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Mauro Matteo Cascella , Qiuhao Li , Peter Xu , Jason Wang , David Hildenbrand , Gerd Hoffmann , Peter Maydell , Li Qiang , Thomas Huth , Laurent Vivier , Bandan Das , "Edgar E . Iglesias" , Darren Kenny , Bin Meng , Paolo Bonzini , Stefan Hajnoczi , "Michael S. Tsirkin" , Marcel Apfelbaum Subject: [PATCH v2 3/3] memory: fix bh-initiated dma-reentracy issues Date: Fri, 27 May 2022 12:19:37 -0400 Message-Id: <20220527161937.328754-4-alxndr@bu.edu> X-Mailer: git-send-email 2.33.0 In-Reply-To: <20220527161937.328754-1-alxndr@bu.edu> References: <20220527161937.328754-1-alxndr@bu.edu> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-CES-GSUITE_AUTH: bf3aNvsZpxl8 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=216.71.140.205; envelope-from=alxndr@bu.edu; helo=esa16.hc2706-39.iphmx.com X-Spam_score_int: 0 X-Spam_score: -0.1 X-Spam_bar: / X-Spam_report: (-0.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, HK_RANDOM_ENVFROM=0.998, HK_RANDOM_FROM=0.998, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=no autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: 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 @bu.edu) X-ZM-MESSAGEID: 1653668540952100001 Content-Type: text/plain; charset="utf-8" This patch leverages the DeviceState engaged_in_io flag to prevent issues due to accesses similar to bh -> dma -> mmio. e.g. CVE-2021-3929 Signed-off-by: Alexander Bulekov --- include/hw/pci/pci.h | 13 +++++++++++-- softmmu/dma-helpers.c | 12 ++++++++++++ 2 files changed, 23 insertions(+), 2 deletions(-) diff --git a/include/hw/pci/pci.h b/include/hw/pci/pci.h index 44dacfa224..ab1ad0f7a8 100644 --- a/include/hw/pci/pci.h +++ b/include/hw/pci/pci.h @@ -834,8 +834,17 @@ static inline MemTxResult pci_dma_rw(PCIDevice *dev, d= ma_addr_t addr, void *buf, dma_addr_t len, DMADirection dir, MemTxAttrs attrs) { - return dma_memory_rw(pci_get_address_space(dev), addr, buf, len, - dir, attrs); + bool prior_engaged_state; + MemTxResult result; + + prior_engaged_state =3D dev->qdev.engaged_in_io; + + dev->qdev.engaged_in_io =3D true; + result =3D dma_memory_rw(pci_get_address_space(dev), addr, buf, len, + dir, attrs); + dev->qdev.engaged_in_io =3D prior_engaged_state; + + return result; } =20 /** diff --git a/softmmu/dma-helpers.c b/softmmu/dma-helpers.c index 7820fec54c..7a4f1fb9b3 100644 --- a/softmmu/dma-helpers.c +++ b/softmmu/dma-helpers.c @@ -288,8 +288,16 @@ static MemTxResult dma_buf_rw(void *buf, dma_addr_t le= n, dma_addr_t *residual, uint8_t *ptr =3D buf; dma_addr_t xresidual; int sg_cur_index; + DeviceState *dev; + bool prior_engaged_state; MemTxResult res =3D MEMTX_OK; =20 + dev =3D sg->dev; + if (dev) { + prior_engaged_state =3D dev->engaged_in_io; + dev->engaged_in_io =3D true; + } + xresidual =3D sg->size; sg_cur_index =3D 0; len =3D MIN(len, xresidual); @@ -302,6 +310,10 @@ static MemTxResult dma_buf_rw(void *buf, dma_addr_t le= n, dma_addr_t *residual, xresidual -=3D xfer; } =20 + if (dev) { + dev->engaged_in_io =3D prior_engaged_state; + } + if (residual) { *residual =3D xresidual; } --=20 2.33.0