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=-17.5 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_CR_TRAILER,INCLUDES_PATCH,MAILING_LIST_MULTI,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 2BA07C433E6 for ; Mon, 15 Mar 2021 18:21:34 +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 B483264F4C for ; Mon, 15 Mar 2021 18:21:33 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org B483264F4C Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([::1]:35918 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lLrqO-0007Ft-KW for qemu-devel@archiver.kernel.org; Mon, 15 Mar 2021 14:21:32 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:34536) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lLrXV-0001Y4-Bo for qemu-devel@nongnu.org; Mon, 15 Mar 2021 14:02:02 -0400 Received: from us-smtp-delivery-124.mimecast.com ([216.205.24.124]:44110) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1lLrXS-0000Bo-D4 for qemu-devel@nongnu.org; Mon, 15 Mar 2021 14:02:01 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1615831317; 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: in-reply-to:in-reply-to:references:references; bh=syogE5Ywc3wH09HBLliYDP9z6PRQS2Lj3+2g3PzL0+8=; b=ZQa/mMpI8BRjr+ki1GBm0YYpMJb2x9ahzru6kfsy9FjHNei4HyhaQHATn0GAW+rK9w2YtS T6vsxKVG2xDbdlLhjaFRg08j0DpoyL8AFkiB775fHYhQ/7KmSMMzJN3aly60xje9OUTuiQ uQrvao+wSlAOmTb6cuTi2w80tv5/nZk= 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-429-He61n1IUMgy2ndKXH0sFgw-1; Mon, 15 Mar 2021 14:01:54 -0400 X-MC-Unique: He61n1IUMgy2ndKXH0sFgw-1 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 3690593940; Mon, 15 Mar 2021 18:01:31 +0000 (UTC) Received: from work-vm (ovpn-114-235.ams2.redhat.com [10.36.114.235]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 5FE582C169; Mon, 15 Mar 2021 18:01:30 +0000 (UTC) Date: Mon, 15 Mar 2021 18:01:27 +0000 From: "Dr. David Alan Gilbert" To: Mahmoud Mandour Subject: Re: [PATCH 6/9] migration: Replaced qemu_mutex_lock calls with QEMU_LOCK_GUARD Message-ID: References: <20210311031538.5325-1-ma.mandourr@gmail.com> <20210311031538.5325-7-ma.mandourr@gmail.com> MIME-Version: 1.0 In-Reply-To: User-Agent: Mutt/2.0.5 (2021-01-21) X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=dgilbert@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Received-SPF: pass client-ip=216.205.24.124; envelope-from=dgilbert@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -29 X-Spam_score: -3.0 X-Spam_bar: --- X-Spam_report: (-3.0 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.25, 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_H3=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=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: qemu-devel@nongnu.org, Juan Quintela Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" * Dr. David Alan Gilbert (dgilbert@redhat.com) wrote: > * Mahmoud Mandour (ma.mandourr@gmail.com) wrote: > > Replaced various qemu_mutex_lock calls and their respective > > qemu_mutex_unlock calls with QEMU_LOCK_GUARD macro. This simplifies > > the code by eliminating the respective qemu_mutex_unlock calls. > > > > Signed-off-by: Mahmoud Mandour > > Reviewed-by: Dr. David Alan Gilbert I've queued 5 and 6 via my queue. Dave > > --- > > migration/migration.c | 6 ++---- > > migration/ram.c | 6 ++---- > > 2 files changed, 4 insertions(+), 8 deletions(-) > > > > diff --git a/migration/migration.c b/migration/migration.c > > index a5ddf43559..36768391b6 100644 > > --- a/migration/migration.c > > +++ b/migration/migration.c > > @@ -323,7 +323,7 @@ static int migrate_send_rp_message(MigrationIncomingState *mis, > > int ret = 0; > > > > trace_migrate_send_rp_message((int)message_type, len); > > - qemu_mutex_lock(&mis->rp_mutex); > > + QEMU_LOCK_GUARD(&mis->rp_mutex); > > > > /* > > * It's possible that the file handle got lost due to network > > @@ -331,7 +331,7 @@ static int migrate_send_rp_message(MigrationIncomingState *mis, > > */ > > if (!mis->to_src_file) { > > ret = -EIO; > > - goto error; > > + return ret; > > } > > > > qemu_put_be16(mis->to_src_file, (unsigned int)message_type); > > @@ -342,8 +342,6 @@ static int migrate_send_rp_message(MigrationIncomingState *mis, > > /* It's possible that qemu file got error during sending */ > > ret = qemu_file_get_error(mis->to_src_file); > > > > -error: > > - qemu_mutex_unlock(&mis->rp_mutex); > > return ret; > > } > > > > diff --git a/migration/ram.c b/migration/ram.c > > index 72143da0ac..52537f14ac 100644 > > --- a/migration/ram.c > > +++ b/migration/ram.c > > @@ -819,7 +819,7 @@ static inline bool migration_bitmap_clear_dirty(RAMState *rs, > > { > > bool ret; > > > > - qemu_mutex_lock(&rs->bitmap_mutex); > > + QEMU_LOCK_GUARD(&rs->bitmap_mutex); > > > > /* > > * Clear dirty bitmap if needed. This _must_ be called before we > > @@ -852,7 +852,6 @@ static inline bool migration_bitmap_clear_dirty(RAMState *rs, > > if (ret) { > > rs->migration_dirty_pages--; > > } > > - qemu_mutex_unlock(&rs->bitmap_mutex); > > > > return ret; > > } > > @@ -3275,7 +3274,7 @@ static void decompress_data_with_multi_threads(QEMUFile *f, > > int idx, thread_count; > > > > thread_count = migrate_decompress_threads(); > > - qemu_mutex_lock(&decomp_done_lock); > > + QEMU_LOCK_GUARD(&decomp_done_lock); > > while (true) { > > for (idx = 0; idx < thread_count; idx++) { > > if (decomp_param[idx].done) { > > @@ -3295,7 +3294,6 @@ static void decompress_data_with_multi_threads(QEMUFile *f, > > qemu_cond_wait(&decomp_done_cond, &decomp_done_lock); > > } > > } > > - qemu_mutex_unlock(&decomp_done_lock); > > } > > > > /* > > -- > > 2.25.1 > > > -- > Dr. David Alan Gilbert / dgilbert@redhat.com / Manchester, UK > > -- Dr. David Alan Gilbert / dgilbert@redhat.com / Manchester, UK