Message ID | 1544628195-37728-16-git-send-email-pbonzini@redhat.com |
---|---|
State | New |
Headers | show
Return-Path: <qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org> X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=nongnu.org (client-ip=2001:4830:134:3::11; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=<UNKNOWN>) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="o4L/fDod"; dkim-atps=neutral Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 43FLNS43S3z9s1c for <incoming@patchwork.ozlabs.org>; Thu, 13 Dec 2018 02:30:16 +1100 (AEDT) Received: from localhost ([::1]:45592 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from <qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org>) id 1gX6Sk-00060C-0S for incoming@patchwork.ozlabs.org; Wed, 12 Dec 2018 10:30:14 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:52257) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from <paolo.bonzini@gmail.com>) id 1gX6MZ-0000py-6b for qemu-devel@nongnu.org; Wed, 12 Dec 2018 10:23:53 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from <paolo.bonzini@gmail.com>) id 1gX6MX-0000Ee-B6 for qemu-devel@nongnu.org; Wed, 12 Dec 2018 10:23:50 -0500 Received: from mail-wm1-x330.google.com ([2a00:1450:4864:20::330]:55390) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from <paolo.bonzini@gmail.com>) id 1gX6MW-0008Vd-Vo for qemu-devel@nongnu.org; Wed, 12 Dec 2018 10:23:49 -0500 Received: by mail-wm1-x330.google.com with SMTP id y139so6132645wmc.5 for <qemu-devel@nongnu.org>; Wed, 12 Dec 2018 07:23:36 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references; bh=uPaT0p8VJsvqef3cLGXCD9zDoUfQqofW9BxFkZ06I6g=; b=o4L/fDodRSn8j/eyJaIja6P6CobQwB9Qn1tLBc/TK8CTVaQiGrXfRju1uNQYQp03an Kr7110ndlWXqw+WdU+F2dYcJ581EzRxwSXv4FcOtuze7MqVaXTxhjBc09thiV4/vUii8 aPnPWiDenrzGbPmxfy6I1QkMMia7TVh59rdH3toq9YG3tZKW/EBJ1M5VEQxw52KZC8UN Eyb7j6xDiVpGYXEmcYXAKBsXI/CZKWopz7opj5djUtFX3lij+83mmNmirg8NDzLpH/pi 8LyFTT9lASbw+Kg+OEcOsC7PJIQ9CY+jaSjISEf1AKXeIlvDMAPBMdLqOwS4oCHpm7+E UYxw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references; bh=uPaT0p8VJsvqef3cLGXCD9zDoUfQqofW9BxFkZ06I6g=; b=cyv4wD9EC4aP0UpothiZiYm1wwdlvtFrs7v1AnuCx/7Wffs2/rFBAhbU3Qa1MYa08J c023pkBQn2eSXhlsLI1wSdTRVlYOypOYyBVEy43uaOj+TgQl7DgmwVgX4hz9Jok6xHwz 8ARja+BKpaPlgTJqN3QEMQndvNd6AXEpp+G7Yrpqw5R+PgKRfKwmU6fZu4l/vddU7ukT SMAI7/ugZBq7VHga2P1AMzUidiWTQrmGIYThH6jKBSxVyBSFrFFNn0zNIqs6jIE7L2xg zbnRl0Fjhkg6LCHCh4D89A7tm7woGTq+4wR5/LNpg1jypodgAWTo6BGDgO6qlu0q6nFC FR1Q== X-Gm-Message-State: AA+aEWbQVpOknUzGkReMUsyCfEe4m727XdJa5UHk65y1rokoccVu4nyE qBaRlQVPdPlXhI9TN0Qq9UAKwzGt X-Google-Smtp-Source: AFSGD/XAoL18wxrqartSHfvQlqiJmibpvxg6lG8lAkLB0CgDm77vSefMT9/Hq0hSoKBA6VJdWPP+Tg== X-Received: by 2002:a1c:8acf:: with SMTP id m198mr7140746wmd.143.1544628215115; Wed, 12 Dec 2018 07:23:35 -0800 (PST) Received: from 640k.lan ([93.56.166.5]) by smtp.gmail.com with ESMTPSA id u10sm15878859wrr.33.2018.12.12.07.23.34 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 12 Dec 2018 07:23:34 -0800 (PST) From: Paolo Bonzini <pbonzini@redhat.com> To: qemu-devel@nongnu.org Date: Wed, 12 Dec 2018 16:22:36 +0100 Message-Id: <1544628195-37728-16-git-send-email-pbonzini@redhat.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1544628195-37728-1-git-send-email-pbonzini@redhat.com> References: <1544628195-37728-1-git-send-email-pbonzini@redhat.com> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::330 Subject: [Qemu-devel] [PULL 15/54] block/iscsi: cancel libiscsi task when ABORT TASK TMF completes X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: <qemu-devel.nongnu.org> List-Unsubscribe: <https://lists.nongnu.org/mailman/options/qemu-devel>, <mailto:qemu-devel-request@nongnu.org?subject=unsubscribe> List-Archive: <http://lists.nongnu.org/archive/html/qemu-devel/> List-Post: <mailto:qemu-devel@nongnu.org> List-Help: <mailto:qemu-devel-request@nongnu.org?subject=help> List-Subscribe: <https://lists.nongnu.org/mailman/listinfo/qemu-devel>, <mailto:qemu-devel-request@nongnu.org?subject=subscribe> Cc: Stefan Hajnoczi <stefanha@redhat.com> Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" <qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org> |
Series |
[PULL,01/54] accel: Improve selection of the default accelerator
|
expand
|
diff --git a/block/iscsi.c b/block/iscsi.c index abb872d..a7e8c1f 100644 --- a/block/iscsi.c +++ b/block/iscsi.c @@ -295,8 +295,12 @@ iscsi_abort_task_cb(struct iscsi_context *iscsi, int status, void *command_data, { IscsiAIOCB *acb = private_data; - acb->status = -ECANCELED; - iscsi_schedule_bh(acb); + /* If the command callback hasn't been called yet, drop the task */ + if (!acb->bh) { + /* Call iscsi_aio_ioctl_cb() with SCSI_STATUS_CANCELLED */ + iscsi_scsi_cancel_task(iscsi, acb->task); + } + qemu_aio_unref(acb); /* acquired in iscsi_aio_cancel() */ } @@ -947,6 +951,14 @@ iscsi_aio_ioctl_cb(struct iscsi_context *iscsi, int status, { IscsiAIOCB *acb = opaque; + if (status == SCSI_STATUS_CANCELLED) { + if (!acb->bh) { + acb->status = -ECANCELED; + iscsi_schedule_bh(acb); + } + return; + } + acb->status = 0; if (status < 0) { error_report("Failed to ioctl(SG_IO) to iSCSI lun. %s",