From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-9.6 required=3.0 tests=DKIM_INVALID,DKIM_SIGNED, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 00E1EC4BA3D for ; Thu, 27 Feb 2020 12:19:36 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id C24EE24699 for ; Thu, 27 Feb 2020 12:19:35 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (1024-bit key) header.d=citrix.com header.i=@citrix.com header.b="Guy2QMpa" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org C24EE24699 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=citrix.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([::1]:58387 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1j7I8d-0001oh-0D for qemu-devel@archiver.kernel.org; Thu, 27 Feb 2020 07:19:35 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:60382) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1j7I6F-00072e-Gx for qemu-devel@nongnu.org; Thu, 27 Feb 2020 07:17:08 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1j7I6D-0001BV-2Q for qemu-devel@nongnu.org; Thu, 27 Feb 2020 07:17:07 -0500 Received: from esa1.hc3370-68.iphmx.com ([216.71.145.142]:64917) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1j7I6C-00014m-33 for qemu-devel@nongnu.org; Thu, 27 Feb 2020 07:17:04 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=citrix.com; s=securemail; t=1582805824; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=CDWU+sgbS+JktH9g2iumodc54MqCBgShHGQD/NQz8io=; b=Guy2QMpawTAtC1jHneOyUGUkoZAYBT+bhUZygmdylBDoccW5PrST/nR0 p0uUplNSKh7lPrhHW11chjc1TfgDKXmdLcCaQNB2sR9x/F18jO9SX4TZ1 UhQJWOh3uymJhIod5ohfFa98lGde6e4rtZ+0TtzxzpP9icfqF9XmEhJIW k=; Authentication-Results: esa1.hc3370-68.iphmx.com; dkim=none (message not signed) header.i=none; spf=None smtp.pra=anthony.perard@citrix.com; spf=Pass smtp.mailfrom=anthony.perard@citrix.com; spf=None smtp.helo=postmaster@mail.citrix.com Received-SPF: None (esa1.hc3370-68.iphmx.com: no sender authenticity information available from domain of anthony.perard@citrix.com) identity=pra; client-ip=162.221.158.21; receiver=esa1.hc3370-68.iphmx.com; envelope-from="anthony.perard@citrix.com"; x-sender="anthony.perard@citrix.com"; x-conformance=sidf_compatible Received-SPF: Pass (esa1.hc3370-68.iphmx.com: domain of anthony.perard@citrix.com designates 162.221.158.21 as permitted sender) identity=mailfrom; client-ip=162.221.158.21; receiver=esa1.hc3370-68.iphmx.com; envelope-from="anthony.perard@citrix.com"; x-sender="anthony.perard@citrix.com"; x-conformance=sidf_compatible; x-record-type="v=spf1"; x-record-text="v=spf1 ip4:209.167.231.154 ip4:178.63.86.133 ip4:195.66.111.40/30 ip4:85.115.9.32/28 ip4:199.102.83.4 ip4:192.28.146.160 ip4:192.28.146.107 ip4:216.52.6.88 ip4:216.52.6.188 ip4:162.221.158.21 ip4:162.221.156.83 ip4:168.245.78.127 ~all" Received-SPF: None (esa1.hc3370-68.iphmx.com: no sender authenticity information available from domain of postmaster@mail.citrix.com) identity=helo; client-ip=162.221.158.21; receiver=esa1.hc3370-68.iphmx.com; envelope-from="anthony.perard@citrix.com"; x-sender="postmaster@mail.citrix.com"; x-conformance=sidf_compatible IronPort-SDR: iemrAuRoNR9K59H1rtr/9irQXvzz6cNInNaTzMvS9W+79DG5k+OGII2ScMbgIg9Y2FS3BjITVZ q8IIDmq+XvKnOl2YCniard/b7u7bbxT69I4Dpa3uWf2Vw7nPfFTX3XruOIV08LASzDCpvHbBWK 0Etm1FlhHaAPqT/h4Nz3IZBqujr9ARwuyhRyvXdg2ObSNIJjRvIAajjdc4oaIbchFhfBsPtioA 1/GyRze7OCXBN75k095RovC7lb3GazLbFMlBEAJOdrzuhQhZhCkQdiaTjypP5b06p3RJnrL6mv l38= X-SBRS: 2.7 X-MesageID: 13277763 X-Ironport-Server: esa1.hc3370-68.iphmx.com X-Remote-IP: 162.221.158.21 X-Policy: $RELAYED X-IronPort-AV: E=Sophos;i="5.70,492,1574139600"; d="scan'208";a="13277763" From: Anthony PERARD To: Subject: [PULL 2/3] xen-bus/block: explicitly assign event channels to an AioContext Date: Thu, 27 Feb 2020 12:16:44 +0000 Message-ID: <20200227121645.2601280-3-anthony.perard@citrix.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20200227121645.2601280-1-anthony.perard@citrix.com> References: <20200227121645.2601280-1-anthony.perard@citrix.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain X-detected-operating-system: by eggs.gnu.org: FreeBSD 9.x [fuzzy] X-Received-From: 216.71.145.142 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: Peter Maydell , xen-devel@lists.xenproject.org Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" From: Paul Durrant It is not safe to close an event channel from the QEMU main thread when that channel's poller is running in IOThread context. This patch adds a new xen_device_set_event_channel_context() function to explicitly assign the channel AioContext, and modifies xen_device_bind_event_channel() to initially assign the channel's poller to the QEMU main thread context. The code in xen-block's dataplane is then modified to assign the channel to IOThread context during xen_block_dataplane_start() and de-assign it during in xen_block_dataplane_stop(), such that the channel is always assigned back to main thread context before it is closed. aio_set_fd_handler() already deals with all the necessary synchronization when moving an fd between AioContext-s so no extra code is needed to manage this. Reported-by: Julien Grall Signed-off-by: Paul Durrant Reviewed-by: Anthony PERARD Message-Id: <20191216143451.19024-1-pdurrant@amazon.com> Signed-off-by: Anthony PERARD --- hw/block/dataplane/xen-block.c | 20 ++++++++++++++++++-- hw/xen/xen-bus.c | 27 +++++++++++++++++++++++---- include/hw/xen/xen-bus.h | 5 ++++- 3 files changed, 45 insertions(+), 7 deletions(-) diff --git a/hw/block/dataplane/xen-block.c b/hw/block/dataplane/xen-block.c index 3b9caeb2fa00..288a87a814ad 100644 --- a/hw/block/dataplane/xen-block.c +++ b/hw/block/dataplane/xen-block.c @@ -685,12 +685,24 @@ void xen_block_dataplane_stop(XenBlockDataPlane *dataplane) return; } + xendev = dataplane->xendev; + aio_context_acquire(dataplane->ctx); + if (dataplane->event_channel) { + /* Only reason for failure is a NULL channel */ + xen_device_set_event_channel_context(xendev, dataplane->event_channel, + qemu_get_aio_context(), + &error_abort); + } /* Xen doesn't have multiple users for nodes, so this can't fail */ blk_set_aio_context(dataplane->blk, qemu_get_aio_context(), &error_abort); aio_context_release(dataplane->ctx); - xendev = dataplane->xendev; + /* + * Now that the context has been moved onto the main thread, cancel + * further processing. + */ + qemu_bh_cancel(dataplane->bh); if (dataplane->event_channel) { Error *local_err = NULL; @@ -807,7 +819,7 @@ void xen_block_dataplane_start(XenBlockDataPlane *dataplane, } dataplane->event_channel = - xen_device_bind_event_channel(xendev, dataplane->ctx, event_channel, + xen_device_bind_event_channel(xendev, event_channel, xen_block_dataplane_event, dataplane, &local_err); if (local_err) { @@ -818,7 +830,11 @@ void xen_block_dataplane_start(XenBlockDataPlane *dataplane, aio_context_acquire(dataplane->ctx); /* If other users keep the BlockBackend in the iothread, that's ok */ blk_set_aio_context(dataplane->blk, dataplane->ctx, NULL); + /* Only reason for failure is a NULL channel */ + xen_device_set_event_channel_context(xendev, dataplane->event_channel, + dataplane->ctx, &error_abort); aio_context_release(dataplane->ctx); + return; stop: diff --git a/hw/xen/xen-bus.c b/hw/xen/xen-bus.c index 919e66162a45..18237b34ea85 100644 --- a/hw/xen/xen-bus.c +++ b/hw/xen/xen-bus.c @@ -1089,8 +1089,26 @@ static void xen_device_event(void *opaque) } } +void xen_device_set_event_channel_context(XenDevice *xendev, + XenEventChannel *channel, + AioContext *ctx, + Error **errp) +{ + if (!channel) { + error_setg(errp, "bad channel"); + return; + } + + if (channel->ctx) + aio_set_fd_handler(channel->ctx, xenevtchn_fd(channel->xeh), true, + NULL, NULL, NULL, NULL); + + channel->ctx = ctx; + aio_set_fd_handler(channel->ctx, xenevtchn_fd(channel->xeh), true, + xen_device_event, NULL, xen_device_poll, channel); +} + XenEventChannel *xen_device_bind_event_channel(XenDevice *xendev, - AioContext *ctx, unsigned int port, XenEventHandler handler, void *opaque, Error **errp) @@ -1116,9 +1134,10 @@ XenEventChannel *xen_device_bind_event_channel(XenDevice *xendev, channel->handler = handler; channel->opaque = opaque; - channel->ctx = ctx; - aio_set_fd_handler(channel->ctx, xenevtchn_fd(channel->xeh), true, - xen_device_event, NULL, xen_device_poll, channel); + /* Only reason for failure is a NULL channel */ + xen_device_set_event_channel_context(xendev, channel, + qemu_get_aio_context(), + &error_abort); QLIST_INSERT_HEAD(&xendev->event_channels, channel, list); diff --git a/include/hw/xen/xen-bus.h b/include/hw/xen/xen-bus.h index 3d5532258df7..c18c1372af38 100644 --- a/include/hw/xen/xen-bus.h +++ b/include/hw/xen/xen-bus.h @@ -128,10 +128,13 @@ void xen_device_copy_grant_refs(XenDevice *xendev, bool to_domain, typedef bool (*XenEventHandler)(void *opaque); XenEventChannel *xen_device_bind_event_channel(XenDevice *xendev, - AioContext *ctx, unsigned int port, XenEventHandler handler, void *opaque, Error **errp); +void xen_device_set_event_channel_context(XenDevice *xendev, + XenEventChannel *channel, + AioContext *ctx, + Error **errp); void xen_device_notify_event_channel(XenDevice *xendev, XenEventChannel *channel, Error **errp); -- Anthony PERARD From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-9.6 required=3.0 tests=DKIM_INVALID,DKIM_SIGNED, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 150C6C4BA3B for ; Thu, 27 Feb 2020 12:17:34 +0000 (UTC) Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id DC36D24699 for ; Thu, 27 Feb 2020 12:17:33 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (1024-bit key) header.d=citrix.com header.i=@citrix.com header.b="hGuXUPIl" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org DC36D24699 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=citrix.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=xen-devel-bounces@lists.xenproject.org Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.89) (envelope-from ) id 1j7I6F-00063Z-U6; Thu, 27 Feb 2020 12:17:07 +0000 Received: from all-amaz-eas1.inumbo.com ([34.197.232.57] helo=us1-amaz-eas2.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.89) (envelope-from ) id 1j7I6E-00063E-5n for xen-devel@lists.xenproject.org; Thu, 27 Feb 2020 12:17:06 +0000 X-Inumbo-ID: 0ea718dc-595b-11ea-9666-12813bfff9fa Received: from esa1.hc3370-68.iphmx.com (unknown [216.71.145.142]) by us1-amaz-eas2.inumbo.com (Halon) with ESMTPS id 0ea718dc-595b-11ea-9666-12813bfff9fa; Thu, 27 Feb 2020 12:17:01 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=citrix.com; s=securemail; t=1582805821; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=CDWU+sgbS+JktH9g2iumodc54MqCBgShHGQD/NQz8io=; b=hGuXUPIl19mgpvf6igra9almxm5hHvnwkiGWobRC/emO5Ys3YGcfoq4k oO9GiCBH+ptAH4qerhsrFaTNVZXxblfUjF15tzJ0AJDNTPvViC4Jp8AyP hpwH3M+JkTHVI1LwvqCQ8O81l+rCOEIS/OiUpCIKgv3XXuF54fYIUIQzU k=; Authentication-Results: esa1.hc3370-68.iphmx.com; dkim=none (message not signed) header.i=none; spf=None smtp.pra=anthony.perard@citrix.com; spf=Pass smtp.mailfrom=anthony.perard@citrix.com; spf=None smtp.helo=postmaster@mail.citrix.com Received-SPF: None (esa1.hc3370-68.iphmx.com: no sender authenticity information available from domain of anthony.perard@citrix.com) identity=pra; client-ip=162.221.158.21; receiver=esa1.hc3370-68.iphmx.com; envelope-from="anthony.perard@citrix.com"; x-sender="anthony.perard@citrix.com"; x-conformance=sidf_compatible Received-SPF: Pass (esa1.hc3370-68.iphmx.com: domain of anthony.perard@citrix.com designates 162.221.158.21 as permitted sender) identity=mailfrom; client-ip=162.221.158.21; receiver=esa1.hc3370-68.iphmx.com; envelope-from="anthony.perard@citrix.com"; x-sender="anthony.perard@citrix.com"; x-conformance=sidf_compatible; x-record-type="v=spf1"; x-record-text="v=spf1 ip4:209.167.231.154 ip4:178.63.86.133 ip4:195.66.111.40/30 ip4:85.115.9.32/28 ip4:199.102.83.4 ip4:192.28.146.160 ip4:192.28.146.107 ip4:216.52.6.88 ip4:216.52.6.188 ip4:162.221.158.21 ip4:162.221.156.83 ip4:168.245.78.127 ~all" Received-SPF: None (esa1.hc3370-68.iphmx.com: no sender authenticity information available from domain of postmaster@mail.citrix.com) identity=helo; client-ip=162.221.158.21; receiver=esa1.hc3370-68.iphmx.com; envelope-from="anthony.perard@citrix.com"; x-sender="postmaster@mail.citrix.com"; x-conformance=sidf_compatible IronPort-SDR: iemrAuRoNR9K59H1rtr/9irQXvzz6cNInNaTzMvS9W+79DG5k+OGII2ScMbgIg9Y2FS3BjITVZ q8IIDmq+XvKnOl2YCniard/b7u7bbxT69I4Dpa3uWf2Vw7nPfFTX3XruOIV08LASzDCpvHbBWK 0Etm1FlhHaAPqT/h4Nz3IZBqujr9ARwuyhRyvXdg2ObSNIJjRvIAajjdc4oaIbchFhfBsPtioA 1/GyRze7OCXBN75k095RovC7lb3GazLbFMlBEAJOdrzuhQhZhCkQdiaTjypP5b06p3RJnrL6mv l38= X-SBRS: 2.7 X-MesageID: 13277763 X-Ironport-Server: esa1.hc3370-68.iphmx.com X-Remote-IP: 162.221.158.21 X-Policy: $RELAYED X-IronPort-AV: E=Sophos;i="5.70,492,1574139600"; d="scan'208";a="13277763" From: Anthony PERARD To: Date: Thu, 27 Feb 2020 12:16:44 +0000 Message-ID: <20200227121645.2601280-3-anthony.perard@citrix.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20200227121645.2601280-1-anthony.perard@citrix.com> References: <20200227121645.2601280-1-anthony.perard@citrix.com> MIME-Version: 1.0 Subject: [Xen-devel] [PULL 2/3] xen-bus/block: explicitly assign event channels to an AioContext X-BeenThere: xen-devel@lists.xenproject.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Cc: Peter Maydell , xen-devel@lists.xenproject.org Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Errors-To: xen-devel-bounces@lists.xenproject.org Sender: "Xen-devel" RnJvbTogUGF1bCBEdXJyYW50IDxwZHVycmFudEBhbWF6b24uY29tPgoKSXQgaXMgbm90IHNhZmUg dG8gY2xvc2UgYW4gZXZlbnQgY2hhbm5lbCBmcm9tIHRoZSBRRU1VIG1haW4gdGhyZWFkIHdoZW4K dGhhdCBjaGFubmVsJ3MgcG9sbGVyIGlzIHJ1bm5pbmcgaW4gSU9UaHJlYWQgY29udGV4dC4KClRo aXMgcGF0Y2ggYWRkcyBhIG5ldyB4ZW5fZGV2aWNlX3NldF9ldmVudF9jaGFubmVsX2NvbnRleHQo KSBmdW5jdGlvbgp0byBleHBsaWNpdGx5IGFzc2lnbiB0aGUgY2hhbm5lbCBBaW9Db250ZXh0LCBh bmQgbW9kaWZpZXMKeGVuX2RldmljZV9iaW5kX2V2ZW50X2NoYW5uZWwoKSB0byBpbml0aWFsbHkg YXNzaWduIHRoZSBjaGFubmVsJ3MgcG9sbGVyCnRvIHRoZSBRRU1VIG1haW4gdGhyZWFkIGNvbnRl eHQuIFRoZSBjb2RlIGluIHhlbi1ibG9jaydzIGRhdGFwbGFuZSBpcwp0aGVuIG1vZGlmaWVkIHRv IGFzc2lnbiB0aGUgY2hhbm5lbCB0byBJT1RocmVhZCBjb250ZXh0IGR1cmluZwp4ZW5fYmxvY2tf ZGF0YXBsYW5lX3N0YXJ0KCkgYW5kIGRlLWFzc2lnbiBpdCBkdXJpbmcgaW4KeGVuX2Jsb2NrX2Rh dGFwbGFuZV9zdG9wKCksIHN1Y2ggdGhhdCB0aGUgY2hhbm5lbCBpcyBhbHdheXMgYXNzaWduZWQK YmFjayB0byBtYWluIHRocmVhZCBjb250ZXh0IGJlZm9yZSBpdCBpcyBjbG9zZWQuIGFpb19zZXRf ZmRfaGFuZGxlcigpCmFscmVhZHkgZGVhbHMgd2l0aCBhbGwgdGhlIG5lY2Vzc2FyeSBzeW5jaHJv bml6YXRpb24gd2hlbiBtb3ZpbmcgYW4gZmQKYmV0d2VlbiBBaW9Db250ZXh0LXMgc28gbm8gZXh0 cmEgY29kZSBpcyBuZWVkZWQgdG8gbWFuYWdlIHRoaXMuCgpSZXBvcnRlZC1ieTogSnVsaWVuIEdy YWxsIDxqZ3JhbGxAYW1hem9uLmNvbT4KU2lnbmVkLW9mZi1ieTogUGF1bCBEdXJyYW50IDxwZHVy cmFudEBhbWF6b24uY29tPgpSZXZpZXdlZC1ieTogQW50aG9ueSBQRVJBUkQgPGFudGhvbnkucGVy YXJkQGNpdHJpeC5jb20+Ck1lc3NhZ2UtSWQ6IDwyMDE5MTIxNjE0MzQ1MS4xOTAyNC0xLXBkdXJy YW50QGFtYXpvbi5jb20+ClNpZ25lZC1vZmYtYnk6IEFudGhvbnkgUEVSQVJEIDxhbnRob255LnBl cmFyZEBjaXRyaXguY29tPgotLS0KIGh3L2Jsb2NrL2RhdGFwbGFuZS94ZW4tYmxvY2suYyB8IDIw ICsrKysrKysrKysrKysrKysrKy0tCiBody94ZW4veGVuLWJ1cy5jICAgICAgICAgICAgICAgfCAy NyArKysrKysrKysrKysrKysrKysrKysrKy0tLS0KIGluY2x1ZGUvaHcveGVuL3hlbi1idXMuaCAg ICAgICB8ICA1ICsrKystCiAzIGZpbGVzIGNoYW5nZWQsIDQ1IGluc2VydGlvbnMoKyksIDcgZGVs ZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEvaHcvYmxvY2svZGF0YXBsYW5lL3hlbi1ibG9jay5jIGIv aHcvYmxvY2svZGF0YXBsYW5lL3hlbi1ibG9jay5jCmluZGV4IDNiOWNhZWIyZmEwMC4uMjg4YTg3 YTgxNGFkIDEwMDY0NAotLS0gYS9ody9ibG9jay9kYXRhcGxhbmUveGVuLWJsb2NrLmMKKysrIGIv aHcvYmxvY2svZGF0YXBsYW5lL3hlbi1ibG9jay5jCkBAIC02ODUsMTIgKzY4NSwyNCBAQCB2b2lk IHhlbl9ibG9ja19kYXRhcGxhbmVfc3RvcChYZW5CbG9ja0RhdGFQbGFuZSAqZGF0YXBsYW5lKQog ICAgICAgICByZXR1cm47CiAgICAgfQogCisgICAgeGVuZGV2ID0gZGF0YXBsYW5lLT54ZW5kZXY7 CisKICAgICBhaW9fY29udGV4dF9hY3F1aXJlKGRhdGFwbGFuZS0+Y3R4KTsKKyAgICBpZiAoZGF0 YXBsYW5lLT5ldmVudF9jaGFubmVsKSB7CisgICAgICAgIC8qIE9ubHkgcmVhc29uIGZvciBmYWls dXJlIGlzIGEgTlVMTCBjaGFubmVsICovCisgICAgICAgIHhlbl9kZXZpY2Vfc2V0X2V2ZW50X2No YW5uZWxfY29udGV4dCh4ZW5kZXYsIGRhdGFwbGFuZS0+ZXZlbnRfY2hhbm5lbCwKKyAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIHFlbXVfZ2V0X2Fpb19jb250ZXh0 KCksCisgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAmZXJyb3Jf YWJvcnQpOworICAgIH0KICAgICAvKiBYZW4gZG9lc24ndCBoYXZlIG11bHRpcGxlIHVzZXJzIGZv ciBub2Rlcywgc28gdGhpcyBjYW4ndCBmYWlsICovCiAgICAgYmxrX3NldF9haW9fY29udGV4dChk YXRhcGxhbmUtPmJsaywgcWVtdV9nZXRfYWlvX2NvbnRleHQoKSwgJmVycm9yX2Fib3J0KTsKICAg ICBhaW9fY29udGV4dF9yZWxlYXNlKGRhdGFwbGFuZS0+Y3R4KTsKIAotICAgIHhlbmRldiA9IGRh dGFwbGFuZS0+eGVuZGV2OworICAgIC8qCisgICAgICogTm93IHRoYXQgdGhlIGNvbnRleHQgaGFz IGJlZW4gbW92ZWQgb250byB0aGUgbWFpbiB0aHJlYWQsIGNhbmNlbAorICAgICAqIGZ1cnRoZXIg cHJvY2Vzc2luZy4KKyAgICAgKi8KKyAgICBxZW11X2JoX2NhbmNlbChkYXRhcGxhbmUtPmJoKTsK IAogICAgIGlmIChkYXRhcGxhbmUtPmV2ZW50X2NoYW5uZWwpIHsKICAgICAgICAgRXJyb3IgKmxv Y2FsX2VyciA9IE5VTEw7CkBAIC04MDcsNyArODE5LDcgQEAgdm9pZCB4ZW5fYmxvY2tfZGF0YXBs YW5lX3N0YXJ0KFhlbkJsb2NrRGF0YVBsYW5lICpkYXRhcGxhbmUsCiAgICAgfQogCiAgICAgZGF0 YXBsYW5lLT5ldmVudF9jaGFubmVsID0KLSAgICAgICAgeGVuX2RldmljZV9iaW5kX2V2ZW50X2No YW5uZWwoeGVuZGV2LCBkYXRhcGxhbmUtPmN0eCwgZXZlbnRfY2hhbm5lbCwKKyAgICAgICAgeGVu X2RldmljZV9iaW5kX2V2ZW50X2NoYW5uZWwoeGVuZGV2LCBldmVudF9jaGFubmVsLAogICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICB4ZW5fYmxvY2tfZGF0YXBsYW5lX2V2ZW50 LCBkYXRhcGxhbmUsCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICZsb2Nh bF9lcnIpOwogICAgIGlmIChsb2NhbF9lcnIpIHsKQEAgLTgxOCw3ICs4MzAsMTEgQEAgdm9pZCB4 ZW5fYmxvY2tfZGF0YXBsYW5lX3N0YXJ0KFhlbkJsb2NrRGF0YVBsYW5lICpkYXRhcGxhbmUsCiAg ICAgYWlvX2NvbnRleHRfYWNxdWlyZShkYXRhcGxhbmUtPmN0eCk7CiAgICAgLyogSWYgb3RoZXIg dXNlcnMga2VlcCB0aGUgQmxvY2tCYWNrZW5kIGluIHRoZSBpb3RocmVhZCwgdGhhdCdzIG9rICov CiAgICAgYmxrX3NldF9haW9fY29udGV4dChkYXRhcGxhbmUtPmJsaywgZGF0YXBsYW5lLT5jdHgs IE5VTEwpOworICAgIC8qIE9ubHkgcmVhc29uIGZvciBmYWlsdXJlIGlzIGEgTlVMTCBjaGFubmVs ICovCisgICAgeGVuX2RldmljZV9zZXRfZXZlbnRfY2hhbm5lbF9jb250ZXh0KHhlbmRldiwgZGF0 YXBsYW5lLT5ldmVudF9jaGFubmVsLAorICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICBkYXRhcGxhbmUtPmN0eCwgJmVycm9yX2Fib3J0KTsKICAgICBhaW9fY29udGV4dF9y ZWxlYXNlKGRhdGFwbGFuZS0+Y3R4KTsKKwogICAgIHJldHVybjsKIAogc3RvcDoKZGlmZiAtLWdp dCBhL2h3L3hlbi94ZW4tYnVzLmMgYi9ody94ZW4veGVuLWJ1cy5jCmluZGV4IDkxOWU2NjE2MmE0 NS4uMTgyMzdiMzRlYTg1IDEwMDY0NAotLS0gYS9ody94ZW4veGVuLWJ1cy5jCisrKyBiL2h3L3hl bi94ZW4tYnVzLmMKQEAgLTEwODksOCArMTA4OSwyNiBAQCBzdGF0aWMgdm9pZCB4ZW5fZGV2aWNl X2V2ZW50KHZvaWQgKm9wYXF1ZSkKICAgICB9CiB9CiAKK3ZvaWQgeGVuX2RldmljZV9zZXRfZXZl bnRfY2hhbm5lbF9jb250ZXh0KFhlbkRldmljZSAqeGVuZGV2LAorICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgWGVuRXZlbnRDaGFubmVsICpjaGFubmVsLAorICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgQWlvQ29udGV4dCAqY3R4LAorICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgRXJyb3IgKiplcnJwKQorewor ICAgIGlmICghY2hhbm5lbCkgeworICAgICAgICBlcnJvcl9zZXRnKGVycnAsICJiYWQgY2hhbm5l bCIpOworICAgICAgICByZXR1cm47CisgICAgfQorCisgICAgaWYgKGNoYW5uZWwtPmN0eCkKKyAg ICAgICAgYWlvX3NldF9mZF9oYW5kbGVyKGNoYW5uZWwtPmN0eCwgeGVuZXZ0Y2huX2ZkKGNoYW5u ZWwtPnhlaCksIHRydWUsCisgICAgICAgICAgICAgICAgICAgICAgICAgICBOVUxMLCBOVUxMLCBO VUxMLCBOVUxMKTsKKworICAgIGNoYW5uZWwtPmN0eCA9IGN0eDsKKyAgICBhaW9fc2V0X2ZkX2hh bmRsZXIoY2hhbm5lbC0+Y3R4LCB4ZW5ldnRjaG5fZmQoY2hhbm5lbC0+eGVoKSwgdHJ1ZSwKKyAg ICAgICAgICAgICAgICAgICAgICAgeGVuX2RldmljZV9ldmVudCwgTlVMTCwgeGVuX2RldmljZV9w b2xsLCBjaGFubmVsKTsKK30KKwogWGVuRXZlbnRDaGFubmVsICp4ZW5fZGV2aWNlX2JpbmRfZXZl bnRfY2hhbm5lbChYZW5EZXZpY2UgKnhlbmRldiwKLSAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgQWlvQ29udGV4dCAqY3R4LAogICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICB1bnNpZ25lZCBpbnQgcG9ydCwKICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgWGVuRXZlbnRIYW5kbGVyIGhh bmRsZXIsCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIHZv aWQgKm9wYXF1ZSwgRXJyb3IgKiplcnJwKQpAQCAtMTExNiw5ICsxMTM0LDEwIEBAIFhlbkV2ZW50 Q2hhbm5lbCAqeGVuX2RldmljZV9iaW5kX2V2ZW50X2NoYW5uZWwoWGVuRGV2aWNlICp4ZW5kZXYs CiAgICAgY2hhbm5lbC0+aGFuZGxlciA9IGhhbmRsZXI7CiAgICAgY2hhbm5lbC0+b3BhcXVlID0g b3BhcXVlOwogCi0gICAgY2hhbm5lbC0+Y3R4ID0gY3R4OwotICAgIGFpb19zZXRfZmRfaGFuZGxl cihjaGFubmVsLT5jdHgsIHhlbmV2dGNobl9mZChjaGFubmVsLT54ZWgpLCB0cnVlLAotICAgICAg ICAgICAgICAgICAgICAgICB4ZW5fZGV2aWNlX2V2ZW50LCBOVUxMLCB4ZW5fZGV2aWNlX3BvbGws IGNoYW5uZWwpOworICAgIC8qIE9ubHkgcmVhc29uIGZvciBmYWlsdXJlIGlzIGEgTlVMTCBjaGFu bmVsICovCisgICAgeGVuX2RldmljZV9zZXRfZXZlbnRfY2hhbm5lbF9jb250ZXh0KHhlbmRldiwg Y2hhbm5lbCwKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgcWVtdV9n ZXRfYWlvX2NvbnRleHQoKSwKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgJmVycm9yX2Fib3J0KTsKIAogICAgIFFMSVNUX0lOU0VSVF9IRUFEKCZ4ZW5kZXYtPmV2ZW50 X2NoYW5uZWxzLCBjaGFubmVsLCBsaXN0KTsKIApkaWZmIC0tZ2l0IGEvaW5jbHVkZS9ody94ZW4v eGVuLWJ1cy5oIGIvaW5jbHVkZS9ody94ZW4veGVuLWJ1cy5oCmluZGV4IDNkNTUzMjI1OGRmNy4u YzE4YzEzNzJhZjM4IDEwMDY0NAotLS0gYS9pbmNsdWRlL2h3L3hlbi94ZW4tYnVzLmgKKysrIGIv aW5jbHVkZS9ody94ZW4veGVuLWJ1cy5oCkBAIC0xMjgsMTAgKzEyOCwxMyBAQCB2b2lkIHhlbl9k ZXZpY2VfY29weV9ncmFudF9yZWZzKFhlbkRldmljZSAqeGVuZGV2LCBib29sIHRvX2RvbWFpbiwK IHR5cGVkZWYgYm9vbCAoKlhlbkV2ZW50SGFuZGxlcikodm9pZCAqb3BhcXVlKTsKIAogWGVuRXZl bnRDaGFubmVsICp4ZW5fZGV2aWNlX2JpbmRfZXZlbnRfY2hhbm5lbChYZW5EZXZpY2UgKnhlbmRl diwKLSAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgQWlvQ29u dGV4dCAqY3R4LAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICB1bnNpZ25lZCBpbnQgcG9ydCwKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgWGVuRXZlbnRIYW5kbGVyIGhhbmRsZXIsCiAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgIHZvaWQgKm9wYXF1ZSwgRXJyb3IgKiplcnJwKTsK K3ZvaWQgeGVuX2RldmljZV9zZXRfZXZlbnRfY2hhbm5lbF9jb250ZXh0KFhlbkRldmljZSAqeGVu ZGV2LAorICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgWGVuRXZlbnRD aGFubmVsICpjaGFubmVsLAorICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgQWlvQ29udGV4dCAqY3R4LAorICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgRXJyb3IgKiplcnJwKTsKIHZvaWQgeGVuX2RldmljZV9ub3RpZnlfZXZlbnRfY2hhbm5l bChYZW5EZXZpY2UgKnhlbmRldiwKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICBYZW5FdmVudENoYW5uZWwgKmNoYW5uZWwsCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgRXJyb3IgKiplcnJwKTsKLS0gCkFudGhvbnkgUEVSQVJECgoKX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX18KWGVuLWRldmVsIG1haWxpbmcgbGlz dApYZW4tZGV2ZWxAbGlzdHMueGVucHJvamVjdC5vcmcKaHR0cHM6Ly9saXN0cy54ZW5wcm9qZWN0 Lm9yZy9tYWlsbWFuL2xpc3RpbmZvL3hlbi1kZXZlbA==