From nobody Fri Apr 19 12:05:52 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.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; Authentication-Results: mx.zohomail.com; spf=pass (zoho.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 ARC-Seal: i=1; a=rsa-sha256; t=1568220215; cv=none; d=zoho.com; s=zohoarc; b=UUPkU3ULUyHJ8ViaCtrL0z+wSPtpKDsggffCGxh9PXMHit5+fUOMv3/KjPtnLn321oB3p+ZYaso+iwoB0PO08oQX8waEG3PEyQyHN0WbWOYbbBQqJJnH0Oj4OsnySPHPGqS+AVpbYs5P1YDJgSkFd5Lf1My1MYltDms5fsXW9nY= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1568220215; h=Content-Transfer-Encoding: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:ARC-Authentication-Results; bh=fQdNhVGvZDM7eDYnZFIdx9ZAo+XfBRw+aeeHZ9ZlOh4=; b=VMfmtfKIEa2lKJlBXypRG6e8OF6yWDzKGw865z5JL6DZ1mzGpkFueDNVnELPWVwS6hCdfoi7+coZCYUL7P6FN7N1l1RR8L6wHz+3lVMuUhDkCUekkbx1p/WJQ36B11N0OHglWbxv7vln1IkwFF1WHHVfIa9ymHZMHeUEll7hJGk= ARC-Authentication-Results: i=1; mx.zoho.com; spf=pass (zoho.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 header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1568220215098727.8505836106349; Wed, 11 Sep 2019 09:43:35 -0700 (PDT) Received: from localhost ([::1]:53648 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1i85iP-0002XG-DH for importer@patchew.org; Wed, 11 Sep 2019 12:43:33 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:41837) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1i85h3-0001LS-1n for qemu-devel@nongnu.org; Wed, 11 Sep 2019 12:42:09 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1i85h2-00005s-54 for qemu-devel@nongnu.org; Wed, 11 Sep 2019 12:42:08 -0400 Received: from mx1.redhat.com ([209.132.183.28]:21733) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1i85h1-00005J-W3 for qemu-devel@nongnu.org; Wed, 11 Sep 2019 12:42:08 -0400 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 5656730024DA for ; Wed, 11 Sep 2019 16:42:07 +0000 (UTC) Received: from dgilbert-t580.localhost (ovpn-117-243.ams2.redhat.com [10.36.117.243]) by smtp.corp.redhat.com (Postfix) with ESMTP id 55DE560C18; Wed, 11 Sep 2019 16:42:06 +0000 (UTC) From: "Dr. David Alan Gilbert (git)" To: qemu-devel@nongnu.org, pbonzini@redhat.com, berrange@redhat.com, quintela@redhat.com Date: Wed, 11 Sep 2019 17:42:00 +0100 Message-Id: <20190911164202.31136-2-dgilbert@redhat.com> In-Reply-To: <20190911164202.31136-1-dgilbert@redhat.com> References: <20190911164202.31136-1-dgilbert@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.40]); Wed, 11 Sep 2019 16:42:07 +0000 (UTC) Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PATCH 1/3] rcu: Add automatically released rcu_read_lock variant 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: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Type: text/plain; charset="utf-8" From: "Dr. David Alan Gilbert" RCU_READ_LOCK_AUTO takes the rcu_read_lock and then uses glib's g_auto infrastrcture (and thus whatever the compilers hooks are) to release it on all exits of the block. Note this macro has a variable declaration in, and hence is not in a while loop. Signed-off-by: Dr. David Alan Gilbert --- include/qemu/rcu.h | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/include/qemu/rcu.h b/include/qemu/rcu.h index 22876d1428..6a25b27d28 100644 --- a/include/qemu/rcu.h +++ b/include/qemu/rcu.h @@ -154,6 +154,18 @@ extern void call_rcu1(struct rcu_head *head, RCUCBFunc= *func); }), \ (RCUCBFunc *)g_free); =20 +typedef char rcu_read_auto_t; +static inline void rcu_read_auto_unlock(rcu_read_auto_t *r) +{ + rcu_read_unlock(); +} + +G_DEFINE_AUTO_CLEANUP_CLEAR_FUNC(rcu_read_auto_t, rcu_read_auto_unlock) + +#define RCU_READ_LOCK_AUTO g_auto(rcu_read_auto_t) \ + _rcu_read_auto =3D 'x'; \ + rcu_read_lock(); + #ifdef __cplusplus } #endif --=20 2.21.0 From nobody Fri Apr 19 12:05:52 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.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; Authentication-Results: mx.zohomail.com; spf=pass (zoho.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 ARC-Seal: i=1; a=rsa-sha256; t=1568220309; cv=none; d=zoho.com; s=zohoarc; b=MVmUceXRnBpNZnMjOOZ+NwqNEJpX9gP7BGahQduBNeSxX4jNp7yUtjnCsMxQN6YVqjSAUyS5t38aYSIdR/04rgrMMZxvMzvzRocp3K67txOFqB5KduwS/OizMLsxoBzWOf+TQ9cR1Tvx4OuZMItuV48ww8aCnl9HVZVi0kvGI1I= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1568220309; h=Content-Transfer-Encoding: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:ARC-Authentication-Results; bh=LE8Gul5kFXWJ7U+4zkLYJW5TXdXoRpgw99R4X485EEk=; b=e71mBeRspo5cAqY6Pdpw1jehuyINSrK0U0rFjZYt+bwYphynEIWcZRatYbHjRpHDdomfWCXbwFYuMSU8hvE0uwLyCExg8sbo7z0c+E0rMdmA0UKkaNSzmvj1NzEoFBT8G7xx5j+mfx4uofLWS7FhPd0vRB60AbZKfSjz12UhNDY= ARC-Authentication-Results: i=1; mx.zoho.com; spf=pass (zoho.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 header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1568220309647291.66670226571375; Wed, 11 Sep 2019 09:45:09 -0700 (PDT) Received: from localhost ([::1]:53668 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1i85jr-0004Qg-32 for importer@patchew.org; Wed, 11 Sep 2019 12:45:03 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:41858) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1i85h6-0001Nl-S9 for qemu-devel@nongnu.org; Wed, 11 Sep 2019 12:42:13 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1i85h5-00007i-Od for qemu-devel@nongnu.org; Wed, 11 Sep 2019 12:42:12 -0400 Received: from mx1.redhat.com ([209.132.183.28]:45406) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1i85h5-00007C-GF for qemu-devel@nongnu.org; Wed, 11 Sep 2019 12:42:11 -0400 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id C417D10C092B for ; Wed, 11 Sep 2019 16:42:10 +0000 (UTC) Received: from dgilbert-t580.localhost (ovpn-117-243.ams2.redhat.com [10.36.117.243]) by smtp.corp.redhat.com (Postfix) with ESMTP id 9FD7660BEC; Wed, 11 Sep 2019 16:42:07 +0000 (UTC) From: "Dr. David Alan Gilbert (git)" To: qemu-devel@nongnu.org, pbonzini@redhat.com, berrange@redhat.com, quintela@redhat.com Date: Wed, 11 Sep 2019 17:42:01 +0100 Message-Id: <20190911164202.31136-3-dgilbert@redhat.com> In-Reply-To: <20190911164202.31136-1-dgilbert@redhat.com> References: <20190911164202.31136-1-dgilbert@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.6.2 (mx1.redhat.com [10.5.110.66]); Wed, 11 Sep 2019 16:42:10 +0000 (UTC) Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PATCH 2/3] migration: Use automatic rcu_read unlock in ram.c 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: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Type: text/plain; charset="utf-8" From: "Dr. David Alan Gilbert" Use the automatic read unlocker in migration/ram.c; only for the cases where the unlock is at the end of the function. Signed-off-by: Dr. David Alan Gilbert --- migration/ram.c | 25 +++++++++---------------- 1 file changed, 9 insertions(+), 16 deletions(-) diff --git a/migration/ram.c b/migration/ram.c index b2bd618a89..750d198f37 100644 --- a/migration/ram.c +++ b/migration/ram.c @@ -181,14 +181,14 @@ int foreach_not_ignored_block(RAMBlockIterFunc func, = void *opaque) RAMBlock *block; int ret =3D 0; =20 - rcu_read_lock(); + RCU_READ_LOCK_AUTO + RAMBLOCK_FOREACH_NOT_IGNORED(block) { ret =3D func(block, opaque); if (ret) { break; } } - rcu_read_unlock(); return ret; } =20 @@ -2398,13 +2398,12 @@ static void migration_page_queue_free(RAMState *rs) /* This queue generally should be empty - but in the case of a failed * migration might have some droppings in. */ - rcu_read_lock(); + RCU_READ_LOCK_AUTO QSIMPLEQ_FOREACH_SAFE(mspr, &rs->src_page_requests, next_req, next_msp= r) { memory_region_unref(mspr->rb->mr); QSIMPLEQ_REMOVE_HEAD(&rs->src_page_requests, next_req); g_free(mspr); } - rcu_read_unlock(); } =20 /** @@ -2425,7 +2424,8 @@ int ram_save_queue_pages(const char *rbname, ram_addr= _t start, ram_addr_t len) RAMState *rs =3D ram_state; =20 ram_counters.postcopy_requests++; - rcu_read_lock(); + RCU_READ_LOCK_AUTO + if (!rbname) { /* Reuse last RAMBlock */ ramblock =3D rs->last_req_rb; @@ -2467,12 +2467,10 @@ int ram_save_queue_pages(const char *rbname, ram_ad= dr_t start, ram_addr_t len) QSIMPLEQ_INSERT_TAIL(&rs->src_page_requests, new_entry, next_req); migration_make_urgent_request(); qemu_mutex_unlock(&rs->src_page_req_mutex); - rcu_read_unlock(); =20 return 0; =20 err: - rcu_read_unlock(); return -1; } =20 @@ -2712,7 +2710,8 @@ static uint64_t ram_bytes_total_common(bool count_ign= ored) RAMBlock *block; uint64_t total =3D 0; =20 - rcu_read_lock(); + RCU_READ_LOCK_AUTO + if (count_ignored) { RAMBLOCK_FOREACH_MIGRATABLE(block) { total +=3D block->used_length; @@ -2722,7 +2721,6 @@ static uint64_t ram_bytes_total_common(bool count_ign= ored) total +=3D block->used_length; } } - rcu_read_unlock(); return total; } =20 @@ -3086,7 +3084,7 @@ int ram_postcopy_send_discard_bitmap(MigrationState *= ms) RAMBlock *block; int ret; =20 - rcu_read_lock(); + RCU_READ_LOCK_AUTO =20 /* This should be our last sync, the src is now paused */ migration_bitmap_sync(rs); @@ -3107,13 +3105,11 @@ int ram_postcopy_send_discard_bitmap(MigrationState= *ms) * point. */ error_report("migration ram resized during precopy phase"); - rcu_read_unlock(); return -EINVAL; } /* Deal with TPS !=3D HPS and huge pages */ ret =3D postcopy_chunk_hostpages(ms, block); if (ret) { - rcu_read_unlock(); return ret; } =20 @@ -3128,7 +3124,6 @@ int ram_postcopy_send_discard_bitmap(MigrationState *= ms) trace_ram_postcopy_send_discard_bitmap(); =20 ret =3D postcopy_each_ram_send_discard(ms); - rcu_read_unlock(); =20 return ret; } @@ -3149,7 +3144,7 @@ int ram_discard_range(const char *rbname, uint64_t st= art, size_t length) =20 trace_ram_discard_range(rbname, start, length); =20 - rcu_read_lock(); + RCU_READ_LOCK_AUTO RAMBlock *rb =3D qemu_ram_block_by_name(rbname); =20 if (!rb) { @@ -3169,8 +3164,6 @@ int ram_discard_range(const char *rbname, uint64_t st= art, size_t length) ret =3D ram_block_discard_range(rb, start, length); =20 err: - rcu_read_unlock(); - return ret; } =20 --=20 2.21.0 From nobody Fri Apr 19 12:05:52 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.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; Authentication-Results: mx.zohomail.com; spf=pass (zoho.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 ARC-Seal: i=1; a=rsa-sha256; t=1568220223; cv=none; d=zoho.com; s=zohoarc; b=h7gHrN7JAFHCMRx/+0GIAhKCXEW0WqvZGguMTDO9DLxkuZcde25StjomOoonuzOMkFD9Vvwax6CHLoplh+qk7psQj4S+CgAIID8yjmvtdT2I+kUz1D4UetsynvzmV6T4AkWel7q9RmM7s68MdUFRMvM9Yjx+SaJpOVC+gNIv8qA= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1568220223; h=Content-Transfer-Encoding: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:ARC-Authentication-Results; bh=oWzs2wj7RRqOduP6Ya5uVgW5P5H87mC6T1gZl99rn8U=; b=io+8qZPhRptWHL93sAIwQwzZAerq/5TFbSRqTreFnTwAQy8p/+v0qiKj4S+HFhT8T8ttJ3upj532GLLvEjxIpqQ8XWa/2A0nx4vWKgYI5A//uF5k7tXWOtDLVluds7TPaaBjvRo6IkHmCfBsuF3w7K80bqsjZqMMuAg3RCBCIR8= ARC-Authentication-Results: i=1; mx.zoho.com; spf=pass (zoho.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 header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 156822022389712.491801801211977; Wed, 11 Sep 2019 09:43:43 -0700 (PDT) Received: from localhost ([::1]:53652 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1i85iY-0002jG-7s for importer@patchew.org; Wed, 11 Sep 2019 12:43:42 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:41869) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1i85h8-0001Py-Gh for qemu-devel@nongnu.org; Wed, 11 Sep 2019 12:42:15 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1i85h6-00008E-W3 for qemu-devel@nongnu.org; Wed, 11 Sep 2019 12:42:14 -0400 Received: from mx1.redhat.com ([209.132.183.28]:34482) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1i85h6-00007r-OL for qemu-devel@nongnu.org; Wed, 11 Sep 2019 12:42:12 -0400 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 1B16F1918642 for ; Wed, 11 Sep 2019 16:42:12 +0000 (UTC) Received: from dgilbert-t580.localhost (ovpn-117-243.ams2.redhat.com [10.36.117.243]) by smtp.corp.redhat.com (Postfix) with ESMTP id 1A2AF60BEC; Wed, 11 Sep 2019 16:42:10 +0000 (UTC) From: "Dr. David Alan Gilbert (git)" To: qemu-devel@nongnu.org, pbonzini@redhat.com, berrange@redhat.com, quintela@redhat.com Date: Wed, 11 Sep 2019 17:42:02 +0100 Message-Id: <20190911164202.31136-4-dgilbert@redhat.com> In-Reply-To: <20190911164202.31136-1-dgilbert@redhat.com> References: <20190911164202.31136-1-dgilbert@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.6.2 (mx1.redhat.com [10.5.110.70]); Wed, 11 Sep 2019 16:42:12 +0000 (UTC) Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PATCH 3/3] migration: Use automatic rcu_read unlock in rdma.c 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: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Type: text/plain; charset="utf-8" From: "Dr. David Alan Gilbert" Use the automatic read unlocker in migration/rdma.c. Signed-off-by: Dr. David Alan Gilbert --- migration/rdma.c | 57 ++++++++++-------------------------------------- 1 file changed, 11 insertions(+), 46 deletions(-) diff --git a/migration/rdma.c b/migration/rdma.c index 78e6b72bac..40f8292ab9 100644 --- a/migration/rdma.c +++ b/migration/rdma.c @@ -88,7 +88,6 @@ static uint32_t known_capabilities =3D RDMA_CAPABILITY_PI= N_ALL; " to abort!"); \ rdma->error_reported =3D 1; \ } \ - rcu_read_unlock(); \ return rdma->error_state; \ } \ } while (0) @@ -2678,11 +2677,10 @@ static ssize_t qio_channel_rdma_writev(QIOChannel *= ioc, size_t i; size_t len =3D 0; =20 - rcu_read_lock(); + RCU_READ_LOCK_AUTO rdma =3D atomic_rcu_read(&rioc->rdmaout); =20 if (!rdma) { - rcu_read_unlock(); return -EIO; } =20 @@ -2695,7 +2693,6 @@ static ssize_t qio_channel_rdma_writev(QIOChannel *io= c, ret =3D qemu_rdma_write_flush(f, rdma); if (ret < 0) { rdma->error_state =3D ret; - rcu_read_unlock(); return ret; } =20 @@ -2715,7 +2712,6 @@ static ssize_t qio_channel_rdma_writev(QIOChannel *io= c, =20 if (ret < 0) { rdma->error_state =3D ret; - rcu_read_unlock(); return ret; } =20 @@ -2724,7 +2720,6 @@ static ssize_t qio_channel_rdma_writev(QIOChannel *io= c, } } =20 - rcu_read_unlock(); return done; } =20 @@ -2764,11 +2759,10 @@ static ssize_t qio_channel_rdma_readv(QIOChannel *i= oc, ssize_t i; size_t done =3D 0; =20 - rcu_read_lock(); + RCU_READ_LOCK_AUTO rdma =3D atomic_rcu_read(&rioc->rdmain); =20 if (!rdma) { - rcu_read_unlock(); return -EIO; } =20 @@ -2805,7 +2799,6 @@ static ssize_t qio_channel_rdma_readv(QIOChannel *ioc, =20 if (ret < 0) { rdma->error_state =3D ret; - rcu_read_unlock(); return ret; } =20 @@ -2819,14 +2812,12 @@ static ssize_t qio_channel_rdma_readv(QIOChannel *i= oc, /* Still didn't get enough, so lets just return */ if (want) { if (done =3D=3D 0) { - rcu_read_unlock(); return QIO_CHANNEL_ERR_BLOCK; } else { break; } } } - rcu_read_unlock(); return done; } =20 @@ -2882,7 +2873,7 @@ qio_channel_rdma_source_prepare(GSource *source, GIOCondition cond =3D 0; *timeout =3D -1; =20 - rcu_read_lock(); + RCU_READ_LOCK_AUTO if (rsource->condition =3D=3D G_IO_IN) { rdma =3D atomic_rcu_read(&rsource->rioc->rdmain); } else { @@ -2891,7 +2882,6 @@ qio_channel_rdma_source_prepare(GSource *source, =20 if (!rdma) { error_report("RDMAContext is NULL when prepare Gsource"); - rcu_read_unlock(); return FALSE; } =20 @@ -2900,7 +2890,6 @@ qio_channel_rdma_source_prepare(GSource *source, } cond |=3D G_IO_OUT; =20 - rcu_read_unlock(); return cond & rsource->condition; } =20 @@ -2911,7 +2900,7 @@ qio_channel_rdma_source_check(GSource *source) RDMAContext *rdma; GIOCondition cond =3D 0; =20 - rcu_read_lock(); + RCU_READ_LOCK_AUTO if (rsource->condition =3D=3D G_IO_IN) { rdma =3D atomic_rcu_read(&rsource->rioc->rdmain); } else { @@ -2920,7 +2909,6 @@ qio_channel_rdma_source_check(GSource *source) =20 if (!rdma) { error_report("RDMAContext is NULL when check Gsource"); - rcu_read_unlock(); return FALSE; } =20 @@ -2929,7 +2917,6 @@ qio_channel_rdma_source_check(GSource *source) } cond |=3D G_IO_OUT; =20 - rcu_read_unlock(); return cond & rsource->condition; } =20 @@ -2943,7 +2930,7 @@ qio_channel_rdma_source_dispatch(GSource *source, RDMAContext *rdma; GIOCondition cond =3D 0; =20 - rcu_read_lock(); + RCU_READ_LOCK_AUTO if (rsource->condition =3D=3D G_IO_IN) { rdma =3D atomic_rcu_read(&rsource->rioc->rdmain); } else { @@ -2952,7 +2939,6 @@ qio_channel_rdma_source_dispatch(GSource *source, =20 if (!rdma) { error_report("RDMAContext is NULL when dispatch Gsource"); - rcu_read_unlock(); return FALSE; } =20 @@ -2961,7 +2947,6 @@ qio_channel_rdma_source_dispatch(GSource *source, } cond |=3D G_IO_OUT; =20 - rcu_read_unlock(); return (*func)(QIO_CHANNEL(rsource->rioc), (cond & rsource->condition), user_data); @@ -3058,7 +3043,7 @@ qio_channel_rdma_shutdown(QIOChannel *ioc, QIOChannelRDMA *rioc =3D QIO_CHANNEL_RDMA(ioc); RDMAContext *rdmain, *rdmaout; =20 - rcu_read_lock(); + RCU_READ_LOCK_AUTO =20 rdmain =3D atomic_rcu_read(&rioc->rdmain); rdmaout =3D atomic_rcu_read(&rioc->rdmain); @@ -3085,7 +3070,6 @@ qio_channel_rdma_shutdown(QIOChannel *ioc, break; } =20 - rcu_read_unlock(); return 0; } =20 @@ -3131,18 +3115,16 @@ static size_t qemu_rdma_save_page(QEMUFile *f, void= *opaque, RDMAContext *rdma; int ret; =20 - rcu_read_lock(); + RCU_READ_LOCK_AUTO rdma =3D atomic_rcu_read(&rioc->rdmaout); =20 if (!rdma) { - rcu_read_unlock(); return -EIO; } =20 CHECK_ERROR_STATE(); =20 if (migration_in_postcopy()) { - rcu_read_unlock(); return RAM_SAVE_CONTROL_NOT_SUPP; } =20 @@ -3227,11 +3209,9 @@ static size_t qemu_rdma_save_page(QEMUFile *f, void = *opaque, } } =20 - rcu_read_unlock(); return RAM_SAVE_CONTROL_DELAYED; err: rdma->error_state =3D ret; - rcu_read_unlock(); return ret; } =20 @@ -3451,11 +3431,10 @@ static int qemu_rdma_registration_handle(QEMUFile *= f, void *opaque) int count =3D 0; int i =3D 0; =20 - rcu_read_lock(); + RCU_READ_LOCK_AUTO rdma =3D atomic_rcu_read(&rioc->rdmain); =20 if (!rdma) { - rcu_read_unlock(); return -EIO; } =20 @@ -3698,7 +3677,6 @@ out: if (ret < 0) { rdma->error_state =3D ret; } - rcu_read_unlock(); return ret; } =20 @@ -3716,11 +3694,10 @@ rdma_block_notification_handle(QIOChannelRDMA *rioc= , const char *name) int curr; int found =3D -1; =20 - rcu_read_lock(); + RCU_READ_LOCK_AUTO rdma =3D atomic_rcu_read(&rioc->rdmain); =20 if (!rdma) { - rcu_read_unlock(); return -EIO; } =20 @@ -3734,7 +3711,6 @@ rdma_block_notification_handle(QIOChannelRDMA *rioc, = const char *name) =20 if (found =3D=3D -1) { error_report("RAMBlock '%s' not found on destination", name); - rcu_read_unlock(); return -ENOENT; } =20 @@ -3742,7 +3718,6 @@ rdma_block_notification_handle(QIOChannelRDMA *rioc, = const char *name) trace_rdma_block_notification_handle(name, rdma->next_src_index); rdma->next_src_index++; =20 - rcu_read_unlock(); return 0; } =20 @@ -3767,17 +3742,15 @@ static int qemu_rdma_registration_start(QEMUFile *f= , void *opaque, QIOChannelRDMA *rioc =3D QIO_CHANNEL_RDMA(opaque); RDMAContext *rdma; =20 - rcu_read_lock(); + RCU_READ_LOCK_AUTO rdma =3D atomic_rcu_read(&rioc->rdmaout); if (!rdma) { - rcu_read_unlock(); return -EIO; } =20 CHECK_ERROR_STATE(); =20 if (migration_in_postcopy()) { - rcu_read_unlock(); return 0; } =20 @@ -3785,7 +3758,6 @@ static int qemu_rdma_registration_start(QEMUFile *f, = void *opaque, qemu_put_be64(f, RAM_SAVE_FLAG_HOOK); qemu_fflush(f); =20 - rcu_read_unlock(); return 0; } =20 @@ -3802,17 +3774,15 @@ static int qemu_rdma_registration_stop(QEMUFile *f,= void *opaque, RDMAControlHeader head =3D { .len =3D 0, .repeat =3D 1 }; int ret =3D 0; =20 - rcu_read_lock(); + RCU_READ_LOCK_AUTO rdma =3D atomic_rcu_read(&rioc->rdmaout); if (!rdma) { - rcu_read_unlock(); return -EIO; } =20 CHECK_ERROR_STATE(); =20 if (migration_in_postcopy()) { - rcu_read_unlock(); return 0; } =20 @@ -3844,7 +3814,6 @@ static int qemu_rdma_registration_stop(QEMUFile *f, v= oid *opaque, qemu_rdma_reg_whole_ram_blocks : NULL); if (ret < 0) { ERROR(errp, "receiving remote info!"); - rcu_read_unlock(); return ret; } =20 @@ -3868,7 +3837,6 @@ static int qemu_rdma_registration_stop(QEMUFile *f, v= oid *opaque, "not identical on both the source and destination.= ", local->nb_blocks, nb_dest_blocks); rdma->error_state =3D -EINVAL; - rcu_read_unlock(); return -EINVAL; } =20 @@ -3885,7 +3853,6 @@ static int qemu_rdma_registration_stop(QEMUFile *f, v= oid *opaque, local->block[i].length, rdma->dest_blocks[i].length); rdma->error_state =3D -EINVAL; - rcu_read_unlock(); return -EINVAL; } local->block[i].remote_host_addr =3D @@ -3903,11 +3870,9 @@ static int qemu_rdma_registration_stop(QEMUFile *f, = void *opaque, goto err; } =20 - rcu_read_unlock(); return 0; err: rdma->error_state =3D ret; - rcu_read_unlock(); return ret; } =20 --=20 2.21.0