From nobody Sat Oct 25 09:08:51 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1520343752095665.0696487454452; Tue, 6 Mar 2018 05:42:32 -0800 (PST) Received: from localhost ([::1]:55832 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1etCrP-00012E-CV for importer@patchew.org; Tue, 06 Mar 2018 08:42:31 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:48191) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1etCVb-0005EH-FG for qemu-devel@nongnu.org; Tue, 06 Mar 2018 08:20:00 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1etCVX-0006Nx-Fa for qemu-devel@nongnu.org; Tue, 06 Mar 2018 08:19:59 -0500 Received: from mail-wr0-x243.google.com ([2a00:1450:400c:c0c::243]:42918) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1etCVX-0006NX-8Y for qemu-devel@nongnu.org; Tue, 06 Mar 2018 08:19:55 -0500 Received: by mail-wr0-x243.google.com with SMTP id k9so20878356wre.9 for ; Tue, 06 Mar 2018 05:19:55 -0800 (PST) Received: from 640k.lan (94-36-191-219.adsl-ull.clienti.tiscali.it. [94.36.191.219]) by smtp.gmail.com with ESMTPSA id l38sm25652538wrc.96.2018.03.06.05.19.52 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 06 Mar 2018 05:19:53 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:subject:date:message-id:in-reply-to:references; bh=hOS1RwABf20pTv/sBn3lio9Rwa9RkF0vJoM8RX6VPZY=; b=ad16U+/dH7FUVnKojqAIAFsOqDgjX+SnOVJIYQBbmJYOZzqHAY6sWp4+fkBxc5u2Zf LkRf6WTA9O6zFtI0XEarM8M0GuiGTQGb4jaoqd4WEfXfyDu2LSAuUsGKkvI/TzeJ9LFz 4bQVUB2shLpK0XGX7XyJlhxMyNEAhe27dvxMljuZWzFwZG2r8PHcE2ONuQcRnyyhNGgd p6ytF9kBQvuQBRIvv11EtQt074ugs/mvSxBh3NKAIPdYWqhTfKneFq8HX0TsxNKDPtad 0Nuri4Gt5L+/VFP+2uzdqKaK6XREGicVUU3aRcL/Kr3SyxTvaFomXRY+cUdlPdfa1QDx go5g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:subject:date:message-id :in-reply-to:references; bh=hOS1RwABf20pTv/sBn3lio9Rwa9RkF0vJoM8RX6VPZY=; b=CcBpmWdR5FSNe8aZJQBfmnz7D9W5A7vCAlM2xlx/wOVlZsu/bvlC/CGjLye4sv6KyL YtfhUYongeIQagMJwIkK/hs6Cwrini9QIgP/09x57tFzJHX6Yo6oQibsDC3AIpnS9vdd h4eNv9SJi3GeMasIAII/J1wqt3y0tZrXchnD+Y1RaydRa2lIrpMkvRPYpgKuS0P7oDHY S1GFiy2bnTY2nYhKwUfUY48if2A8A0EzpA45V2ErzBOdScwzaX70zrSURRE6sMx+BECA fyqd/USpzIjiunZ+HC9NuZdQz8k2lIcLb72l872Uw1zzQMevNMw6SWsZAsKm2uxdpThx N96A== X-Gm-Message-State: APf1xPA8HLVWdTZHGkvM6q0VrSm9ziCf8z714vzJayZ19JwXptLAFudd A1cAHN0ADw+Wvq6bf9bSEKhYYMA/ X-Google-Smtp-Source: AG47ELs74DVEKMy5u3Wi13Wchp0NkTRh2SN3wo3ifoJE1PAeXDGFYRm/Sq9nAuYcY+BQup2k6eOMEg== X-Received: by 10.223.134.170 with SMTP id 39mr15129037wrx.221.1520342393965; Tue, 06 Mar 2018 05:19:53 -0800 (PST) From: Paolo Bonzini To: qemu-devel@nongnu.org Date: Tue, 6 Mar 2018 14:19:13 +0100 Message-Id: <1520342370-123606-18-git-send-email-pbonzini@redhat.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1520342370-123606-1-git-send-email-pbonzini@redhat.com> References: <1520342370-123606-1-git-send-email-pbonzini@redhat.com> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:400c:c0c::243 Subject: [Qemu-devel] [PULL 17/34] address_space_write: address_space_to_flatview needs RCU lock X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 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: fail (Header signature does not verify) X-ZohoMail: RDKM_2 RSF_0 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" address_space_write is calling address_space_to_flatview but it can be called outside the RCU lock. To fix it, push the rcu_read_lock/unlock pair up from flatview_write to address_space_write. Reviewed-by: Alexey Kardashevskiy Signed-off-by: Paolo Bonzini --- exec.c | 37 ++++++++++++++++++++++--------------- 1 file changed, 22 insertions(+), 15 deletions(-) diff --git a/exec.c b/exec.c index 4d8addb..ec91162 100644 --- a/exec.c +++ b/exec.c @@ -3078,6 +3078,7 @@ static MemTxResult flatview_write_continue(FlatView *= fv, hwaddr addr, return result; } =20 +/* Called from RCU critical section. */ static MemTxResult flatview_write(FlatView *fv, hwaddr addr, MemTxAttrs at= trs, const uint8_t *buf, int len) { @@ -3086,25 +3087,14 @@ static MemTxResult flatview_write(FlatView *fv, hwa= ddr addr, MemTxAttrs attrs, MemoryRegion *mr; MemTxResult result =3D MEMTX_OK; =20 - if (len > 0) { - rcu_read_lock(); - l =3D len; - mr =3D flatview_translate(fv, addr, &addr1, &l, true); - result =3D flatview_write_continue(fv, addr, attrs, buf, len, - addr1, l, mr); - rcu_read_unlock(); - } + l =3D len; + mr =3D flatview_translate(fv, addr, &addr1, &l, true); + result =3D flatview_write_continue(fv, addr, attrs, buf, len, + addr1, l, mr); =20 return result; } =20 -MemTxResult address_space_write(AddressSpace *as, hwaddr addr, - MemTxAttrs attrs, - const uint8_t *buf, int len) -{ - return flatview_write(address_space_to_flatview(as), addr, attrs, buf,= len); -} - /* Called within RCU critical section. */ MemTxResult flatview_read_continue(FlatView *fv, hwaddr addr, MemTxAttrs attrs, uint8_t *buf, @@ -3213,6 +3203,23 @@ MemTxResult address_space_rw(AddressSpace *as, hwadd= r addr, addr, attrs, buf, len, is_write); } =20 +MemTxResult address_space_write(AddressSpace *as, hwaddr addr, + MemTxAttrs attrs, + const uint8_t *buf, int len) +{ + MemTxResult result =3D MEMTX_OK; + FlatView *fv; + + if (len > 0) { + rcu_read_lock(); + fv =3D address_space_to_flatview(as); + result =3D flatview_write(fv, addr, attrs, buf, len); + rcu_read_unlock(); + } + + return result; +} + void cpu_physical_memory_rw(hwaddr addr, uint8_t *buf, int len, int is_write) { --=20 1.8.3.1