From nobody Sat May 18 10:30:04 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=oracle.com ARC-Seal: i=1; a=rsa-sha256; t=1686148983; cv=none; d=zohomail.com; s=zohoarc; b=ZYBhu1veLlPGq7/c2VcMDE/kOeXuX/vvl1mv1v/EvugIV4F16//RR/Z7Ubw5sImA6R6lP7Pi60LNhjC2/w/iPBOpmXWl89VNF1bMToUXV/Uq1uOhcwlvqlRReW61kzkSl88Nu+iWmTqdqdvhy4NJfctP3VoJV2Tw0GjOETWRNfw= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1686148983; h=Cc:Date:From:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:Message-ID:Sender:Subject:To; bh=Kg5E0n82+jWNSzfNMmqRDSNK0xETj0FrOvrv7EwXfLA=; b=niQ2OKQlpPsU6Da/JaeMoTbNxIYMCM/HnJEnb4QQMEGqiu0yJJb/GpMG3VjVHhR6QjMkeo0htPpALvNFOx7IbehsG2d7sKmLdROVuP+YeCzI0QrUM0BCCjM97nyMm9kY6MyaOSnvfkHMRd8csdkFlyzixZDwcppOVpZ27g77U7U= 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 168614898307287.27607106904918; Wed, 7 Jun 2023 07:43:03 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1q6uN2-0004ma-Tw; Wed, 07 Jun 2023 10:42:44 -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 1q6uMz-0004mL-QJ for qemu-devel@nongnu.org; Wed, 07 Jun 2023 10:42:42 -0400 Received: from mx0b-00069f02.pphosted.com ([205.220.177.32]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1q6uMx-0007MY-Fi for qemu-devel@nongnu.org; Wed, 07 Jun 2023 10:42:41 -0400 Received: from pps.filterd (m0246630.ppops.net [127.0.0.1]) by mx0b-00069f02.pphosted.com (8.17.1.19/8.17.1.19) with ESMTP id 3576JuX4018047; Wed, 7 Jun 2023 14:42:37 GMT Received: from iadpaimrmta02.imrmtpd1.prodappiadaev1.oraclevcn.com (iadpaimrmta02.appoci.oracle.com [147.154.18.20]) by mx0b-00069f02.pphosted.com (PPS) with ESMTPS id 3r2a6u9x31-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Wed, 07 Jun 2023 14:42:37 +0000 Received: from pps.filterd (iadpaimrmta02.imrmtpd1.prodappiadaev1.oraclevcn.com [127.0.0.1]) by iadpaimrmta02.imrmtpd1.prodappiadaev1.oraclevcn.com (8.17.1.19/8.17.1.19) with ESMTP id 357DBtiI011147; Wed, 7 Jun 2023 14:42:36 GMT Received: from pps.reinject (localhost [127.0.0.1]) by iadpaimrmta02.imrmtpd1.prodappiadaev1.oraclevcn.com (PPS) with ESMTPS id 3r2a6qkyca-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Wed, 07 Jun 2023 14:42:35 +0000 Received: from iadpaimrmta02.imrmtpd1.prodappiadaev1.oraclevcn.com (iadpaimrmta02.imrmtpd1.prodappiadaev1.oraclevcn.com [127.0.0.1]) by pps.reinject (8.17.1.5/8.17.1.5) with ESMTP id 357EgZlZ039912; Wed, 7 Jun 2023 14:42:35 GMT Received: from ca-dev63.us.oracle.com (ca-dev63.us.oracle.com [10.211.8.221]) by iadpaimrmta02.imrmtpd1.prodappiadaev1.oraclevcn.com (PPS) with ESMTP id 3r2a6qkybs-1; Wed, 07 Jun 2023 14:42:35 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oracle.com; h=from : to : cc : subject : date : message-id; s=corp-2023-03-30; bh=Kg5E0n82+jWNSzfNMmqRDSNK0xETj0FrOvrv7EwXfLA=; b=i+y3lJULJ7k1WKbPU5Vnp14k4P1v3bkXMrMv37YQ8zjqHeMdom3TLi4sBO0Y4rjjS1Be OKwJTUEX0wjM3k4ZFWNoyJkxqGBcNyvYTWE+IH8egw+N6ekWCL2FXq9Yotada5d53txs TN2H5qWCYsoqUyjxC1LB/QM56SqueaG+s3eBoZlwb3JWlY/wwIa3emQW9txxgoppfdsA mxrGBAPYKvApjl+mKamLXLh/hsYymmIgNMqyXAGJLUtRSPxLhRvyJ5Uk9C4D+Mwl0tG2 SeIjfoslGgLMgHc+7YoYusxSCd9zJwA+rDZL78nEArJqMH7xA/15NXaaR/dLmttNW7H4 pQ== From: Steve Sistare To: qemu-devel@nongnu.org Cc: Juan Quintela , "Michael S. Tsirkin" , Alex Williamson , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Steve Sistare Subject: [PATCH V3] migration: simplify notifiers Date: Wed, 7 Jun 2023 07:42:34 -0700 Message-Id: <1686148954-250144-1-git-send-email-steven.sistare@oracle.com> X-Mailer: git-send-email 1.8.3.1 X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.254,Aquarius:18.0.957,Hydra:6.0.573,FMLib:17.11.176.26 definitions=2023-06-07_07,2023-06-07_01,2023-05-22_02 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 suspectscore=0 malwarescore=0 mlxscore=0 bulkscore=0 phishscore=0 mlxlogscore=999 spamscore=0 adultscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2305260000 definitions=main-2306070124 X-Proofpoint-GUID: B6Na2LeDwwsYSUh-2sYpC3-lddJMluTi X-Proofpoint-ORIG-GUID: B6Na2LeDwwsYSUh-2sYpC3-lddJMluTi 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=205.220.177.32; envelope-from=steven.sistare@oracle.com; helo=mx0b-00069f02.pphosted.com X-Spam_score_int: -27 X-Spam_score: -2.8 X-Spam_bar: -- X-Spam_report: (-2.8 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_MED=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_LOW=-0.7, RCVD_IN_MSPIKE_H5=0.001, RCVD_IN_MSPIKE_WL=0.001, 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 @oracle.com) X-ZM-MESSAGEID: 1686148984873100003 Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Pass the callback function to add_migration_state_change_notifier so that migration can initialize the notifier on add and clear it on delete, which simplifies the call sites. Shorten the function names so the extra arg can be added more legibly. Hide the global notifier list in a new function migration_call_notifiers, and make it externally visible so future live update code can call it. No functional change. Signed-off-by: Steve Sistare Reviewed-by: Juan Quintela Reviewed-by: Michael Galaxy Reviewed-by: Peter Xu Tested-by: Michael Galaxy --- hw/net/virtio-net.c | 6 +++--- hw/vfio/migration.c | 8 ++++---- include/migration/misc.h | 6 ++++-- migration/migration.c | 22 ++++++++++++++++------ net/vhost-vdpa.c | 7 ++++--- ui/spice-core.c | 3 +-- 6 files changed, 32 insertions(+), 20 deletions(-) diff --git a/hw/net/virtio-net.c b/hw/net/virtio-net.c index 6df6b73..c4dc795 100644 --- a/hw/net/virtio-net.c +++ b/hw/net/virtio-net.c @@ -3605,8 +3605,8 @@ static void virtio_net_device_realize(DeviceState *de= v, Error **errp) n->primary_listener.hide_device =3D failover_hide_primary_device; qatomic_set(&n->failover_primary_hidden, true); device_listener_register(&n->primary_listener); - n->migration_state.notify =3D virtio_net_migration_state_notifier; - add_migration_state_change_notifier(&n->migration_state); + migration_add_notifier(&n->migration_state, + virtio_net_migration_state_notifier); n->host_features |=3D (1ULL << VIRTIO_NET_F_STANDBY); } =20 @@ -3769,7 +3769,7 @@ static void virtio_net_device_unrealize(DeviceState *= dev) if (n->failover) { qobject_unref(n->primary_opts); device_listener_unregister(&n->primary_listener); - remove_migration_state_change_notifier(&n->migration_state); + migration_remove_notifier(&n->migration_state); } else { assert(n->primary_opts =3D=3D NULL); } diff --git a/hw/vfio/migration.c b/hw/vfio/migration.c index c4656bb..8af0294 100644 --- a/hw/vfio/migration.c +++ b/hw/vfio/migration.c @@ -619,9 +619,9 @@ static int vfio_migration_init(VFIODevice *vbasedev) migration->vm_state =3D qdev_add_vm_change_state_handler(vbasedev->dev, vfio_vmstate_ch= ange, vbasedev); - migration->migration_state.notify =3D vfio_migration_state_notifier; - add_migration_state_change_notifier(&migration->migration_state); - + migration_add_notifier(&migration->migration_state, + vfio_migration_state_notifier); + =20 return 0; } =20 @@ -670,7 +670,7 @@ void vfio_migration_exit(VFIODevice *vbasedev) if (vbasedev->migration) { VFIOMigration *migration =3D vbasedev->migration; =20 - remove_migration_state_change_notifier(&migration->migration_state= ); + migration_remove_notifier(&migration->migration_state); qemu_del_vm_change_state_handler(migration->vm_state); unregister_savevm(VMSTATE_IF(vbasedev->dev), "vfio", vbasedev); vfio_migration_free(vbasedev); diff --git a/include/migration/misc.h b/include/migration/misc.h index 5ebe13b..0987eb1 100644 --- a/include/migration/misc.h +++ b/include/migration/misc.h @@ -59,8 +59,10 @@ void migration_object_init(void); void migration_shutdown(void); bool migration_is_idle(void); bool migration_is_active(MigrationState *); -void add_migration_state_change_notifier(Notifier *notify); -void remove_migration_state_change_notifier(Notifier *notify); +void migration_add_notifier(Notifier *notify, + void (*func)(Notifier *notifier, void *data)); +void migration_remove_notifier(Notifier *notify); +void migration_call_notifiers(MigrationState *s); bool migration_in_setup(MigrationState *); bool migration_has_finished(MigrationState *); bool migration_has_failed(MigrationState *); diff --git a/migration/migration.c b/migration/migration.c index 5103e2f..17b4b47 100644 --- a/migration/migration.c +++ b/migration/migration.c @@ -1178,7 +1178,7 @@ static void migrate_fd_cleanup(MigrationState *s) /* It is used on info migrate. We can't free it */ error_report_err(error_copy(s->error)); } - notifier_list_notify(&migration_state_notifiers, s); + migration_call_notifiers(s); block_cleanup_parameters(); yank_unregister_instance(MIGRATION_YANK_INSTANCE); } @@ -1273,14 +1273,24 @@ static void migrate_fd_cancel(MigrationState *s) } } =20 -void add_migration_state_change_notifier(Notifier *notify) +void migration_add_notifier(Notifier *notify, + void (*func)(Notifier *notifier, void *data)) { + notify->notify =3D func; notifier_list_add(&migration_state_notifiers, notify); } =20 -void remove_migration_state_change_notifier(Notifier *notify) +void migration_remove_notifier(Notifier *notify) { - notifier_remove(notify); + if (notify->notify) { + notifier_remove(notify); + notify->notify =3D NULL; + } +} + +void migration_call_notifiers(MigrationState *s) +{ + notifier_list_notify(&migration_state_notifiers, s); } =20 bool migration_in_setup(MigrationState *s) @@ -2191,7 +2201,7 @@ static int postcopy_start(MigrationState *ms) * spice needs to trigger a transition now */ ms->postcopy_after_devices =3D true; - notifier_list_notify(&migration_state_notifiers, ms); + migration_call_notifiers(ms); =20 ms->downtime =3D qemu_clock_get_ms(QEMU_CLOCK_REALTIME) - time_at_sto= p; =20 @@ -3219,7 +3229,7 @@ void migrate_fd_connect(MigrationState *s, Error *err= or_in) rate_limit =3D migrate_max_bandwidth(); =20 /* Notify before starting migration thread */ - notifier_list_notify(&migration_state_notifiers, s); + migration_call_notifiers(s); } =20 migration_rate_set(rate_limit); diff --git a/net/vhost-vdpa.c b/net/vhost-vdpa.c index 37cdc84..1a4608b 100644 --- a/net/vhost-vdpa.c +++ b/net/vhost-vdpa.c @@ -297,7 +297,8 @@ static void vhost_vdpa_net_data_start_first(VhostVDPASt= ate *s) { struct vhost_vdpa *v =3D &s->vhost_vdpa; =20 - add_migration_state_change_notifier(&s->migration_state); + migration_add_notifier(&s->migration_state, + vdpa_net_migration_state_notifier); if (v->shadow_vqs_enabled) { v->iova_tree =3D vhost_iova_tree_new(v->iova_range.first, v->iova_range.last); @@ -341,7 +342,7 @@ static void vhost_vdpa_net_client_stop(NetClientState *= nc) assert(nc->info->type =3D=3D NET_CLIENT_DRIVER_VHOST_VDPA); =20 if (s->vhost_vdpa.index =3D=3D 0) { - remove_migration_state_change_notifier(&s->migration_state); + migration_remove_notifier(&s->migration_state); } =20 dev =3D s->vhost_vdpa.dev; @@ -818,7 +819,7 @@ static NetClientState *net_vhost_vdpa_init(NetClientSta= te *peer, s->vhost_vdpa.device_fd =3D vdpa_device_fd; s->vhost_vdpa.index =3D queue_pair_index; s->always_svq =3D svq; - s->migration_state.notify =3D vdpa_net_migration_state_notifier; + s->migration_state.notify =3D NULL; s->vhost_vdpa.shadow_vqs_enabled =3D svq; s->vhost_vdpa.iova_range =3D iova_range; s->vhost_vdpa.shadow_data =3D svq; diff --git a/ui/spice-core.c b/ui/spice-core.c index 52a5938..db21db2 100644 --- a/ui/spice-core.c +++ b/ui/spice-core.c @@ -821,8 +821,7 @@ static void qemu_spice_init(void) }; using_spice =3D 1; =20 - migration_state.notify =3D migration_state_notifier; - add_migration_state_change_notifier(&migration_state); + migration_add_notifier(&migration_state, migration_state_notifier); spice_migrate.base.sif =3D &migrate_interface.base; qemu_spice.add_interface(&spice_migrate.base); =20 --=20 1.8.3.1