From nobody Thu Apr 17 06:00:18 2025
Delivered-To: importer@patchew.org
Authentication-Results: mx.zohomail.com;
dkim=fail;
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=fail(p=none dis=none) header.from=redhat.com
ARC-Seal: i=1; a=rsa-sha256; t=1612545061; cv=none;
d=zohomail.com; s=zohoarc;
b=AXMYK5VhOQHG3JI6joXUigGaf7OjIYlg/MCv+OQi0w6A4Ugg7O3OFPvBiIlVgtoW19r/xaSehk9iA+H3RdnmJn5Y19D9/gASusxm8pNHnzcDCJWAWqVmU4CWPSuIYuHlyGRA0bOBPGH2RhZKqHi+uXcBO9ersTLmN0TN02sxsq4=
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com;
s=zohoarc;
t=1612545061;
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=ZPakaozXTp5xm9647QN9viZsZHG4zCXv3GF1H1HQUmU=;
b=TjK5Xar4Q885uhzkpY+6dN5ox+J3A9pB7p2UCiD5EoFksjH+wUMsskAogfxZgfCIdxet5QXguXp4Q06WmUCNQNJMFrGwIjg3klT5+/KiTo4Dzxy2Jgktc0YcTo7fI9fDkckxR7ZnxYOfyRtrA3s9w8679WfN2Wa/LkAuKq//zRA=
ARC-Authentication-Results: i=1; mx.zohomail.com;
dkim=fail;
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=fail header.from=<stefanha@redhat.com> (p=none dis=none)
header.from=<stefanha@redhat.com>
Return-Path: <qemu-devel-bounces+importer=patchew.org@nongnu.org>
Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by
mx.zohomail.com
with SMTPS id 161254506195069.46915277155335;
Fri, 5 Feb 2021 09:11:01 -0800 (PST)
Received: from localhost ([::1]:57090 helo=lists1p.gnu.org)
by lists.gnu.org with esmtp (Exim 4.90_1)
(envelope-from <qemu-devel-bounces+importer=patchew.org@nongnu.org>)
id 1l84dI-0001OE-HR
for importer@patchew.org; Fri, 05 Feb 2021 12:11:00 -0500
Received: from eggs.gnu.org ([2001:470:142:3::10]:43200)
by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256)
(Exim 4.90_1) (envelope-from <stefanha@redhat.com>)
id 1l84IE-0003hy-57
for qemu-devel@nongnu.org; Fri, 05 Feb 2021 11:49:14 -0500
Received: from us-smtp-delivery-124.mimecast.com ([216.205.24.124]:22111)
by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256)
(Exim 4.90_1) (envelope-from <stefanha@redhat.com>)
id 1l84IB-0007P5-K2
for qemu-devel@nongnu.org; Fri, 05 Feb 2021 11:49:13 -0500
Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com
[209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id
us-mta-253-t_D0ENVgMgK3SaciU0iJZQ-1; Fri, 05 Feb 2021 11:49:06 -0500
Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com
[10.5.11.14])
(using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
(No client certificate requested)
by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 0FC1E19611A0;
Fri, 5 Feb 2021 16:49:04 +0000 (UTC)
Received: from localhost (ovpn-112-54.ams2.redhat.com [10.36.112.54])
by smtp.corp.redhat.com (Postfix) with ESMTP id AD4675D9DB;
Fri, 5 Feb 2021 16:48:52 +0000 (UTC)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com;
s=mimecast20190719; t=1612543748;
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=ZPakaozXTp5xm9647QN9viZsZHG4zCXv3GF1H1HQUmU=;
b=afjW9ZAxGZNWibCmiszd40x0+lQdOrbwI1J4zwTFcJRehkwZNSd3vHeGRuZJeU3zXGuD4/
bPRWkoH5YRLB8AJm6nZW5Ulye5KqtXfW3ZntFrcz+hEgtBiK8batnQpAR3Qxsz6yUpuUz/
o9o7U1SrpGS/1u94jsIkaC4Zk8mW5Ns=
X-MC-Unique: t_D0ENVgMgK3SaciU0iJZQ-1
From: Stefan Hajnoczi <stefanha@redhat.com>
To: Peter Maydell <peter.maydell@linaro.org>,
qemu-devel@nongnu.org
Subject: [PULL v3 21/27] multi-process: Forward PCI config space acceses to
the remote process
Date: Fri, 5 Feb 2021 16:44:53 +0000
Message-Id: <20210205164459.432714-22-stefanha@redhat.com>
In-Reply-To: <20210205164459.432714-1-stefanha@redhat.com>
References: <20210205164459.432714-1-stefanha@redhat.com>
MIME-Version: 1.0
X-Scanned-By: MIMEDefang 2.79 on 10.5.11.14
Authentication-Results: relay.mimecast.com;
auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=stefanha@redhat.com
X-Mimecast-Spam-Score: 0
X-Mimecast-Originator: redhat.com
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=216.205.24.124;
envelope-from=stefanha@redhat.com;
helo=us-smtp-delivery-124.mimecast.com
X-Spam_score_int: -13
X-Spam_score: -1.4
X-Spam_bar: -
X-Spam_report: (-1.4 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.352,
DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1,
MIME_BASE64_TEXT=1.741, RCVD_IN_DNSWL_LOW=-0.7, RCVD_IN_MSPIKE_H3=0.001,
RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001,
SPF_PASS=-0.001 autolearn=unavailable autolearn_force=no
X-Spam_action: no action
X-BeenThere: qemu-devel@nongnu.org
X-Mailman-Version: 2.1.23
Precedence: list
List-Id: <qemu-devel.nongnu.org>
List-Unsubscribe: <https://lists.nongnu.org/mailman/options/qemu-devel>,
<mailto:qemu-devel-request@nongnu.org?subject=unsubscribe>
List-Archive: <https://lists.nongnu.org/archive/html/qemu-devel>
List-Post: <mailto:qemu-devel@nongnu.org>
List-Help: <mailto:qemu-devel-request@nongnu.org?subject=help>
List-Subscribe: <https://lists.nongnu.org/mailman/listinfo/qemu-devel>,
<mailto:qemu-devel-request@nongnu.org?subject=subscribe>
Cc: Fam Zheng <fam@euphon.net>, John G Johnson <john.g.johnson@oracle.com>,
Thomas Huth <thuth@redhat.com>, Jagannathan Raman <jag.raman@oracle.com>,
Stefan Hajnoczi <stefanha@redhat.com>, qemu-block@nongnu.org,
"Michael S. Tsirkin" <mst@redhat.com>, "Denis V. Lunev" <den@openvz.org>,
=?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= <philmd@redhat.com>,
=?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= <berrange@redhat.com>,
Elena Ufimtseva <elena.ufimtseva@oracle.com>,
Wainer dos Santos Moschetta <wainersm@redhat.com>,
Igor Mammedov <imammedo@redhat.com>, Paolo Bonzini <pbonzini@redhat.com>,
=?UTF-8?q?Alex=20Benn=C3=A9e?= <alex.bennee@linaro.org>,
Eduardo Habkost <ehabkost@redhat.com>
Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org
Sender: "Qemu-devel" <qemu-devel-bounces+importer=patchew.org@nongnu.org>
X-ZohoMail-DKIM: fail (Header signature does not verify)
Content-Type: text/plain; charset="utf-8"
From: Elena Ufimtseva <elena.ufimtseva@oracle.com>
The Proxy Object sends the PCI config space accesses as messages
to the remote process over the communication channel
Signed-off-by: Elena Ufimtseva <elena.ufimtseva@oracle.com>
Signed-off-by: Jagannathan Raman <jag.raman@oracle.com>
Signed-off-by: John G Johnson <john.g.johnson@oracle.com>
Reviewed-by: Stefan Hajnoczi <stefanha@redhat.com>
Message-id: d3c94f4618813234655356c60e6f0d0362ff42d6.1611938319.git.jag.ram=
an@oracle.com
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
---
include/hw/remote/mpqemu-link.h | 10 ++++++
hw/remote/message.c | 60 +++++++++++++++++++++++++++++++++
hw/remote/mpqemu-link.c | 8 ++++-
hw/remote/proxy.c | 55 ++++++++++++++++++++++++++++++
4 files changed, 132 insertions(+), 1 deletion(-)
diff --git a/include/hw/remote/mpqemu-link.h b/include/hw/remote/mpqemu-lin=
k.h
index 1b35d408f8..7bc0bddb5a 100644
--- a/include/hw/remote/mpqemu-link.h
+++ b/include/hw/remote/mpqemu-link.h
@@ -34,6 +34,9 @@
*/
typedef enum {
MPQEMU_CMD_SYNC_SYSMEM,
+ MPQEMU_CMD_RET,
+ MPQEMU_CMD_PCI_CFGWRITE,
+ MPQEMU_CMD_PCI_CFGREAD,
MPQEMU_CMD_MAX,
} MPQemuCmd;
=20
@@ -43,6 +46,12 @@ typedef struct {
off_t offsets[REMOTE_MAX_FDS];
} SyncSysmemMsg;
=20
+typedef struct {
+ uint32_t addr;
+ uint32_t val;
+ int len;
+} PciConfDataMsg;
+
/**
* MPQemuMsg:
* @cmd: The remote command
@@ -60,6 +69,7 @@ typedef struct {
=20
union {
uint64_t u64;
+ PciConfDataMsg pci_conf_data;
SyncSysmemMsg sync_sysmem;
} data;
=20
diff --git a/hw/remote/message.c b/hw/remote/message.c
index 36e2d4fb0c..636bd161bd 100644
--- a/hw/remote/message.c
+++ b/hw/remote/message.c
@@ -15,6 +15,12 @@
#include "hw/remote/mpqemu-link.h"
#include "qapi/error.h"
#include "sysemu/runstate.h"
+#include "hw/pci/pci.h"
+
+static void process_config_write(QIOChannel *ioc, PCIDevice *dev,
+ MPQemuMsg *msg, Error **errp);
+static void process_config_read(QIOChannel *ioc, PCIDevice *dev,
+ MPQemuMsg *msg, Error **errp);
=20
void coroutine_fn mpqemu_remote_msg_loop_co(void *data)
{
@@ -40,6 +46,12 @@ void coroutine_fn mpqemu_remote_msg_loop_co(void *data)
}
=20
switch (msg.cmd) {
+ case MPQEMU_CMD_PCI_CFGWRITE:
+ process_config_write(com->ioc, pci_dev, &msg, &local_err);
+ break;
+ case MPQEMU_CMD_PCI_CFGREAD:
+ process_config_read(com->ioc, pci_dev, &msg, &local_err);
+ break;
default:
error_setg(&local_err,
"Unknown command (%d) received for device %s"
@@ -55,3 +67,51 @@ void coroutine_fn mpqemu_remote_msg_loop_co(void *data)
qemu_system_shutdown_request(SHUTDOWN_CAUSE_GUEST_SHUTDOWN);
}
}
+
+static void process_config_write(QIOChannel *ioc, PCIDevice *dev,
+ MPQemuMsg *msg, Error **errp)
+{
+ ERRP_GUARD();
+ PciConfDataMsg *conf =3D (PciConfDataMsg *)&msg->data.pci_conf_data;
+ MPQemuMsg ret =3D { 0 };
+
+ if ((conf->addr + sizeof(conf->val)) > pci_config_size(dev)) {
+ error_setg(errp, "Bad address for PCI config write, pid "FMT_pid".=
",
+ getpid());
+ ret.data.u64 =3D UINT64_MAX;
+ } else {
+ pci_default_write_config(dev, conf->addr, conf->val, conf->len);
+ }
+
+ ret.cmd =3D MPQEMU_CMD_RET;
+ ret.size =3D sizeof(ret.data.u64);
+
+ if (!mpqemu_msg_send(&ret, ioc, NULL)) {
+ error_prepend(errp, "Error returning code to proxy, pid "FMT_pid":=
",
+ getpid());
+ }
+}
+
+static void process_config_read(QIOChannel *ioc, PCIDevice *dev,
+ MPQemuMsg *msg, Error **errp)
+{
+ ERRP_GUARD();
+ PciConfDataMsg *conf =3D (PciConfDataMsg *)&msg->data.pci_conf_data;
+ MPQemuMsg ret =3D { 0 };
+
+ if ((conf->addr + sizeof(conf->val)) > pci_config_size(dev)) {
+ error_setg(errp, "Bad address for PCI config read, pid "FMT_pid".",
+ getpid());
+ ret.data.u64 =3D UINT64_MAX;
+ } else {
+ ret.data.u64 =3D pci_default_read_config(dev, conf->addr, conf->le=
n);
+ }
+
+ ret.cmd =3D MPQEMU_CMD_RET;
+ ret.size =3D sizeof(ret.data.u64);
+
+ if (!mpqemu_msg_send(&ret, ioc, NULL)) {
+ error_prepend(errp, "Error returning code to proxy, pid "FMT_pid":=
",
+ getpid());
+ }
+}
diff --git a/hw/remote/mpqemu-link.c b/hw/remote/mpqemu-link.c
index f5e9e01923..b45f325686 100644
--- a/hw/remote/mpqemu-link.c
+++ b/hw/remote/mpqemu-link.c
@@ -207,7 +207,7 @@ uint64_t mpqemu_msg_send_and_await_reply(MPQemuMsg *msg=
, PCIProxyDev *pdev,
return ret;
}
=20
- if (!mpqemu_msg_valid(&msg_reply)) {
+ if (!mpqemu_msg_valid(&msg_reply) || msg_reply.cmd !=3D MPQEMU_CMD_RET=
) {
error_setg(errp, "ERROR: Invalid reply received for command %d",
msg->cmd);
return ret;
@@ -242,6 +242,12 @@ bool mpqemu_msg_valid(MPQemuMsg *msg)
return false;
}
break;
+ case MPQEMU_CMD_PCI_CFGWRITE:
+ case MPQEMU_CMD_PCI_CFGREAD:
+ if (msg->size !=3D sizeof(PciConfDataMsg)) {
+ return false;
+ }
+ break;
default:
break;
}
diff --git a/hw/remote/proxy.c b/hw/remote/proxy.c
index cd5b071ab4..2b1439432b 100644
--- a/hw/remote/proxy.c
+++ b/hw/remote/proxy.c
@@ -17,6 +17,8 @@
#include "monitor/monitor.h"
#include "migration/blocker.h"
#include "qemu/sockets.h"
+#include "hw/remote/mpqemu-link.h"
+#include "qemu/error-report.h"
=20
static void pci_proxy_dev_realize(PCIDevice *device, Error **errp)
{
@@ -65,6 +67,56 @@ static void pci_proxy_dev_exit(PCIDevice *pdev)
error_free(dev->migration_blocker);
}
=20
+static void config_op_send(PCIProxyDev *pdev, uint32_t addr, uint32_t *val,
+ int len, unsigned int op)
+{
+ MPQemuMsg msg =3D { 0 };
+ uint64_t ret =3D -EINVAL;
+ Error *local_err =3D NULL;
+
+ msg.cmd =3D op;
+ msg.data.pci_conf_data.addr =3D addr;
+ msg.data.pci_conf_data.val =3D (op =3D=3D MPQEMU_CMD_PCI_CFGWRITE) ? *=
val : 0;
+ msg.data.pci_conf_data.len =3D len;
+ msg.size =3D sizeof(PciConfDataMsg);
+
+ ret =3D mpqemu_msg_send_and_await_reply(&msg, pdev, &local_err);
+ if (local_err) {
+ error_report_err(local_err);
+ }
+
+ if (ret =3D=3D UINT64_MAX) {
+ error_report("Failed to perform PCI config %s operation",
+ (op =3D=3D MPQEMU_CMD_PCI_CFGREAD) ? "READ" : "WRITE"=
);
+ }
+
+ if (op =3D=3D MPQEMU_CMD_PCI_CFGREAD) {
+ *val =3D (uint32_t)ret;
+ }
+}
+
+static uint32_t pci_proxy_read_config(PCIDevice *d, uint32_t addr, int len)
+{
+ uint32_t val;
+
+ config_op_send(PCI_PROXY_DEV(d), addr, &val, len, MPQEMU_CMD_PCI_CFGRE=
AD);
+
+ return val;
+}
+
+static void pci_proxy_write_config(PCIDevice *d, uint32_t addr, uint32_t v=
al,
+ int len)
+{
+ /*
+ * Some of the functions access the copy of remote device's PCI config
+ * space which is cached in the proxy device. Therefore, maintain
+ * it updated.
+ */
+ pci_default_write_config(d, addr, val, len);
+
+ config_op_send(PCI_PROXY_DEV(d), addr, &val, len, MPQEMU_CMD_PCI_CFGWR=
ITE);
+}
+
static Property proxy_properties[] =3D {
DEFINE_PROP_STRING("fd", PCIProxyDev, fd),
DEFINE_PROP_END_OF_LIST(),
@@ -77,6 +129,9 @@ static void pci_proxy_dev_class_init(ObjectClass *klass,=
void *data)
=20
k->realize =3D pci_proxy_dev_realize;
k->exit =3D pci_proxy_dev_exit;
+ k->config_read =3D pci_proxy_read_config;
+ k->config_write =3D pci_proxy_write_config;
+
device_class_set_props(dc, proxy_properties);
}
=20
--=20
2.29.2