From nobody Tue Apr 30 18:26:49 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=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1685696053; cv=none; d=zohomail.com; s=zohoarc; b=YftMjT6FK+yQB0thdszz62C2SuuEBVyUW0RuJdi/vnO3AmxwTw9/XNzwN+TJvpRx+vhl5LkV8KXY0utZUYA3OYZjxMTgiWiz07f4CGDd7kJIl+xMCdMEQ5h7wbGoQTVN4kLmWKVDQoHzRx/e00Lvm1oKsIq+3Djpxvsc6GyBujA= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1685696053; 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=pFG4FsF2H9Ytku6Q/zZoLXcCQJcdVs4FKgYbzfCe9Fo=; b=RHNejBp1X8BVq9XT9DFg+m+wXaoipFN/4bAxzjclAhgwrYJR5vWcJV+d+y0v1MSr0NYE2yJkECqhGaW/wLKqGz2HTcNPjVAd914/2Zf0IDXwmFpegmmOo+lc+AXPNQT3fEvQC2IyI8uVJYcV7YBRjPLzXhBf90AalV7c9Zvifug= 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 1685696053579617.2491452539796; Fri, 2 Jun 2023 01:54:13 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1q50XL-0000r1-82; Fri, 02 Jun 2023 04:53:31 -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 1q50XJ-0000qM-KO for qemu-devel@nongnu.org; Fri, 02 Jun 2023 04:53:29 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1q50XI-0003gP-6G for qemu-devel@nongnu.org; Fri, 02 Jun 2023 04:53:29 -0400 Received: from mimecast-mx02.redhat.com (mx3-rdu2.redhat.com [66.187.233.73]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-356-4sFJTqUcOh-9bs3CUdyT3A-1; Fri, 02 Jun 2023 04:53:26 -0400 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.rdu2.redhat.com [10.11.54.2]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 050BA2801A4B for ; Fri, 2 Jun 2023 08:53:26 +0000 (UTC) Received: from eperezma.remote.csb (unknown [10.39.193.168]) by smtp.corp.redhat.com (Postfix) with ESMTP id 5D54340C6EC4; Fri, 2 Jun 2023 08:53:24 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1685696007; 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=pFG4FsF2H9Ytku6Q/zZoLXcCQJcdVs4FKgYbzfCe9Fo=; b=fZq2UjkCLHEdAB39NhvN4RcVCuaKPbE8OAQDN9jcmUWXwybQocKV3ezOPFJPws/sFZhCw8 EC3VwNR6daAhCqopeVBKR2eJlhFr6mVDja5kFYFVcYCZqeBO7txvd12IkvKZNx571pJ3h9 ++N/bVwTkk+Ztn+CTnUrCADyfys4jbw= X-MC-Unique: 4sFJTqUcOh-9bs3CUdyT3A-1 From: =?UTF-8?q?Eugenio=20P=C3=A9rez?= To: qemu-devel@nongnu.org Cc: Lei Yang , Jason Wang , "Michael S. Tsirkin" , =?UTF-8?q?Eugenio=20P=C3=A9rez?= Subject: [PATCH 1/2] vdpa: reorder vhost_vdpa_net_cvq_cmd_page_len function Date: Fri, 2 Jun 2023 10:53:20 +0200 Message-Id: <20230602085321.1814165-2-eperezma@redhat.com> In-Reply-To: <20230602085321.1814165-1-eperezma@redhat.com> References: <20230602085321.1814165-1-eperezma@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.1 on 10.11.54.2 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=170.10.133.124; envelope-from=eperezma@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -22 X-Spam_score: -2.3 X-Spam_bar: -- X-Spam_report: (-2.3 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.166, 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, T_SCC_BODY_TEXT_LINE=-0.01 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 @redhat.com) X-ZM-MESSAGEID: 1685696054520100001 We need to call it from resource cleanup context, as munmap needs the size of the mappings. Signed-off-by: Eugenio P=C3=A9rez Reviewed-by: Philippe Mathieu-Daud=C3=A9 --- net/vhost-vdpa.c | 32 ++++++++++++++++---------------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/net/vhost-vdpa.c b/net/vhost-vdpa.c index 37cdc84562..5fcdc05042 100644 --- a/net/vhost-vdpa.c +++ b/net/vhost-vdpa.c @@ -116,6 +116,22 @@ VHostNetState *vhost_vdpa_get_vhost_net(NetClientState= *nc) return s->vhost_net; } =20 +static size_t vhost_vdpa_net_cvq_cmd_len(void) +{ + /* + * MAC_TABLE_SET is the ctrl command that produces the longer out buff= er. + * In buffer is always 1 byte, so it should fit here + */ + return sizeof(struct virtio_net_ctrl_hdr) + + 2 * sizeof(struct virtio_net_ctrl_mac) + + MAC_TABLE_ENTRIES * ETH_ALEN; +} + +static size_t vhost_vdpa_net_cvq_cmd_page_len(void) +{ + return ROUND_UP(vhost_vdpa_net_cvq_cmd_len(), qemu_real_host_page_size= ()); +} + static bool vhost_vdpa_net_valid_svq_features(uint64_t features, Error **e= rrp) { uint64_t invalid_dev_features =3D @@ -422,22 +438,6 @@ static void vhost_vdpa_cvq_unmap_buf(struct vhost_vdpa= *v, void *addr) vhost_iova_tree_remove(tree, *map); } =20 -static size_t vhost_vdpa_net_cvq_cmd_len(void) -{ - /* - * MAC_TABLE_SET is the ctrl command that produces the longer out buff= er. - * In buffer is always 1 byte, so it should fit here - */ - return sizeof(struct virtio_net_ctrl_hdr) + - 2 * sizeof(struct virtio_net_ctrl_mac) + - MAC_TABLE_ENTRIES * ETH_ALEN; -} - -static size_t vhost_vdpa_net_cvq_cmd_page_len(void) -{ - return ROUND_UP(vhost_vdpa_net_cvq_cmd_len(), qemu_real_host_page_size= ()); -} - /** Map CVQ buffer. */ static int vhost_vdpa_cvq_map_buf(struct vhost_vdpa *v, void *buf, size_t = size, bool write) --=20 2.31.1 From nobody Tue Apr 30 18:26:49 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=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1685696068; cv=none; d=zohomail.com; s=zohoarc; b=Tdo3AsYfsKe/hW4opx84jkNmhNDIylgPpINlAeVkgsw+Ia1YukR3DfN31QNxq7THuSPHTpkoPVmivyZ0EjgOrE1jiO99S2d9cqh0yELg6s//2AMkyDsvjRhF7cV9OAKgadm2u3VgdAMrrcTSjpuUhTiwSoyoqHUs0f4+QIoouP0= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1685696068; 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=ml1S3EEt3L219LDwTEF4jvTpZqPqlGMzs4Us7q4mVGQ=; b=PtJGbc+jpey8B/piVHmnNkugpL+s8icN5dPXJp5FfxBCwcI599EPqNHS5kugexg/EyOCceA0MRJFLFqKtjmkkIa2BSoGEPev3l5mazYROLuYuLy7avKxIEx76UdNLS0pfnPVgUlzio9Gof5BnScuqaNbudG6QPhlZFhanW4BjEo= 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 1685696068256408.23096959974737; Fri, 2 Jun 2023 01:54:28 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1q50XN-0000rY-Iw; Fri, 02 Jun 2023 04:53:33 -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 1q50XL-0000r2-9u for qemu-devel@nongnu.org; Fri, 02 Jun 2023 04:53:31 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.129.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1q50XJ-0003gX-Jw for qemu-devel@nongnu.org; Fri, 02 Jun 2023 04:53:31 -0400 Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-85-nTJVxpUcMa-64UZje_8ypw-1; Fri, 02 Jun 2023 04:53:27 -0400 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.rdu2.redhat.com [10.11.54.2]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 3F0AB800B2A for ; Fri, 2 Jun 2023 08:53:27 +0000 (UTC) Received: from eperezma.remote.csb (unknown [10.39.193.168]) by smtp.corp.redhat.com (Postfix) with ESMTP id 4445440C6EC4; Fri, 2 Jun 2023 08:53:26 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1685696008; 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=ml1S3EEt3L219LDwTEF4jvTpZqPqlGMzs4Us7q4mVGQ=; b=Hg+qZg6ZzPtmkECq5yxsGAcpLr7Jpuf/AbhCBzoAWUfzKZtyysv24GhHgwkfEHeTxLwnEU gMi7rwXlYeQ9yG8x/ymAw633tL3Q3PPYr25mHLt4mDUS42BoQxslugJ7R/C0k4h3xrvBqm 7WdtL4MSrk1PEpMBxLwZ2a9LWVM5TfI= X-MC-Unique: nTJVxpUcMa-64UZje_8ypw-1 From: =?UTF-8?q?Eugenio=20P=C3=A9rez?= To: qemu-devel@nongnu.org Cc: Lei Yang , Jason Wang , "Michael S. Tsirkin" , =?UTF-8?q?Eugenio=20P=C3=A9rez?= Subject: [PATCH 2/2] vdpa: map shadow vrings with MAP_SHARED Date: Fri, 2 Jun 2023 10:53:21 +0200 Message-Id: <20230602085321.1814165-3-eperezma@redhat.com> In-Reply-To: <20230602085321.1814165-1-eperezma@redhat.com> References: <20230602085321.1814165-1-eperezma@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.1 on 10.11.54.2 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=170.10.129.124; envelope-from=eperezma@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -22 X-Spam_score: -2.3 X-Spam_bar: -- X-Spam_report: (-2.3 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.166, 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, T_SCC_BODY_TEXT_LINE=-0.01 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 @redhat.com) X-ZM-MESSAGEID: 1685696070359100001 The vdpa devices that use va addresses neeeds these maps shared. Otherwise, vhost_vdpa checks will refuse to accept the maps. The mmap call will always return a page aligned address, so removing the qemu_memalign call. Keeping the ROUND_UP for the size as we still need to DMA-map them in full. Not applying fixes tag as it never worked with va devices. Signed-off-by: Eugenio P=C3=A9rez --- hw/virtio/vhost-shadow-virtqueue.c | 16 +++++++--------- net/vhost-vdpa.c | 15 +++++++-------- 2 files changed, 14 insertions(+), 17 deletions(-) diff --git a/hw/virtio/vhost-shadow-virtqueue.c b/hw/virtio/vhost-shadow-vi= rtqueue.c index bd7c12b6d3..1892e2cef1 100644 --- a/hw/virtio/vhost-shadow-virtqueue.c +++ b/hw/virtio/vhost-shadow-virtqueue.c @@ -649,7 +649,7 @@ void vhost_svq_set_svq_kick_fd(VhostShadowVirtqueue *sv= q, int svq_kick_fd) void vhost_svq_start(VhostShadowVirtqueue *svq, VirtIODevice *vdev, VirtQueue *vq, VhostIOVATree *iova_tree) { - size_t desc_size, driver_size, device_size; + size_t desc_size; =20 event_notifier_set_handler(&svq->hdev_call, vhost_svq_handle_call); svq->next_guest_avail_elem =3D NULL; @@ -662,14 +662,12 @@ void vhost_svq_start(VhostShadowVirtqueue *svq, VirtI= ODevice *vdev, =20 svq->vring.num =3D virtio_queue_get_num(vdev, virtio_get_queue_index(v= q)); svq->num_free =3D svq->vring.num; - driver_size =3D vhost_svq_driver_area_size(svq); - device_size =3D vhost_svq_device_area_size(svq); - svq->vring.desc =3D qemu_memalign(qemu_real_host_page_size(), driver_s= ize); + svq->vring.desc =3D mmap(NULL, vhost_svq_driver_area_size(svq), O_RDWR, + MAP_SHARED | MAP_ANONYMOUS, -1, 0); desc_size =3D sizeof(vring_desc_t) * svq->vring.num; svq->vring.avail =3D (void *)((char *)svq->vring.desc + desc_size); - memset(svq->vring.desc, 0, driver_size); - svq->vring.used =3D qemu_memalign(qemu_real_host_page_size(), device_s= ize); - memset(svq->vring.used, 0, device_size); + svq->vring.used =3D mmap(NULL, vhost_svq_device_area_size(svq), O_RDWR, + MAP_SHARED | MAP_ANONYMOUS, -1, 0); svq->desc_state =3D g_new0(SVQDescState, svq->vring.num); svq->desc_next =3D g_new0(uint16_t, svq->vring.num); for (unsigned i =3D 0; i < svq->vring.num - 1; i++) { @@ -712,8 +710,8 @@ void vhost_svq_stop(VhostShadowVirtqueue *svq) svq->vq =3D NULL; g_free(svq->desc_next); g_free(svq->desc_state); - qemu_vfree(svq->vring.desc); - qemu_vfree(svq->vring.used); + munmap(svq->vring.desc, vhost_svq_driver_area_size(svq)); + munmap(svq->vring.used, vhost_svq_device_area_size(svq)); event_notifier_set_handler(&svq->hdev_call, NULL); } =20 diff --git a/net/vhost-vdpa.c b/net/vhost-vdpa.c index 5fcdc05042..329b481351 100644 --- a/net/vhost-vdpa.c +++ b/net/vhost-vdpa.c @@ -201,8 +201,8 @@ static void vhost_vdpa_cleanup(NetClientState *nc) { VhostVDPAState *s =3D DO_UPCAST(VhostVDPAState, nc, nc); =20 - qemu_vfree(s->cvq_cmd_out_buffer); - qemu_vfree(s->status); + munmap(s->cvq_cmd_out_buffer, vhost_vdpa_net_cvq_cmd_page_len()); + munmap(s->status, vhost_vdpa_net_cvq_cmd_page_len()); if (s->vhost_net) { vhost_net_cleanup(s->vhost_net); g_free(s->vhost_net); @@ -826,12 +826,11 @@ static NetClientState *net_vhost_vdpa_init(NetClientS= tate *peer, vhost_vdpa_net_valid_svq_features(features, &s->vhost_vdpa.migration_blocker= ); } else if (!is_datapath) { - s->cvq_cmd_out_buffer =3D qemu_memalign(qemu_real_host_page_size(), - vhost_vdpa_net_cvq_cmd_page_le= n()); - memset(s->cvq_cmd_out_buffer, 0, vhost_vdpa_net_cvq_cmd_page_len()= ); - s->status =3D qemu_memalign(qemu_real_host_page_size(), - vhost_vdpa_net_cvq_cmd_page_len()); - memset(s->status, 0, vhost_vdpa_net_cvq_cmd_page_len()); + s->cvq_cmd_out_buffer =3D mmap(NULL, vhost_vdpa_net_cvq_cmd_page_l= en(), + O_RDWR, MAP_SHARED | MAP_ANONYMOUS, -= 1, + 0); + s->status =3D mmap(NULL, vhost_vdpa_net_cvq_cmd_page_len(), O_RDWR, + MAP_SHARED | MAP_ANONYMOUS, -1, 0); =20 s->vhost_vdpa.shadow_vq_ops =3D &vhost_vdpa_net_svq_ops; s->vhost_vdpa.shadow_vq_ops_opaque =3D s; --=20 2.31.1