From nobody Sun May 5 08:02:47 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.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; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org ARC-Seal: i=1; a=rsa-sha256; t=1584970474; cv=none; d=zohomail.com; s=zohoarc; b=D6uAh3+uwd6nKNXfIzU75g/ZDrjwyF8Y6PoLnrCkH352dVsYBhUZ7EG8ALVvT1FChaNu2jW7Qt9Tp+9yYE412GaO065p6dQi3mCW+uwSGRUX59rx0nEZQgYTvNfrr1gmzyP7QVYJQS5AmNwdoRa9JnTcHS5uXCJgWZRHsjqBjkU= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1584970474; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Sender:Subject:To; bh=rn1rzPyZjU/1uasX4nLAsRBp6Z3yrACVS7w/C5ZCX9E=; b=niKni+SnIjgJ9Xd615sJae/b7tHPmJIoI7169sq5dkPdQpFGpx1UQHPxFJMmYF13Y8FBfcVs8nMPcBI7l9A0mkc0gUBH/mOFJ9D5Rfg/Q2LLyYA4VkfauZJS9ZNU0SVQ/kfLhR01mhWuedamT8h9K0IHqH+9UPYy8E8WaP7mVDY= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1584970474708187.7533703145292; Mon, 23 Mar 2020 06:34:34 -0700 (PDT) Received: from localhost ([::1]:33908 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jGNDt-0000Os-Db for importer@patchew.org; Mon, 23 Mar 2020 09:34:33 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:59258) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jGFe4-0007jz-Vs for qemu-devel@nongnu.org; Mon, 23 Mar 2020 01:29:06 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1jGFe3-0001UJ-IP for qemu-devel@nongnu.org; Mon, 23 Mar 2020 01:29:04 -0400 Received: from mail-pg1-x544.google.com ([2607:f8b0:4864:20::544]:33594) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1jGFe3-0001TS-6K for qemu-devel@nongnu.org; Mon, 23 Mar 2020 01:29:03 -0400 Received: by mail-pg1-x544.google.com with SMTP id d17so6049883pgo.0 for ; Sun, 22 Mar 2020 22:29:02 -0700 (PDT) Received: from 31_216.localdomain ([47.75.244.237]) by smtp.gmail.com with ESMTPSA id o14sm7905195pfh.147.2020.03.22.22.28.59 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 22 Mar 2020 22:29:00 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=smartx-com.20150623.gappssmtp.com; s=20150623; h=mime-version:from:to:cc:subject:date:message-id :content-transfer-encoding; bh=rn1rzPyZjU/1uasX4nLAsRBp6Z3yrACVS7w/C5ZCX9E=; b=B9kLgXi3vNJYNNkLfWhZnzynGcZLN8KTTOi8S+uISLsDOJcRwitaSnkEzROIMMeoLG 58xy7wUshKtDWX0p3yk9rEFKtVu5tpJ6BANPa/D7Mxg9uDZce6unDBjZsxeRgr17ZmOu KmV7mLqlJLXMRbzmbgSR9gILYafA3hHaoxYmR5g5/w4UHDEM06P2ekTmi+xfxg9BdFmF NTx8fYak39FQyEcLGEV8F9X5/gUjkgikmgZyoXSQYhHUwXXZmH+cwKezXB3t/lDZj+1E 0sJRbXvJy79ovmcsYirW4KiOYN10y+A5A7jQxr18/Am1cps9juRk/ZRP50aazcjJJ6NQ sWSg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=mime-version:x-gm-message-state:from:to:cc:subject:date:message-id :content-transfer-encoding; bh=rn1rzPyZjU/1uasX4nLAsRBp6Z3yrACVS7w/C5ZCX9E=; b=gD8qNpjyNB3a9xyA7D5EizXFF7KPkEphL1EaO6eh7akbMiKhViIbeYhwCRaq+GPP7J KwaLX4NInBFJuSHHkgeuXxJPuvu39nuphWBO8SHSCXZxWfm9yujdSiZLnR9/h0Qsxy2U iD5tZclcLk2u3QgSdpPCaBGsliJc1T7tfpKY2gcLq/XgzM/O/hDdcXMXDJ7JnCcWmWlZ +VGr6C3NOSZZeKSI2HmwYTQnOL4G8EwRmR8mcTUnKcVmh0YQTvgagTW9FAEqeTTus4nR jyo8+3KVJNC5REZsxGnj77/YgVHOpsWccNtBU0Y6ameGLsaImtVt9h1aPhKtJ5dgommG vI8A== MIME-Version: 1.0 X-Gm-Message-State: ANhLgQ20QCZKqtRCMMJrkdFsGnAFoUieAbfHgi2em7nUzf8t8PGvEKmn +FluWJPE3aGpnhPbRbn41Ya9aYQdPIhv39Q9mOzpwr/VOYShGGOr/ZsnJmsRxgRkkuMjpcg8JbH OCRXduEEW X-Google-Smtp-Source: ADFU+vv8MuenS8R5ry2qx46wBcwxJrWPxc3S3Nn2FVeAf73oMUwG6iP99FeBCSokK4B8UY/nHoPA8A== X-Received: by 2002:aa7:8f3a:: with SMTP id y26mr22191464pfr.180.1584941341253; Sun, 22 Mar 2020 22:29:01 -0700 (PDT) From: Li Feng To: "Michael S. Tsirkin" , Kevin Wolf , Max Reitz , qemu-block@nongnu.org (open list:Block layer core), qemu-devel@nongnu.org (open list:All patches CC here) Subject: [PATCH] fix vhost_user_blk_watch crash Date: Mon, 23 Mar 2020 13:29:24 +0800 Message-Id: <20200323052924.29286-1-fengli@smartx.com> X-Mailer: git-send-email 2.11.0 Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2607:f8b0:4864:20::544 X-Mailman-Approved-At: Mon, 23 Mar 2020 09:32:41 -0400 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: Li Feng Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @smartx-com.20150623.gappssmtp.com) Content-Type: text/plain; charset="utf-8" the G_IO_HUP is watched in tcp_chr_connect, and the callback vhost_user_blk_watch is not needed, because tcp_chr_hup is registered as callback. And it will close the tcp link. Signed-off-by: Li Feng Reviewed-by: Raphael Norwitz --- hw/block/vhost-user-blk.c | 19 ------------------- include/hw/virtio/vhost-user-blk.h | 1 - 2 files changed, 20 deletions(-) diff --git a/hw/block/vhost-user-blk.c b/hw/block/vhost-user-blk.c index 12925a47ec..17df5338e7 100644 --- a/hw/block/vhost-user-blk.c +++ b/hw/block/vhost-user-blk.c @@ -349,18 +349,6 @@ static void vhost_user_blk_disconnect(DeviceState *dev) vhost_dev_cleanup(&s->dev); } =20 -static gboolean vhost_user_blk_watch(GIOChannel *chan, GIOCondition cond, - void *opaque) -{ - DeviceState *dev =3D opaque; - VirtIODevice *vdev =3D VIRTIO_DEVICE(dev); - VHostUserBlk *s =3D VHOST_USER_BLK(vdev); - - qemu_chr_fe_disconnect(&s->chardev); - - return true; -} - static void vhost_user_blk_event(void *opaque, QEMUChrEvent event) { DeviceState *dev =3D opaque; @@ -373,15 +361,9 @@ static void vhost_user_blk_event(void *opaque, QEMUChr= Event event) qemu_chr_fe_disconnect(&s->chardev); return; } - s->watch =3D qemu_chr_fe_add_watch(&s->chardev, G_IO_HUP, - vhost_user_blk_watch, dev); break; case CHR_EVENT_CLOSED: vhost_user_blk_disconnect(dev); - if (s->watch) { - g_source_remove(s->watch); - s->watch =3D 0; - } break; case CHR_EVENT_BREAK: case CHR_EVENT_MUX_IN: @@ -428,7 +410,6 @@ static void vhost_user_blk_device_realize(DeviceState *= dev, Error **errp) =20 s->inflight =3D g_new0(struct vhost_inflight, 1); s->vhost_vqs =3D g_new0(struct vhost_virtqueue, s->num_queues); - s->watch =3D 0; s->connected =3D false; =20 qemu_chr_fe_set_handlers(&s->chardev, NULL, NULL, vhost_user_blk_even= t, diff --git a/include/hw/virtio/vhost-user-blk.h b/include/hw/virtio/vhost-u= ser-blk.h index 05ea0ad183..34ad6f0c0e 100644 --- a/include/hw/virtio/vhost-user-blk.h +++ b/include/hw/virtio/vhost-user-blk.h @@ -38,7 +38,6 @@ typedef struct VHostUserBlk { VhostUserState vhost_user; struct vhost_virtqueue *vhost_vqs; VirtQueue **virtqs; - guint watch; bool connected; } VHostUserBlk; =20 --=20 2.11.0 --=20 The SmartX email address is only for business purpose. Any sent message=20 that is not related to the business is not authorized or permitted by=20 SmartX. =E6=9C=AC=E9=82=AE=E7=AE=B1=E4=B8=BA=E5=8C=97=E4=BA=AC=E5=BF=97=E5=87=8C=E6= =B5=B7=E7=BA=B3=E7=A7=91=E6=8A=80=E6=9C=89=E9=99=90=E5=85=AC=E5=8F=B8=EF=BC= =88SmartX=EF=BC=89=E5=B7=A5=E4=BD=9C=E9=82=AE=E7=AE=B1. =E5=A6=82=E6=9C=AC= =E9=82=AE=E7=AE=B1=E5=8F=91=E5=87=BA=E7=9A=84=E9=82=AE=E4=BB=B6=E4=B8=8E=E5= =B7=A5=E4=BD=9C=E6=97=A0=E5=85=B3,=E8=AF=A5=E9=82=AE=E4=BB=B6=E6=9C=AA=E5= =BE=97=E5=88=B0=E6=9C=AC=E5=85=AC=E5=8F=B8=E4=BB=BB=E4=BD=95=E7=9A=84=E6=98= =8E=E7=A4=BA=E6=88=96=E9=BB=98=E7=A4=BA=E7=9A=84=E6=8E=88=E6=9D=83.