From patchwork Fri Aug 3 09:13:44 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: 858585 jemmy X-Patchwork-Id: 10554805 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 4A31313BF for ; Fri, 3 Aug 2018 09:15:48 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 4165D2C0EF for ; Fri, 3 Aug 2018 09:15:48 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 356692C110; Fri, 3 Aug 2018 09:15:48 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-7.8 required=2.0 tests=BAYES_00,DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI,RCVD_IN_DNSWL_HI,T_DKIM_INVALID autolearn=ham version=3.3.1 Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id C6D522C0EF for ; Fri, 3 Aug 2018 09:15:47 +0000 (UTC) Received: from localhost ([::1]:49749 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1flWBW-0002y8-OB for patchwork-qemu-devel@patchwork.kernel.org; Fri, 03 Aug 2018 05:15:46 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:52845) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1flW9z-0001T9-Oc for qemu-devel@nongnu.org; Fri, 03 Aug 2018 05:14:13 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1flW9x-0001WZ-To for qemu-devel@nongnu.org; Fri, 03 Aug 2018 05:14:11 -0400 Received: from mail-pf1-x429.google.com ([2607:f8b0:4864:20::429]:38122) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1flW9x-0001Tu-JB for qemu-devel@nongnu.org; Fri, 03 Aug 2018 05:14:09 -0400 Received: by mail-pf1-x429.google.com with SMTP id x17-v6so2928832pfh.5 for ; Fri, 03 Aug 2018 02:14:09 -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=i+9cu6YEw6HZ98kuAAxb7164x+SFub9Zft6Br89mO6c=; b=nydgSbRLaiX4u1s5gA94N3LTxvuRzovqDQfI4sjrxDI/PCb2nEQjMuU5hyLB9T1Q1e 64SbMm5ospr58jklE6IKMyGS4FX9q3nfkufyWiO7Mmk+j5jENFfMV8Z9W9Ot8/z4tRoE 8XkzfQ7fkqOyH8wmi8aaE2QkvJCRNfWleqlj22Ulfbwo6QuemgIXtllXxSoFtd4U+Upz bdbjL+gQCa9FG+Hsq0HI/3kpVMXUuC+WWX1Q/ZtdKNxATMNa0tEyT6FMjrwDqwzAeOTV BtCPXYhwVmvuqov4F2/m0r+hvCa5N97mPtw5g2RqtTUnKmhVP+c7UvDSpsyZHfQfCPjm LKag== 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=i+9cu6YEw6HZ98kuAAxb7164x+SFub9Zft6Br89mO6c=; b=QCDmtp/zba6WFzAbO+3tInQ87Zp0sVGX+PRs+C+vSpcWVfFS+BgFank4gJB9T9tulw bJ0fN8EMY8eQG/6W+/JqK64mD6k3+2Qv/ENpAdl8O9m3Ktu6ww50juArR+7+2HGLoXwr Sudvt81rV5s1UKdr+i8/Z6i7tqiT+r6MUPuorp8gkpB/5oFKD/6ohPVUNeOcNP39XaVN gaxRvhCo1hDzxZCLuO7E1mAZQs6Ra0BHUciszN5SjSJ4BCXu7LmS8uPxnVSaUNwIZ8b4 i0Y5OIF+wCMBY9SP/PMC9/KwlMAZEPUfd2Evs9UPPXBMme8S1GYXXyVjz8ZZTECGSvdc rSjw== X-Gm-Message-State: AOUpUlE6fkoA2BzVD0K8I+fHDQfXWm9vd0Cs1gcLQiNW6tkxGWusp3Vg iFzqc1nLp2WHo1KA5+RRWMJjbZQ2NcQ= X-Google-Smtp-Source: AAOMgpc8/8epSVfH+87tDn3KVz/QGPmZx4dgkQFPlbstKHMBTv+0TEiv2egpkdzEIx5qTKelXGaXgQ== X-Received: by 2002:a62:4c0f:: with SMTP id z15-v6mr3465076pfa.110.1533287648813; Fri, 03 Aug 2018 02:14:08 -0700 (PDT) Received: from VM_120_46_centos.localdomain ([119.28.87.64]) by smtp.gmail.com with ESMTPSA id e21-v6sm7991352pfl.187.2018.08.03.02.14.07 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 03 Aug 2018 02:14:08 -0700 (PDT) From: Lidong Chen X-Google-Original-From: Lidong Chen To: zhang.zhanghailiang@huawei.com, quintela@redhat.com, dgilbert@redhat.com Date: Fri, 3 Aug 2018 17:13:44 +0800 Message-Id: <1533287630-4221-7-git-send-email-lidongchen@tencent.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1533287630-4221-1-git-send-email-lidongchen@tencent.com> References: <1533287630-4221-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:4864:20::429 Subject: [Qemu-devel] [PATCH v6 06/12] migration: implement io_set_aio_fd_handler function for RDMA QIOChannel 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: Lidong Chen , qemu-devel@nongnu.org, Lidong Chen Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" X-Virus-Scanned: ClamAV using ClamSMTP From: Lidong Chen if qio_channel_rdma_readv return QIO_CHANNEL_ERR_BLOCK, the destination qemu crash. The backtrace is: (gdb) bt #0 0x0000000000000000 in ?? () #1 0x00000000008db50e in qio_channel_set_aio_fd_handler (ioc=0x38111e0, ctx=0x3726080, io_read=0x8db841 , io_write=0x0, opaque=0x38111e0) at io/channel.c: #2 0x00000000008db952 in qio_channel_set_aio_fd_handlers (ioc=0x38111e0) at io/channel.c:438 #3 0x00000000008dbab4 in qio_channel_yield (ioc=0x38111e0, condition=G_IO_IN) at io/channel.c:47 #4 0x00000000007a870b in channel_get_buffer (opaque=0x38111e0, buf=0x440c038 "", pos=0, size=327 at migration/qemu-file-channel.c:83 #5 0x00000000007a70f6 in qemu_fill_buffer (f=0x440c000) at migration/qemu-file.c:299 #6 0x00000000007a79d0 in qemu_peek_byte (f=0x440c000, offset=0) at migration/qemu-file.c:562 #7 0x00000000007a7a22 in qemu_get_byte (f=0x440c000) at migration/qemu-file.c:575 #8 0x00000000007a7c78 in qemu_get_be32 (f=0x440c000) at migration/qemu-file.c:655 #9 0x00000000007a0508 in qemu_loadvm_state (f=0x440c000) at migration/savevm.c:2126 #10 0x0000000000794141 in process_incoming_migration_co (opaque=0x0) at migration/migration.c:366 #11 0x000000000095c598 in coroutine_trampoline (i0=84033984, i1=0) at util/coroutine-ucontext.c:1 #12 0x00007f9c0db56d40 in ?? () from /lib64/libc.so.6 #13 0x00007f96fe858760 in ?? () #14 0x0000000000000000 in ?? () RDMA QIOChannel not implement io_set_aio_fd_handler. so qio_channel_set_aio_fd_handler will access NULL pointer. Signed-off-by: Lidong Chen Reviewed-by: Juan Quintela --- migration/rdma.c | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/migration/rdma.c b/migration/rdma.c index cfb0671..d6bbf28 100644 --- a/migration/rdma.c +++ b/migration/rdma.c @@ -2963,6 +2963,21 @@ static GSource *qio_channel_rdma_create_watch(QIOChannel *ioc, return source; } +static void qio_channel_rdma_set_aio_fd_handler(QIOChannel *ioc, + AioContext *ctx, + IOHandler *io_read, + IOHandler *io_write, + void *opaque) +{ + QIOChannelRDMA *rioc = QIO_CHANNEL_RDMA(ioc); + if (io_read) { + aio_set_fd_handler(ctx, rioc->rdmain->comp_channel->fd, + false, io_read, io_write, NULL, opaque); + } else { + aio_set_fd_handler(ctx, rioc->rdmaout->comp_channel->fd, + false, io_read, io_write, NULL, opaque); + } +} static int qio_channel_rdma_close(QIOChannel *ioc, Error **errp) @@ -3822,6 +3837,7 @@ static void qio_channel_rdma_class_init(ObjectClass *klass, ioc_klass->io_set_blocking = qio_channel_rdma_set_blocking; ioc_klass->io_close = qio_channel_rdma_close; ioc_klass->io_create_watch = qio_channel_rdma_create_watch; + ioc_klass->io_set_aio_fd_handler = qio_channel_rdma_set_aio_fd_handler; } static const TypeInfo qio_channel_rdma_info = {