From nobody Wed Oct 29 17:30:52 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=gmail.com Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 152466743523419.478879926906302; Wed, 25 Apr 2018 07:43:55 -0700 (PDT) Received: from localhost ([::1]:37355 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fBLeA-00066B-AR for importer@patchew.org; Wed, 25 Apr 2018 10:43:50 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:33369) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fBLXd-0000dv-2X for qemu-devel@nongnu.org; Wed, 25 Apr 2018 10:37:06 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fBLXZ-00088F-UQ for qemu-devel@nongnu.org; Wed, 25 Apr 2018 10:37:05 -0400 Received: from mail-pf0-x244.google.com ([2607:f8b0:400e:c00::244]:42483) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1fBLXZ-00087u-OH for qemu-devel@nongnu.org; Wed, 25 Apr 2018 10:37:01 -0400 Received: by mail-pf0-x244.google.com with SMTP id o16so15391988pfk.9 for ; Wed, 25 Apr 2018 07:37:01 -0700 (PDT) Received: from VM_127_91_centos.localdomain ([119.28.195.137]) by smtp.gmail.com with ESMTPSA id y29sm18244004pff.42.2018.04.25.07.36.02 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 25 Apr 2018 07:37:00 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=R9FLfX1tL4VaDyok72m55Q1F0jlLSepx6JB/Y4hCFCM=; b=iopdLUjzXjH0IwYmtN0YXEHBUiFTxYz4ky3MyOXQjJN0j1QIGRSTa85LQpq/lHXK1r OFXWPmI5/0xxNgyJW3xcicB/9hTScgpWV+ClpGQn7WKKjqjGNZUacPE9fsXevkBY0Dqx 6m4UGwogajGKNRftdTk+pGEO3zcPKb8nnLUMTXYVC00E3yfvoG0kCUHwMdFAWDbM+iM4 bULZqErQDqy2XZB854lxfV1VIYPF0TxPBCWOoDF9urwWHSZZ0aUaf+ma5/5VGZPyGcWQ ldYApMWcbWxWUPJuacaQAMh+f7XPT8rJ0O0jjlxzPv+LbyS6UWHUifKsL4yapwQzG3Od ymrQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=R9FLfX1tL4VaDyok72m55Q1F0jlLSepx6JB/Y4hCFCM=; b=M9j2DAFxVlK9FY9FfUL6AncR12gNX/V4Xd29ycVKBQOvbMDkUP8EQsO+J45rbwOd24 lp7TZ4LlEBw5RbWz02iwcX8mPWghfNzZfMFCb8z8iFsvgutRXlBJsfCw1J78+ums7Uxv CQjrdwf6Nz4C3ZpoNp9SYSblzop/kFe8iOdq9/+WG86uC4+2r3QGAqrwWptCEzmE1bd4 ojVbedDqeHD6V9xI/13hbIsJaVXRxins8ct/hes/7FOFyLvkYLGqFqYV5JVaLjlXSn5h ZEQvwES4lWREyxKg09l3GlStM4E48hm5u9WGbrBj/LESDvt85uHjmBceo7UBbB+X/68Z Nxvw== X-Gm-Message-State: ALQs6tAmRB3jp/mAnz7c05QGOf7wM0eADTYZ38PQoryJHOQQuE2+wRah bWNHbOCARlHjNN0P4Aw6znE= X-Google-Smtp-Source: AB8JxZq15JwXWMjE/oMnT85TGJifVjgXJbojnjZJxG7NF5S6ciFwTrAa2U+/8oHzoXiZcnNkG/SUzg== X-Received: by 10.99.127.23 with SMTP id a23mr6943199pgd.99.1524667020974; Wed, 25 Apr 2018 07:37:00 -0700 (PDT) From: Lidong Chen X-Google-Original-From: Lidong Chen To: quintela@redhat.com, dgilbert@redhat.com Date: Wed, 25 Apr 2018 22:35:32 +0800 Message-Id: <1524666934-8064-4-git-send-email-lidongchen@tencent.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1524666934-8064-1-git-send-email-lidongchen@tencent.com> References: <1524666934-8064-1-git-send-email-lidongchen@tencent.com> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2607:f8b0:400e:c00::244 Subject: [Qemu-devel] [PATCH v2 3/5] migration: remove unnecessary variables len in QIOChannelRDMA X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: galsha@mellanox.com, adido@mellanox.com, aviadye@mellanox.com, qemu-devel@nongnu.org, licq@mellanox.com, Lidong Chen Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZohoMail: RDKM_2 RSF_0 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Because qio_channel_rdma_writev and qio_channel_rdma_readv maybe invoked by different threads concurrently, this patch removes unnecessary variables len in QIOChannelRDMA and use local variable instead. Signed-off-by: Lidong Chen Reviewed-by: Daniel P. Berrang=C3=A9 Reviewed-by: Dr. David Alan Gilbert --- migration/rdma.c | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/migration/rdma.c b/migration/rdma.c index c745427..f5c1d02 100644 --- a/migration/rdma.c +++ b/migration/rdma.c @@ -404,7 +404,6 @@ struct QIOChannelRDMA { QIOChannel parent; RDMAContext *rdma; QEMUFile *file; - size_t len; bool blocking; /* XXX we don't actually honour this yet */ }; =20 @@ -2640,6 +2639,7 @@ static ssize_t qio_channel_rdma_writev(QIOChannel *io= c, int ret; ssize_t done =3D 0; size_t i; + size_t len =3D 0; =20 CHECK_ERROR_STATE(); =20 @@ -2659,10 +2659,10 @@ static ssize_t qio_channel_rdma_writev(QIOChannel *= ioc, while (remaining) { RDMAControlHeader head; =20 - rioc->len =3D MIN(remaining, RDMA_SEND_INCREMENT); - remaining -=3D rioc->len; + len =3D MIN(remaining, RDMA_SEND_INCREMENT); + remaining -=3D len; =20 - head.len =3D rioc->len; + head.len =3D len; head.type =3D RDMA_CONTROL_QEMU_FILE; =20 ret =3D qemu_rdma_exchange_send(rdma, &head, data, NULL, NULL,= NULL); @@ -2672,8 +2672,8 @@ static ssize_t qio_channel_rdma_writev(QIOChannel *io= c, return ret; } =20 - data +=3D rioc->len; - done +=3D rioc->len; + data +=3D len; + done +=3D len; } } =20 @@ -2768,8 +2768,7 @@ static ssize_t qio_channel_rdma_readv(QIOChannel *ioc, } } } - rioc->len =3D done; - return rioc->len; + return done; } =20 /* --=20 1.8.3.1