From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-11.3 required=3.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, NICE_REPLY_A,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,USER_AGENT_SANE_1 autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 4BE5AC4363D for ; Thu, 24 Sep 2020 21:45:15 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 69233239E5 for ; Thu, 24 Sep 2020 21:45:14 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (2048-bit key) header.d=oracle.com header.i=@oracle.com header.b="mClRdSzU" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 69233239E5 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=oracle.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([::1]:57910 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kLZ3B-0003IW-2z for qemu-devel@archiver.kernel.org; Thu, 24 Sep 2020 17:45:13 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:49992) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kLZ1z-0002dJ-F9 for qemu-devel@nongnu.org; Thu, 24 Sep 2020 17:43:59 -0400 Received: from aserp2130.oracle.com ([141.146.126.79]:46966) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kLZ1w-0006P5-VO for qemu-devel@nongnu.org; Thu, 24 Sep 2020 17:43:58 -0400 Received: from pps.filterd (aserp2130.oracle.com [127.0.0.1]) by aserp2130.oracle.com (8.16.0.42/8.16.0.42) with SMTP id 08OLTvix120150; Thu, 24 Sep 2020 21:43:49 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oracle.com; h=subject : to : cc : references : from : message-id : date : mime-version : in-reply-to : content-type : content-transfer-encoding; s=corp-2020-01-29; bh=DaXCwH5/z1d0WeDJgUg+xx4kUQkoUZuQu+lLOfwtsm0=; b=mClRdSzUdRYHS+7jtnWJlimNsTjguF7+vGpK/zzC1uV6XYTAwAOF/Ll8vKat7US2Fiu2 6xe/w4ZOTKOBmkAPhHLZqqjk4lCrjIGzq0viliW19Wr+keMm5Lh+5s4FWmaFsp3oi8Oh EhO7xdgCxN0rp4OizbOIWT3UYX8QgYfrJv9O6RcE4AtlSskbzoteaE8AFr6U2dNf0Ngl LXa7kTF/smVpzFECg56fL5L7BfseUF325gpPiYzLZWXmzQoNbOryvlvS6APcITT/gVEI Q6XbW5NRLNA9e5G2Ai+oKgWYm3DR03gJMENnTnZeOjxsiiVzufMI8wP/XEI2qshO2mAb /A== Received: from aserp3030.oracle.com (aserp3030.oracle.com [141.146.126.71]) by aserp2130.oracle.com with ESMTP id 33qcpu7m94-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=FAIL); Thu, 24 Sep 2020 21:43:49 +0000 Received: from pps.filterd (aserp3030.oracle.com [127.0.0.1]) by aserp3030.oracle.com (8.16.0.42/8.16.0.42) with SMTP id 08OLUYA4160540; Thu, 24 Sep 2020 21:43:49 GMT Received: from aserv0121.oracle.com (aserv0121.oracle.com [141.146.126.235]) by aserp3030.oracle.com with ESMTP id 33nujreqh3-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Thu, 24 Sep 2020 21:43:49 +0000 Received: from abhmp0017.oracle.com (abhmp0017.oracle.com [141.146.116.23]) by aserv0121.oracle.com (8.14.4/8.13.8) with ESMTP id 08OLhmjR014202; Thu, 24 Sep 2020 21:43:48 GMT Received: from [10.39.244.100] (/10.39.244.100) by default (Oracle Beehive Gateway v4.0) with ESMTP ; Thu, 24 Sep 2020 14:43:48 -0700 Subject: Re: [PATCH V1 01/32] savevm: add vmstate handler iterators To: "Dr. David Alan Gilbert" References: <1596122076-341293-1-git-send-email-steven.sistare@oracle.com> <1596122076-341293-2-git-send-email-steven.sistare@oracle.com> <20200911162441.GJ3310@work-vm> From: Steven Sistare Organization: Oracle Corporation Message-ID: <9d029ce0-0e07-e81b-4fb0-a2b934c0dc11@oracle.com> Date: Thu, 24 Sep 2020 17:43:45 -0400 User-Agent: Mozilla/5.0 (Windows NT 10.0; WOW64; rv:68.0) Gecko/20100101 Thunderbird/68.12.0 MIME-Version: 1.0 In-Reply-To: <20200911162441.GJ3310@work-vm> Content-Type: text/plain; charset=utf-8 Content-Language: en-US Content-Transfer-Encoding: 7bit X-Proofpoint-Virus-Version: vendor=nai engine=6000 definitions=9754 signatures=668680 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 bulkscore=0 malwarescore=0 mlxlogscore=999 phishscore=0 adultscore=0 spamscore=0 suspectscore=2 mlxscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2006250000 definitions=main-2009240155 X-Proofpoint-Virus-Version: vendor=nai engine=6000 definitions=9754 signatures=668680 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 suspectscore=2 mlxlogscore=999 adultscore=0 bulkscore=0 mlxscore=0 lowpriorityscore=0 priorityscore=1501 phishscore=0 spamscore=0 malwarescore=0 clxscore=1015 impostorscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2006250000 definitions=main-2009240155 Received-SPF: pass client-ip=141.146.126.79; envelope-from=steven.sistare@oracle.com; helo=aserp2130.oracle.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/09/24 17:43:55 X-ACL-Warn: Detected OS = Linux 3.1-3.10 [fuzzy] X-Spam_score_int: -41 X-Spam_score: -4.2 X-Spam_bar: ---- X-Spam_report: (-4.2 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-1.199, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, NICE_REPLY_A=-0.214, RCVD_IN_DNSWL_LOW=-0.7, RCVD_IN_MSPIKE_H4=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: "Daniel P. Berrange" , "Michael S. Tsirkin" , =?UTF-8?Q?Alex_Benn=c3=a9e?= , Juan Quintela , qemu-devel@nongnu.org, Markus Armbruster , Alex Williamson , Stefan Hajnoczi , =?UTF-8?Q?Marc-Andr=c3=a9_Lureau?= , Paolo Bonzini , =?UTF-8?Q?Philippe_Mathieu-Daud=c3=a9?= Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" On 9/11/2020 12:24 PM, Dr. David Alan Gilbert wrote: > Apologies for taking a while to get around to this, > > * Steve Sistare (steven.sistare@oracle.com) wrote: >> Provide the SAVEVM_FOREACH and SAVEVM_FORALL macros to loop over all save >> VM state handlers. The former will filter handlers based on the operation >> in the later patch "savevm: VM handlers mode mask". The latter loops over >> all handlers. >> >> No functional change. >> >> Signed-off-by: Steve Sistare >> --- >> migration/savevm.c | 57 ++++++++++++++++++++++++++++++++++++------------------ >> 1 file changed, 38 insertions(+), 19 deletions(-) >> >> diff --git a/migration/savevm.c b/migration/savevm.c >> index 45c9dd9..a07fcad 100644 >> --- a/migration/savevm.c >> +++ b/migration/savevm.c >> @@ -266,6 +266,25 @@ static SaveState savevm_state = { >> .global_section_id = 0, >> }; >> >> +/* >> + * The FOREACH macros will filter handlers based on the current operation when >> + * additional conditions are added in a subsequent patch. >> + */ >> + >> +#define SAVEVM_FOREACH(se, entry) \ >> + QTAILQ_FOREACH(se, &savevm_state.handlers, entry) \ >> + >> +#define SAVEVM_FOREACH_SAFE(se, entry, new_se) \ >> + QTAILQ_FOREACH_SAFE(se, &savevm_state.handlers, entry, new_se) \ >> + >> +/* The FORALL macros unconditionally loop over all handlers. */ >> + >> +#define SAVEVM_FORALL(se, entry) \ >> + QTAILQ_FOREACH(se, &savevm_state.handlers, entry) >> + >> +#define SAVEVM_FORALL_SAFE(se, entry, new_se) \ >> + QTAILQ_FOREACH_SAFE(se, &savevm_state.handlers, entry, new_se) >> + > > OK, can I ask you to merge this with the next patch but to spin it the > other way, so that we have: > > SAVEVM_FOR(se, entry, mask) > > and the places you use SAVEVM_FORALL_SAFE would become > > SAVEVM_FOR(se, entry, VMS_MODE_ALL) > > I'm thinking at some point in the future we could merge a bunch of the > other flag checks in there. Sure. Is this what you have in mind? #define SAVEVM_FOR(se, entry, mask) \ QTAILQ_FOREACH(se, &savevm_state.handlers, entry) \ if (savevm_state.mode & mask) #define SAVEVM_FOR_SAFE(se, entry, new_se, mask) \ QTAILQ_FOREACH_SAFE(se, &savevm_state.handlers, entry, new_se) \ if (savevm_state.mode & mask) Callers: SAVEVM_FOR(se, entry, mode_mask(se)) SAVEVM_FOR(se, entry, VMS_MODE_ALL) SAVEVM_FOR_SAFE(se, entry, mode_mask(se)) SAVEVM_FOR_SAFE(se, entry, VMS_MODE_ALL) - Steve >> static bool should_validate_capability(int capability) >> { >> assert(capability >= 0 && capability < MIGRATION_CAPABILITY__MAX); >> @@ -673,7 +692,7 @@ static uint32_t calculate_new_instance_id(const char *idstr) >> SaveStateEntry *se; >> uint32_t instance_id = 0; >> >> - QTAILQ_FOREACH(se, &savevm_state.handlers, entry) { >> + SAVEVM_FORALL(se, entry) { >> if (strcmp(idstr, se->idstr) == 0 >> && instance_id <= se->instance_id) { >> instance_id = se->instance_id + 1; >> @@ -689,7 +708,7 @@ static int calculate_compat_instance_id(const char *idstr) >> SaveStateEntry *se; >> int instance_id = 0; >> >> - QTAILQ_FOREACH(se, &savevm_state.handlers, entry) { >> + SAVEVM_FORALL(se, entry) { >> if (!se->compat) { >> continue; >> } >> @@ -803,7 +822,7 @@ void unregister_savevm(VMStateIf *obj, const char *idstr, void *opaque) >> } >> pstrcat(id, sizeof(id), idstr); >> >> - QTAILQ_FOREACH_SAFE(se, &savevm_state.handlers, entry, new_se) { >> + SAVEVM_FORALL_SAFE(se, entry, new_se) { >> if (strcmp(se->idstr, id) == 0 && se->opaque == opaque) { >> savevm_state_handler_remove(se); >> g_free(se->compat); >> @@ -867,7 +886,7 @@ void vmstate_unregister(VMStateIf *obj, const VMStateDescription *vmsd, >> { >> SaveStateEntry *se, *new_se; >> >> - QTAILQ_FOREACH_SAFE(se, &savevm_state.handlers, entry, new_se) { >> + SAVEVM_FORALL_SAFE(se, entry, new_se) { >> if (se->vmsd == vmsd && se->opaque == opaque) { >> savevm_state_handler_remove(se); >> g_free(se->compat); >> @@ -1119,7 +1138,7 @@ bool qemu_savevm_state_blocked(Error **errp) >> { >> SaveStateEntry *se; >> >> - QTAILQ_FOREACH(se, &savevm_state.handlers, entry) { >> + SAVEVM_FORALL(se, entry) { >> if (se->vmsd && se->vmsd->unmigratable) { >> error_setg(errp, "State blocked by non-migratable device '%s'", >> se->idstr); >> @@ -1145,7 +1164,7 @@ bool qemu_savevm_state_guest_unplug_pending(void) >> { >> SaveStateEntry *se; >> >> - QTAILQ_FOREACH(se, &savevm_state.handlers, entry) { >> + SAVEVM_FOREACH(se, entry) { >> if (se->vmsd && se->vmsd->dev_unplug_pending && >> se->vmsd->dev_unplug_pending(se->opaque)) { >> return true; >> @@ -1162,7 +1181,7 @@ void qemu_savevm_state_setup(QEMUFile *f) >> int ret; >> >> trace_savevm_state_setup(); >> - QTAILQ_FOREACH(se, &savevm_state.handlers, entry) { >> + SAVEVM_FOREACH(se, entry) { >> if (!se->ops || !se->ops->save_setup) { >> continue; >> } >> @@ -1193,7 +1212,7 @@ int qemu_savevm_state_resume_prepare(MigrationState *s) >> >> trace_savevm_state_resume_prepare(); >> >> - QTAILQ_FOREACH(se, &savevm_state.handlers, entry) { >> + SAVEVM_FOREACH(se, entry) { >> if (!se->ops || !se->ops->resume_prepare) { >> continue; >> } >> @@ -1223,7 +1242,7 @@ int qemu_savevm_state_iterate(QEMUFile *f, bool postcopy) >> int ret = 1; >> >> trace_savevm_state_iterate(); >> - QTAILQ_FOREACH(se, &savevm_state.handlers, entry) { >> + SAVEVM_FOREACH(se, entry) { >> if (!se->ops || !se->ops->save_live_iterate) { >> continue; >> } >> @@ -1291,7 +1310,7 @@ void qemu_savevm_state_complete_postcopy(QEMUFile *f) >> SaveStateEntry *se; >> int ret; >> >> - QTAILQ_FOREACH(se, &savevm_state.handlers, entry) { >> + SAVEVM_FOREACH(se, entry) { >> if (!se->ops || !se->ops->save_live_complete_postcopy) { >> continue; >> } >> @@ -1324,7 +1343,7 @@ int qemu_savevm_state_complete_precopy_iterable(QEMUFile *f, bool in_postcopy) >> SaveStateEntry *se; >> int ret; >> >> - QTAILQ_FOREACH(se, &savevm_state.handlers, entry) { >> + SAVEVM_FOREACH(se, entry) { >> if (!se->ops || >> (in_postcopy && se->ops->has_postcopy && >> se->ops->has_postcopy(se->opaque)) || >> @@ -1366,7 +1385,7 @@ int qemu_savevm_state_complete_precopy_non_iterable(QEMUFile *f, >> vmdesc = qjson_new(); >> json_prop_int(vmdesc, "page_size", qemu_target_page_size()); >> json_start_array(vmdesc, "devices"); >> - QTAILQ_FOREACH(se, &savevm_state.handlers, entry) { >> + SAVEVM_FOREACH(se, entry) { >> >> if ((!se->ops || !se->ops->save_state) && !se->vmsd) { >> continue; >> @@ -1476,7 +1495,7 @@ void qemu_savevm_state_pending(QEMUFile *f, uint64_t threshold_size, >> *res_postcopy_only = 0; >> >> >> - QTAILQ_FOREACH(se, &savevm_state.handlers, entry) { >> + SAVEVM_FOREACH(se, entry) { >> if (!se->ops || !se->ops->save_live_pending) { >> continue; >> } >> @@ -1501,7 +1520,7 @@ void qemu_savevm_state_cleanup(void) >> } >> >> trace_savevm_state_cleanup(); >> - QTAILQ_FOREACH(se, &savevm_state.handlers, entry) { >> + SAVEVM_FOREACH(se, entry) { >> if (se->ops && se->ops->save_cleanup) { >> se->ops->save_cleanup(se->opaque); >> } >> @@ -1580,7 +1599,7 @@ int qemu_save_device_state(QEMUFile *f) >> } >> cpu_synchronize_all_states(); >> >> - QTAILQ_FOREACH(se, &savevm_state.handlers, entry) { >> + SAVEVM_FOREACH(se, entry) { >> int ret; >> >> if (se->is_ram) { >> @@ -1612,7 +1631,7 @@ static SaveStateEntry *find_se(const char *idstr, uint32_t instance_id) >> { >> SaveStateEntry *se; >> >> - QTAILQ_FOREACH(se, &savevm_state.handlers, entry) { >> + SAVEVM_FORALL(se, entry) { >> if (!strcmp(se->idstr, idstr) && >> (instance_id == se->instance_id || >> instance_id == se->alias_id)) >> @@ -2334,7 +2353,7 @@ qemu_loadvm_section_part_end(QEMUFile *f, MigrationIncomingState *mis) >> } >> >> trace_qemu_loadvm_state_section_partend(section_id); >> - QTAILQ_FOREACH(se, &savevm_state.handlers, entry) { >> + SAVEVM_FOREACH(se, entry) { >> if (se->load_section_id == section_id) { >> break; >> } >> @@ -2400,7 +2419,7 @@ static int qemu_loadvm_state_setup(QEMUFile *f) >> int ret; >> >> trace_loadvm_state_setup(); >> - QTAILQ_FOREACH(se, &savevm_state.handlers, entry) { >> + SAVEVM_FOREACH(se, entry) { >> if (!se->ops || !se->ops->load_setup) { >> continue; >> } >> @@ -2425,7 +2444,7 @@ void qemu_loadvm_state_cleanup(void) >> SaveStateEntry *se; >> >> trace_loadvm_state_cleanup(); >> - QTAILQ_FOREACH(se, &savevm_state.handlers, entry) { >> + SAVEVM_FOREACH(se, entry) { >> if (se->ops && se->ops->load_cleanup) { >> se->ops->load_cleanup(se->opaque); >> } >> -- >> 1.8.3.1 >>