From nobody Fri May 3 07:57:19 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 170.10.133.124 as permitted sender) client-ip=170.10.133.124; envelope-from=philmd@redhat.com; helo=us-smtp-delivery-124.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.133.124 as permitted sender) smtp.mailfrom=philmd@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1629736927; cv=none; d=zohomail.com; s=zohoarc; b=Olg+DUFsw9OlaQpl3m3GqIi5E+S46FUmKWlILYmqx5jpLImCiElcqtlqEoEXLAzcgTd/Zj6x+QH12Ozc0vwGkEw85kUkTqV6LFI1VI8cfugJ3olLPnov2Mnmj39uJmJCqUK4u8udEhV+D7GuV8s3b43ms4/au9EorTx50OI3+BA= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1629736927; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Subject:To; bh=YckUsUuV9Qy+6aID6wMdVmO5kBrH6n8ni00XTKyY7A0=; b=C16nFxlIzPKHwvdxpTW7rAPYUVRlQglQCSgk8VjllsDxRmUfAC76SX8dR3PlCO8RbIgnqyuUxg8lp5WT3ND310HwAnJqOfsS+8Q2o0ef+tGRzURs/0sMh9MbM6kMnHiHePUWUlY96IPNFBn/lv5Kaf7qzln6qhfVgak40Qcruhg= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.133.124 as permitted sender) smtp.mailfrom=philmd@redhat.com; dmarc=pass header.from= (p=none dis=none) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by mx.zohomail.com with SMTPS id 1629736927014981.5816299221036; Mon, 23 Aug 2021 09:42:07 -0700 (PDT) Received: from mail-wr1-f72.google.com (mail-wr1-f72.google.com [209.85.221.72]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-244-LQl1KX-vMhypATi1BOKVmA-1; Mon, 23 Aug 2021 12:42:04 -0400 Received: by mail-wr1-f72.google.com with SMTP id v18-20020adfe2920000b029013bbfb19640so5152011wri.17 for ; Mon, 23 Aug 2021 09:42:04 -0700 (PDT) Return-Path: Return-Path: Received: from x1w.. (163.red-83-52-55.dynamicip.rima-tde.net. [83.52.55.163]) by smtp.gmail.com with ESMTPSA id j17sm15371045wrt.69.2021.08.23.09.42.02 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 23 Aug 2021 09:42:03 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1629736926; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=YckUsUuV9Qy+6aID6wMdVmO5kBrH6n8ni00XTKyY7A0=; b=Urep3svfStXLhgsarqPqOTEd0bPwhQhrJAVYe3ycEQMGIl2+G6kU6r0c1UMLFHZIgErbBQ HBkzrwS4Ta9CFXl9X63fIDOtlJMCkDNTx2mqUHe0JK49s4PaYAATIunr6G/ILTG4vs3gCy r6wXiJL3XFeUeFnBrw/pgp6upZ6Wl0k= X-MC-Unique: LQl1KX-vMhypATi1BOKVmA-1 X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=YckUsUuV9Qy+6aID6wMdVmO5kBrH6n8ni00XTKyY7A0=; b=QXzaVc8uXSq3X1GEofkix9+RwQRoqfmj5jM6WomZBz9/DI8ozEunCPaoszsWcdWSMV 0zjzFJZ90xxWJunePalU2kFmscJyUOt41tXd0MywUTrwxuEezQWicDyXg8sfrBDFzjOm IKdtcWYHxWo3G/bpHRLJDBjWy24Dte9LYTLrOmWz4/QIl18pxqL8SHUL3/woNnVdztHO pfTRv6lFvx7iMk/7ors+piiBQ7mu/70gQAghB4qLweB8Xu3JcAK/a/z1bZX7iVUR96FF yBLJz2nda6AVhHgyBAvbz8FwnmiFr/tzfoxjoVy028ED16LnuyOI/crPOUocIOMTHGMy RXMw== X-Gm-Message-State: AOAM530XxVwMHAcf6av8DUfCvYUNhYEJbuFoevZDrMGt7ykoQzKU9NQs bRdWu5L0xA78eP+avc3OBDUC82xh69qATwe9kO43AdYjYC8j4+N8IC85QfOR+LO0h5aPv1qHC8J 7V4GGORjZcIoyHQ== X-Received: by 2002:adf:f2d1:: with SMTP id d17mr1483421wrp.381.1629736923720; Mon, 23 Aug 2021 09:42:03 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyoQTwJbU3js530K2WX8ZDPVo5o/3C1I6uXbf7lFVJ9dcxudLyttVejhIOrqg0wtrIEBGxe3Q== X-Received: by 2002:adf:f2d1:: with SMTP id d17mr1483398wrp.381.1629736923601; Mon, 23 Aug 2021 09:42:03 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Alexander Bulekov , David Hildenbrand , "Edgar E . Iglesias" , Peter Maydell , Stefan Hajnoczi , Jason Wang , qemu-arm@nongnu.org, Qiuhao Li , Peter Xu , Li Qiang , Paolo Bonzini , Gerd Hoffmann , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [RFC PATCH v2 1/5] softmmu/physmem: Simplify flatview_write and address_space_access_valid Date: Mon, 23 Aug 2021 18:41:53 +0200 Message-Id: <20210823164157.751807-2-philmd@redhat.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210823164157.751807-1-philmd@redhat.com> References: <20210823164157.751807-1-philmd@redhat.com> MIME-Version: 1.0 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=philmd@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1629736929078100001 Remove unuseful local 'result' variables. Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Alexander Bulekov Reviewed-by: David Hildenbrand Reviewed-by: Peter Xu Reviewed-by: Stefan Hajnoczi --- softmmu/physmem.c | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/softmmu/physmem.c b/softmmu/physmem.c index 2e18947598e..e534dc69918 100644 --- a/softmmu/physmem.c +++ b/softmmu/physmem.c @@ -2810,14 +2810,11 @@ static MemTxResult flatview_write(FlatView *fv, hwa= ddr addr, MemTxAttrs attrs, hwaddr l; hwaddr addr1; MemoryRegion *mr; - MemTxResult result =3D MEMTX_OK; =20 l =3D len; mr =3D flatview_translate(fv, addr, &addr1, &l, true, attrs); - result =3D flatview_write_continue(fv, addr, attrs, buf, len, - addr1, l, mr); - - return result; + return flatview_write_continue(fv, addr, attrs, buf, len, + addr1, l, mr); } =20 /* Called within RCU critical section. */ @@ -3114,12 +3111,10 @@ bool address_space_access_valid(AddressSpace *as, h= waddr addr, MemTxAttrs attrs) { FlatView *fv; - bool result; =20 RCU_READ_LOCK_GUARD(); fv =3D address_space_to_flatview(as); - result =3D flatview_access_valid(fv, addr, len, is_write, attrs); - return result; + return flatview_access_valid(fv, addr, len, is_write, attrs); } =20 static hwaddr --=20 2.31.1 From nobody Fri May 3 07:57:19 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 170.10.133.124 as permitted sender) client-ip=170.10.133.124; envelope-from=philmd@redhat.com; helo=us-smtp-delivery-124.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.133.124 as permitted sender) smtp.mailfrom=philmd@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1629736931; cv=none; d=zohomail.com; s=zohoarc; b=ScAlb3F43KIX6xzz+kT7x4/oHhT4nIYkMRwLC3u1maXt8FZM6kX19WGMX0gBKXLx+2kyIUK5cMLUtT0aCJTCI84iyD5oVJLfgL6W8BFvricZ6W6nhJP+Wi92cava4JGPsmGgjNjzCPoU9CT/xFtTdyKVfA/k5qpWNtnwlT6xMWk= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1629736931; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Subject:To; bh=9ahhZw7UhNiaeiQddaQJNPmtavRWVitOR1ZCYyKxXHQ=; b=OI0Wnegl08yE3mVvg9v+HREqmtz8aH+HipGhZs8+M71J4kwJ8C0KVC9goMrL1HSnfhY9w6N/ICb8NDmYqzJtMIREscVS8n05x3aOFhrMxpTNQvgWdur9z9h1h9kyKh/0a8CqFN+X2HN689gzpBf3WxP7Aj71UMGDlUUE5G1gB1U= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.133.124 as permitted sender) smtp.mailfrom=philmd@redhat.com; dmarc=pass header.from= (p=none dis=none) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by mx.zohomail.com with SMTPS id 1629736931590339.7295381521433; Mon, 23 Aug 2021 09:42:11 -0700 (PDT) Received: from mail-wm1-f72.google.com (mail-wm1-f72.google.com [209.85.128.72]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-308-0oJxmqUgMDi4blJ_ihupgQ-1; Mon, 23 Aug 2021 12:42:09 -0400 Received: by mail-wm1-f72.google.com with SMTP id f19-20020a1c1f13000000b002e6bd83c344so190292wmf.3 for ; Mon, 23 Aug 2021 09:42:09 -0700 (PDT) Return-Path: Return-Path: Received: from x1w.. (163.red-83-52-55.dynamicip.rima-tde.net. [83.52.55.163]) by smtp.gmail.com with ESMTPSA id p9sm10502547wmq.40.2021.08.23.09.42.07 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 23 Aug 2021 09:42:07 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1629736930; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=9ahhZw7UhNiaeiQddaQJNPmtavRWVitOR1ZCYyKxXHQ=; b=ZUWIeaTtn8ApgMFoddsw0I5m1AE9gP1Kr4sJZzebkOc96wwexZs3HA59MPrjm1OINnC7Vj ZlhHDFCxVpDraZyWyB/uOd5IoHWJCruKiSVyXQRNi2K+ufLcn/OrADiR7P5cIooPGeAdPG nNEYbX0lCtdAgGBtqPVQ5YWrvfZUt8U= X-MC-Unique: 0oJxmqUgMDi4blJ_ihupgQ-1 X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=9ahhZw7UhNiaeiQddaQJNPmtavRWVitOR1ZCYyKxXHQ=; b=bY/0gFWeNwbgDhoWFZsLptUDjbsxqOBOFl989SqbNqAUnxpEXe1l7qsEisUpQki1BR aEuYeF+nyJ1I2pOWm8oD5ZTYXyHAf7QvtSZcy/PVVZFhN714VeCWvYGcddtyub8uDZi5 1HY1uVjxa0jp4RfaCnrFhyDTYMH8mBBXPai+h+J8ZYJ0MawwDoXlo2bcCqNVn437Xku/ 2I3gVgFNAfq3QWfTajLrVIiP58K3rXK5a9XYzTPxQ64YQPxzUo9AdAbjRgHLn0GkYV6D q0U7qLLHS8+5VffnQ00xCi51lmJtS3nXOT3plErT4rfyl1vqjrHQYko6RRi/bPZpaz5E Y8kQ== X-Gm-Message-State: AOAM5332Az54bG8gtPrdQrG8WdXh6Nt5Em8mck1LWB178mXF+4jxcaMf iEOvDvWrDFf0a6b8/jEbKhYkdAPzmInJcPFKdBu4n4n4kpLjJLZI4sNHM5+LdicodfHwJ9DW9dz 62POGfTUqfyha1Q== X-Received: by 2002:a1c:a5c2:: with SMTP id o185mr1825613wme.34.1629736928308; Mon, 23 Aug 2021 09:42:08 -0700 (PDT) X-Google-Smtp-Source: ABdhPJz5RC9IdJb8SJs6rfbcQqD7kcDryEb9HPPXiTquTariJ+esiuJJexDY4DS5jsKdOf/nbNpmuQ== X-Received: by 2002:a1c:a5c2:: with SMTP id o185mr1825597wme.34.1629736928186; Mon, 23 Aug 2021 09:42:08 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Alexander Bulekov , David Hildenbrand , "Edgar E . Iglesias" , Peter Maydell , Stefan Hajnoczi , Jason Wang , qemu-arm@nongnu.org, Qiuhao Li , Peter Xu , Li Qiang , Paolo Bonzini , Gerd Hoffmann , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [RFC PATCH v2 2/5] hw/intc/arm_gicv3: Check for !MEMTX_OK instead of MEMTX_ERROR Date: Mon, 23 Aug 2021 18:41:54 +0200 Message-Id: <20210823164157.751807-3-philmd@redhat.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210823164157.751807-1-philmd@redhat.com> References: <20210823164157.751807-1-philmd@redhat.com> MIME-Version: 1.0 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=philmd@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1629736933321100001 We are going to introduce more MemTxResult bits, so it is safer to check for !MEMTX_OK rather than MEMTX_ERROR. Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: David Hildenbrand Reviewed-by: Peter Maydell Reviewed-by: Peter Xu --- hw/intc/arm_gicv3_dist.c | 4 ++-- hw/intc/arm_gicv3_redist.c | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/hw/intc/arm_gicv3_dist.c b/hw/intc/arm_gicv3_dist.c index b65f56f9035..e62a9cdfa8d 100644 --- a/hw/intc/arm_gicv3_dist.c +++ b/hw/intc/arm_gicv3_dist.c @@ -819,7 +819,7 @@ MemTxResult gicv3_dist_read(void *opaque, hwaddr offset= , uint64_t *data, break; } =20 - if (r =3D=3D MEMTX_ERROR) { + if (r !=3D MEMTX_OK) { qemu_log_mask(LOG_GUEST_ERROR, "%s: invalid guest read at offset " TARGET_FMT_plx "size %u\n", __func__, offset, size); @@ -861,7 +861,7 @@ MemTxResult gicv3_dist_write(void *opaque, hwaddr offse= t, uint64_t data, break; } =20 - if (r =3D=3D MEMTX_ERROR) { + if (r !=3D MEMTX_OK) { qemu_log_mask(LOG_GUEST_ERROR, "%s: invalid guest write at offset " TARGET_FMT_plx "size %u\n", __func__, offset, size); diff --git a/hw/intc/arm_gicv3_redist.c b/hw/intc/arm_gicv3_redist.c index 53da703ed84..547281a8961 100644 --- a/hw/intc/arm_gicv3_redist.c +++ b/hw/intc/arm_gicv3_redist.c @@ -450,7 +450,7 @@ MemTxResult gicv3_redist_read(void *opaque, hwaddr offs= et, uint64_t *data, break; } =20 - if (r =3D=3D MEMTX_ERROR) { + if (r !=3D MEMTX_OK) { qemu_log_mask(LOG_GUEST_ERROR, "%s: invalid guest read at offset " TARGET_FMT_plx " size %u\n", __func__, offset, size); @@ -507,7 +507,7 @@ MemTxResult gicv3_redist_write(void *opaque, hwaddr off= set, uint64_t data, break; } =20 - if (r =3D=3D MEMTX_ERROR) { + if (r !=3D MEMTX_OK) { qemu_log_mask(LOG_GUEST_ERROR, "%s: invalid guest write at offset " TARGET_FMT_plx " size %u\n", __func__, offset, size); --=20 2.31.1 From nobody Fri May 3 07:57:19 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 216.205.24.124 as permitted sender) client-ip=216.205.24.124; envelope-from=philmd@redhat.com; helo=us-smtp-delivery-124.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 216.205.24.124 as permitted sender) smtp.mailfrom=philmd@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1629736936; cv=none; d=zohomail.com; s=zohoarc; b=LnO7DknAoVVBgMjnOPpGzMVCzjh+cz899BcymkC1bS5IkHn0pg5m7hA01ws66uAk4K2qM80FBv+ouBgj565lX+2WW5WQu8JqBotc4JK5eY4IJjbz2cKJzmngA4G6Sqn8p8m2F2zFjiVbiqHVxWjxf5Wf+U91bZt75oUYvp77ZCg= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1629736936; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Subject:To; bh=HKpjD30wqc1vCj0eTxqs6392PPziUtsLt1ojowv2C3g=; b=lQHI5BmgiBxoKMIcHlrfiV4PckUa5blIoeSlr1cQzrlN82/+fWiy0k9dcYLUWfZoxFXzO+1Br0tmdpT3D+meuYJcQQD6haWGbLEsHw5tl6+FEm8Z13nhPSra5v5lSVybzfqJ90xP0BhIva2Uf2BTDMwxOAFhpA3zXUg3LofFvEk= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 216.205.24.124 as permitted sender) smtp.mailfrom=philmd@redhat.com; dmarc=pass header.from= (p=none dis=none) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [216.205.24.124]) by mx.zohomail.com with SMTPS id 1629736936455387.3254301731231; Mon, 23 Aug 2021 09:42:16 -0700 (PDT) Received: from mail-wm1-f69.google.com (mail-wm1-f69.google.com [209.85.128.69]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-495-E76aLcNtPTauJRVg0iwLbA-1; Mon, 23 Aug 2021 12:42:14 -0400 Received: by mail-wm1-f69.google.com with SMTP id v2-20020a7bcb420000b02902e6b108fcf1so8699908wmj.8 for ; Mon, 23 Aug 2021 09:42:13 -0700 (PDT) Return-Path: Return-Path: Received: from x1w.. (163.red-83-52-55.dynamicip.rima-tde.net. [83.52.55.163]) by smtp.gmail.com with ESMTPSA id r1sm15831189wrt.24.2021.08.23.09.42.11 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 23 Aug 2021 09:42:12 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1629736935; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=HKpjD30wqc1vCj0eTxqs6392PPziUtsLt1ojowv2C3g=; b=GKUdl4z0yCZGQVyIe/3X7RsO1vmJ5KE+yOvjvLy1JaWrviLTziI3qBowdSyy5B9xYpQ1LN mI/Py2L2tC7tzeHXo6vNR1jFh0QEctlr4dUecai92Hvqoz1REnxxQxzwDtF4LCI9joSlyl 5KEr5St1kMJXaCsbnXcK7joy1pwPpcM= X-MC-Unique: E76aLcNtPTauJRVg0iwLbA-1 X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=HKpjD30wqc1vCj0eTxqs6392PPziUtsLt1ojowv2C3g=; b=MXZiBKHSAvolDYurEPNCsrvFgtuCVJgfONXMxP8CZWDiqgNHm89NYz1+rYSsuwO4U/ VK1dhNYJMAv55BsIXpNfebszOmGcMkWOHaESWrle5EQwXJ8xN6sw3heGruC1+WF72zSY efwtwKUEurB3226CE2hUhBk9Mc9Qg0/JcWKUWBshZOjtmNsqam1g3K6aL42fQ1oYWMzH VYs/UCeMjy095iINpsWGCHwvTMncSMqwsI6PFK8Pz4ZcK+khwnMgpNjzB0aO9sE5Hdgk FZPFNvFdvz1m5P8bJcBJUGUgKolYVhMCOF9Bh40NKKan8tmNjyUH5p50lG/ey89MIegu HMUQ== X-Gm-Message-State: AOAM533QRWEOjUikXikL6jzTNA3aOkCTKSQgrXSV80WQyw/dezHBL255 zfJgFvMgnd3ZeQVowzNO+I/Lj+4bEvNTFq4E1SMu9+mPhYWwl7GRzTKxl1373dRvACcEujNdRM/ vHmBPd1EU5cp58Q== X-Received: by 2002:a1c:4b04:: with SMTP id y4mr16748199wma.19.1629736932988; Mon, 23 Aug 2021 09:42:12 -0700 (PDT) X-Google-Smtp-Source: ABdhPJy8fXDLGpsvdnTWf4B8j2AwaPTvJKoE7pqUMlwiFI6cOr+8aED2W4z/WfCTVbvQaYODMaXIyQ== X-Received: by 2002:a1c:4b04:: with SMTP id y4mr16748178wma.19.1629736932861; Mon, 23 Aug 2021 09:42:12 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Alexander Bulekov , David Hildenbrand , "Edgar E . Iglesias" , Peter Maydell , Stefan Hajnoczi , Jason Wang , qemu-arm@nongnu.org, Qiuhao Li , Peter Xu , Li Qiang , Paolo Bonzini , Gerd Hoffmann , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [RFC PATCH v2 3/5] exec/memattrs: Introduce MemTxAttrs::bus_perm field Date: Mon, 23 Aug 2021 18:41:55 +0200 Message-Id: <20210823164157.751807-4-philmd@redhat.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210823164157.751807-1-philmd@redhat.com> References: <20210823164157.751807-1-philmd@redhat.com> MIME-Version: 1.0 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=philmd@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1629736937878100001 Add the 'direct_access' bit to the memory attributes to restrict bus master access to ROM/RAM. Have read/write accessors return MEMTX_BUS_ERROR if an access is restricted and the region is not ROM/RAM ('direct'). Add corresponding trace events. Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- include/exec/memattrs.h | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/include/exec/memattrs.h b/include/exec/memattrs.h index 95f2d20d55b..7a94ee75a88 100644 --- a/include/exec/memattrs.h +++ b/include/exec/memattrs.h @@ -14,6 +14,13 @@ #ifndef MEMATTRS_H #define MEMATTRS_H =20 +/* Permission to restrict bus memory accesses. See MemTxAttrs::bus_perm */ +enum { + MEMTXPERM_UNSPECIFIED =3D 0, + MEMTXPERM_UNRESTRICTED =3D 1, + MEMTXPERM_RAM_DEVICE =3D 2, +}; + /* Every memory transaction has associated with it a set of * attributes. Some of these are generic (such as the ID of * the bus master); some are specific to a particular kind of @@ -35,6 +42,19 @@ typedef struct MemTxAttrs { unsigned int secure:1; /* Memory access is usermode (unprivileged) */ unsigned int user:1; + /* + * Bus memory access permission. + * + * Some devices (such DMA) might be restricted to only access + * some type of device, such RAM devices. By default memory + * accesses are unspecified (MEMTXPERM_UNSPECIFIED), but could be + * unrestricted (MEMTXPERM_UNRESTRICTED, similar to an allow list) + * or restricted to a type of devices (similar to a deny list). + * Currently only RAM devices can be restricted (MEMTXPERM_RAM_DEVICE). + * + * Memory accesses to restricted addresses return MEMTX_BUS_ERROR. + */ + unsigned int bus_perm:2; /* Requester ID (for MSI for example) */ unsigned int requester_id:16; /* Invert endianness for this page */ @@ -66,6 +86,7 @@ typedef struct MemTxAttrs { #define MEMTX_OK 0 #define MEMTX_ERROR (1U << 0) /* device returned an error */ #define MEMTX_DECODE_ERROR (1U << 1) /* nothing at that address */ +#define MEMTX_BUS_ERROR (1U << 2) /* bus returned an error */ typedef uint32_t MemTxResult; =20 #endif --=20 2.31.1 From nobody Fri May 3 07:57:19 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 170.10.133.124 as permitted sender) client-ip=170.10.133.124; envelope-from=philmd@redhat.com; helo=us-smtp-delivery-124.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.133.124 as permitted sender) smtp.mailfrom=philmd@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1629736941; cv=none; d=zohomail.com; s=zohoarc; b=efU7Mbcrh0CbgN2bUqAxBzDPyXQYEwmdD3pGgry8EROE9AQzjY7D7qjXohqKXF5l9XF6VzulcXWPqNzM1wtV7JJegUdXTH6AVY4N05BV9t2xZhNB27ddYnyjRIFODHhQIDkYYqzng5vDols7QYrFD54pkg4rk7aZWIPjxhloDEs= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1629736941; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Subject:To; bh=7R4zUdURf5txsJu6CyZuzHy/f/1sygZW3eoytgU2yN8=; b=FsZWCUgnFnn5WqMBhAfmXSlfXpiGCoDnfB7DIDItMcpzr4d5aqpwY1m/gXB+4UT3RJwGiImjELFZjlGYzGGWqQi4hV6sXKrwvrilsIPqOifl494q3SRUDY/YaDXTjUeeCOwjXNpJ7SVZ428Z4zEWmpe1yNKfXjZseRvZ4I+QY/4= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.133.124 as permitted sender) smtp.mailfrom=philmd@redhat.com; dmarc=pass header.from= (p=none dis=none) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by mx.zohomail.com with SMTPS id 1629736941209329.310045853116; Mon, 23 Aug 2021 09:42:21 -0700 (PDT) Received: from mail-wr1-f72.google.com (mail-wr1-f72.google.com [209.85.221.72]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-152-k1ks-K4ePWm8MUZJSN0Ukg-1; Mon, 23 Aug 2021 12:42:18 -0400 Received: by mail-wr1-f72.google.com with SMTP id p10-20020adfce0a000000b001572d05c970so3003170wrn.21 for ; Mon, 23 Aug 2021 09:42:18 -0700 (PDT) Return-Path: Return-Path: Received: from x1w.. (163.red-83-52-55.dynamicip.rima-tde.net. [83.52.55.163]) by smtp.gmail.com with ESMTPSA id o10sm2922553wrc.16.2021.08.23.09.42.16 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 23 Aug 2021 09:42:17 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1629736940; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=7R4zUdURf5txsJu6CyZuzHy/f/1sygZW3eoytgU2yN8=; b=BbL4GA65WdLhc8rqJa3aaPiG0M/e7MwCE47pKBrViFZebjH9KWaHYlVE7m85vOEK7vHKYI tREnWuHWQkBCa3JZwmC1rx61xbHJHCcu/FPMXwVJ9d2y3pLfNAsH+AeL4ylv3zefhVvwz1 r1R0y8fDagB6lGnl291Mi7Yjge6i59M= X-MC-Unique: k1ks-K4ePWm8MUZJSN0Ukg-1 X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=7R4zUdURf5txsJu6CyZuzHy/f/1sygZW3eoytgU2yN8=; b=N3IpUcOrYtvDLMZ/xEwB5KZZrd4ckya6kGieNyBuesGTrZbyQZozG37VUeq8cYYpcS HKPmPFUEMHoz+nG5JFdlvQI6UzvX8JcL7o0NMHyROVSL2aeb4K550UWVpW1/v5ysoNam JMGqveQ/sDyRuI5o/srWxOXAo2yIKua8YNklWZuLxErsMkmltsZ0OMb6QUdjTxTswMeR 2MSd9QuXKUhvnZCHw4PZXcqKcooWW7xx6u33H4Vb/PJEWYkrCGdHNota8Vlf/b3hfRO9 vlHWseWJqXBLbdQe0ESn1BkgYAhIM2ziYlLXxfWtl2A7rJ0tBZDSaV0jGRbDIRGpo2JX cLZw== X-Gm-Message-State: AOAM531FPX6yJL1n7J/NfwvXlW+4nmvEcbfR0Gw6cmfxVsQR315otulY /ckv6trTKj54h/LQXZzdZVR6vckJd4dVcopzsk/d6mdtK5loPuGdALQyS51uVc4VzSOGMklGPTQ z324ed/SjQ9rh/w== X-Received: by 2002:a1c:4a:: with SMTP id 71mr17335575wma.87.1629736937590; Mon, 23 Aug 2021 09:42:17 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzysm3WS85qZRVEgfejMlzTLBMjDfyEPfsxyuaYQdwihLiPfPMjXZUAZlmI/9N9UU5KhKEfLQ== X-Received: by 2002:a1c:4a:: with SMTP id 71mr17335551wma.87.1629736937427; Mon, 23 Aug 2021 09:42:17 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Alexander Bulekov , David Hildenbrand , "Edgar E . Iglesias" , Peter Maydell , Stefan Hajnoczi , Jason Wang , qemu-arm@nongnu.org, Qiuhao Li , Peter Xu , Li Qiang , Paolo Bonzini , Gerd Hoffmann , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [RFC PATCH v2 4/5] softmmu/physmem: Introduce flatview_access_allowed() to check bus perms Date: Mon, 23 Aug 2021 18:41:56 +0200 Message-Id: <20210823164157.751807-5-philmd@redhat.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210823164157.751807-1-philmd@redhat.com> References: <20210823164157.751807-1-philmd@redhat.com> MIME-Version: 1.0 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=philmd@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1629736942480100001 Introduce flatview_access_allowed() to check bus permission before running any bus transaction. For now this is a simple stub. Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- softmmu/physmem.c | 37 +++++++++++++++++++++++++++++++++++-- 1 file changed, 35 insertions(+), 2 deletions(-) diff --git a/softmmu/physmem.c b/softmmu/physmem.c index e534dc69918..0d31a2f4199 100644 --- a/softmmu/physmem.c +++ b/softmmu/physmem.c @@ -2754,6 +2754,27 @@ static bool prepare_mmio_access(MemoryRegion *mr) return release_lock; } =20 +/** + * flatview_access_allowed + * @mr: #MemoryRegion to be accessed + * @attrs: memory transaction attributes + * @addr: address within that memory region + * @len: the number of bytes to access + * @result: optional pointer to a MemTxResult or NULL + * + * Check if a memory transaction is allowed. If an error occurs this + * method will return false to indicate denial, as well as setting + * @result to contain corresponding #MemTxResult. + * + * Returns: true if transaction is allowed, false if denied. + */ +static inline bool flatview_access_allowed(MemoryRegion *mr, MemTxAttrs at= trs, + hwaddr addr, hwaddr len, + MemTxResult *result) +{ + return true; +} + /* Called within RCU critical section. */ static MemTxResult flatview_write_continue(FlatView *fv, hwaddr addr, MemTxAttrs attrs, @@ -2768,7 +2789,9 @@ static MemTxResult flatview_write_continue(FlatView *= fv, hwaddr addr, const uint8_t *buf =3D ptr; =20 for (;;) { - if (!memory_access_is_direct(mr, true)) { + if (!flatview_access_allowed(mr, attrs, addr1, l, &result)) { + /* 'result' contains the error, keep going. */ + } else if (!memory_access_is_direct(mr, true)) { release_lock |=3D prepare_mmio_access(mr); l =3D memory_access_size(mr, l, addr1); /* XXX: could force current_cpu to NULL to avoid @@ -2810,9 +2833,13 @@ static MemTxResult flatview_write(FlatView *fv, hwad= dr addr, MemTxAttrs attrs, hwaddr l; hwaddr addr1; MemoryRegion *mr; + MemTxResult result =3D MEMTX_OK; =20 l =3D len; mr =3D flatview_translate(fv, addr, &addr1, &l, true, attrs); + if (!flatview_access_allowed(mr, attrs, addr, len, &result)) { + return result; + } return flatview_write_continue(fv, addr, attrs, buf, len, addr1, l, mr); } @@ -2831,7 +2858,9 @@ MemTxResult flatview_read_continue(FlatView *fv, hwad= dr addr, =20 fuzz_dma_read_cb(addr, len, mr); for (;;) { - if (!memory_access_is_direct(mr, false)) { + if (!flatview_access_allowed(mr, attrs, addr1, l, &result)) { + /* 'result' contains the error, keep going. */ + } else if (!memory_access_is_direct(mr, false)) { /* I/O case */ release_lock |=3D prepare_mmio_access(mr); l =3D memory_access_size(mr, l, addr1); @@ -2871,9 +2900,13 @@ static MemTxResult flatview_read(FlatView *fv, hwadd= r addr, hwaddr l; hwaddr addr1; MemoryRegion *mr; + MemTxResult result =3D MEMTX_OK; =20 l =3D len; mr =3D flatview_translate(fv, addr, &addr1, &l, false, attrs); + if (!flatview_access_allowed(mr, attrs, addr, len, &result)) { + return result; + } return flatview_read_continue(fv, addr, attrs, buf, len, addr1, l, mr); } --=20 2.31.1 From nobody Fri May 3 07:57:19 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 216.205.24.124 as permitted sender) client-ip=216.205.24.124; envelope-from=philmd@redhat.com; helo=us-smtp-delivery-124.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 216.205.24.124 as permitted sender) smtp.mailfrom=philmd@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1629736946; cv=none; d=zohomail.com; s=zohoarc; b=Bik+PPWZw4N1J2uLvjIpyBm8Cp5YPcg64YtocUI1adhfA81UWQby9ipf5QHBv4o6ED1S4cBCC88Lxw1hHax3U4wjYPugVaBHR3r+Q7660jfCf69WHwIZmV54YGSikJz4RBZuJhOT4dY0gZSZR7iN/Y3GsPgoYFX3OfR5MxRrmQI= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1629736946; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Subject:To; bh=U6o7mUiS+x+yoYgYKCe3zRTvEmO9Jt50OpWWKAuJ49Y=; b=bCsZbIVsIT/zWM0+qnJIBiLchqC9G/MxYe7q/BjGVWwJRUFXCw8wYfXE4EMaNvLWf3MvdwAedWHyHcr2X/HGQAhh61Ni/aAcRT2V+b+wui4yldY8Vj1oueECFbGs7K3eh8vj67nyEVZZvwm2qV89CO+szAzUrtILti6yaVIKroE= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 216.205.24.124 as permitted sender) smtp.mailfrom=philmd@redhat.com; dmarc=pass header.from= (p=none dis=none) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [216.205.24.124]) by mx.zohomail.com with SMTPS id 1629736945998198.14170421745575; Mon, 23 Aug 2021 09:42:25 -0700 (PDT) Received: from mail-wm1-f69.google.com (mail-wm1-f69.google.com [209.85.128.69]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-583-VuCVScu5OK6c0QevYYpfCA-1; Mon, 23 Aug 2021 12:42:23 -0400 Received: by mail-wm1-f69.google.com with SMTP id o20-20020a05600c379400b002e755735eedso207670wmr.0 for ; Mon, 23 Aug 2021 09:42:23 -0700 (PDT) Return-Path: Return-Path: Received: from x1w.. (163.red-83-52-55.dynamicip.rima-tde.net. [83.52.55.163]) by smtp.gmail.com with ESMTPSA id s16sm8505653wrw.44.2021.08.23.09.42.21 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 23 Aug 2021 09:42:21 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1629736944; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=U6o7mUiS+x+yoYgYKCe3zRTvEmO9Jt50OpWWKAuJ49Y=; b=PCGBpfpFaZLjYasU8P5D1Q+PzXu937UUu46siQYfyNn9ReyHMrp6FZArgH1c0PPcS/eZD8 riJXLViy3LbYIXSuwWpZWl1GMSqjpfIjtQmvUctFHEHZtydeMOIytXt5kwqCJl4BBEQGq2 fFjY3MoBGTGgYd3a5NeSxQu2jw0cSZA= X-MC-Unique: VuCVScu5OK6c0QevYYpfCA-1 X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=U6o7mUiS+x+yoYgYKCe3zRTvEmO9Jt50OpWWKAuJ49Y=; b=bnGJvtbWdRbaOZrOBWVEmWT5ADJjnWJkoh/7qXv9NhqBgbyZ1lyoO3qLypx3bbdPE0 jqsWMKH5ETcw2WVDj+GJPgoHz0DyY4+bOnsO26nw1L9Qtyr2OSZgGgxPMKKDmNlsHbr3 52A+3dW+V4klojF/zDpNMRUPjvVkAkfppcJtMJ1PMF7x23y6shMwV3g1tZ1dgoiJfziN 5Lutc+5KJxfv0l8ZlIlBiudpGR+4uRtDWb1FMicQYmQ2D5WCnRafOiuOCY8gpZ10ljc3 czR4NHHbzCw5MWIWn8M/IYSVqDTuOXIWkVIOKMT2QHaMRnFZawcbYCP9tOEFk/J2sBoX uU4A== X-Gm-Message-State: AOAM530gOFhPPLQyhkWtU2mlFnoFg3jaeqiPc+NLfQ/GUGH8yzoqlvfy j6AFMCxWYf1VEsPMODQVMLi8jEgbMhakHog9QU/pC92rHeyDkN5SghsxP3iKMQPF343IMYLQTbm 0eq34nNT7BsHVDg== X-Received: by 2002:a05:600c:241:: with SMTP id 1mr11269903wmj.93.1629736942290; Mon, 23 Aug 2021 09:42:22 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxK8E4wJeqKC1vHJvRWr2gaLqg/4qrJHs8pGEpSWPboeu5B5479K8sbltqGJ0DurBZf1G/EaQ== X-Received: by 2002:a05:600c:241:: with SMTP id 1mr11269882wmj.93.1629736942128; Mon, 23 Aug 2021 09:42:22 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Alexander Bulekov , David Hildenbrand , "Edgar E . Iglesias" , Peter Maydell , Stefan Hajnoczi , Jason Wang , qemu-arm@nongnu.org, Qiuhao Li , Peter Xu , Li Qiang , Paolo Bonzini , Gerd Hoffmann , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [RFC PATCH v2 5/5] softmmu/physmem: Have flaview API check MemTxAttrs::bus_perm field Date: Mon, 23 Aug 2021 18:41:57 +0200 Message-Id: <20210823164157.751807-6-philmd@redhat.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210823164157.751807-1-philmd@redhat.com> References: <20210823164157.751807-1-philmd@redhat.com> MIME-Version: 1.0 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=philmd@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1629736947157100001 Check bus permission in flatview_access_allowed() before running any bus transaction. There is not change for the default case (MEMTXPERM_UNSPECIFIED). The MEMTXPERM_UNRESTRICTED case works as an allow list. Devices using it won't be checked by flatview_access_allowed(). The only deny list equivalent is MEMTXPERM_RAM_DEVICE: devices using this flag will reject transactions and set the optional MemTxResult to MEMTX_BUS_ERROR. Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- softmmu/physmem.c | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) diff --git a/softmmu/physmem.c b/softmmu/physmem.c index 0d31a2f4199..329542dba75 100644 --- a/softmmu/physmem.c +++ b/softmmu/physmem.c @@ -2772,7 +2772,22 @@ static inline bool flatview_access_allowed(MemoryReg= ion *mr, MemTxAttrs attrs, hwaddr addr, hwaddr len, MemTxResult *result) { - return true; + if (unlikely(attrs.bus_perm =3D=3D MEMTXPERM_RAM_DEVICE)) { + if (memory_region_is_ram(mr) || memory_region_is_ram_device(mr)) { + return true; + } + qemu_log_mask(LOG_GUEST_ERROR, + "Invalid access to non-RAM device at " + "addr 0x%" HWADDR_PRIX ", size %" HWADDR_PRIu ", " + "region '%s'\n", addr, len, memory_region_name(mr)); + if (result) { + *result |=3D MEMTX_BUS_ERROR; + } + return false; + } else { + /* MEMTXPERM_UNRESTRICTED and MEMTXPERM_UNSPECIFIED cases */ + return true; + } } =20 /* Called within RCU critical section. */ --=20 2.31.1