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.8 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH, MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED, USER_AGENT_GIT autolearn=unavailable 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 35EBFC00454 for ; Wed, 11 Dec 2019 15:30:14 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 0D29A24671 for ; Wed, 11 Dec 2019 15:30:14 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=amazon.com header.i=@amazon.com header.b="cTSKbM41" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2387678AbfLKPaJ (ORCPT ); Wed, 11 Dec 2019 10:30:09 -0500 Received: from smtp-fw-4101.amazon.com ([72.21.198.25]:61065 "EHLO smtp-fw-4101.amazon.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2387751AbfLKPaH (ORCPT ); Wed, 11 Dec 2019 10:30:07 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=amazon.com; i=@amazon.com; q=dns/txt; s=amazon201209; t=1576078207; x=1607614207; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=iUa3rMrxmsbf7wqyelx7uKp4w0L5PGnWaAJKZ1+2hRA=; b=cTSKbM41K5a+TpaQu2fopTrSOifueqCyPZ1HkG+kaBqU9sgD8BOFjW+c Msa66gq/9iug/gF0j0UOq7wByZ465T0LMJXKpqvpO2iTY8+FrD+IykA/t PpD7nvTh8VKzBh73ZEArTRgYzb7g5tiOaboJHp4x/dZne5eFlzJ55s1qw c=; IronPort-SDR: k+ahKTZHIO0ciIGn4hMaP6zVJRPspOxO/cgWgiMFZcQpLsQqkQ6c1rHpCPrZg2+A0/TfDf2Ix1 0d4IQXOJvoNw== X-IronPort-AV: E=Sophos;i="5.69,301,1571702400"; d="scan'208";a="8046829" Received: from iad6-co-svc-p1-lb1-vlan3.amazon.com (HELO email-inbound-relay-2a-69849ee2.us-west-2.amazon.com) ([10.124.125.6]) by smtp-border-fw-out-4101.iad4.amazon.com with ESMTP; 11 Dec 2019 15:30:06 +0000 Received: from EX13MTAUEA001.ant.amazon.com (pdx4-ws-svc-p6-lb7-vlan2.pdx.amazon.com [10.170.41.162]) by email-inbound-relay-2a-69849ee2.us-west-2.amazon.com (Postfix) with ESMTPS id 2B8E7A245B; Wed, 11 Dec 2019 15:30:05 +0000 (UTC) Received: from EX13D32EUC001.ant.amazon.com (10.43.164.159) by EX13MTAUEA001.ant.amazon.com (10.43.61.243) with Microsoft SMTP Server (TLS) id 15.0.1367.3; Wed, 11 Dec 2019 15:30:04 +0000 Received: from EX13MTAUWC001.ant.amazon.com (10.43.162.135) by EX13D32EUC001.ant.amazon.com (10.43.164.159) with Microsoft SMTP Server (TLS) id 15.0.1367.3; Wed, 11 Dec 2019 15:30:03 +0000 Received: from u2f063a87eabd5f.cbg10.amazon.com (10.125.106.135) by mail-relay.amazon.com (10.43.162.232) with Microsoft SMTP Server id 15.0.1367.3 via Frontend Transport; Wed, 11 Dec 2019 15:30:01 +0000 From: Paul Durrant To: , , CC: Paul Durrant , Juergen Gross , "Boris Ostrovsky" , Stefano Stabellini Subject: [PATCH v3 1/4] xenbus: move xenbus_dev_shutdown() into frontend code... Date: Wed, 11 Dec 2019 15:29:53 +0000 Message-ID: <20191211152956.5168-2-pdurrant@amazon.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20191211152956.5168-1-pdurrant@amazon.com> References: <20191211152956.5168-1-pdurrant@amazon.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain Sender: linux-block-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-block@vger.kernel.org ...and make it static xenbus_dev_shutdown() is seemingly intended to cause clean shutdown of PV frontends when a guest is rebooted. Indeed the function waits for a conpletion which is only set by a call to xenbus_frontend_closed(). This patch removes the shutdown() method from backends and moves xenbus_dev_shutdown() from xenbus_probe.c into xenbus_probe_frontend.c, renaming it appropriately and making it static. NOTE: In the case where the backend is running in a driver domain, the toolstack should have already terminated any frontends that may be using it (since Xen does not support re-startable PV driver domains) so xenbus_dev_shutdown() should never be called. Signed-off-by: Paul Durrant Reviewed-by: Juergen Gross --- Cc: Boris Ostrovsky Cc: Stefano Stabellini --- drivers/xen/xenbus/xenbus.h | 2 -- drivers/xen/xenbus/xenbus_probe.c | 23 --------------------- drivers/xen/xenbus/xenbus_probe_backend.c | 1 - drivers/xen/xenbus/xenbus_probe_frontend.c | 24 +++++++++++++++++++++- 4 files changed, 23 insertions(+), 27 deletions(-) diff --git a/drivers/xen/xenbus/xenbus.h b/drivers/xen/xenbus/xenbus.h index d75a2385b37c..5f5b8a7d5b80 100644 --- a/drivers/xen/xenbus/xenbus.h +++ b/drivers/xen/xenbus/xenbus.h @@ -116,8 +116,6 @@ int xenbus_probe_devices(struct xen_bus_type *bus); void xenbus_dev_changed(const char *node, struct xen_bus_type *bus); -void xenbus_dev_shutdown(struct device *_dev); - int xenbus_dev_suspend(struct device *dev); int xenbus_dev_resume(struct device *dev); int xenbus_dev_cancel(struct device *dev); diff --git a/drivers/xen/xenbus/xenbus_probe.c b/drivers/xen/xenbus/xenbus_probe.c index c21be6e9d38a..5aa29396c9e3 100644 --- a/drivers/xen/xenbus/xenbus_probe.c +++ b/drivers/xen/xenbus/xenbus_probe.c @@ -281,29 +281,6 @@ int xenbus_dev_remove(struct device *_dev) } EXPORT_SYMBOL_GPL(xenbus_dev_remove); -void xenbus_dev_shutdown(struct device *_dev) -{ - struct xenbus_device *dev = to_xenbus_device(_dev); - unsigned long timeout = 5*HZ; - - DPRINTK("%s", dev->nodename); - - get_device(&dev->dev); - if (dev->state != XenbusStateConnected) { - pr_info("%s: %s: %s != Connected, skipping\n", - __func__, dev->nodename, xenbus_strstate(dev->state)); - goto out; - } - xenbus_switch_state(dev, XenbusStateClosing); - timeout = wait_for_completion_timeout(&dev->down, timeout); - if (!timeout) - pr_info("%s: %s timeout closing device\n", - __func__, dev->nodename); - out: - put_device(&dev->dev); -} -EXPORT_SYMBOL_GPL(xenbus_dev_shutdown); - int xenbus_register_driver_common(struct xenbus_driver *drv, struct xen_bus_type *bus, struct module *owner, const char *mod_name) diff --git a/drivers/xen/xenbus/xenbus_probe_backend.c b/drivers/xen/xenbus/xenbus_probe_backend.c index b0bed4faf44c..14876faff3b0 100644 --- a/drivers/xen/xenbus/xenbus_probe_backend.c +++ b/drivers/xen/xenbus/xenbus_probe_backend.c @@ -198,7 +198,6 @@ static struct xen_bus_type xenbus_backend = { .uevent = xenbus_uevent_backend, .probe = xenbus_dev_probe, .remove = xenbus_dev_remove, - .shutdown = xenbus_dev_shutdown, .dev_groups = xenbus_dev_groups, }, }; diff --git a/drivers/xen/xenbus/xenbus_probe_frontend.c b/drivers/xen/xenbus/xenbus_probe_frontend.c index a7d90a719cea..8a1650bbe18f 100644 --- a/drivers/xen/xenbus/xenbus_probe_frontend.c +++ b/drivers/xen/xenbus/xenbus_probe_frontend.c @@ -126,6 +126,28 @@ static int xenbus_frontend_dev_probe(struct device *dev) return xenbus_dev_probe(dev); } +static void xenbus_frontend_dev_shutdown(struct device *_dev) +{ + struct xenbus_device *dev = to_xenbus_device(_dev); + unsigned long timeout = 5*HZ; + + DPRINTK("%s", dev->nodename); + + get_device(&dev->dev); + if (dev->state != XenbusStateConnected) { + pr_info("%s: %s: %s != Connected, skipping\n", + __func__, dev->nodename, xenbus_strstate(dev->state)); + goto out; + } + xenbus_switch_state(dev, XenbusStateClosing); + timeout = wait_for_completion_timeout(&dev->down, timeout); + if (!timeout) + pr_info("%s: %s timeout closing device\n", + __func__, dev->nodename); + out: + put_device(&dev->dev); +} + static const struct dev_pm_ops xenbus_pm_ops = { .suspend = xenbus_dev_suspend, .resume = xenbus_frontend_dev_resume, @@ -146,7 +168,7 @@ static struct xen_bus_type xenbus_frontend = { .uevent = xenbus_uevent_frontend, .probe = xenbus_frontend_dev_probe, .remove = xenbus_dev_remove, - .shutdown = xenbus_dev_shutdown, + .shutdown = xenbus_frontend_dev_shutdown, .dev_groups = xenbus_dev_groups, .pm = &xenbus_pm_ops, -- 2.20.1 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=-8.4 required=3.0 tests=DKIM_ADSP_ALL,DKIM_INVALID, DKIM_SIGNED,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,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 12FD1C2D0C6 for ; Wed, 11 Dec 2019 15:30:20 +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 D9922208C3 for ; Wed, 11 Dec 2019 15:30:19 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (1024-bit key) header.d=amazon.com header.i=@amazon.com header.b="cTSKbM41" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org D9922208C3 Authentication-Results: mail.kernel.org; dmarc=fail (p=quarantine dis=none) header.from=amazon.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 1if3wI-00026U-I9; Wed, 11 Dec 2019 15:30:10 +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 1if3wI-00026E-1Q for xen-devel@lists.xenproject.org; Wed, 11 Dec 2019 15:30:10 +0000 X-Inumbo-ID: 1becc234-1c2b-11ea-8b7d-12813bfff9fa Received: from smtp-fw-4101.amazon.com (unknown [72.21.198.25]) by us1-amaz-eas2.inumbo.com (Halon) with ESMTPS id 1becc234-1c2b-11ea-8b7d-12813bfff9fa; Wed, 11 Dec 2019 15:30:06 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=amazon.com; i=@amazon.com; q=dns/txt; s=amazon201209; t=1576078207; x=1607614207; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=iUa3rMrxmsbf7wqyelx7uKp4w0L5PGnWaAJKZ1+2hRA=; b=cTSKbM41K5a+TpaQu2fopTrSOifueqCyPZ1HkG+kaBqU9sgD8BOFjW+c Msa66gq/9iug/gF0j0UOq7wByZ465T0LMJXKpqvpO2iTY8+FrD+IykA/t PpD7nvTh8VKzBh73ZEArTRgYzb7g5tiOaboJHp4x/dZne5eFlzJ55s1qw c=; IronPort-SDR: k+ahKTZHIO0ciIGn4hMaP6zVJRPspOxO/cgWgiMFZcQpLsQqkQ6c1rHpCPrZg2+A0/TfDf2Ix1 0d4IQXOJvoNw== X-IronPort-AV: E=Sophos;i="5.69,301,1571702400"; d="scan'208";a="8046829" Received: from iad6-co-svc-p1-lb1-vlan3.amazon.com (HELO email-inbound-relay-2a-69849ee2.us-west-2.amazon.com) ([10.124.125.6]) by smtp-border-fw-out-4101.iad4.amazon.com with ESMTP; 11 Dec 2019 15:30:06 +0000 Received: from EX13MTAUEA001.ant.amazon.com (pdx4-ws-svc-p6-lb7-vlan2.pdx.amazon.com [10.170.41.162]) by email-inbound-relay-2a-69849ee2.us-west-2.amazon.com (Postfix) with ESMTPS id 2B8E7A245B; Wed, 11 Dec 2019 15:30:05 +0000 (UTC) Received: from EX13D32EUC001.ant.amazon.com (10.43.164.159) by EX13MTAUEA001.ant.amazon.com (10.43.61.243) with Microsoft SMTP Server (TLS) id 15.0.1367.3; Wed, 11 Dec 2019 15:30:04 +0000 Received: from EX13MTAUWC001.ant.amazon.com (10.43.162.135) by EX13D32EUC001.ant.amazon.com (10.43.164.159) with Microsoft SMTP Server (TLS) id 15.0.1367.3; Wed, 11 Dec 2019 15:30:03 +0000 Received: from u2f063a87eabd5f.cbg10.amazon.com (10.125.106.135) by mail-relay.amazon.com (10.43.162.232) with Microsoft SMTP Server id 15.0.1367.3 via Frontend Transport; Wed, 11 Dec 2019 15:30:01 +0000 From: Paul Durrant To: , , Date: Wed, 11 Dec 2019 15:29:53 +0000 Message-ID: <20191211152956.5168-2-pdurrant@amazon.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20191211152956.5168-1-pdurrant@amazon.com> References: <20191211152956.5168-1-pdurrant@amazon.com> MIME-Version: 1.0 Precedence: Bulk Subject: [Xen-devel] [PATCH v3 1/4] xenbus: move xenbus_dev_shutdown() into frontend code... X-BeenThere: xen-devel@lists.xenproject.org X-Mailman-Version: 2.1.23 List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Cc: Juergen Gross , Paul Durrant , Stefano Stabellini , Boris Ostrovsky Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Errors-To: xen-devel-bounces@lists.xenproject.org Sender: "Xen-devel" Li4uYW5kIG1ha2UgaXQgc3RhdGljCgp4ZW5idXNfZGV2X3NodXRkb3duKCkgaXMgc2VlbWluZ2x5 IGludGVuZGVkIHRvIGNhdXNlIGNsZWFuIHNodXRkb3duIG9mIFBWCmZyb250ZW5kcyB3aGVuIGEg Z3Vlc3QgaXMgcmVib290ZWQuIEluZGVlZCB0aGUgZnVuY3Rpb24gd2FpdHMgZm9yIGEKY29ucGxl dGlvbiB3aGljaCBpcyBvbmx5IHNldCBieSBhIGNhbGwgdG8geGVuYnVzX2Zyb250ZW5kX2Nsb3Nl ZCgpLgoKVGhpcyBwYXRjaCByZW1vdmVzIHRoZSBzaHV0ZG93bigpIG1ldGhvZCBmcm9tIGJhY2tl bmRzIGFuZCBtb3Zlcwp4ZW5idXNfZGV2X3NodXRkb3duKCkgZnJvbSB4ZW5idXNfcHJvYmUuYyBp bnRvIHhlbmJ1c19wcm9iZV9mcm9udGVuZC5jLApyZW5hbWluZyBpdCBhcHByb3ByaWF0ZWx5IGFu ZCBtYWtpbmcgaXQgc3RhdGljLgoKTk9URTogSW4gdGhlIGNhc2Ugd2hlcmUgdGhlIGJhY2tlbmQg aXMgcnVubmluZyBpbiBhIGRyaXZlciBkb21haW4sIHRoZQogICAgICB0b29sc3RhY2sgc2hvdWxk IGhhdmUgYWxyZWFkeSB0ZXJtaW5hdGVkIGFueSBmcm9udGVuZHMgdGhhdCBtYXkgYmUKICAgICAg dXNpbmcgaXQgKHNpbmNlIFhlbiBkb2VzIG5vdCBzdXBwb3J0IHJlLXN0YXJ0YWJsZSBQViBkcml2 ZXIgZG9tYWlucykKICAgICAgc28geGVuYnVzX2Rldl9zaHV0ZG93bigpIHNob3VsZCBuZXZlciBi ZSBjYWxsZWQuCgpTaWduZWQtb2ZmLWJ5OiBQYXVsIER1cnJhbnQgPHBkdXJyYW50QGFtYXpvbi5j b20+ClJldmlld2VkLWJ5OiBKdWVyZ2VuIEdyb3NzIDxqZ3Jvc3NAc3VzZS5jb20+Ci0tLQpDYzog Qm9yaXMgT3N0cm92c2t5IDxib3Jpcy5vc3Ryb3Zza3lAb3JhY2xlLmNvbT4KQ2M6IFN0ZWZhbm8g U3RhYmVsbGluaSA8c3N0YWJlbGxpbmlAa2VybmVsLm9yZz4KLS0tCiBkcml2ZXJzL3hlbi94ZW5i dXMveGVuYnVzLmggICAgICAgICAgICAgICAgfCAgMiAtLQogZHJpdmVycy94ZW4veGVuYnVzL3hl bmJ1c19wcm9iZS5jICAgICAgICAgIHwgMjMgLS0tLS0tLS0tLS0tLS0tLS0tLS0tCiBkcml2ZXJz L3hlbi94ZW5idXMveGVuYnVzX3Byb2JlX2JhY2tlbmQuYyAgfCAgMSAtCiBkcml2ZXJzL3hlbi94 ZW5idXMveGVuYnVzX3Byb2JlX2Zyb250ZW5kLmMgfCAyNCArKysrKysrKysrKysrKysrKysrKyst CiA0IGZpbGVzIGNoYW5nZWQsIDIzIGluc2VydGlvbnMoKyksIDI3IGRlbGV0aW9ucygtKQoKZGlm ZiAtLWdpdCBhL2RyaXZlcnMveGVuL3hlbmJ1cy94ZW5idXMuaCBiL2RyaXZlcnMveGVuL3hlbmJ1 cy94ZW5idXMuaAppbmRleCBkNzVhMjM4NWIzN2MuLjVmNWI4YTdkNWI4MCAxMDA2NDQKLS0tIGEv ZHJpdmVycy94ZW4veGVuYnVzL3hlbmJ1cy5oCisrKyBiL2RyaXZlcnMveGVuL3hlbmJ1cy94ZW5i dXMuaApAQCAtMTE2LDggKzExNiw2IEBAIGludCB4ZW5idXNfcHJvYmVfZGV2aWNlcyhzdHJ1Y3Qg eGVuX2J1c190eXBlICpidXMpOwogCiB2b2lkIHhlbmJ1c19kZXZfY2hhbmdlZChjb25zdCBjaGFy ICpub2RlLCBzdHJ1Y3QgeGVuX2J1c190eXBlICpidXMpOwogCi12b2lkIHhlbmJ1c19kZXZfc2h1 dGRvd24oc3RydWN0IGRldmljZSAqX2Rldik7Ci0KIGludCB4ZW5idXNfZGV2X3N1c3BlbmQoc3Ry dWN0IGRldmljZSAqZGV2KTsKIGludCB4ZW5idXNfZGV2X3Jlc3VtZShzdHJ1Y3QgZGV2aWNlICpk ZXYpOwogaW50IHhlbmJ1c19kZXZfY2FuY2VsKHN0cnVjdCBkZXZpY2UgKmRldik7CmRpZmYgLS1n aXQgYS9kcml2ZXJzL3hlbi94ZW5idXMveGVuYnVzX3Byb2JlLmMgYi9kcml2ZXJzL3hlbi94ZW5i dXMveGVuYnVzX3Byb2JlLmMKaW5kZXggYzIxYmU2ZTlkMzhhLi41YWEyOTM5NmM5ZTMgMTAwNjQ0 Ci0tLSBhL2RyaXZlcnMveGVuL3hlbmJ1cy94ZW5idXNfcHJvYmUuYworKysgYi9kcml2ZXJzL3hl bi94ZW5idXMveGVuYnVzX3Byb2JlLmMKQEAgLTI4MSwyOSArMjgxLDYgQEAgaW50IHhlbmJ1c19k ZXZfcmVtb3ZlKHN0cnVjdCBkZXZpY2UgKl9kZXYpCiB9CiBFWFBPUlRfU1lNQk9MX0dQTCh4ZW5i dXNfZGV2X3JlbW92ZSk7CiAKLXZvaWQgeGVuYnVzX2Rldl9zaHV0ZG93bihzdHJ1Y3QgZGV2aWNl ICpfZGV2KQotewotCXN0cnVjdCB4ZW5idXNfZGV2aWNlICpkZXYgPSB0b194ZW5idXNfZGV2aWNl KF9kZXYpOwotCXVuc2lnbmVkIGxvbmcgdGltZW91dCA9IDUqSFo7Ci0KLQlEUFJJTlRLKCIlcyIs IGRldi0+bm9kZW5hbWUpOwotCi0JZ2V0X2RldmljZSgmZGV2LT5kZXYpOwotCWlmIChkZXYtPnN0 YXRlICE9IFhlbmJ1c1N0YXRlQ29ubmVjdGVkKSB7Ci0JCXByX2luZm8oIiVzOiAlczogJXMgIT0g Q29ubmVjdGVkLCBza2lwcGluZ1xuIiwKLQkJCV9fZnVuY19fLCBkZXYtPm5vZGVuYW1lLCB4ZW5i dXNfc3Ryc3RhdGUoZGV2LT5zdGF0ZSkpOwotCQlnb3RvIG91dDsKLQl9Ci0JeGVuYnVzX3N3aXRj aF9zdGF0ZShkZXYsIFhlbmJ1c1N0YXRlQ2xvc2luZyk7Ci0JdGltZW91dCA9IHdhaXRfZm9yX2Nv bXBsZXRpb25fdGltZW91dCgmZGV2LT5kb3duLCB0aW1lb3V0KTsKLQlpZiAoIXRpbWVvdXQpCi0J CXByX2luZm8oIiVzOiAlcyB0aW1lb3V0IGNsb3NpbmcgZGV2aWNlXG4iLAotCQkJX19mdW5jX18s IGRldi0+bm9kZW5hbWUpOwotIG91dDoKLQlwdXRfZGV2aWNlKCZkZXYtPmRldik7Ci19Ci1FWFBP UlRfU1lNQk9MX0dQTCh4ZW5idXNfZGV2X3NodXRkb3duKTsKLQogaW50IHhlbmJ1c19yZWdpc3Rl cl9kcml2ZXJfY29tbW9uKHN0cnVjdCB4ZW5idXNfZHJpdmVyICpkcnYsCiAJCQkJICBzdHJ1Y3Qg eGVuX2J1c190eXBlICpidXMsCiAJCQkJICBzdHJ1Y3QgbW9kdWxlICpvd25lciwgY29uc3QgY2hh ciAqbW9kX25hbWUpCmRpZmYgLS1naXQgYS9kcml2ZXJzL3hlbi94ZW5idXMveGVuYnVzX3Byb2Jl X2JhY2tlbmQuYyBiL2RyaXZlcnMveGVuL3hlbmJ1cy94ZW5idXNfcHJvYmVfYmFja2VuZC5jCmlu ZGV4IGIwYmVkNGZhZjQ0Yy4uMTQ4NzZmYWZmM2IwIDEwMDY0NAotLS0gYS9kcml2ZXJzL3hlbi94 ZW5idXMveGVuYnVzX3Byb2JlX2JhY2tlbmQuYworKysgYi9kcml2ZXJzL3hlbi94ZW5idXMveGVu YnVzX3Byb2JlX2JhY2tlbmQuYwpAQCAtMTk4LDcgKzE5OCw2IEBAIHN0YXRpYyBzdHJ1Y3QgeGVu X2J1c190eXBlIHhlbmJ1c19iYWNrZW5kID0gewogCQkudWV2ZW50CQk9IHhlbmJ1c191ZXZlbnRf YmFja2VuZCwKIAkJLnByb2JlCQk9IHhlbmJ1c19kZXZfcHJvYmUsCiAJCS5yZW1vdmUJCT0geGVu YnVzX2Rldl9yZW1vdmUsCi0JCS5zaHV0ZG93bgk9IHhlbmJ1c19kZXZfc2h1dGRvd24sCiAJCS5k ZXZfZ3JvdXBzCT0geGVuYnVzX2Rldl9ncm91cHMsCiAJfSwKIH07CmRpZmYgLS1naXQgYS9kcml2 ZXJzL3hlbi94ZW5idXMveGVuYnVzX3Byb2JlX2Zyb250ZW5kLmMgYi9kcml2ZXJzL3hlbi94ZW5i dXMveGVuYnVzX3Byb2JlX2Zyb250ZW5kLmMKaW5kZXggYTdkOTBhNzE5Y2VhLi44YTE2NTBiYmUx OGYgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMveGVuL3hlbmJ1cy94ZW5idXNfcHJvYmVfZnJvbnRlbmQu YworKysgYi9kcml2ZXJzL3hlbi94ZW5idXMveGVuYnVzX3Byb2JlX2Zyb250ZW5kLmMKQEAgLTEy Niw2ICsxMjYsMjggQEAgc3RhdGljIGludCB4ZW5idXNfZnJvbnRlbmRfZGV2X3Byb2JlKHN0cnVj dCBkZXZpY2UgKmRldikKIAlyZXR1cm4geGVuYnVzX2Rldl9wcm9iZShkZXYpOwogfQogCitzdGF0 aWMgdm9pZCB4ZW5idXNfZnJvbnRlbmRfZGV2X3NodXRkb3duKHN0cnVjdCBkZXZpY2UgKl9kZXYp Cit7CisJc3RydWN0IHhlbmJ1c19kZXZpY2UgKmRldiA9IHRvX3hlbmJ1c19kZXZpY2UoX2Rldik7 CisJdW5zaWduZWQgbG9uZyB0aW1lb3V0ID0gNSpIWjsKKworCURQUklOVEsoIiVzIiwgZGV2LT5u b2RlbmFtZSk7CisKKwlnZXRfZGV2aWNlKCZkZXYtPmRldik7CisJaWYgKGRldi0+c3RhdGUgIT0g WGVuYnVzU3RhdGVDb25uZWN0ZWQpIHsKKwkJcHJfaW5mbygiJXM6ICVzOiAlcyAhPSBDb25uZWN0 ZWQsIHNraXBwaW5nXG4iLAorCQkJX19mdW5jX18sIGRldi0+bm9kZW5hbWUsIHhlbmJ1c19zdHJz dGF0ZShkZXYtPnN0YXRlKSk7CisJCWdvdG8gb3V0OworCX0KKwl4ZW5idXNfc3dpdGNoX3N0YXRl KGRldiwgWGVuYnVzU3RhdGVDbG9zaW5nKTsKKwl0aW1lb3V0ID0gd2FpdF9mb3JfY29tcGxldGlv bl90aW1lb3V0KCZkZXYtPmRvd24sIHRpbWVvdXQpOworCWlmICghdGltZW91dCkKKwkJcHJfaW5m bygiJXM6ICVzIHRpbWVvdXQgY2xvc2luZyBkZXZpY2VcbiIsCisJCQlfX2Z1bmNfXywgZGV2LT5u b2RlbmFtZSk7Cisgb3V0OgorCXB1dF9kZXZpY2UoJmRldi0+ZGV2KTsKK30KKwogc3RhdGljIGNv bnN0IHN0cnVjdCBkZXZfcG1fb3BzIHhlbmJ1c19wbV9vcHMgPSB7CiAJLnN1c3BlbmQJPSB4ZW5i dXNfZGV2X3N1c3BlbmQsCiAJLnJlc3VtZQkJPSB4ZW5idXNfZnJvbnRlbmRfZGV2X3Jlc3VtZSwK QEAgLTE0Niw3ICsxNjgsNyBAQCBzdGF0aWMgc3RydWN0IHhlbl9idXNfdHlwZSB4ZW5idXNfZnJv bnRlbmQgPSB7CiAJCS51ZXZlbnQJCT0geGVuYnVzX3VldmVudF9mcm9udGVuZCwKIAkJLnByb2Jl CQk9IHhlbmJ1c19mcm9udGVuZF9kZXZfcHJvYmUsCiAJCS5yZW1vdmUJCT0geGVuYnVzX2Rldl9y ZW1vdmUsCi0JCS5zaHV0ZG93bgk9IHhlbmJ1c19kZXZfc2h1dGRvd24sCisJCS5zaHV0ZG93bgk9 IHhlbmJ1c19mcm9udGVuZF9kZXZfc2h1dGRvd24sCiAJCS5kZXZfZ3JvdXBzCT0geGVuYnVzX2Rl dl9ncm91cHMsCiAKIAkJLnBtCQk9ICZ4ZW5idXNfcG1fb3BzLAotLSAKMi4yMC4xCgoKX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX18KWGVuLWRldmVsIG1haWxp bmcgbGlzdApYZW4tZGV2ZWxAbGlzdHMueGVucHJvamVjdC5vcmcKaHR0cHM6Ly9saXN0cy54ZW5w cm9qZWN0Lm9yZy9tYWlsbWFuL2xpc3RpbmZvL3hlbi1kZXZlbA==