From mboxrd@z Thu Jan 1 00:00:00 1970 From: Sean Paul Subject: Re: [PATCH 1/2 v2] drm/atomic: fix self-refresh helpers crtc state dereference Date: Wed, 6 Nov 2019 13:58:14 -0500 Message-ID: <20191106185814.GD63329@art_vandelay> References: <20191104173737.142558-1-robdclark@gmail.com> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Return-path: Content-Disposition: inline In-Reply-To: <20191104173737.142558-1-robdclark@gmail.com> Sender: linux-kernel-owner@vger.kernel.org To: Rob Clark Cc: dri-devel@lists.freedesktop.org, Sean Paul , Maarten Lankhorst , Rob Clark , Maxime Ripard , Sean Paul , David Airlie , Daniel Vetter , open list List-Id: dri-devel@lists.freedesktop.org On Mon, Nov 04, 2019 at 09:37:36AM -0800, Rob Clark wrote: > From: Rob Clark > > drm_self_refresh_helper_update_avg_times() was incorrectly accessing the > new incoming state after drm_atomic_helper_commit_hw_done(). But this > state might have already been superceeded by an !nonblock atomic update > resulting in dereferencing an already free'd crtc_state. > > TODO I *think* this will more or less do the right thing.. althought I'm > not 100% sure if, for example, we enter psr in a nonblock commit, and > then leave psr in a !nonblock commit that overtakes the completion of > the nonblock commit. Not sure if this sort of scenario can happen in > practice. But not crashing is better than crashing, so I guess we > should either take this patch or rever the self-refresh helpers until > Sean can figure out a better solution. > > Fixes: d4da4e33341c ("drm: Measure Self Refresh Entry/Exit times to avoid thrashing") > Cc: Sean Paul > Signed-off-by: Rob Clark Thanks for tracking this down, Rob. I gave it a spin on my rk3399 kevin and it behaved as expected. I've pushed this patch to drm-misc-fixes in hopes it'll catch 5.4 Sean > --- > drivers/gpu/drm/drm_atomic_helper.c | 14 +++++++++++++- > drivers/gpu/drm/drm_self_refresh_helper.c | 15 +++++++++------ > include/drm/drm_self_refresh_helper.h | 3 ++- > 3 files changed, 24 insertions(+), 8 deletions(-) > > diff --git a/drivers/gpu/drm/drm_atomic_helper.c b/drivers/gpu/drm/drm_atomic_helper.c > index 3ef2ac52ce94..648494c813e5 100644 > --- a/drivers/gpu/drm/drm_atomic_helper.c > +++ b/drivers/gpu/drm/drm_atomic_helper.c > @@ -1581,8 +1581,11 @@ static void commit_tail(struct drm_atomic_state *old_state) > { > struct drm_device *dev = old_state->dev; > const struct drm_mode_config_helper_funcs *funcs; > + struct drm_crtc_state *new_crtc_state; > + struct drm_crtc *crtc; > ktime_t start; > s64 commit_time_ms; > + unsigned i, new_self_refresh_mask = 0; > > funcs = dev->mode_config.helper_private; > > @@ -1602,6 +1605,14 @@ static void commit_tail(struct drm_atomic_state *old_state) > > drm_atomic_helper_wait_for_dependencies(old_state); > > + /* > + * We cannot safely access new_crtc_state after drm_atomic_helper_commit_hw_done() > + * so figure out which crtc's have self-refresh active beforehand: > + */ > + for_each_new_crtc_in_state(old_state, crtc, new_crtc_state, i) > + if (new_crtc_state->self_refresh_active) > + new_self_refresh_mask |= BIT(i); > + > if (funcs && funcs->atomic_commit_tail) > funcs->atomic_commit_tail(old_state); > else > @@ -1610,7 +1621,8 @@ static void commit_tail(struct drm_atomic_state *old_state) > commit_time_ms = ktime_ms_delta(ktime_get(), start); > if (commit_time_ms > 0) > drm_self_refresh_helper_update_avg_times(old_state, > - (unsigned long)commit_time_ms); > + (unsigned long)commit_time_ms, > + new_self_refresh_mask); > > drm_atomic_helper_commit_cleanup_done(old_state); > > diff --git a/drivers/gpu/drm/drm_self_refresh_helper.c b/drivers/gpu/drm/drm_self_refresh_helper.c > index 68f4765a5896..011b8d5f7dd6 100644 > --- a/drivers/gpu/drm/drm_self_refresh_helper.c > +++ b/drivers/gpu/drm/drm_self_refresh_helper.c > @@ -133,6 +133,8 @@ static void drm_self_refresh_helper_entry_work(struct work_struct *work) > * drm_self_refresh_helper_update_avg_times - Updates a crtc's SR time averages > * @state: the state which has just been applied to hardware > * @commit_time_ms: the amount of time in ms that this commit took to complete > + * @new_self_refresh_mask: bitmask of crtc's that have self_refresh_active in > + * new state > * > * Called after &drm_mode_config_funcs.atomic_commit_tail, this function will > * update the average entry/exit self refresh times on self refresh transitions. > @@ -140,22 +142,23 @@ static void drm_self_refresh_helper_entry_work(struct work_struct *work) > * entering self refresh mode after activity. > */ > void drm_self_refresh_helper_update_avg_times(struct drm_atomic_state *state, > - unsigned int commit_time_ms) > + unsigned int commit_time_ms, > + unsigned int new_self_refresh_mask) > { > struct drm_crtc *crtc; > - struct drm_crtc_state *old_crtc_state, *new_crtc_state; > + struct drm_crtc_state *old_crtc_state; > int i; > > - for_each_oldnew_crtc_in_state(state, crtc, old_crtc_state, > - new_crtc_state, i) { > + for_each_old_crtc_in_state(state, crtc, old_crtc_state, i) { > + bool new_self_refresh_active = new_self_refresh_mask & BIT(i); > struct drm_self_refresh_data *sr_data = crtc->self_refresh_data; > struct ewma_psr_time *time; > > if (old_crtc_state->self_refresh_active == > - new_crtc_state->self_refresh_active) > + new_self_refresh_active) > continue; > > - if (new_crtc_state->self_refresh_active) > + if (new_self_refresh_active) > time = &sr_data->entry_avg_ms; > else > time = &sr_data->exit_avg_ms; > diff --git a/include/drm/drm_self_refresh_helper.h b/include/drm/drm_self_refresh_helper.h > index 5b79d253fb46..b2c08b328aa1 100644 > --- a/include/drm/drm_self_refresh_helper.h > +++ b/include/drm/drm_self_refresh_helper.h > @@ -13,7 +13,8 @@ struct drm_crtc; > > void drm_self_refresh_helper_alter_state(struct drm_atomic_state *state); > void drm_self_refresh_helper_update_avg_times(struct drm_atomic_state *state, > - unsigned int commit_time_ms); > + unsigned int commit_time_ms, > + unsigned int new_self_refresh_mask); > > int drm_self_refresh_helper_init(struct drm_crtc *crtc); > void drm_self_refresh_helper_cleanup(struct drm_crtc *crtc); > -- > 2.23.0 > -- Sean Paul, Software Engineer, Google / Chromium OS 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.2 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS, USER_AGENT_SANE_1 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 23312C5DF63 for ; Wed, 6 Nov 2019 18:58:19 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (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 F37B120869 for ; Wed, 6 Nov 2019 18:58:18 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org F37B120869 Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=poorly.run Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=dri-devel-bounces@lists.freedesktop.org Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 5E4496E28B; Wed, 6 Nov 2019 18:58:18 +0000 (UTC) Received: from mail-yw1-xc43.google.com (mail-yw1-xc43.google.com [IPv6:2607:f8b0:4864:20::c43]) by gabe.freedesktop.org (Postfix) with ESMTPS id 64A476E2A3 for ; Wed, 6 Nov 2019 18:58:17 +0000 (UTC) Received: by mail-yw1-xc43.google.com with SMTP id v84so9950254ywc.4 for ; Wed, 06 Nov 2019 10:58:17 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:from:to:cc:subject:message-id:references :mime-version:content-disposition:in-reply-to:user-agent; bh=0MXcH0+MhIAIwCsst+sUwWj3vWo2sspD8l9LQIiuDn8=; b=tAPNLb/ut7oPQa1ZfYVA6tdc7XlUqooKGlukso/Zpee3QWBBE4SRBQu8lEGCoT4jCC SQ+APsrm2Xm4EIjmkP1WMoYF3skPHV20TRAbowA1/2u5LWC+VXdKNHrziFTGhOfSaEBa Gv+dFCUfC+Saq1DOIx0Hufg1BCNzXca0VjdgcLtNK0erykng3y4Ajj0OetqZ2pt3SixS V1kbhOb2iskthSn2tvBPEbIC91Oo9q1HMleXHEz7VwrfniobAkeAaByikFtnO6tpllhl 9rNRFr2vEE1HlvweThL/A78UDwMoswmxXLI8NsMiX4m3RuqYK6MEiKU1HqYT7cJ9YwqU Nd1g== X-Gm-Message-State: APjAAAXEmEAig5pBEXZGVWQbqUZmOm1Tnp+whw4T4kvI0ZKIkZy+k3hz wMPV+UXfoV0EpJy5ryEv56Mc/g== X-Google-Smtp-Source: APXvYqyoHGhHZ2Tokg56LUX7ZhWl32oT4TeFymTsLfThNayr5cMfbJBNkoJ+AUyPbHDYSJLaFfpniQ== X-Received: by 2002:a81:5b03:: with SMTP id p3mr2658691ywb.189.1573066696343; Wed, 06 Nov 2019 10:58:16 -0800 (PST) Received: from localhost ([2620:0:1013:11:89c6:2139:5435:371d]) by smtp.gmail.com with ESMTPSA id k62sm7166332ywd.72.2019.11.06.10.58.15 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 06 Nov 2019 10:58:15 -0800 (PST) Date: Wed, 6 Nov 2019 13:58:14 -0500 From: Sean Paul To: Rob Clark Subject: Re: [PATCH 1/2 v2] drm/atomic: fix self-refresh helpers crtc state dereference Message-ID: <20191106185814.GD63329@art_vandelay> References: <20191104173737.142558-1-robdclark@gmail.com> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <20191104173737.142558-1-robdclark@gmail.com> User-Agent: Mutt/1.10.1 (2018-07-13) X-Mailman-Original-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=poorly.run; s=google; h=date:from:to:cc:subject:message-id:references:mime-version :content-disposition:in-reply-to:user-agent; bh=0MXcH0+MhIAIwCsst+sUwWj3vWo2sspD8l9LQIiuDn8=; b=cIfRAAiC4qOCBoT4IlNmmCOs9EQ2pN4IhUvbQsdYXeFHylavkdQGeKM/3wVCba+aGL 6MUuR52YYvyBqz1Y0YG56AwHc3EnAy2Tu5xAqyEkdpBXibfAET4SUObouTM5Mnygu15K ZWZPG0S/E7/dBd3Hr31G70u1SvmduxPKYYy6NVJNLPlPEmyZAv/Mz18+8BBm6IpAPVrA iTryLGi9BxvHLgrgsj0XCESANItuSjZfPLcHV5bjHKT/aiqnm5KfXd3st1OSocvTdDuR eA07Qzwnd/RcfAeahaxQd/rQL0DJJOw7TLyIFZ+O1CfMEdNV4jc4xp1pj8wcp31nkvZZ oXlw== X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Rob Clark , David Airlie , open list , Sean Paul , dri-devel@lists.freedesktop.org, Sean Paul Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" Message-ID: <20191106185814.rhsYGxdwsUo6Fu6OBiiVxBqFVMS7pe9YQOEk_pjk1t0@z> T24gTW9uLCBOb3YgMDQsIDIwMTkgYXQgMDk6Mzc6MzZBTSAtMDgwMCwgUm9iIENsYXJrIHdyb3Rl Ogo+IEZyb206IFJvYiBDbGFyayA8cm9iZGNsYXJrQGNocm9taXVtLm9yZz4KPiAKPiBkcm1fc2Vs Zl9yZWZyZXNoX2hlbHBlcl91cGRhdGVfYXZnX3RpbWVzKCkgd2FzIGluY29ycmVjdGx5IGFjY2Vz c2luZyB0aGUKPiBuZXcgaW5jb21pbmcgc3RhdGUgYWZ0ZXIgZHJtX2F0b21pY19oZWxwZXJfY29t bWl0X2h3X2RvbmUoKS4gIEJ1dCB0aGlzCj4gc3RhdGUgbWlnaHQgaGF2ZSBhbHJlYWR5IGJlZW4g c3VwZXJjZWVkZWQgYnkgYW4gIW5vbmJsb2NrIGF0b21pYyB1cGRhdGUKPiByZXN1bHRpbmcgaW4g ZGVyZWZlcmVuY2luZyBhbiBhbHJlYWR5IGZyZWUnZCBjcnRjX3N0YXRlLgo+IAo+IFRPRE8gSSAq dGhpbmsqIHRoaXMgd2lsbCBtb3JlIG9yIGxlc3MgZG8gdGhlIHJpZ2h0IHRoaW5nLi4gYWx0aG91 Z2h0IEknbQo+IG5vdCAxMDAlIHN1cmUgaWYsIGZvciBleGFtcGxlLCB3ZSBlbnRlciBwc3IgaW4g YSBub25ibG9jayBjb21taXQsIGFuZAo+IHRoZW4gbGVhdmUgcHNyIGluIGEgIW5vbmJsb2NrIGNv bW1pdCB0aGF0IG92ZXJ0YWtlcyB0aGUgY29tcGxldGlvbiBvZgo+IHRoZSBub25ibG9jayBjb21t aXQuICBOb3Qgc3VyZSBpZiB0aGlzIHNvcnQgb2Ygc2NlbmFyaW8gY2FuIGhhcHBlbiBpbgo+IHBy YWN0aWNlLiAgQnV0IG5vdCBjcmFzaGluZyBpcyBiZXR0ZXIgdGhhbiBjcmFzaGluZywgc28gSSBn dWVzcyB3ZQo+IHNob3VsZCBlaXRoZXIgdGFrZSB0aGlzIHBhdGNoIG9yIHJldmVyIHRoZSBzZWxm LXJlZnJlc2ggaGVscGVycyB1bnRpbAo+IFNlYW4gY2FuIGZpZ3VyZSBvdXQgYSBiZXR0ZXIgc29s dXRpb24uCj4gCj4gRml4ZXM6IGQ0ZGE0ZTMzMzQxYyAoImRybTogTWVhc3VyZSBTZWxmIFJlZnJl c2ggRW50cnkvRXhpdCB0aW1lcyB0byBhdm9pZCB0aHJhc2hpbmciKQo+IENjOiBTZWFuIFBhdWwg PHNlYW5wYXVsQGNocm9taXVtLm9yZz4KPiBTaWduZWQtb2ZmLWJ5OiBSb2IgQ2xhcmsgPHJvYmRj bGFya0BjaHJvbWl1bS5vcmc+CgpUaGFua3MgZm9yIHRyYWNraW5nIHRoaXMgZG93biwgUm9iLiBJ IGdhdmUgaXQgYSBzcGluIG9uIG15IHJrMzM5OSBrZXZpbiBhbmQgaXQKYmVoYXZlZCBhcyBleHBl Y3RlZC4KCkkndmUgcHVzaGVkIHRoaXMgcGF0Y2ggdG8gZHJtLW1pc2MtZml4ZXMgaW4gaG9wZXMg aXQnbGwgY2F0Y2ggNS40CgpTZWFuCgo+IC0tLQo+ICBkcml2ZXJzL2dwdS9kcm0vZHJtX2F0b21p Y19oZWxwZXIuYyAgICAgICB8IDE0ICsrKysrKysrKysrKystCj4gIGRyaXZlcnMvZ3B1L2RybS9k cm1fc2VsZl9yZWZyZXNoX2hlbHBlci5jIHwgMTUgKysrKysrKysrLS0tLS0tCj4gIGluY2x1ZGUv ZHJtL2RybV9zZWxmX3JlZnJlc2hfaGVscGVyLmggICAgIHwgIDMgKystCj4gIDMgZmlsZXMgY2hh bmdlZCwgMjQgaW5zZXJ0aW9ucygrKSwgOCBkZWxldGlvbnMoLSkKPiAKPiBkaWZmIC0tZ2l0IGEv ZHJpdmVycy9ncHUvZHJtL2RybV9hdG9taWNfaGVscGVyLmMgYi9kcml2ZXJzL2dwdS9kcm0vZHJt X2F0b21pY19oZWxwZXIuYwo+IGluZGV4IDNlZjJhYzUyY2U5NC4uNjQ4NDk0YzgxM2U1IDEwMDY0 NAo+IC0tLSBhL2RyaXZlcnMvZ3B1L2RybS9kcm1fYXRvbWljX2hlbHBlci5jCj4gKysrIGIvZHJp dmVycy9ncHUvZHJtL2RybV9hdG9taWNfaGVscGVyLmMKPiBAQCAtMTU4MSw4ICsxNTgxLDExIEBA IHN0YXRpYyB2b2lkIGNvbW1pdF90YWlsKHN0cnVjdCBkcm1fYXRvbWljX3N0YXRlICpvbGRfc3Rh dGUpCj4gIHsKPiAgCXN0cnVjdCBkcm1fZGV2aWNlICpkZXYgPSBvbGRfc3RhdGUtPmRldjsKPiAg CWNvbnN0IHN0cnVjdCBkcm1fbW9kZV9jb25maWdfaGVscGVyX2Z1bmNzICpmdW5jczsKPiArCXN0 cnVjdCBkcm1fY3J0Y19zdGF0ZSAqbmV3X2NydGNfc3RhdGU7Cj4gKwlzdHJ1Y3QgZHJtX2NydGMg KmNydGM7Cj4gIAlrdGltZV90IHN0YXJ0Owo+ICAJczY0IGNvbW1pdF90aW1lX21zOwo+ICsJdW5z aWduZWQgaSwgbmV3X3NlbGZfcmVmcmVzaF9tYXNrID0gMDsKPiAgCj4gIAlmdW5jcyA9IGRldi0+ bW9kZV9jb25maWcuaGVscGVyX3ByaXZhdGU7Cj4gIAo+IEBAIC0xNjAyLDYgKzE2MDUsMTQgQEAg c3RhdGljIHZvaWQgY29tbWl0X3RhaWwoc3RydWN0IGRybV9hdG9taWNfc3RhdGUgKm9sZF9zdGF0 ZSkKPiAgCj4gIAlkcm1fYXRvbWljX2hlbHBlcl93YWl0X2Zvcl9kZXBlbmRlbmNpZXMob2xkX3N0 YXRlKTsKPiAgCj4gKwkvKgo+ICsJICogV2UgY2Fubm90IHNhZmVseSBhY2Nlc3MgbmV3X2NydGNf c3RhdGUgYWZ0ZXIgZHJtX2F0b21pY19oZWxwZXJfY29tbWl0X2h3X2RvbmUoKQo+ICsJICogc28g ZmlndXJlIG91dCB3aGljaCBjcnRjJ3MgaGF2ZSBzZWxmLXJlZnJlc2ggYWN0aXZlIGJlZm9yZWhh bmQ6Cj4gKwkgKi8KPiArCWZvcl9lYWNoX25ld19jcnRjX2luX3N0YXRlKG9sZF9zdGF0ZSwgY3J0 YywgbmV3X2NydGNfc3RhdGUsIGkpCj4gKwkJaWYgKG5ld19jcnRjX3N0YXRlLT5zZWxmX3JlZnJl c2hfYWN0aXZlKQo+ICsJCQluZXdfc2VsZl9yZWZyZXNoX21hc2sgfD0gQklUKGkpOwo+ICsKPiAg CWlmIChmdW5jcyAmJiBmdW5jcy0+YXRvbWljX2NvbW1pdF90YWlsKQo+ICAJCWZ1bmNzLT5hdG9t aWNfY29tbWl0X3RhaWwob2xkX3N0YXRlKTsKPiAgCWVsc2UKPiBAQCAtMTYxMCw3ICsxNjIxLDgg QEAgc3RhdGljIHZvaWQgY29tbWl0X3RhaWwoc3RydWN0IGRybV9hdG9taWNfc3RhdGUgKm9sZF9z dGF0ZSkKPiAgCWNvbW1pdF90aW1lX21zID0ga3RpbWVfbXNfZGVsdGEoa3RpbWVfZ2V0KCksIHN0 YXJ0KTsKPiAgCWlmIChjb21taXRfdGltZV9tcyA+IDApCj4gIAkJZHJtX3NlbGZfcmVmcmVzaF9o ZWxwZXJfdXBkYXRlX2F2Z190aW1lcyhvbGRfc3RhdGUsCj4gLQkJCQkJCSAodW5zaWduZWQgbG9u Zyljb21taXRfdGltZV9tcyk7Cj4gKwkJCQkJCSAodW5zaWduZWQgbG9uZyljb21taXRfdGltZV9t cywKPiArCQkJCQkJIG5ld19zZWxmX3JlZnJlc2hfbWFzayk7Cj4gIAo+ICAJZHJtX2F0b21pY19o ZWxwZXJfY29tbWl0X2NsZWFudXBfZG9uZShvbGRfc3RhdGUpOwo+ICAKPiBkaWZmIC0tZ2l0IGEv ZHJpdmVycy9ncHUvZHJtL2RybV9zZWxmX3JlZnJlc2hfaGVscGVyLmMgYi9kcml2ZXJzL2dwdS9k cm0vZHJtX3NlbGZfcmVmcmVzaF9oZWxwZXIuYwo+IGluZGV4IDY4ZjQ3NjVhNTg5Ni4uMDExYjhk NWY3ZGQ2IDEwMDY0NAo+IC0tLSBhL2RyaXZlcnMvZ3B1L2RybS9kcm1fc2VsZl9yZWZyZXNoX2hl bHBlci5jCj4gKysrIGIvZHJpdmVycy9ncHUvZHJtL2RybV9zZWxmX3JlZnJlc2hfaGVscGVyLmMK PiBAQCAtMTMzLDYgKzEzMyw4IEBAIHN0YXRpYyB2b2lkIGRybV9zZWxmX3JlZnJlc2hfaGVscGVy X2VudHJ5X3dvcmsoc3RydWN0IHdvcmtfc3RydWN0ICp3b3JrKQo+ICAgKiBkcm1fc2VsZl9yZWZy ZXNoX2hlbHBlcl91cGRhdGVfYXZnX3RpbWVzIC0gVXBkYXRlcyBhIGNydGMncyBTUiB0aW1lIGF2 ZXJhZ2VzCj4gICAqIEBzdGF0ZTogdGhlIHN0YXRlIHdoaWNoIGhhcyBqdXN0IGJlZW4gYXBwbGll ZCB0byBoYXJkd2FyZQo+ICAgKiBAY29tbWl0X3RpbWVfbXM6IHRoZSBhbW91bnQgb2YgdGltZSBp biBtcyB0aGF0IHRoaXMgY29tbWl0IHRvb2sgdG8gY29tcGxldGUKPiArICogQG5ld19zZWxmX3Jl ZnJlc2hfbWFzazogYml0bWFzayBvZiBjcnRjJ3MgdGhhdCBoYXZlIHNlbGZfcmVmcmVzaF9hY3Rp dmUgaW4KPiArICogICAgbmV3IHN0YXRlCj4gICAqCj4gICAqIENhbGxlZCBhZnRlciAmZHJtX21v ZGVfY29uZmlnX2Z1bmNzLmF0b21pY19jb21taXRfdGFpbCwgdGhpcyBmdW5jdGlvbiB3aWxsCj4g ICAqIHVwZGF0ZSB0aGUgYXZlcmFnZSBlbnRyeS9leGl0IHNlbGYgcmVmcmVzaCB0aW1lcyBvbiBz ZWxmIHJlZnJlc2ggdHJhbnNpdGlvbnMuCj4gQEAgLTE0MCwyMiArMTQyLDIzIEBAIHN0YXRpYyB2 b2lkIGRybV9zZWxmX3JlZnJlc2hfaGVscGVyX2VudHJ5X3dvcmsoc3RydWN0IHdvcmtfc3RydWN0 ICp3b3JrKQo+ICAgKiBlbnRlcmluZyBzZWxmIHJlZnJlc2ggbW9kZSBhZnRlciBhY3Rpdml0eS4K PiAgICovCj4gIHZvaWQgZHJtX3NlbGZfcmVmcmVzaF9oZWxwZXJfdXBkYXRlX2F2Z190aW1lcyhz dHJ1Y3QgZHJtX2F0b21pY19zdGF0ZSAqc3RhdGUsCj4gLQkJCQkJICAgICAgdW5zaWduZWQgaW50 IGNvbW1pdF90aW1lX21zKQo+ICsJCQkJCSAgICAgIHVuc2lnbmVkIGludCBjb21taXRfdGltZV9t cywKPiArCQkJCQkgICAgICB1bnNpZ25lZCBpbnQgbmV3X3NlbGZfcmVmcmVzaF9tYXNrKQo+ICB7 Cj4gIAlzdHJ1Y3QgZHJtX2NydGMgKmNydGM7Cj4gLQlzdHJ1Y3QgZHJtX2NydGNfc3RhdGUgKm9s ZF9jcnRjX3N0YXRlLCAqbmV3X2NydGNfc3RhdGU7Cj4gKwlzdHJ1Y3QgZHJtX2NydGNfc3RhdGUg Km9sZF9jcnRjX3N0YXRlOwo+ICAJaW50IGk7Cj4gIAo+IC0JZm9yX2VhY2hfb2xkbmV3X2NydGNf aW5fc3RhdGUoc3RhdGUsIGNydGMsIG9sZF9jcnRjX3N0YXRlLAo+IC0JCQkJICAgICAgbmV3X2Ny dGNfc3RhdGUsIGkpIHsKPiArCWZvcl9lYWNoX29sZF9jcnRjX2luX3N0YXRlKHN0YXRlLCBjcnRj LCBvbGRfY3J0Y19zdGF0ZSwgaSkgewo+ICsJCWJvb2wgbmV3X3NlbGZfcmVmcmVzaF9hY3RpdmUg PSBuZXdfc2VsZl9yZWZyZXNoX21hc2sgJiBCSVQoaSk7Cj4gIAkJc3RydWN0IGRybV9zZWxmX3Jl ZnJlc2hfZGF0YSAqc3JfZGF0YSA9IGNydGMtPnNlbGZfcmVmcmVzaF9kYXRhOwo+ICAJCXN0cnVj dCBld21hX3Bzcl90aW1lICp0aW1lOwo+ICAKPiAgCQlpZiAob2xkX2NydGNfc3RhdGUtPnNlbGZf cmVmcmVzaF9hY3RpdmUgPT0KPiAtCQkgICAgbmV3X2NydGNfc3RhdGUtPnNlbGZfcmVmcmVzaF9h Y3RpdmUpCj4gKwkJICAgIG5ld19zZWxmX3JlZnJlc2hfYWN0aXZlKQo+ICAJCQljb250aW51ZTsK PiAgCj4gLQkJaWYgKG5ld19jcnRjX3N0YXRlLT5zZWxmX3JlZnJlc2hfYWN0aXZlKQo+ICsJCWlm IChuZXdfc2VsZl9yZWZyZXNoX2FjdGl2ZSkKPiAgCQkJdGltZSA9ICZzcl9kYXRhLT5lbnRyeV9h dmdfbXM7Cj4gIAkJZWxzZQo+ICAJCQl0aW1lID0gJnNyX2RhdGEtPmV4aXRfYXZnX21zOwo+IGRp ZmYgLS1naXQgYS9pbmNsdWRlL2RybS9kcm1fc2VsZl9yZWZyZXNoX2hlbHBlci5oIGIvaW5jbHVk ZS9kcm0vZHJtX3NlbGZfcmVmcmVzaF9oZWxwZXIuaAo+IGluZGV4IDViNzlkMjUzZmI0Ni4uYjJj MDhiMzI4YWExIDEwMDY0NAo+IC0tLSBhL2luY2x1ZGUvZHJtL2RybV9zZWxmX3JlZnJlc2hfaGVs cGVyLmgKPiArKysgYi9pbmNsdWRlL2RybS9kcm1fc2VsZl9yZWZyZXNoX2hlbHBlci5oCj4gQEAg LTEzLDcgKzEzLDggQEAgc3RydWN0IGRybV9jcnRjOwo+ICAKPiAgdm9pZCBkcm1fc2VsZl9yZWZy ZXNoX2hlbHBlcl9hbHRlcl9zdGF0ZShzdHJ1Y3QgZHJtX2F0b21pY19zdGF0ZSAqc3RhdGUpOwo+ ICB2b2lkIGRybV9zZWxmX3JlZnJlc2hfaGVscGVyX3VwZGF0ZV9hdmdfdGltZXMoc3RydWN0IGRy bV9hdG9taWNfc3RhdGUgKnN0YXRlLAo+IC0JCQkJCSAgICAgIHVuc2lnbmVkIGludCBjb21taXRf dGltZV9tcyk7Cj4gKwkJCQkJICAgICAgdW5zaWduZWQgaW50IGNvbW1pdF90aW1lX21zLAo+ICsJ CQkJCSAgICAgIHVuc2lnbmVkIGludCBuZXdfc2VsZl9yZWZyZXNoX21hc2spOwo+ICAKPiAgaW50 IGRybV9zZWxmX3JlZnJlc2hfaGVscGVyX2luaXQoc3RydWN0IGRybV9jcnRjICpjcnRjKTsKPiAg dm9pZCBkcm1fc2VsZl9yZWZyZXNoX2hlbHBlcl9jbGVhbnVwKHN0cnVjdCBkcm1fY3J0YyAqY3J0 Yyk7Cj4gLS0gCj4gMi4yMy4wCj4gCgotLSAKU2VhbiBQYXVsLCBTb2Z0d2FyZSBFbmdpbmVlciwg R29vZ2xlIC8gQ2hyb21pdW0gT1MKX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX18KZHJpLWRldmVsIG1haWxpbmcgbGlzdApkcmktZGV2ZWxAbGlzdHMuZnJlZWRl c2t0b3Aub3JnCmh0dHBzOi8vbGlzdHMuZnJlZWRlc2t0b3Aub3JnL21haWxtYW4vbGlzdGluZm8v ZHJpLWRldmVs