From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-wm0-f68.google.com ([74.125.82.68]:37864 "EHLO mail-wm0-f68.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751910AbdLMMtp (ORCPT ); Wed, 13 Dec 2017 07:49:45 -0500 Received: by mail-wm0-f68.google.com with SMTP id f140so4867721wmd.2 for ; Wed, 13 Dec 2017 04:49:44 -0800 (PST) From: Daniel Vetter To: Intel Graphics Development Cc: DRI Development , Daniel Vetter , Ben Widawsky , Dave Airlie , Chris Wilson , Sean Paul , stable@vger.kernel.org, Daniel Vetter , Jani Nikula , Gustavo Padovan , David Airlie , Javier Martinez Canillas , Shuah Khan , Guillaume Tucker , Mark Brown , Kevin Hilman , Matt Hart , Thierry Escande , Tomeu Vizoso , Enric Balletbo i Serra Subject: [PATCH] drm: rework delayed connector cleanup in connector_iter Date: Wed, 13 Dec 2017 13:49:36 +0100 Message-Id: <20171213124936.17914-1-daniel.vetter@ffwll.ch> In-Reply-To: <20171213104553.30821-1-daniel.vetter@ffwll.ch> References: <20171213104553.30821-1-daniel.vetter@ffwll.ch> Sender: stable-owner@vger.kernel.org List-ID: PROBE_DEFER also uses system_wq to reprobe drivers, which means when that again fails, and we try to flush the overall system_wq (to get all the delayed connectore cleanup work_struct completed), we deadlock. Fix this by using just a single cleanup work, so that we can only flush that one and don't block on anything else. That means a free list plus locking, a standard pattern. v2: - Correctly free connectors only on last ref. Oops (Chris). - use llist_head/node (Chris). Fixes: a703c55004e1 ("drm: safely free connectors from connector_iter") Fixes: 613051dac40d ("drm: locking&new iterators for connector_list") Cc: Ben Widawsky Cc: Dave Airlie Cc: Chris Wilson Cc: Sean Paul Cc: # v4.11+: 613051dac40d ("drm: locking&new iterators for connector_list" Cc: # v4.11+ Cc: Daniel Vetter Cc: Jani Nikula Cc: Gustavo Padovan Cc: David Airlie Cc: Javier Martinez Canillas Cc: Shuah Khan Cc: Guillaume Tucker Cc: Mark Brown Cc: Kevin Hilman Cc: Matt Hart Cc: Thierry Escande Cc: Tomeu Vizoso Cc: Enric Balletbo i Serra Signed-off-by: Daniel Vetter --- drivers/gpu/drm/drm_connector.c | 50 ++++++++++++++++++++++++++----------- drivers/gpu/drm/drm_crtc_internal.h | 1 + drivers/gpu/drm/drm_mode_config.c | 4 ++- include/drm/drm_connector.h | 10 +++++--- include/drm/drm_mode_config.h | 18 ++++++++++++- 5 files changed, 62 insertions(+), 21 deletions(-) diff --git a/drivers/gpu/drm/drm_connector.c b/drivers/gpu/drm/drm_connector.c index 0b7e0974e6da..3f53f127e1f2 100644 --- a/drivers/gpu/drm/drm_connector.c +++ b/drivers/gpu/drm/drm_connector.c @@ -153,14 +153,23 @@ static void drm_connector_free(struct kref *kref) connector->funcs->destroy(connector); } -static void drm_connector_free_work_fn(struct work_struct *work) +void drm_connector_free_work_fn(struct work_struct *work) { - struct drm_connector *connector = - container_of(work, struct drm_connector, free_work); - struct drm_device *dev = connector->dev; + struct drm_connector *connector, *n; + struct drm_device *dev = + container_of(work, struct drm_device, mode_config.connector_free_work); + struct drm_mode_config *config = &dev->mode_config; + unsigned long flags; + struct llist_node *freed; - drm_mode_object_unregister(dev, &connector->base); - connector->funcs->destroy(connector); + spin_lock_irqsave(&config->connector_list_lock, flags); + freed = llist_del_all(&config->connector_free_list); + spin_unlock_irqrestore(&config->connector_list_lock, flags); + + llist_for_each_entry_safe(connector, n, freed, free_node) { + drm_mode_object_unregister(dev, &connector->base); + connector->funcs->destroy(connector); + } } /** @@ -192,8 +201,6 @@ int drm_connector_init(struct drm_device *dev, if (ret) return ret; - INIT_WORK(&connector->free_work, drm_connector_free_work_fn); - connector->base.properties = &connector->properties; connector->dev = dev; connector->funcs = funcs; @@ -550,10 +557,17 @@ EXPORT_SYMBOL(drm_connector_list_iter_begin); * actually release the connector when dropping our final reference. */ static void -drm_connector_put_safe(struct drm_connector *conn) +__drm_connector_put_safe(struct drm_connector *conn) { - if (refcount_dec_and_test(&conn->base.refcount.refcount)) - schedule_work(&conn->free_work); + struct drm_mode_config *config = &conn->dev->mode_config; + + lockdep_assert_held(&config->connector_list_lock); + + if (!refcount_dec_and_test(&conn->base.refcount.refcount)) + return; + + llist_add(&conn->free_node, &config->connector_free_list); + schedule_work(&config->connector_free_work); } /** @@ -585,10 +599,10 @@ drm_connector_list_iter_next(struct drm_connector_list_iter *iter) /* loop until it's not a zombie connector */ } while (!kref_get_unless_zero(&iter->conn->base.refcount)); - spin_unlock_irqrestore(&config->connector_list_lock, flags); if (old_conn) - drm_connector_put_safe(old_conn); + __drm_connector_put_safe(old_conn); + spin_unlock_irqrestore(&config->connector_list_lock, flags); return iter->conn; } @@ -605,9 +619,15 @@ EXPORT_SYMBOL(drm_connector_list_iter_next); */ void drm_connector_list_iter_end(struct drm_connector_list_iter *iter) { + struct drm_mode_config *config = &iter->dev->mode_config; + unsigned long flags; + iter->dev = NULL; - if (iter->conn) - drm_connector_put_safe(iter->conn); + if (iter->conn) { + spin_lock_irqsave(&config->connector_list_lock, flags); + __drm_connector_put_safe(iter->conn); + spin_unlock_irqrestore(&config->connector_list_lock, flags); + } lock_release(&connector_list_iter_dep_map, 0, _RET_IP_); } EXPORT_SYMBOL(drm_connector_list_iter_end); diff --git a/drivers/gpu/drm/drm_crtc_internal.h b/drivers/gpu/drm/drm_crtc_internal.h index 9ebb8841778c..af00f42ba269 100644 --- a/drivers/gpu/drm/drm_crtc_internal.h +++ b/drivers/gpu/drm/drm_crtc_internal.h @@ -142,6 +142,7 @@ int drm_mode_connector_set_obj_prop(struct drm_mode_object *obj, uint64_t value); int drm_connector_create_standard_properties(struct drm_device *dev); const char *drm_get_connector_force_name(enum drm_connector_force force); +void drm_connector_free_work_fn(struct work_struct *work); /* IOCTL */ int drm_mode_connector_property_set_ioctl(struct drm_device *dev, diff --git a/drivers/gpu/drm/drm_mode_config.c b/drivers/gpu/drm/drm_mode_config.c index 6ffe952142e6..7681269abe41 100644 --- a/drivers/gpu/drm/drm_mode_config.c +++ b/drivers/gpu/drm/drm_mode_config.c @@ -382,6 +382,8 @@ void drm_mode_config_init(struct drm_device *dev) ida_init(&dev->mode_config.connector_ida); spin_lock_init(&dev->mode_config.connector_list_lock); + INIT_WORK(&dev->mode_config.connector_free_work, drm_connector_free_work_fn); + drm_mode_create_standard_properties(dev); /* Just to be sure */ @@ -432,7 +434,7 @@ void drm_mode_config_cleanup(struct drm_device *dev) } drm_connector_list_iter_end(&conn_iter); /* connector_iter drops references in a work item. */ - flush_scheduled_work(); + flush_work(&dev->mode_config.connector_free_work); if (WARN_ON(!list_empty(&dev->mode_config.connector_list))) { drm_connector_list_iter_begin(dev, &conn_iter); drm_for_each_connector_iter(connector, &conn_iter) diff --git a/include/drm/drm_connector.h b/include/drm/drm_connector.h index ee3155391243..ed38df4ac204 100644 --- a/include/drm/drm_connector.h +++ b/include/drm/drm_connector.h @@ -24,6 +24,7 @@ #define __DRM_CONNECTOR_H__ #include +#include #include #include #include @@ -966,12 +967,13 @@ struct drm_connector { uint16_t tile_h_size, tile_v_size; /** - * @free_work: + * @free_node: * - * Work used only by &drm_connector_iter to be able to clean up a - * connector from any context. + * List used only by &drm_connector_iter to be able to clean up a + * connector from any context, in conjunction with + * &drm_mode_config.connector_free_work. */ - struct work_struct free_work; + struct llist_node free_node; }; #define obj_to_connector(x) container_of(x, struct drm_connector, base) diff --git a/include/drm/drm_mode_config.h b/include/drm/drm_mode_config.h index e5f3b43014e1..2cb6f02df64a 100644 --- a/include/drm/drm_mode_config.h +++ b/include/drm/drm_mode_config.h @@ -27,6 +27,7 @@ #include #include #include +#include #include @@ -402,7 +403,7 @@ struct drm_mode_config { /** * @connector_list_lock: Protects @num_connector and - * @connector_list. + * @connector_list and @connector_free_list. */ spinlock_t connector_list_lock; /** @@ -422,6 +423,21 @@ struct drm_mode_config { * &struct drm_connector_list_iter to walk this list. */ struct list_head connector_list; + /** + * @connector_free_list: + * + * List of connector objects linked with &drm_connector.free_head. + * Protected by @connector_list_lock. Used by + * drm_for_each_connector_iter() and + * &struct drm_connector_list_iter to savely free connectors using + * @connector_free_work. + */ + struct llist_head connector_free_list; + /** + * @connector_free_work: Work to clean up @connector_free_list. + */ + struct work_struct connector_free_work; + /** * @num_encoder: * -- 2.15.1 From mboxrd@z Thu Jan 1 00:00:00 1970 From: Daniel Vetter Subject: [PATCH] drm: rework delayed connector cleanup in connector_iter Date: Wed, 13 Dec 2017 13:49:36 +0100 Message-ID: <20171213124936.17914-1-daniel.vetter@ffwll.ch> References: <20171213104553.30821-1-daniel.vetter@ffwll.ch> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: In-Reply-To: <20171213104553.30821-1-daniel.vetter@ffwll.ch> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" To: Intel Graphics Development Cc: Ben Widawsky , Tomeu Vizoso , David Airlie , Daniel Vetter , Mark Brown , Shuah Khan , DRI Development , Thierry Escande , stable@vger.kernel.org, Enric Balletbo i Serra , Daniel Vetter , Javier Martinez Canillas , Kevin Hilman , Matt Hart List-Id: dri-devel@lists.freedesktop.org UFJPQkVfREVGRVIgYWxzbyB1c2VzIHN5c3RlbV93cSB0byByZXByb2JlIGRyaXZlcnMsIHdoaWNo IG1lYW5zIHdoZW4KdGhhdCBhZ2FpbiBmYWlscywgYW5kIHdlIHRyeSB0byBmbHVzaCB0aGUgb3Zl cmFsbCBzeXN0ZW1fd3EgKHRvIGdldAphbGwgdGhlIGRlbGF5ZWQgY29ubmVjdG9yZSBjbGVhbnVw IHdvcmtfc3RydWN0IGNvbXBsZXRlZCksIHdlCmRlYWRsb2NrLgoKRml4IHRoaXMgYnkgdXNpbmcg anVzdCBhIHNpbmdsZSBjbGVhbnVwIHdvcmssIHNvIHRoYXQgd2UgY2FuIG9ubHkKZmx1c2ggdGhh dCBvbmUgYW5kIGRvbid0IGJsb2NrIG9uIGFueXRoaW5nIGVsc2UuIFRoYXQgbWVhbnMgYSBmcmVl Cmxpc3QgcGx1cyBsb2NraW5nLCBhIHN0YW5kYXJkIHBhdHRlcm4uCgp2MjoKLSBDb3JyZWN0bHkg ZnJlZSBjb25uZWN0b3JzIG9ubHkgb24gbGFzdCByZWYuIE9vcHMgKENocmlzKS4KLSB1c2UgbGxp c3RfaGVhZC9ub2RlIChDaHJpcykuCgpGaXhlczogYTcwM2M1NTAwNGUxICgiZHJtOiBzYWZlbHkg ZnJlZSBjb25uZWN0b3JzIGZyb20gY29ubmVjdG9yX2l0ZXIiKQpGaXhlczogNjEzMDUxZGFjNDBk ICgiZHJtOiBsb2NraW5nJm5ldyBpdGVyYXRvcnMgZm9yIGNvbm5lY3Rvcl9saXN0IikKQ2M6IEJl biBXaWRhd3NreSA8YmVuQGJ3aWRhd3NrLm5ldD4KQ2M6IERhdmUgQWlybGllIDxhaXJsaWVkQGdt YWlsLmNvbT4KQ2M6IENocmlzIFdpbHNvbiA8Y2hyaXNAY2hyaXMtd2lsc29uLmNvLnVrPgpDYzog U2VhbiBQYXVsIDxzZWFucGF1bEBjaHJvbWl1bS5vcmc+CkNjOiA8c3RhYmxlQHZnZXIua2VybmVs Lm9yZz4gIyB2NC4xMSs6IDYxMzA1MWRhYzQwZCAoImRybTogbG9ja2luZyZuZXcgaXRlcmF0b3Jz IGZvciBjb25uZWN0b3JfbGlzdCIKQ2M6IDxzdGFibGVAdmdlci5rZXJuZWwub3JnPiAjIHY0LjEx KwpDYzogRGFuaWVsIFZldHRlciA8ZGFuaWVsLnZldHRlckBpbnRlbC5jb20+CkNjOiBKYW5pIE5p a3VsYSA8amFuaS5uaWt1bGFAbGludXguaW50ZWwuY29tPgpDYzogR3VzdGF2byBQYWRvdmFuIDxn dXN0YXZvQHBhZG92YW4ub3JnPgpDYzogRGF2aWQgQWlybGllIDxhaXJsaWVkQGxpbnV4LmllPgpD YzogSmF2aWVyIE1hcnRpbmV6IENhbmlsbGFzIDxqYXZpZXJAZG93aGlsZTAub3JnPgpDYzogU2h1 YWggS2hhbiA8c2h1YWhraEBvc2cuc2Ftc3VuZy5jb20+CkNjOiBHdWlsbGF1bWUgVHVja2VyIDxn dWlsbGF1bWUudHVja2VyQGNvbGxhYm9yYS5jb20+CkNjOiBNYXJrIEJyb3duIDxicm9vbmllQGtl cm5lbC5vcmc+CkNjOiBLZXZpbiBIaWxtYW4gPGtoaWxtYW5AYmF5bGlicmUuY29tPgpDYzogTWF0 dCBIYXJ0IDxtYXR0aGV3LmhhcnRAbGluYXJvLm9yZz4KQ2M6IFRoaWVycnkgRXNjYW5kZSA8dGhp ZXJyeS5lc2NhbmRlQGNvbGxhYm9yYS5jby51az4KQ2M6IFRvbWV1IFZpem9zbyA8dG9tZXUudml6 b3NvQGNvbGxhYm9yYS5jb20+CkNjOiBFbnJpYyBCYWxsZXRibyBpIFNlcnJhIDxlbnJpYy5iYWxs ZXRib0Bjb2xsYWJvcmEuY29tPgpTaWduZWQtb2ZmLWJ5OiBEYW5pZWwgVmV0dGVyIDxkYW5pZWwu dmV0dGVyQGludGVsLmNvbT4KLS0tCiBkcml2ZXJzL2dwdS9kcm0vZHJtX2Nvbm5lY3Rvci5jICAg ICB8IDUwICsrKysrKysrKysrKysrKysrKysrKysrKysrLS0tLS0tLS0tLS0KIGRyaXZlcnMvZ3B1 L2RybS9kcm1fY3J0Y19pbnRlcm5hbC5oIHwgIDEgKwogZHJpdmVycy9ncHUvZHJtL2RybV9tb2Rl X2NvbmZpZy5jICAgfCAgNCArKy0KIGluY2x1ZGUvZHJtL2RybV9jb25uZWN0b3IuaCAgICAgICAg IHwgMTAgKysrKystLS0KIGluY2x1ZGUvZHJtL2RybV9tb2RlX2NvbmZpZy5oICAgICAgIHwgMTgg KysrKysrKysrKysrLQogNSBmaWxlcyBjaGFuZ2VkLCA2MiBpbnNlcnRpb25zKCspLCAyMSBkZWxl dGlvbnMoLSkKCmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vZHJtX2Nvbm5lY3Rvci5jIGIv ZHJpdmVycy9ncHUvZHJtL2RybV9jb25uZWN0b3IuYwppbmRleCAwYjdlMDk3NGU2ZGEuLjNmNTNm MTI3ZTFmMiAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2RybV9jb25uZWN0b3IuYworKysg Yi9kcml2ZXJzL2dwdS9kcm0vZHJtX2Nvbm5lY3Rvci5jCkBAIC0xNTMsMTQgKzE1MywyMyBAQCBz dGF0aWMgdm9pZCBkcm1fY29ubmVjdG9yX2ZyZWUoc3RydWN0IGtyZWYgKmtyZWYpCiAJY29ubmVj dG9yLT5mdW5jcy0+ZGVzdHJveShjb25uZWN0b3IpOwogfQogCi1zdGF0aWMgdm9pZCBkcm1fY29u bmVjdG9yX2ZyZWVfd29ya19mbihzdHJ1Y3Qgd29ya19zdHJ1Y3QgKndvcmspCit2b2lkIGRybV9j b25uZWN0b3JfZnJlZV93b3JrX2ZuKHN0cnVjdCB3b3JrX3N0cnVjdCAqd29yaykKIHsKLQlzdHJ1 Y3QgZHJtX2Nvbm5lY3RvciAqY29ubmVjdG9yID0KLQkJY29udGFpbmVyX29mKHdvcmssIHN0cnVj dCBkcm1fY29ubmVjdG9yLCBmcmVlX3dvcmspOwotCXN0cnVjdCBkcm1fZGV2aWNlICpkZXYgPSBj b25uZWN0b3ItPmRldjsKKwlzdHJ1Y3QgZHJtX2Nvbm5lY3RvciAqY29ubmVjdG9yLCAqbjsKKwlz dHJ1Y3QgZHJtX2RldmljZSAqZGV2ID0KKwkJY29udGFpbmVyX29mKHdvcmssIHN0cnVjdCBkcm1f ZGV2aWNlLCBtb2RlX2NvbmZpZy5jb25uZWN0b3JfZnJlZV93b3JrKTsKKwlzdHJ1Y3QgZHJtX21v ZGVfY29uZmlnICpjb25maWcgPSAmZGV2LT5tb2RlX2NvbmZpZzsKKwl1bnNpZ25lZCBsb25nIGZs YWdzOworCXN0cnVjdCBsbGlzdF9ub2RlICpmcmVlZDsKIAotCWRybV9tb2RlX29iamVjdF91bnJl Z2lzdGVyKGRldiwgJmNvbm5lY3Rvci0+YmFzZSk7Ci0JY29ubmVjdG9yLT5mdW5jcy0+ZGVzdHJv eShjb25uZWN0b3IpOworCXNwaW5fbG9ja19pcnFzYXZlKCZjb25maWctPmNvbm5lY3Rvcl9saXN0 X2xvY2ssIGZsYWdzKTsKKwlmcmVlZCA9IGxsaXN0X2RlbF9hbGwoJmNvbmZpZy0+Y29ubmVjdG9y X2ZyZWVfbGlzdCk7CisJc3Bpbl91bmxvY2tfaXJxcmVzdG9yZSgmY29uZmlnLT5jb25uZWN0b3Jf bGlzdF9sb2NrLCBmbGFncyk7CisKKwlsbGlzdF9mb3JfZWFjaF9lbnRyeV9zYWZlKGNvbm5lY3Rv ciwgbiwgZnJlZWQsIGZyZWVfbm9kZSkgeworCQlkcm1fbW9kZV9vYmplY3RfdW5yZWdpc3Rlcihk ZXYsICZjb25uZWN0b3ItPmJhc2UpOworCQljb25uZWN0b3ItPmZ1bmNzLT5kZXN0cm95KGNvbm5l Y3Rvcik7CisJfQogfQogCiAvKioKQEAgLTE5Miw4ICsyMDEsNiBAQCBpbnQgZHJtX2Nvbm5lY3Rv cl9pbml0KHN0cnVjdCBkcm1fZGV2aWNlICpkZXYsCiAJaWYgKHJldCkKIAkJcmV0dXJuIHJldDsK IAotCUlOSVRfV09SSygmY29ubmVjdG9yLT5mcmVlX3dvcmssIGRybV9jb25uZWN0b3JfZnJlZV93 b3JrX2ZuKTsKLQogCWNvbm5lY3Rvci0+YmFzZS5wcm9wZXJ0aWVzID0gJmNvbm5lY3Rvci0+cHJv cGVydGllczsKIAljb25uZWN0b3ItPmRldiA9IGRldjsKIAljb25uZWN0b3ItPmZ1bmNzID0gZnVu Y3M7CkBAIC01NTAsMTAgKzU1NywxNyBAQCBFWFBPUlRfU1lNQk9MKGRybV9jb25uZWN0b3JfbGlz dF9pdGVyX2JlZ2luKTsKICAqIGFjdHVhbGx5IHJlbGVhc2UgdGhlIGNvbm5lY3RvciB3aGVuIGRy b3BwaW5nIG91ciBmaW5hbCByZWZlcmVuY2UuCiAgKi8KIHN0YXRpYyB2b2lkCi1kcm1fY29ubmVj dG9yX3B1dF9zYWZlKHN0cnVjdCBkcm1fY29ubmVjdG9yICpjb25uKQorX19kcm1fY29ubmVjdG9y X3B1dF9zYWZlKHN0cnVjdCBkcm1fY29ubmVjdG9yICpjb25uKQogewotCWlmIChyZWZjb3VudF9k ZWNfYW5kX3Rlc3QoJmNvbm4tPmJhc2UucmVmY291bnQucmVmY291bnQpKQotCQlzY2hlZHVsZV93 b3JrKCZjb25uLT5mcmVlX3dvcmspOworCXN0cnVjdCBkcm1fbW9kZV9jb25maWcgKmNvbmZpZyA9 ICZjb25uLT5kZXYtPm1vZGVfY29uZmlnOworCisJbG9ja2RlcF9hc3NlcnRfaGVsZCgmY29uZmln LT5jb25uZWN0b3JfbGlzdF9sb2NrKTsKKworCWlmICghcmVmY291bnRfZGVjX2FuZF90ZXN0KCZj b25uLT5iYXNlLnJlZmNvdW50LnJlZmNvdW50KSkKKwkJcmV0dXJuOworCisJbGxpc3RfYWRkKCZj b25uLT5mcmVlX25vZGUsICZjb25maWctPmNvbm5lY3Rvcl9mcmVlX2xpc3QpOworCXNjaGVkdWxl X3dvcmsoJmNvbmZpZy0+Y29ubmVjdG9yX2ZyZWVfd29yayk7CiB9CiAKIC8qKgpAQCAtNTg1LDEw ICs1OTksMTAgQEAgZHJtX2Nvbm5lY3Rvcl9saXN0X2l0ZXJfbmV4dChzdHJ1Y3QgZHJtX2Nvbm5l Y3Rvcl9saXN0X2l0ZXIgKml0ZXIpCiAKIAkJLyogbG9vcCB1bnRpbCBpdCdzIG5vdCBhIHpvbWJp ZSBjb25uZWN0b3IgKi8KIAl9IHdoaWxlICgha3JlZl9nZXRfdW5sZXNzX3plcm8oJml0ZXItPmNv bm4tPmJhc2UucmVmY291bnQpKTsKLQlzcGluX3VubG9ja19pcnFyZXN0b3JlKCZjb25maWctPmNv bm5lY3Rvcl9saXN0X2xvY2ssIGZsYWdzKTsKIAogCWlmIChvbGRfY29ubikKLQkJZHJtX2Nvbm5l Y3Rvcl9wdXRfc2FmZShvbGRfY29ubik7CisJCV9fZHJtX2Nvbm5lY3Rvcl9wdXRfc2FmZShvbGRf Y29ubik7CisJc3Bpbl91bmxvY2tfaXJxcmVzdG9yZSgmY29uZmlnLT5jb25uZWN0b3JfbGlzdF9s b2NrLCBmbGFncyk7CiAKIAlyZXR1cm4gaXRlci0+Y29ubjsKIH0KQEAgLTYwNSw5ICs2MTksMTUg QEAgRVhQT1JUX1NZTUJPTChkcm1fY29ubmVjdG9yX2xpc3RfaXRlcl9uZXh0KTsKICAqLwogdm9p ZCBkcm1fY29ubmVjdG9yX2xpc3RfaXRlcl9lbmQoc3RydWN0IGRybV9jb25uZWN0b3JfbGlzdF9p dGVyICppdGVyKQogeworCXN0cnVjdCBkcm1fbW9kZV9jb25maWcgKmNvbmZpZyA9ICZpdGVyLT5k ZXYtPm1vZGVfY29uZmlnOworCXVuc2lnbmVkIGxvbmcgZmxhZ3M7CisKIAlpdGVyLT5kZXYgPSBO VUxMOwotCWlmIChpdGVyLT5jb25uKQotCQlkcm1fY29ubmVjdG9yX3B1dF9zYWZlKGl0ZXItPmNv bm4pOworCWlmIChpdGVyLT5jb25uKSB7CisJCXNwaW5fbG9ja19pcnFzYXZlKCZjb25maWctPmNv bm5lY3Rvcl9saXN0X2xvY2ssIGZsYWdzKTsKKwkJX19kcm1fY29ubmVjdG9yX3B1dF9zYWZlKGl0 ZXItPmNvbm4pOworCQlzcGluX3VubG9ja19pcnFyZXN0b3JlKCZjb25maWctPmNvbm5lY3Rvcl9s aXN0X2xvY2ssIGZsYWdzKTsKKwl9CiAJbG9ja19yZWxlYXNlKCZjb25uZWN0b3JfbGlzdF9pdGVy X2RlcF9tYXAsIDAsIF9SRVRfSVBfKTsKIH0KIEVYUE9SVF9TWU1CT0woZHJtX2Nvbm5lY3Rvcl9s aXN0X2l0ZXJfZW5kKTsKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9kcm1fY3J0Y19pbnRl cm5hbC5oIGIvZHJpdmVycy9ncHUvZHJtL2RybV9jcnRjX2ludGVybmFsLmgKaW5kZXggOWViYjg4 NDE3NzhjLi5hZjAwZjQyYmEyNjkgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9kcm1fY3J0 Y19pbnRlcm5hbC5oCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9kcm1fY3J0Y19pbnRlcm5hbC5oCkBA IC0xNDIsNiArMTQyLDcgQEAgaW50IGRybV9tb2RlX2Nvbm5lY3Rvcl9zZXRfb2JqX3Byb3Aoc3Ry dWN0IGRybV9tb2RlX29iamVjdCAqb2JqLAogCQkJCSAgICB1aW50NjRfdCB2YWx1ZSk7CiBpbnQg ZHJtX2Nvbm5lY3Rvcl9jcmVhdGVfc3RhbmRhcmRfcHJvcGVydGllcyhzdHJ1Y3QgZHJtX2Rldmlj ZSAqZGV2KTsKIGNvbnN0IGNoYXIgKmRybV9nZXRfY29ubmVjdG9yX2ZvcmNlX25hbWUoZW51bSBk cm1fY29ubmVjdG9yX2ZvcmNlIGZvcmNlKTsKK3ZvaWQgZHJtX2Nvbm5lY3Rvcl9mcmVlX3dvcmtf Zm4oc3RydWN0IHdvcmtfc3RydWN0ICp3b3JrKTsKIAogLyogSU9DVEwgKi8KIGludCBkcm1fbW9k ZV9jb25uZWN0b3JfcHJvcGVydHlfc2V0X2lvY3RsKHN0cnVjdCBkcm1fZGV2aWNlICpkZXYsCmRp ZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vZHJtX21vZGVfY29uZmlnLmMgYi9kcml2ZXJzL2dw dS9kcm0vZHJtX21vZGVfY29uZmlnLmMKaW5kZXggNmZmZTk1MjE0MmU2Li43NjgxMjY5YWJlNDEg MTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9kcm1fbW9kZV9jb25maWcuYworKysgYi9kcml2 ZXJzL2dwdS9kcm0vZHJtX21vZGVfY29uZmlnLmMKQEAgLTM4Miw2ICszODIsOCBAQCB2b2lkIGRy bV9tb2RlX2NvbmZpZ19pbml0KHN0cnVjdCBkcm1fZGV2aWNlICpkZXYpCiAJaWRhX2luaXQoJmRl di0+bW9kZV9jb25maWcuY29ubmVjdG9yX2lkYSk7CiAJc3Bpbl9sb2NrX2luaXQoJmRldi0+bW9k ZV9jb25maWcuY29ubmVjdG9yX2xpc3RfbG9jayk7CiAKKwlJTklUX1dPUksoJmRldi0+bW9kZV9j b25maWcuY29ubmVjdG9yX2ZyZWVfd29yaywgZHJtX2Nvbm5lY3Rvcl9mcmVlX3dvcmtfZm4pOwor CiAJZHJtX21vZGVfY3JlYXRlX3N0YW5kYXJkX3Byb3BlcnRpZXMoZGV2KTsKIAogCS8qIEp1c3Qg dG8gYmUgc3VyZSAqLwpAQCAtNDMyLDcgKzQzNCw3IEBAIHZvaWQgZHJtX21vZGVfY29uZmlnX2Ns ZWFudXAoc3RydWN0IGRybV9kZXZpY2UgKmRldikKIAl9CiAJZHJtX2Nvbm5lY3Rvcl9saXN0X2l0 ZXJfZW5kKCZjb25uX2l0ZXIpOwogCS8qIGNvbm5lY3Rvcl9pdGVyIGRyb3BzIHJlZmVyZW5jZXMg aW4gYSB3b3JrIGl0ZW0uICovCi0JZmx1c2hfc2NoZWR1bGVkX3dvcmsoKTsKKwlmbHVzaF93b3Jr KCZkZXYtPm1vZGVfY29uZmlnLmNvbm5lY3Rvcl9mcmVlX3dvcmspOwogCWlmIChXQVJOX09OKCFs aXN0X2VtcHR5KCZkZXYtPm1vZGVfY29uZmlnLmNvbm5lY3Rvcl9saXN0KSkpIHsKIAkJZHJtX2Nv bm5lY3Rvcl9saXN0X2l0ZXJfYmVnaW4oZGV2LCAmY29ubl9pdGVyKTsKIAkJZHJtX2Zvcl9lYWNo X2Nvbm5lY3Rvcl9pdGVyKGNvbm5lY3RvciwgJmNvbm5faXRlcikKZGlmZiAtLWdpdCBhL2luY2x1 ZGUvZHJtL2RybV9jb25uZWN0b3IuaCBiL2luY2x1ZGUvZHJtL2RybV9jb25uZWN0b3IuaAppbmRl eCBlZTMxNTUzOTEyNDMuLmVkMzhkZjRhYzIwNCAxMDA2NDQKLS0tIGEvaW5jbHVkZS9kcm0vZHJt X2Nvbm5lY3Rvci5oCisrKyBiL2luY2x1ZGUvZHJtL2RybV9jb25uZWN0b3IuaApAQCAtMjQsNiAr MjQsNyBAQAogI2RlZmluZSBfX0RSTV9DT05ORUNUT1JfSF9fCiAKICNpbmNsdWRlIDxsaW51eC9s aXN0Lmg+CisjaW5jbHVkZSA8bGludXgvbGxpc3QuaD4KICNpbmNsdWRlIDxsaW51eC9jdHlwZS5o PgogI2luY2x1ZGUgPGxpbnV4L2hkbWkuaD4KICNpbmNsdWRlIDxkcm0vZHJtX21vZGVfb2JqZWN0 Lmg+CkBAIC05NjYsMTIgKzk2NywxMyBAQCBzdHJ1Y3QgZHJtX2Nvbm5lY3RvciB7CiAJdWludDE2 X3QgdGlsZV9oX3NpemUsIHRpbGVfdl9zaXplOwogCiAJLyoqCi0JICogQGZyZWVfd29yazoKKwkg KiBAZnJlZV9ub2RlOgogCSAqCi0JICogV29yayB1c2VkIG9ubHkgYnkgJmRybV9jb25uZWN0b3Jf aXRlciB0byBiZSBhYmxlIHRvIGNsZWFuIHVwIGEKLQkgKiBjb25uZWN0b3IgZnJvbSBhbnkgY29u dGV4dC4KKwkgKiBMaXN0IHVzZWQgb25seSBieSAmZHJtX2Nvbm5lY3Rvcl9pdGVyIHRvIGJlIGFi bGUgdG8gY2xlYW4gdXAgYQorCSAqIGNvbm5lY3RvciBmcm9tIGFueSBjb250ZXh0LCBpbiBjb25q dW5jdGlvbiB3aXRoCisJICogJmRybV9tb2RlX2NvbmZpZy5jb25uZWN0b3JfZnJlZV93b3JrLgog CSAqLwotCXN0cnVjdCB3b3JrX3N0cnVjdCBmcmVlX3dvcms7CisJc3RydWN0IGxsaXN0X25vZGUg ZnJlZV9ub2RlOwogfTsKIAogI2RlZmluZSBvYmpfdG9fY29ubmVjdG9yKHgpIGNvbnRhaW5lcl9v Zih4LCBzdHJ1Y3QgZHJtX2Nvbm5lY3RvciwgYmFzZSkKZGlmZiAtLWdpdCBhL2luY2x1ZGUvZHJt L2RybV9tb2RlX2NvbmZpZy5oIGIvaW5jbHVkZS9kcm0vZHJtX21vZGVfY29uZmlnLmgKaW5kZXgg ZTVmM2I0MzAxNGUxLi4yY2I2ZjAyZGY2NGEgMTAwNjQ0Ci0tLSBhL2luY2x1ZGUvZHJtL2RybV9t b2RlX2NvbmZpZy5oCisrKyBiL2luY2x1ZGUvZHJtL2RybV9tb2RlX2NvbmZpZy5oCkBAIC0yNyw2 ICsyNyw3IEBACiAjaW5jbHVkZSA8bGludXgvdHlwZXMuaD4KICNpbmNsdWRlIDxsaW51eC9pZHIu aD4KICNpbmNsdWRlIDxsaW51eC93b3JrcXVldWUuaD4KKyNpbmNsdWRlIDxsaW51eC9sbGlzdC5o PgogCiAjaW5jbHVkZSA8ZHJtL2RybV9tb2Rlc2V0X2xvY2suaD4KIApAQCAtNDAyLDcgKzQwMyw3 IEBAIHN0cnVjdCBkcm1fbW9kZV9jb25maWcgewogCiAJLyoqCiAJICogQGNvbm5lY3Rvcl9saXN0 X2xvY2s6IFByb3RlY3RzIEBudW1fY29ubmVjdG9yIGFuZAotCSAqIEBjb25uZWN0b3JfbGlzdC4K KwkgKiBAY29ubmVjdG9yX2xpc3QgYW5kIEBjb25uZWN0b3JfZnJlZV9saXN0LgogCSAqLwogCXNw aW5sb2NrX3QgY29ubmVjdG9yX2xpc3RfbG9jazsKIAkvKioKQEAgLTQyMiw2ICs0MjMsMjEgQEAg c3RydWN0IGRybV9tb2RlX2NvbmZpZyB7CiAJICogJnN0cnVjdCBkcm1fY29ubmVjdG9yX2xpc3Rf aXRlciB0byB3YWxrIHRoaXMgbGlzdC4KIAkgKi8KIAlzdHJ1Y3QgbGlzdF9oZWFkIGNvbm5lY3Rv cl9saXN0OworCS8qKgorCSAqIEBjb25uZWN0b3JfZnJlZV9saXN0OgorCSAqCisJICogTGlzdCBv ZiBjb25uZWN0b3Igb2JqZWN0cyBsaW5rZWQgd2l0aCAmZHJtX2Nvbm5lY3Rvci5mcmVlX2hlYWQu CisJICogUHJvdGVjdGVkIGJ5IEBjb25uZWN0b3JfbGlzdF9sb2NrLiBVc2VkIGJ5CisJICogZHJt X2Zvcl9lYWNoX2Nvbm5lY3Rvcl9pdGVyKCkgYW5kCisJICogJnN0cnVjdCBkcm1fY29ubmVjdG9y X2xpc3RfaXRlciB0byBzYXZlbHkgZnJlZSBjb25uZWN0b3JzIHVzaW5nCisJICogQGNvbm5lY3Rv cl9mcmVlX3dvcmsuCisJICovCisJc3RydWN0IGxsaXN0X2hlYWQgY29ubmVjdG9yX2ZyZWVfbGlz dDsKKwkvKioKKwkgKiBAY29ubmVjdG9yX2ZyZWVfd29yazogV29yayB0byBjbGVhbiB1cCBAY29u bmVjdG9yX2ZyZWVfbGlzdC4KKwkgKi8KKwlzdHJ1Y3Qgd29ya19zdHJ1Y3QgY29ubmVjdG9yX2Zy ZWVfd29yazsKKwogCS8qKgogCSAqIEBudW1fZW5jb2RlcjoKIAkgKgotLSAKMi4xNS4xCgpfX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fXwpJbnRlbC1nZnggbWFp bGluZyBsaXN0CkludGVsLWdmeEBsaXN0cy5mcmVlZGVza3RvcC5vcmcKaHR0cHM6Ly9saXN0cy5m cmVlZGVza3RvcC5vcmcvbWFpbG1hbi9saXN0aW5mby9pbnRlbC1nZngK