From nobody Tue Feb 10 03:55:57 2026 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 Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1646319946056390.11872431633947; Thu, 3 Mar 2022 07:05:46 -0800 (PST) Received: from localhost ([::1]:33592 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nPn1V-0007fV-Fw for importer@patchew.org; Thu, 03 Mar 2022 10:05:45 -0500 Received: from eggs.gnu.org ([209.51.188.92]:40648) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nPmua-0006ta-NG for qemu-devel@nongnu.org; Thu, 03 Mar 2022 09:58:36 -0500 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]:46431) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nPmuW-0000pS-Nm for qemu-devel@nongnu.org; Thu, 03 Mar 2022 09:58:35 -0500 Received: from mail-wm1-f72.google.com (mail-wm1-f72.google.com [209.85.128.72]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-492-3CaSVq6PPT-xSJsDa47tKQ-1; Thu, 03 Mar 2022 09:58:29 -0500 Received: by mail-wm1-f72.google.com with SMTP id l19-20020a05600c4f1300b003818783847eso1434791wmq.2 for ; Thu, 03 Mar 2022 06:58:29 -0800 (PST) Received: from vian.redhat.com ([2a0c:5a80:1b14:b500:abb:f9d1:7bc2:3db8]) by smtp.gmail.com with ESMTPSA id v124-20020a1cac82000000b0037c3d08e0e7sm9139512wme.29.2022.03.03.06.58.26 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 03 Mar 2022 06:58:27 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1646319512; 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=0IJvMiwB3fXMCCWHpy2o8W5h1w30vAktoIKbi/G/mnU=; b=GqhfDEubD4ETRwHQ4NYEvXMFXwJXmtHm6Wr+vtAeP1ojuOUvgSuOXiofs4uaLJhCTcZVbb eZ0SIWm2W0MFphsVD6DnE0QhaUocWYynZ6G7oPd5w1z85r2zIxjeaLWiMsQDQzCpi0tl+Q uEDI7hOfdamvTIf2gXyQU+HX1GUwuhI= X-MC-Unique: 3CaSVq6PPT-xSJsDa47tKQ-1 X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=0IJvMiwB3fXMCCWHpy2o8W5h1w30vAktoIKbi/G/mnU=; b=6MxOVkVUTio1CCAD8kbgQx4kob/jULdjBhM+vNFaWecDv5FOteoACqmJRIjKEGGnAQ xVU+SjhD2ayecPc4c7+PjrFVC47uS5ux0QJSKgMZcwLh50LhXSou8cE19MKiCsS3lhuy mlEH3vt+5PopgJt5T3fWuJPJwbVDWXwFU2E8LNc5SRGjDQLJouRXWZFkwTYeCVmagOFR jp8wl2zdlQgx9YqKRpGCSen0HKb2mKcPMYO/WOq1FQb+cpjIuSaALqGpluI+/Nv5ExA5 YHCOgFj0QVcFdDTy0thvPsyIFaJTdxFBs6EAxo+wv55UIheQVlh/8lrc36gL1/uftMpQ 40tg== X-Gm-Message-State: AOAM531O02rg/S5EFmQX+fQh1lKTofloyIJALmPgp3x64Kr8OCdwegRQ k8LzFcWAjHNkApDddy9cXUTFkKB1J4Z9TgeRYG4Kv8iUF5FnS6LHKaJQMzVZ493FumVFyDzYcuD LWaOsPjpyJoV83xw= X-Received: by 2002:a05:6000:24b:b0:1ef:759f:b12f with SMTP id m11-20020a056000024b00b001ef759fb12fmr21593274wrz.130.1646319508370; Thu, 03 Mar 2022 06:58:28 -0800 (PST) X-Google-Smtp-Source: ABdhPJwmzlVXOqO+/hAZy8dvcByPj0va9UiV3zclcUgR87jXVKrkT6pyUts3lco8qSxOq6Cwnuok+Q== X-Received: by 2002:a05:6000:24b:b0:1ef:759f:b12f with SMTP id m11-20020a056000024b00b001ef759fb12fmr21593237wrz.130.1646319507984; Thu, 03 Mar 2022 06:58:27 -0800 (PST) From: Nicolas Saenz Julienne To: kwolf@redhat.com, stefanha@redhat.com, berrange@redhat.com Subject: [PATCH v2 2/4] Introduce event-loop-base abstract class Date: Thu, 3 Mar 2022 15:58:20 +0100 Message-Id: <20220303145822.518887-3-nsaenzju@redhat.com> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220303145822.518887-1-nsaenzju@redhat.com> References: <20220303145822.518887-1-nsaenzju@redhat.com> MIME-Version: 1.0 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=nsaenzju@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=170.10.133.124; envelope-from=nsaenzju@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -28 X-Spam_score: -2.9 X-Spam_bar: -- X-Spam_report: (-2.9 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.082, 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=unavailable 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: , Cc: fam@euphon.net, eduardo@habkost.net, qemu-block@nongnu.org, michael.roth@amd.com, mtosatti@redhat.com, qemu-devel@nongnu.org, armbru@redhat.com, hreitz@redhat.com, pbonzini@redhat.com, Nicolas Saenz Julienne , eblake@redhat.com Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZM-MESSAGEID: 1646319976611100001 Content-Type: text/plain; charset="utf-8" Introduce the 'event-loop-base' abstract class, it'll hold the properties common to all event loops and provide the necessary hooks for their creation and maintenance. Then have iothread inherit from it. EventLoopBaseClass is defined as user creatable and provides a hook for its children to attach themselves to the user creatable class 'complete' function. It also provides an update_params() callback to propagate property changes onto its children. The new 'event-loop-base' class will live in the root directory, and it imposes new compilation dependencies: qom <- event-loop-base <- blockdev (iothread) It is built with on its own using the link_whole option as there are no direct function dependencies between the class and its children (everything happens through the 'contructor' attribute). All this forced some amount of reordering in meson.build, among other things the 'hw' subdir is processed earlier as it introduces files into the 'qom' source set. No functional changes intended. Signed-off-by: Nicolas Saenz Julienne --- Changes since v1: - Rename to event-loop-base - Move event-loop-base into root directory - Build event-loop-base on its own, use link_whole to avoid the problem of the object file not being linked due to lacking direct calls from dependencies. - Move poll parameters into iothread, as main loop can't poll - Update Authorship (I took what iothread.c had and added myself, I hope that's fine) - Introduce update_params() callback event-loop-base.c | 104 +++++++++++++++++++++++++++++++ include/sysemu/event-loop-base.h | 36 +++++++++++ include/sysemu/iothread.h | 6 +- iothread.c | 65 ++++++------------- meson.build | 23 ++++--- 5 files changed, 175 insertions(+), 59 deletions(-) create mode 100644 event-loop-base.c create mode 100644 include/sysemu/event-loop-base.h diff --git a/event-loop-base.c b/event-loop-base.c new file mode 100644 index 0000000000..a924c73a7c --- /dev/null +++ b/event-loop-base.c @@ -0,0 +1,104 @@ +/* + * QEMU event-loop base + * + * Copyright (C) 2022 Red Hat Inc + * + * Authors: + * Stefan Hajnoczi + * Nicolas Saenz Julienne + * + * This work is licensed under the terms of the GNU GPL, version 2 or late= r. + * See the COPYING file in the top-level directory. + */ + +#include "qemu/osdep.h" +#include "qom/object_interfaces.h" +#include "qapi/error.h" +#include "sysemu/event-loop-base.h" + +typedef struct { + const char *name; + ptrdiff_t offset; /* field's byte offset in EventLoopBase struct */ +} EventLoopBaseParamInfo; + +static EventLoopBaseParamInfo aio_max_batch_info =3D { + "aio-max-batch", offsetof(EventLoopBase, aio_max_batch), +}; + +static void event_loop_base_get_param(Object *obj, Visitor *v, + const char *name, void *opaque, Error **errp) +{ + EventLoopBase *event_loop_base =3D EVENT_LOOP_BASE(obj); + EventLoopBaseParamInfo *info =3D opaque; + int64_t *field =3D (void *)event_loop_base + info->offset; + + visit_type_int64(v, name, field, errp); +} + +static void event_loop_base_set_param(Object *obj, Visitor *v, + const char *name, void *opaque, Error **errp) +{ + EventLoopBaseClass *bc =3D EVENT_LOOP_BASE_GET_CLASS(obj); + EventLoopBase *base =3D EVENT_LOOP_BASE(obj); + EventLoopBaseParamInfo *info =3D opaque; + int64_t *field =3D (void *)base + info->offset; + int64_t value; + + if (!visit_type_int64(v, name, &value, errp)) { + return; + } + + if (value < 0) { + error_setg(errp, "%s value must be in range [0, %" PRId64 "]", + info->name, INT64_MAX); + return; + } + + *field =3D value; + + if (bc->update_params) { + bc->update_params(base, errp); + } + + return; +} + +static void event_loop_base_complete(UserCreatable *uc, Error **errp) +{ + EventLoopBaseClass *bc =3D EVENT_LOOP_BASE_GET_CLASS(uc); + EventLoopBase *base =3D EVENT_LOOP_BASE(uc); + + if (bc->init) { + bc->init(base, errp); + } +} + +static void event_loop_base_class_init(ObjectClass *klass, void *class_dat= a) +{ + UserCreatableClass *ucc =3D USER_CREATABLE_CLASS(klass); + ucc->complete =3D event_loop_base_complete; + + object_class_property_add(klass, "aio-max-batch", "int", + event_loop_base_get_param, + event_loop_base_set_param, + NULL, &aio_max_batch_info); +} + +static const TypeInfo event_loop_base_info =3D { + .name =3D TYPE_EVENT_LOOP_BASE, + .parent =3D TYPE_OBJECT, + .instance_size =3D sizeof(EventLoopBase), + .class_size =3D sizeof(EventLoopBaseClass), + .class_init =3D event_loop_base_class_init, + .abstract =3D true, + .interfaces =3D (InterfaceInfo[]) { + { TYPE_USER_CREATABLE }, + { } + } +}; + +static void register_types(void) +{ + type_register_static(&event_loop_base_info); +} +type_init(register_types); diff --git a/include/sysemu/event-loop-base.h b/include/sysemu/event-loop-b= ase.h new file mode 100644 index 0000000000..8e77d8b69f --- /dev/null +++ b/include/sysemu/event-loop-base.h @@ -0,0 +1,36 @@ +/* + * QEMU event-loop backend + * + * Copyright (C) 2022 Red Hat Inc + * + * Authors: + * Nicolas Saenz Julienne + * + * This work is licensed under the terms of the GNU GPL, version 2 or late= r. + * See the COPYING file in the top-level directory. + */ +#ifndef QEMU_EVENT_LOOP_BASE_H +#define QEMU_EVENT_LOOP_BASE_H + +#include "qom/object.h" +#include "block/aio.h" +#include "qemu/typedefs.h" + +#define TYPE_EVENT_LOOP_BASE "event-loop-base" +OBJECT_DECLARE_TYPE(EventLoopBase, EventLoopBaseClass, + EVENT_LOOP_BASE) + +struct EventLoopBaseClass { + ObjectClass parent_class; + + void (*init)(EventLoopBase *base, Error **errp); + void (*update_params)(EventLoopBase *base, Error **errp); +}; + +struct EventLoopBase { + Object parent; + + /* AioContext AIO engine parameters */ + int64_t aio_max_batch; +}; +#endif diff --git a/include/sysemu/iothread.h b/include/sysemu/iothread.h index 7f714bd136..8f8601d6ab 100644 --- a/include/sysemu/iothread.h +++ b/include/sysemu/iothread.h @@ -17,11 +17,12 @@ #include "block/aio.h" #include "qemu/thread.h" #include "qom/object.h" +#include "sysemu/event-loop-base.h" =20 #define TYPE_IOTHREAD "iothread" =20 struct IOThread { - Object parent_obj; + EventLoopBase parent_obj; =20 QemuThread thread; AioContext *ctx; @@ -37,9 +38,6 @@ struct IOThread { int64_t poll_max_ns; int64_t poll_grow; int64_t poll_shrink; - - /* AioContext AIO engine parameters */ - int64_t aio_max_batch; }; typedef struct IOThread IOThread; =20 diff --git a/iothread.c b/iothread.c index 0f98af0f2a..8fa2f3bfb8 100644 --- a/iothread.c +++ b/iothread.c @@ -17,6 +17,7 @@ #include "qemu/module.h" #include "block/aio.h" #include "block/block.h" +#include "sysemu/event-loop-base.h" #include "sysemu/iothread.h" #include "qapi/error.h" #include "qapi/qapi-commands-misc.h" @@ -152,10 +153,15 @@ static void iothread_init_gcontext(IOThread *iothread) iothread->main_loop =3D g_main_loop_new(iothread->worker_context, TRUE= ); } =20 -static void iothread_set_aio_context_params(IOThread *iothread, Error **er= rp) +static void iothread_set_aio_context_params(EventLoopBase *base, Error **e= rrp) { + IOThread *iothread =3D IOTHREAD(base); ERRP_GUARD(); =20 + if (!iothread->ctx) { + return; + } + aio_context_set_poll_params(iothread->ctx, iothread->poll_max_ns, iothread->poll_grow, @@ -166,14 +172,15 @@ static void iothread_set_aio_context_params(IOThread = *iothread, Error **errp) } =20 aio_context_set_aio_params(iothread->ctx, - iothread->aio_max_batch, + iothread->parent_obj.aio_max_batch, errp); } =20 -static void iothread_complete(UserCreatable *obj, Error **errp) + +static void iothread_init(EventLoopBase *base, Error **errp) { Error *local_error =3D NULL; - IOThread *iothread =3D IOTHREAD(obj); + IOThread *iothread =3D IOTHREAD(base); char *thread_name; =20 iothread->stopping =3D false; @@ -189,7 +196,7 @@ static void iothread_complete(UserCreatable *obj, Error= **errp) */ iothread_init_gcontext(iothread); =20 - iothread_set_aio_context_params(iothread, &local_error); + iothread_set_aio_context_params(base, &local_error); if (local_error) { error_propagate(errp, local_error); aio_context_unref(iothread->ctx); @@ -201,7 +208,7 @@ static void iothread_complete(UserCreatable *obj, Error= **errp) * to inherit. */ thread_name =3D g_strdup_printf("IO %s", - object_get_canonical_path_component(OBJECT(obj))); + object_get_canonical_path_component(OBJECT(base))); qemu_thread_create(&iothread->thread, thread_name, iothread_run, iothread, QEMU_THREAD_JOINABLE); g_free(thread_name); @@ -226,9 +233,6 @@ static IOThreadParamInfo poll_grow_info =3D { static IOThreadParamInfo poll_shrink_info =3D { "poll-shrink", offsetof(IOThread, poll_shrink), }; -static IOThreadParamInfo aio_max_batch_info =3D { - "aio-max-batch", offsetof(IOThread, aio_max_batch), -}; =20 static void iothread_get_param(Object *obj, Visitor *v, const char *name, IOThreadParamInfo *info, Error **errp) @@ -288,35 +292,12 @@ static void iothread_set_poll_param(Object *obj, Visi= tor *v, } } =20 -static void iothread_get_aio_param(Object *obj, Visitor *v, - const char *name, void *opaque, Error **errp) -{ - IOThreadParamInfo *info =3D opaque; - - iothread_get_param(obj, v, name, info, errp); -} - -static void iothread_set_aio_param(Object *obj, Visitor *v, - const char *name, void *opaque, Error **errp) -{ - IOThread *iothread =3D IOTHREAD(obj); - IOThreadParamInfo *info =3D opaque; - - if (!iothread_set_param(obj, v, name, info, errp)) { - return; - } - - if (iothread->ctx) { - aio_context_set_aio_params(iothread->ctx, - iothread->aio_max_batch, - errp); - } -} - static void iothread_class_init(ObjectClass *klass, void *class_data) { - UserCreatableClass *ucc =3D USER_CREATABLE_CLASS(klass); - ucc->complete =3D iothread_complete; + EventLoopBaseClass *bc =3D EVENT_LOOP_BASE_CLASS(klass); + + bc->init =3D iothread_init; + bc->update_params =3D iothread_set_aio_context_params; =20 object_class_property_add(klass, "poll-max-ns", "int", iothread_get_poll_param, @@ -330,23 +311,15 @@ static void iothread_class_init(ObjectClass *klass, v= oid *class_data) iothread_get_poll_param, iothread_set_poll_param, NULL, &poll_shrink_info); - object_class_property_add(klass, "aio-max-batch", "int", - iothread_get_aio_param, - iothread_set_aio_param, - NULL, &aio_max_batch_info); } =20 static const TypeInfo iothread_info =3D { .name =3D TYPE_IOTHREAD, - .parent =3D TYPE_OBJECT, + .parent =3D TYPE_EVENT_LOOP_BASE, .class_init =3D iothread_class_init, .instance_size =3D sizeof(IOThread), .instance_init =3D iothread_instance_init, .instance_finalize =3D iothread_instance_finalize, - .interfaces =3D (InterfaceInfo[]) { - {TYPE_USER_CREATABLE}, - {} - }, }; =20 static void iothread_register_types(void) @@ -383,7 +356,7 @@ static int query_one_iothread(Object *object, void *opa= que) info->poll_max_ns =3D iothread->poll_max_ns; info->poll_grow =3D iothread->poll_grow; info->poll_shrink =3D iothread->poll_shrink; - info->aio_max_batch =3D iothread->aio_max_batch; + info->aio_max_batch =3D iothread->parent_obj.aio_max_batch; =20 QAPI_LIST_APPEND(*tail, info); return 0; diff --git a/meson.build b/meson.build index 8df40bfac4..3c90b4f2aa 100644 --- a/meson.build +++ b/meson.build @@ -2717,6 +2717,7 @@ subdir('qom') subdir('authz') subdir('crypto') subdir('ui') +subdir('hw') =20 =20 if enable_modules @@ -2724,6 +2725,18 @@ if enable_modules modulecommon =3D declare_dependency(link_whole: libmodulecommon, compile= _args: '-DBUILD_DSO') endif =20 +qom_ss =3D qom_ss.apply(config_host, strict: false) +libqom =3D static_library('qom', qom_ss.sources() + genh, + dependencies: [qom_ss.dependencies()], + name_suffix: 'fa') +qom =3D declare_dependency(link_whole: libqom) + +event_loop_base =3D files('event-loop-base.c') +event_loop_base =3D static_library('event-loop-base', sources: event_loop_= base, + build_by_default: true) +event_loop_base =3D declare_dependency(link_whole: event_loop_base, + dependencies: [qom]) + stub_ss =3D stub_ss.apply(config_all, strict: false) =20 util_ss.add_all(trace_ss) @@ -2810,7 +2823,6 @@ subdir('monitor') subdir('net') subdir('replay') subdir('semihosting') -subdir('hw') subdir('tcg') subdir('fpu') subdir('accel') @@ -2935,13 +2947,6 @@ qemu_syms =3D custom_target('qemu.syms', output: 'qe= mu.syms', capture: true, command: [undefsym, nm, '@INPUT@']) =20 -qom_ss =3D qom_ss.apply(config_host, strict: false) -libqom =3D static_library('qom', qom_ss.sources() + genh, - dependencies: [qom_ss.dependencies()], - name_suffix: 'fa') - -qom =3D declare_dependency(link_whole: libqom) - authz_ss =3D authz_ss.apply(config_host, strict: false) libauthz =3D static_library('authz', authz_ss.sources() + genh, dependencies: [authz_ss.dependencies()], @@ -2994,7 +2999,7 @@ libblockdev =3D static_library('blockdev', blockdev_s= s.sources() + genh, build_by_default: false) =20 blockdev =3D declare_dependency(link_whole: [libblockdev], - dependencies: [block]) + dependencies: [block, event_loop_base]) =20 qmp_ss =3D qmp_ss.apply(config_host, strict: false) libqmp =3D static_library('qmp', qmp_ss.sources() + genh, --=20 2.35.1