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=-13.6 required=3.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS 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 1206EC6377A for ; Wed, 21 Jul 2021 20:15:24 +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 CA6B360FE7 for ; Wed, 21 Jul 2021 20:15:23 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org CA6B360FE7 Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=jlekstrand.net 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 03E0B6EC46; Wed, 21 Jul 2021 20:15:23 +0000 (UTC) Received: from mail-yb1-xb29.google.com (mail-yb1-xb29.google.com [IPv6:2607:f8b0:4864:20::b29]) by gabe.freedesktop.org (Postfix) with ESMTPS id 653ED6E9C9 for ; Wed, 21 Jul 2021 20:15:21 +0000 (UTC) Received: by mail-yb1-xb29.google.com with SMTP id v189so1132699ybg.3 for ; Wed, 21 Jul 2021 13:15:21 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=jlekstrand-net.20150623.gappssmtp.com; s=20150623; h=mime-version:references:in-reply-to:from:date:message-id:subject:to :cc:content-transfer-encoding; bh=BaFeBHqAdEHJ8sZ9wlap9CpFhKP22NmnG72he3Q2/FY=; b=NhQ1jdMP/HkHsV+VoSJMcrBYGuy6Dq76hgwKdoSYNSpwPb8tP9aKviSDf/wQG+Qi7W 0fzzrjdQmNWAHuRC50HSa1jTSsFSAypCx4AMqzdIC52nLhoatCYRdHbZc762EEyDS/mO QzMH4UE5g0jynGe7vh4zpXJ2FaxF095vtK3VAOzuU5KitGNw6SEwQCpVaRQihMeXL9Uu rRIga1594Rz82sok9vxbHvd+/KWoYSuAE/ogyWDLXnVb2CuLlz0as3qy91ezof/32w0H O4hG4/6ANOeZnZkqW+YZ7nz89IjiGkbSVpvrcVhIkVW0xC+jvQOjSfYuX0yAQaSiPYXk N4qA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to:cc:content-transfer-encoding; bh=BaFeBHqAdEHJ8sZ9wlap9CpFhKP22NmnG72he3Q2/FY=; b=XfZrV+8dJew+KHo5jstXEMe8NFvpKq8o5JW3r6SYAPMLcWyRrKGi89SBFh545NDIrP 7zPJkpFK/39DpTUoQtWnR49z6tHPNs0tAUbbaSHrD4OIqCkS716mbcUf6u/mUWU5rD8b 0kH7JAixwnInPozEDC9WKkM1RyV+A/suyDrCY50l0YAGAzodWbolo59u16IAcplBkLSB vMdJNwRV1SmYiNqGtKVnwe9KfEU+ci9CasYM6vEL25Ci/3+JnJnzkIxFVVYba8kZ7Esb p6dxLLWiCl7dPYXwLCXnICCoIxI5NIYQ6B0RJDewOCYZUPQ1KE9xApORBpMa7xjwztqI 3FjA== X-Gm-Message-State: AOAM533SktY71O3TjvBIccuuhMqqwKBE4MkiD4E/yqtYmGPIEVLNNKMP S72/6Xl9k03Z8yxUz3hyz+65VDADpFsvTkmzG0Jtnw== X-Google-Smtp-Source: ABdhPJx2fkSFgD4SB1a+EoXcmmkr13ozdx54fC1YXXp80yHHYtLhoG0duYkGWmdNHVwtReCjJeIC++JBWdBrkpIsoFI= X-Received: by 2002:a25:81c5:: with SMTP id n5mr49187061ybm.323.1626898520554; Wed, 21 Jul 2021 13:15:20 -0700 (PDT) MIME-Version: 1.0 References: <20210721152358.2893314-1-jason@jlekstrand.net> <20210721152358.2893314-7-jason@jlekstrand.net> <23df1788-bd8e-ac44-337d-92bb5f345b8f@intel.com> In-Reply-To: From: Jason Ekstrand Date: Wed, 21 Jul 2021 15:15:09 -0500 Message-ID: Subject: Re: [Intel-gfx] [PATCH 6/6] drm/i915: Make the kmem slab for i915_buddy_block a global To: Daniel Vetter Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Intel GFX , Matthew Auld , Maling list - DRI developers , =?UTF-8?Q?Christian_K=C3=B6nig?= Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" On Wed, Jul 21, 2021 at 1:56 PM Daniel Vetter wrote: > > On Wed, Jul 21, 2021 at 05:25:41PM +0100, Matthew Auld wrote: > > On 21/07/2021 16:23, Jason Ekstrand wrote: > > > There's no reason that I can tell why this should be per-i915_buddy_m= m > > > and doing so causes KMEM_CACHE to throw dmesg warnings because it tri= es > > > to create a debugfs entry with the name i915_buddy_block multiple tim= es. > > > We could handle this by carefully giving each slab its own name but t= hat > > > brings its own pain because then we have to store that string somewhe= re > > > and manage the lifetimes of the different slabs. The most likely > > > outcome would be a global atomic which we increment to get a new name= or > > > something like that. > > > > > > The much easier solution is to use the i915_globals system like we do > > > for every other slab in i915. This ensures that we have exactly one = of > > > them for each i915 driver load and it gets neatly created on module l= oad > > > and destroyed on module unload. Using the globals system also means > > > that its now tied into the shrink handler so we can properly respond = to > > > low-memory situations. > > > > > > Signed-off-by: Jason Ekstrand > > > Fixes: 88be9a0a06b7 ("drm/i915/ttm: add ttm_buddy_man") > > > Cc: Matthew Auld > > > Cc: Christian K=C3=B6nig > > > > It was intentionally ripped it out with the idea that we would be movin= g the > > buddy stuff into ttm, and so part of that was trying to get rid of the = some > > of the i915 specifics, like this globals thing. > > > > Reviewed-by: Matthew Auld > > I just sent out a patch to put i915_globals on a diet, so maybe we can > hold this patch here a bit when there's other reasons for why this is > special? This is required to get rid of the dmesg warnings. > Or at least no make this use the i915_globals stuff and instead just link > up the init/exit function calls directly into Jason's new table, so that > we don't have a merge conflict here? I'm happy to deal with merge conflicts however they land. --Jason > -Daniel > > > > > > --- > > > drivers/gpu/drm/i915/i915_buddy.c | 44 ++++++++++++++++++++++----= --- > > > drivers/gpu/drm/i915/i915_buddy.h | 3 +- > > > drivers/gpu/drm/i915/i915_globals.c | 2 ++ > > > 3 files changed, 38 insertions(+), 11 deletions(-) > > > > > > diff --git a/drivers/gpu/drm/i915/i915_buddy.c b/drivers/gpu/drm/i915= /i915_buddy.c > > > index 29dd7d0310c1f..911feedad4513 100644 > > > --- a/drivers/gpu/drm/i915/i915_buddy.c > > > +++ b/drivers/gpu/drm/i915/i915_buddy.c > > > @@ -8,8 +8,14 @@ > > > #include "i915_buddy.h" > > > #include "i915_gem.h" > > > +#include "i915_globals.h" > > > #include "i915_utils.h" > > > +static struct i915_global_buddy { > > > + struct i915_global base; > > > + struct kmem_cache *slab_blocks; > > > +} global; > > > + > > > static struct i915_buddy_block *i915_block_alloc(struct i915_buddy_= mm *mm, > > > struct i915_buddy_block = *parent, > > > unsigned int order, > > > @@ -19,7 +25,7 @@ static struct i915_buddy_block *i915_block_alloc(st= ruct i915_buddy_mm *mm, > > > GEM_BUG_ON(order > I915_BUDDY_MAX_ORDER); > > > - block =3D kmem_cache_zalloc(mm->slab_blocks, GFP_KERNEL); > > > + block =3D kmem_cache_zalloc(global.slab_blocks, GFP_KERNEL); > > > if (!block) > > > return NULL; > > > @@ -34,7 +40,7 @@ static struct i915_buddy_block *i915_block_alloc(st= ruct i915_buddy_mm *mm, > > > static void i915_block_free(struct i915_buddy_mm *mm, > > > struct i915_buddy_block *block) > > > { > > > - kmem_cache_free(mm->slab_blocks, block); > > > + kmem_cache_free(global.slab_blocks, block); > > > } > > > static void mark_allocated(struct i915_buddy_block *block) > > > @@ -85,15 +91,11 @@ int i915_buddy_init(struct i915_buddy_mm *mm, u64= size, u64 chunk_size) > > > GEM_BUG_ON(mm->max_order > I915_BUDDY_MAX_ORDER); > > > - mm->slab_blocks =3D KMEM_CACHE(i915_buddy_block, SLAB_HWCACHE_ALI= GN); > > > - if (!mm->slab_blocks) > > > - return -ENOMEM; > > > - > > > mm->free_list =3D kmalloc_array(mm->max_order + 1, > > > sizeof(struct list_head), > > > GFP_KERNEL); > > > if (!mm->free_list) > > > - goto out_destroy_slab; > > > + return -ENOMEM; > > > for (i =3D 0; i <=3D mm->max_order; ++i) > > > INIT_LIST_HEAD(&mm->free_list[i]); > > > @@ -145,8 +147,6 @@ int i915_buddy_init(struct i915_buddy_mm *mm, u64= size, u64 chunk_size) > > > kfree(mm->roots); > > > out_free_list: > > > kfree(mm->free_list); > > > -out_destroy_slab: > > > - kmem_cache_destroy(mm->slab_blocks); > > > return -ENOMEM; > > > } > > > @@ -161,7 +161,6 @@ void i915_buddy_fini(struct i915_buddy_mm *mm) > > > kfree(mm->roots); > > > kfree(mm->free_list); > > > - kmem_cache_destroy(mm->slab_blocks); > > > } > > > static int split_block(struct i915_buddy_mm *mm, > > > @@ -410,3 +409,28 @@ int i915_buddy_alloc_range(struct i915_buddy_mm = *mm, > > > #if IS_ENABLED(CONFIG_DRM_I915_SELFTEST) > > > #include "selftests/i915_buddy.c" > > > #endif > > > + > > > +static void i915_global_buddy_shrink(void) > > > +{ > > > + kmem_cache_shrink(global.slab_blocks); > > > +} > > > + > > > +static void i915_global_buddy_exit(void) > > > +{ > > > + kmem_cache_destroy(global.slab_blocks); > > > +} > > > + > > > +static struct i915_global_buddy global =3D { { > > > + .shrink =3D i915_global_buddy_shrink, > > > + .exit =3D i915_global_buddy_exit, > > > +} }; > > > + > > > +int __init i915_global_buddy_init(void) > > > +{ > > > + global.slab_blocks =3D KMEM_CACHE(i915_buddy_block, 0); > > > + if (!global.slab_blocks) > > > + return -ENOMEM; > > > + > > > + i915_global_register(&global.base); > > > + return 0; > > > +} > > > diff --git a/drivers/gpu/drm/i915/i915_buddy.h b/drivers/gpu/drm/i915= /i915_buddy.h > > > index 37f8c42071d12..d8f26706de52f 100644 > > > --- a/drivers/gpu/drm/i915/i915_buddy.h > > > +++ b/drivers/gpu/drm/i915/i915_buddy.h > > > @@ -47,7 +47,6 @@ struct i915_buddy_block { > > > * i915_buddy_alloc* and i915_buddy_free* should suffice. > > > */ > > > struct i915_buddy_mm { > > > - struct kmem_cache *slab_blocks; > > > /* Maintain a free list for each order. */ > > > struct list_head *free_list; > > > @@ -130,4 +129,6 @@ void i915_buddy_free(struct i915_buddy_mm *mm, st= ruct i915_buddy_block *block); > > > void i915_buddy_free_list(struct i915_buddy_mm *mm, struct list_hea= d *objects); > > > +int i915_global_buddy_init(void); > > > + > > > #endif > > > diff --git a/drivers/gpu/drm/i915/i915_globals.c b/drivers/gpu/drm/i9= 15/i915_globals.c > > > index 87267e1d2ad92..e57102a4c8d16 100644 > > > --- a/drivers/gpu/drm/i915/i915_globals.c > > > +++ b/drivers/gpu/drm/i915/i915_globals.c > > > @@ -8,6 +8,7 @@ > > > #include > > > #include "i915_active.h" > > > +#include "i915_buddy.h" > > > #include "gem/i915_gem_context.h" > > > #include "gem/i915_gem_object.h" > > > #include "i915_globals.h" > > > @@ -87,6 +88,7 @@ static void __i915_globals_cleanup(void) > > > static __initconst int (* const initfn[])(void) =3D { > > > i915_global_active_init, > > > + i915_global_buddy_init, > > > i915_global_context_init, > > > i915_global_gem_context_init, > > > i915_global_objects_init, > > > > > _______________________________________________ > > Intel-gfx mailing list > > Intel-gfx@lists.freedesktop.org > > https://lists.freedesktop.org/mailman/listinfo/intel-gfx > > -- > Daniel Vetter > Software Engineer, Intel Corporation > http://blog.ffwll.ch 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=-13.6 required=3.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS 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 8DA6FC6377B for ; Wed, 21 Jul 2021 20:15:23 +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 4E0D260FE7 for ; Wed, 21 Jul 2021 20:15:23 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 4E0D260FE7 Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=jlekstrand.net Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=intel-gfx-bounces@lists.freedesktop.org Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id D14206E9C9; Wed, 21 Jul 2021 20:15:22 +0000 (UTC) Received: from mail-yb1-xb2e.google.com (mail-yb1-xb2e.google.com [IPv6:2607:f8b0:4864:20::b2e]) by gabe.freedesktop.org (Postfix) with ESMTPS id 716336ED10 for ; Wed, 21 Jul 2021 20:15:21 +0000 (UTC) Received: by mail-yb1-xb2e.google.com with SMTP id p22so4982086yba.7 for ; Wed, 21 Jul 2021 13:15:21 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=jlekstrand-net.20150623.gappssmtp.com; s=20150623; h=mime-version:references:in-reply-to:from:date:message-id:subject:to :cc:content-transfer-encoding; bh=BaFeBHqAdEHJ8sZ9wlap9CpFhKP22NmnG72he3Q2/FY=; b=NhQ1jdMP/HkHsV+VoSJMcrBYGuy6Dq76hgwKdoSYNSpwPb8tP9aKviSDf/wQG+Qi7W 0fzzrjdQmNWAHuRC50HSa1jTSsFSAypCx4AMqzdIC52nLhoatCYRdHbZc762EEyDS/mO QzMH4UE5g0jynGe7vh4zpXJ2FaxF095vtK3VAOzuU5KitGNw6SEwQCpVaRQihMeXL9Uu rRIga1594Rz82sok9vxbHvd+/KWoYSuAE/ogyWDLXnVb2CuLlz0as3qy91ezof/32w0H O4hG4/6ANOeZnZkqW+YZ7nz89IjiGkbSVpvrcVhIkVW0xC+jvQOjSfYuX0yAQaSiPYXk N4qA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to:cc:content-transfer-encoding; bh=BaFeBHqAdEHJ8sZ9wlap9CpFhKP22NmnG72he3Q2/FY=; b=CPWXTSjeXRqYFOn0G5iWulqwTQE0J3GDyzrkcOAtevwUwYAs90B1WkjVeXaiqsUflr d6LJfAhFabyxAhlGLb+M7Jp/sHykxC+DCNLSwtGRiVxVaDabIzPRQM/ETx5tI5PghhCS 9iVfRkbXlkyXfHsCZTXp33uEKImu3wuGlV/sld3HaF/CbdpwhDa5qpZXF+v15sJndDBH 416FIz2aKNXZnVc9ZmB+dLIAnGmSV18nJoxwCOJqkqhrTcngSQwPvtqI2d2Jd9Zx5goF T5+UA+kx5Yte27DavVqdOKYXj26R80aou6DllLBrsIdHt34MpbAD1S1RSEv6FlvGbQuH HhQA== X-Gm-Message-State: AOAM531SdFe9qhkg5/aGHf+X5DQ0hdzDTPoxqGxcz5yRjEYTjEvntnIh rH1NZnX9Lb/WEqb8uiolFIBnHm32hdA5i1pBHtqwJQ== X-Google-Smtp-Source: ABdhPJx2fkSFgD4SB1a+EoXcmmkr13ozdx54fC1YXXp80yHHYtLhoG0duYkGWmdNHVwtReCjJeIC++JBWdBrkpIsoFI= X-Received: by 2002:a25:81c5:: with SMTP id n5mr49187061ybm.323.1626898520554; Wed, 21 Jul 2021 13:15:20 -0700 (PDT) MIME-Version: 1.0 References: <20210721152358.2893314-1-jason@jlekstrand.net> <20210721152358.2893314-7-jason@jlekstrand.net> <23df1788-bd8e-ac44-337d-92bb5f345b8f@intel.com> In-Reply-To: From: Jason Ekstrand Date: Wed, 21 Jul 2021 15:15:09 -0500 Message-ID: To: Daniel Vetter Subject: Re: [Intel-gfx] [PATCH 6/6] drm/i915: Make the kmem slab for i915_buddy_block a global X-BeenThere: intel-gfx@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Intel graphics driver community testing & development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Intel GFX , Matthew Auld , Maling list - DRI developers , =?UTF-8?Q?Christian_K=C3=B6nig?= Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" T24gV2VkLCBKdWwgMjEsIDIwMjEgYXQgMTo1NiBQTSBEYW5pZWwgVmV0dGVyIDxkYW5pZWxAZmZ3 bGwuY2g+IHdyb3RlOgo+Cj4gT24gV2VkLCBKdWwgMjEsIDIwMjEgYXQgMDU6MjU6NDFQTSArMDEw MCwgTWF0dGhldyBBdWxkIHdyb3RlOgo+ID4gT24gMjEvMDcvMjAyMSAxNjoyMywgSmFzb24gRWtz dHJhbmQgd3JvdGU6Cj4gPiA+IFRoZXJlJ3Mgbm8gcmVhc29uIHRoYXQgSSBjYW4gdGVsbCB3aHkg dGhpcyBzaG91bGQgYmUgcGVyLWk5MTVfYnVkZHlfbW0KPiA+ID4gYW5kIGRvaW5nIHNvIGNhdXNl cyBLTUVNX0NBQ0hFIHRvIHRocm93IGRtZXNnIHdhcm5pbmdzIGJlY2F1c2UgaXQgdHJpZXMKPiA+ ID4gdG8gY3JlYXRlIGEgZGVidWdmcyBlbnRyeSB3aXRoIHRoZSBuYW1lIGk5MTVfYnVkZHlfYmxv Y2sgbXVsdGlwbGUgdGltZXMuCj4gPiA+IFdlIGNvdWxkIGhhbmRsZSB0aGlzIGJ5IGNhcmVmdWxs eSBnaXZpbmcgZWFjaCBzbGFiIGl0cyBvd24gbmFtZSBidXQgdGhhdAo+ID4gPiBicmluZ3MgaXRz IG93biBwYWluIGJlY2F1c2UgdGhlbiB3ZSBoYXZlIHRvIHN0b3JlIHRoYXQgc3RyaW5nIHNvbWV3 aGVyZQo+ID4gPiBhbmQgbWFuYWdlIHRoZSBsaWZldGltZXMgb2YgdGhlIGRpZmZlcmVudCBzbGFi cy4gIFRoZSBtb3N0IGxpa2VseQo+ID4gPiBvdXRjb21lIHdvdWxkIGJlIGEgZ2xvYmFsIGF0b21p YyB3aGljaCB3ZSBpbmNyZW1lbnQgdG8gZ2V0IGEgbmV3IG5hbWUgb3IKPiA+ID4gc29tZXRoaW5n IGxpa2UgdGhhdC4KPiA+ID4KPiA+ID4gVGhlIG11Y2ggZWFzaWVyIHNvbHV0aW9uIGlzIHRvIHVz ZSB0aGUgaTkxNV9nbG9iYWxzIHN5c3RlbSBsaWtlIHdlIGRvCj4gPiA+IGZvciBldmVyeSBvdGhl ciBzbGFiIGluIGk5MTUuICBUaGlzIGVuc3VyZXMgdGhhdCB3ZSBoYXZlIGV4YWN0bHkgb25lIG9m Cj4gPiA+IHRoZW0gZm9yIGVhY2ggaTkxNSBkcml2ZXIgbG9hZCBhbmQgaXQgZ2V0cyBuZWF0bHkg Y3JlYXRlZCBvbiBtb2R1bGUgbG9hZAo+ID4gPiBhbmQgZGVzdHJveWVkIG9uIG1vZHVsZSB1bmxv YWQuICBVc2luZyB0aGUgZ2xvYmFscyBzeXN0ZW0gYWxzbyBtZWFucwo+ID4gPiB0aGF0IGl0cyBu b3cgdGllZCBpbnRvIHRoZSBzaHJpbmsgaGFuZGxlciBzbyB3ZSBjYW4gcHJvcGVybHkgcmVzcG9u ZCB0bwo+ID4gPiBsb3ctbWVtb3J5IHNpdHVhdGlvbnMuCj4gPiA+Cj4gPiA+IFNpZ25lZC1vZmYt Ynk6IEphc29uIEVrc3RyYW5kIDxqYXNvbkBqbGVrc3RyYW5kLm5ldD4KPiA+ID4gRml4ZXM6IDg4 YmU5YTBhMDZiNyAoImRybS9pOTE1L3R0bTogYWRkIHR0bV9idWRkeV9tYW4iKQo+ID4gPiBDYzog TWF0dGhldyBBdWxkIDxtYXR0aGV3LmF1bGRAaW50ZWwuY29tPgo+ID4gPiBDYzogQ2hyaXN0aWFu IEvDtm5pZyA8Y2hyaXN0aWFuLmtvZW5pZ0BhbWQuY29tPgo+ID4KPiA+IEl0IHdhcyBpbnRlbnRp b25hbGx5IHJpcHBlZCBpdCBvdXQgd2l0aCB0aGUgaWRlYSB0aGF0IHdlIHdvdWxkIGJlIG1vdmlu ZyB0aGUKPiA+IGJ1ZGR5IHN0dWZmIGludG8gdHRtLCBhbmQgc28gcGFydCBvZiB0aGF0IHdhcyB0 cnlpbmcgdG8gZ2V0IHJpZCBvZiB0aGUgc29tZQo+ID4gb2YgdGhlIGk5MTUgc3BlY2lmaWNzLCBs aWtlIHRoaXMgZ2xvYmFscyB0aGluZy4KPiA+Cj4gPiBSZXZpZXdlZC1ieTogTWF0dGhldyBBdWxk IDxtYXR0aGV3LmF1bGRAaW50ZWwuY29tPgo+Cj4gSSBqdXN0IHNlbnQgb3V0IGEgcGF0Y2ggdG8g cHV0IGk5MTVfZ2xvYmFscyBvbiBhIGRpZXQsIHNvIG1heWJlIHdlIGNhbgo+IGhvbGQgdGhpcyBw YXRjaCBoZXJlIGEgYml0IHdoZW4gdGhlcmUncyBvdGhlciByZWFzb25zIGZvciB3aHkgdGhpcyBp cwo+IHNwZWNpYWw/CgpUaGlzIGlzIHJlcXVpcmVkIHRvIGdldCByaWQgb2YgdGhlIGRtZXNnIHdh cm5pbmdzLgoKPiBPciBhdCBsZWFzdCBubyBtYWtlIHRoaXMgdXNlIHRoZSBpOTE1X2dsb2JhbHMg c3R1ZmYgYW5kIGluc3RlYWQganVzdCBsaW5rCj4gdXAgdGhlIGluaXQvZXhpdCBmdW5jdGlvbiBj YWxscyBkaXJlY3RseSBpbnRvIEphc29uJ3MgbmV3IHRhYmxlLCBzbyB0aGF0Cj4gd2UgZG9uJ3Qg aGF2ZSBhIG1lcmdlIGNvbmZsaWN0IGhlcmU/CgpJJ20gaGFwcHkgdG8gZGVhbCB3aXRoIG1lcmdl IGNvbmZsaWN0cyBob3dldmVyIHRoZXkgbGFuZC4KCi0tSmFzb24KCj4gLURhbmllbAo+Cj4gPgo+ ID4gPiAtLS0KPiA+ID4gICBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2J1ZGR5LmMgICB8IDQ0 ICsrKysrKysrKysrKysrKysrKysrKystLS0tLS0tCj4gPiA+ICAgZHJpdmVycy9ncHUvZHJtL2k5 MTUvaTkxNV9idWRkeS5oICAgfCAgMyArLQo+ID4gPiAgIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2k5 MTVfZ2xvYmFscy5jIHwgIDIgKysKPiA+ID4gICAzIGZpbGVzIGNoYW5nZWQsIDM4IGluc2VydGlv bnMoKyksIDExIGRlbGV0aW9ucygtKQo+ID4gPgo+ID4gPiBkaWZmIC0tZ2l0IGEvZHJpdmVycy9n cHUvZHJtL2k5MTUvaTkxNV9idWRkeS5jIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9idWRk eS5jCj4gPiA+IGluZGV4IDI5ZGQ3ZDAzMTBjMWYuLjkxMWZlZWRhZDQ1MTMgMTAwNjQ0Cj4gPiA+ IC0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfYnVkZHkuYwo+ID4gPiArKysgYi9kcml2 ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2J1ZGR5LmMKPiA+ID4gQEAgLTgsOCArOCwxNCBAQAo+ID4g PiAgICNpbmNsdWRlICJpOTE1X2J1ZGR5LmgiCj4gPiA+ICAgI2luY2x1ZGUgImk5MTVfZ2VtLmgi Cj4gPiA+ICsjaW5jbHVkZSAiaTkxNV9nbG9iYWxzLmgiCj4gPiA+ICAgI2luY2x1ZGUgImk5MTVf dXRpbHMuaCIKPiA+ID4gK3N0YXRpYyBzdHJ1Y3QgaTkxNV9nbG9iYWxfYnVkZHkgewo+ID4gPiAr ICAgc3RydWN0IGk5MTVfZ2xvYmFsIGJhc2U7Cj4gPiA+ICsgICBzdHJ1Y3Qga21lbV9jYWNoZSAq c2xhYl9ibG9ja3M7Cj4gPiA+ICt9IGdsb2JhbDsKPiA+ID4gKwo+ID4gPiAgIHN0YXRpYyBzdHJ1 Y3QgaTkxNV9idWRkeV9ibG9jayAqaTkxNV9ibG9ja19hbGxvYyhzdHJ1Y3QgaTkxNV9idWRkeV9t bSAqbW0sCj4gPiA+ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg IHN0cnVjdCBpOTE1X2J1ZGR5X2Jsb2NrICpwYXJlbnQsCj4gPiA+ICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgIHVuc2lnbmVkIGludCBvcmRlciwKPiA+ID4gQEAg LTE5LDcgKzI1LDcgQEAgc3RhdGljIHN0cnVjdCBpOTE1X2J1ZGR5X2Jsb2NrICppOTE1X2Jsb2Nr X2FsbG9jKHN0cnVjdCBpOTE1X2J1ZGR5X21tICptbSwKPiA+ID4gICAgIEdFTV9CVUdfT04ob3Jk ZXIgPiBJOTE1X0JVRERZX01BWF9PUkRFUik7Cj4gPiA+IC0gICBibG9jayA9IGttZW1fY2FjaGVf emFsbG9jKG1tLT5zbGFiX2Jsb2NrcywgR0ZQX0tFUk5FTCk7Cj4gPiA+ICsgICBibG9jayA9IGtt ZW1fY2FjaGVfemFsbG9jKGdsb2JhbC5zbGFiX2Jsb2NrcywgR0ZQX0tFUk5FTCk7Cj4gPiA+ICAg ICBpZiAoIWJsb2NrKQo+ID4gPiAgICAgICAgICAgICByZXR1cm4gTlVMTDsKPiA+ID4gQEAgLTM0 LDcgKzQwLDcgQEAgc3RhdGljIHN0cnVjdCBpOTE1X2J1ZGR5X2Jsb2NrICppOTE1X2Jsb2NrX2Fs bG9jKHN0cnVjdCBpOTE1X2J1ZGR5X21tICptbSwKPiA+ID4gICBzdGF0aWMgdm9pZCBpOTE1X2Js b2NrX2ZyZWUoc3RydWN0IGk5MTVfYnVkZHlfbW0gKm1tLAo+ID4gPiAgICAgICAgICAgICAgICAg ICAgICAgICBzdHJ1Y3QgaTkxNV9idWRkeV9ibG9jayAqYmxvY2spCj4gPiA+ICAgewo+ID4gPiAt ICAga21lbV9jYWNoZV9mcmVlKG1tLT5zbGFiX2Jsb2NrcywgYmxvY2spOwo+ID4gPiArICAga21l bV9jYWNoZV9mcmVlKGdsb2JhbC5zbGFiX2Jsb2NrcywgYmxvY2spOwo+ID4gPiAgIH0KPiA+ID4g ICBzdGF0aWMgdm9pZCBtYXJrX2FsbG9jYXRlZChzdHJ1Y3QgaTkxNV9idWRkeV9ibG9jayAqYmxv Y2spCj4gPiA+IEBAIC04NSwxNSArOTEsMTEgQEAgaW50IGk5MTVfYnVkZHlfaW5pdChzdHJ1Y3Qg aTkxNV9idWRkeV9tbSAqbW0sIHU2NCBzaXplLCB1NjQgY2h1bmtfc2l6ZSkKPiA+ID4gICAgIEdF TV9CVUdfT04obW0tPm1heF9vcmRlciA+IEk5MTVfQlVERFlfTUFYX09SREVSKTsKPiA+ID4gLSAg IG1tLT5zbGFiX2Jsb2NrcyA9IEtNRU1fQ0FDSEUoaTkxNV9idWRkeV9ibG9jaywgU0xBQl9IV0NB Q0hFX0FMSUdOKTsKPiA+ID4gLSAgIGlmICghbW0tPnNsYWJfYmxvY2tzKQo+ID4gPiAtICAgICAg ICAgICByZXR1cm4gLUVOT01FTTsKPiA+ID4gLQo+ID4gPiAgICAgbW0tPmZyZWVfbGlzdCA9IGtt YWxsb2NfYXJyYXkobW0tPm1heF9vcmRlciArIDEsCj4gPiA+ICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICBzaXplb2Yoc3RydWN0IGxpc3RfaGVhZCksCj4gPiA+ICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICBHRlBfS0VSTkVMKTsKPiA+ID4gICAgIGlmICghbW0tPmZy ZWVfbGlzdCkKPiA+ID4gLSAgICAgICAgICAgZ290byBvdXRfZGVzdHJveV9zbGFiOwo+ID4gPiAr ICAgICAgICAgICByZXR1cm4gLUVOT01FTTsKPiA+ID4gICAgIGZvciAoaSA9IDA7IGkgPD0gbW0t Pm1heF9vcmRlcjsgKytpKQo+ID4gPiAgICAgICAgICAgICBJTklUX0xJU1RfSEVBRCgmbW0tPmZy ZWVfbGlzdFtpXSk7Cj4gPiA+IEBAIC0xNDUsOCArMTQ3LDYgQEAgaW50IGk5MTVfYnVkZHlfaW5p dChzdHJ1Y3QgaTkxNV9idWRkeV9tbSAqbW0sIHU2NCBzaXplLCB1NjQgY2h1bmtfc2l6ZSkKPiA+ ID4gICAgIGtmcmVlKG1tLT5yb290cyk7Cj4gPiA+ICAgb3V0X2ZyZWVfbGlzdDoKPiA+ID4gICAg IGtmcmVlKG1tLT5mcmVlX2xpc3QpOwo+ID4gPiAtb3V0X2Rlc3Ryb3lfc2xhYjoKPiA+ID4gLSAg IGttZW1fY2FjaGVfZGVzdHJveShtbS0+c2xhYl9ibG9ja3MpOwo+ID4gPiAgICAgcmV0dXJuIC1F Tk9NRU07Cj4gPiA+ICAgfQo+ID4gPiBAQCAtMTYxLDcgKzE2MSw2IEBAIHZvaWQgaTkxNV9idWRk eV9maW5pKHN0cnVjdCBpOTE1X2J1ZGR5X21tICptbSkKPiA+ID4gICAgIGtmcmVlKG1tLT5yb290 cyk7Cj4gPiA+ICAgICBrZnJlZShtbS0+ZnJlZV9saXN0KTsKPiA+ID4gLSAgIGttZW1fY2FjaGVf ZGVzdHJveShtbS0+c2xhYl9ibG9ja3MpOwo+ID4gPiAgIH0KPiA+ID4gICBzdGF0aWMgaW50IHNw bGl0X2Jsb2NrKHN0cnVjdCBpOTE1X2J1ZGR5X21tICptbSwKPiA+ID4gQEAgLTQxMCwzICs0MDks MjggQEAgaW50IGk5MTVfYnVkZHlfYWxsb2NfcmFuZ2Uoc3RydWN0IGk5MTVfYnVkZHlfbW0gKm1t LAo+ID4gPiAgICNpZiBJU19FTkFCTEVEKENPTkZJR19EUk1fSTkxNV9TRUxGVEVTVCkKPiA+ID4g ICAjaW5jbHVkZSAic2VsZnRlc3RzL2k5MTVfYnVkZHkuYyIKPiA+ID4gICAjZW5kaWYKPiA+ID4g Kwo+ID4gPiArc3RhdGljIHZvaWQgaTkxNV9nbG9iYWxfYnVkZHlfc2hyaW5rKHZvaWQpCj4gPiA+ ICt7Cj4gPiA+ICsgICBrbWVtX2NhY2hlX3NocmluayhnbG9iYWwuc2xhYl9ibG9ja3MpOwo+ID4g PiArfQo+ID4gPiArCj4gPiA+ICtzdGF0aWMgdm9pZCBpOTE1X2dsb2JhbF9idWRkeV9leGl0KHZv aWQpCj4gPiA+ICt7Cj4gPiA+ICsgICBrbWVtX2NhY2hlX2Rlc3Ryb3koZ2xvYmFsLnNsYWJfYmxv Y2tzKTsKPiA+ID4gK30KPiA+ID4gKwo+ID4gPiArc3RhdGljIHN0cnVjdCBpOTE1X2dsb2JhbF9i dWRkeSBnbG9iYWwgPSB7IHsKPiA+ID4gKyAgIC5zaHJpbmsgPSBpOTE1X2dsb2JhbF9idWRkeV9z aHJpbmssCj4gPiA+ICsgICAuZXhpdCA9IGk5MTVfZ2xvYmFsX2J1ZGR5X2V4aXQsCj4gPiA+ICt9 IH07Cj4gPiA+ICsKPiA+ID4gK2ludCBfX2luaXQgaTkxNV9nbG9iYWxfYnVkZHlfaW5pdCh2b2lk KQo+ID4gPiArewo+ID4gPiArICAgZ2xvYmFsLnNsYWJfYmxvY2tzID0gS01FTV9DQUNIRShpOTE1 X2J1ZGR5X2Jsb2NrLCAwKTsKPiA+ID4gKyAgIGlmICghZ2xvYmFsLnNsYWJfYmxvY2tzKQo+ID4g PiArICAgICAgICAgICByZXR1cm4gLUVOT01FTTsKPiA+ID4gKwo+ID4gPiArICAgaTkxNV9nbG9i YWxfcmVnaXN0ZXIoJmdsb2JhbC5iYXNlKTsKPiA+ID4gKyAgIHJldHVybiAwOwo+ID4gPiArfQo+ ID4gPiBkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9idWRkeS5oIGIvZHJp dmVycy9ncHUvZHJtL2k5MTUvaTkxNV9idWRkeS5oCj4gPiA+IGluZGV4IDM3ZjhjNDIwNzFkMTIu LmQ4ZjI2NzA2ZGU1MmYgMTAwNjQ0Cj4gPiA+IC0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5 MTVfYnVkZHkuaAo+ID4gPiArKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2J1ZGR5LmgK PiA+ID4gQEAgLTQ3LDcgKzQ3LDYgQEAgc3RydWN0IGk5MTVfYnVkZHlfYmxvY2sgewo+ID4gPiAg ICAqIGk5MTVfYnVkZHlfYWxsb2MqIGFuZCBpOTE1X2J1ZGR5X2ZyZWUqIHNob3VsZCBzdWZmaWNl Lgo+ID4gPiAgICAqLwo+ID4gPiAgIHN0cnVjdCBpOTE1X2J1ZGR5X21tIHsKPiA+ID4gLSAgIHN0 cnVjdCBrbWVtX2NhY2hlICpzbGFiX2Jsb2NrczsKPiA+ID4gICAgIC8qIE1haW50YWluIGEgZnJl ZSBsaXN0IGZvciBlYWNoIG9yZGVyLiAqLwo+ID4gPiAgICAgc3RydWN0IGxpc3RfaGVhZCAqZnJl ZV9saXN0Owo+ID4gPiBAQCAtMTMwLDQgKzEyOSw2IEBAIHZvaWQgaTkxNV9idWRkeV9mcmVlKHN0 cnVjdCBpOTE1X2J1ZGR5X21tICptbSwgc3RydWN0IGk5MTVfYnVkZHlfYmxvY2sgKmJsb2NrKTsK PiA+ID4gICB2b2lkIGk5MTVfYnVkZHlfZnJlZV9saXN0KHN0cnVjdCBpOTE1X2J1ZGR5X21tICpt bSwgc3RydWN0IGxpc3RfaGVhZCAqb2JqZWN0cyk7Cj4gPiA+ICtpbnQgaTkxNV9nbG9iYWxfYnVk ZHlfaW5pdCh2b2lkKTsKPiA+ID4gKwo+ID4gPiAgICNlbmRpZgo+ID4gPiBkaWZmIC0tZ2l0IGEv ZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9nbG9iYWxzLmMgYi9kcml2ZXJzL2dwdS9kcm0vaTkx NS9pOTE1X2dsb2JhbHMuYwo+ID4gPiBpbmRleCA4NzI2N2UxZDJhZDkyLi5lNTcxMDJhNGM4ZDE2 IDEwMDY0NAo+ID4gPiAtLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dsb2JhbHMuYwo+ ID4gPiArKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dsb2JhbHMuYwo+ID4gPiBAQCAt OCw2ICs4LDcgQEAKPiA+ID4gICAjaW5jbHVkZSA8bGludXgvd29ya3F1ZXVlLmg+Cj4gPiA+ICAg I2luY2x1ZGUgImk5MTVfYWN0aXZlLmgiCj4gPiA+ICsjaW5jbHVkZSAiaTkxNV9idWRkeS5oIgo+ ID4gPiAgICNpbmNsdWRlICJnZW0vaTkxNV9nZW1fY29udGV4dC5oIgo+ID4gPiAgICNpbmNsdWRl ICJnZW0vaTkxNV9nZW1fb2JqZWN0LmgiCj4gPiA+ICAgI2luY2x1ZGUgImk5MTVfZ2xvYmFscy5o Igo+ID4gPiBAQCAtODcsNiArODgsNyBAQCBzdGF0aWMgdm9pZCBfX2k5MTVfZ2xvYmFsc19jbGVh bnVwKHZvaWQpCj4gPiA+ICAgc3RhdGljIF9faW5pdGNvbnN0IGludCAoKiBjb25zdCBpbml0Zm5b XSkodm9pZCkgPSB7Cj4gPiA+ICAgICBpOTE1X2dsb2JhbF9hY3RpdmVfaW5pdCwKPiA+ID4gKyAg IGk5MTVfZ2xvYmFsX2J1ZGR5X2luaXQsCj4gPiA+ICAgICBpOTE1X2dsb2JhbF9jb250ZXh0X2lu aXQsCj4gPiA+ICAgICBpOTE1X2dsb2JhbF9nZW1fY29udGV4dF9pbml0LAo+ID4gPiAgICAgaTkx NV9nbG9iYWxfb2JqZWN0c19pbml0LAo+ID4gPgo+ID4gX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX18KPiA+IEludGVsLWdmeCBtYWlsaW5nIGxpc3QKPiA+IElu dGVsLWdmeEBsaXN0cy5mcmVlZGVza3RvcC5vcmcKPiA+IGh0dHBzOi8vbGlzdHMuZnJlZWRlc2t0 b3Aub3JnL21haWxtYW4vbGlzdGluZm8vaW50ZWwtZ2Z4Cj4KPiAtLQo+IERhbmllbCBWZXR0ZXIK PiBTb2Z0d2FyZSBFbmdpbmVlciwgSW50ZWwgQ29ycG9yYXRpb24KPiBodHRwOi8vYmxvZy5mZnds bC5jaApfX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fXwpJbnRl bC1nZnggbWFpbGluZyBsaXN0CkludGVsLWdmeEBsaXN0cy5mcmVlZGVza3RvcC5vcmcKaHR0cHM6 Ly9saXN0cy5mcmVlZGVza3RvcC5vcmcvbWFpbG1hbi9saXN0aW5mby9pbnRlbC1nZngK