Received: by 2002:a05:6520:2f93:b029:af:d4db:7a05 with SMTP id 19csp2387502lkf; Fri, 5 Feb 2021 11:50:15 -0800 (PST) X-Google-Smtp-Source: ABdhPJxQP8rYwhw3MrfAzlwRpD+0rDs6UwuBd4fWuWeJQzR6xt2srB9kK3rjtSHE1qYHmdzMtDYh X-Received: by 2002:a17:906:31c1:: with SMTP id f1mr5421941ejf.263.1612554614883; Fri, 05 Feb 2021 11:50:14 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1612554614; cv=none; d=google.com; s=arc-20160816; b=UmhxmpMPGGFWlnQzkmUKneP/ZD83Z+ZumaO9sQEWo55dYwVXjC+EQkbXrLQ3/jjGYp jKig6tP2D0x5Yj3xlkeyaXNjcfKsI/ypDvclMfGUMd2XUlsV7oAYA1Lry2UJzjgQNG4b Apm7xb2B2r0GrjTdxQmp63ZR3JvLp6EmxpsiRvuzK8carDQ78czNVr7lCkvzUiHryh4j 69E4JJyvnAnevTj65vO9LSAqjF0KuiJBAVLQbLDELYlCjzpUwJs352rGe4QtwLWLMGv+ UJ9cWfXAqrQmIe7zRzkk/iAWhDGQSnPUPy/gYZAylgZe1Wz1OGkpiYg+l+Y6DRBEMWve nt+w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:cc:to:subject:message-id:date:from:reply-to :in-reply-to:references:mime-version:dkim-signature; bh=23rZNWZgZ0YC8A8VG23dmqyIISsVpaEUS46vElqLq5U=; b=Hop3nWkALpRGxaTErj945mKT7u2jQvnORLPCYLj/EylA+CIu5DaBff0GvCmUBkwBFQ WsWbD77ng5au1rpmEa4GuxccfBNVVu+ZDXrvsQqbXO3WSIVsSP+mp1MEMG7UBiTD1TiY wvawtiAx3gkg/9U0QXSjSrdE1DODF2rFlMf8DFa63sIxy6qOTFBU3njqKDqG6dyDAE++ StUPCuDwV1LMOpOF/vs3xUx5d3gwyCOgVoJsa7iijuChBTxa1FWqD/kN8MjVrJRXg6mH mUPuqtxLuv9sShIs+ROhzPMvZmXNP+BRyn46kRONEENPed2GMIDCkXmGOYtjUqnFe4AP XVbQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@gmail.com header.s=20161025 header.b=ZUpU0kL0; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id i6si2561959ejb.565.2021.02.05.11.49.49; Fri, 05 Feb 2021 11:50:14 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@gmail.com header.s=20161025 header.b=ZUpU0kL0; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233244AbhBESFe (ORCPT + 99 others); Fri, 5 Feb 2021 13:05:34 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:33576 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233604AbhBESDN (ORCPT ); Fri, 5 Feb 2021 13:03:13 -0500 Received: from mail-il1-x133.google.com (mail-il1-x133.google.com [IPv6:2607:f8b0:4864:20::133]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 3F49FC061788; Fri, 5 Feb 2021 11:44:57 -0800 (PST) Received: by mail-il1-x133.google.com with SMTP id e1so6930749ilu.0; Fri, 05 Feb 2021 11:44:57 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=mime-version:references:in-reply-to:reply-to:from:date:message-id :subject:to:cc; bh=23rZNWZgZ0YC8A8VG23dmqyIISsVpaEUS46vElqLq5U=; b=ZUpU0kL0Y4Lr+FUEOPz2Wr5cPvNsr5Bhkat+EFKC4DbYzcazgCUnGEbld1gYAWGR+F bcjPPtf8lDmZgSd5qzIOO1h2JrO52cTWqCbYtT++2whYsDyKZr7F+N5MwxGtenXrJFqk m1r6e7ndzUkNfwyyUzoUHW8eB36sC7RxDa0/cWtyWV5GxDQwlo7ViUuws5CZaM+EJGy3 Aw/TYWeBm/g6/mjQWCXgi0peNC9DY4VJHbAXaP5H/SEXZYKjD4o83Dk1LWtXz4SoxAxx qxuWKYWmOaFp36qdldnt5riQcPFRb//5kGcl4PS5mXpgeWKh+MUYKWbl9qr+S00WaGwe g0yw== 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:reply-to :from:date:message-id:subject:to:cc; bh=23rZNWZgZ0YC8A8VG23dmqyIISsVpaEUS46vElqLq5U=; b=W3abIfH4nkU+V6QNUA3P/E+PX76fHQdtTOvpn7dHv9J5cGhE4lP7U0JbmIEQnNA6mj 7egQd6CpfU7bVHE5nt+5J/a5KEhwsN6fv/IX8yybCK6bxuHTfmI+QyxTmxtVG6SDmUkT BF8n/0MmpXm3T/38RJ/BTc1P76fjcd32lb7B58zdjJ4nr1quMzLEBWGMVNKistJaM4I4 RtnoRX6S2dRJ5FoSKtU/PUkN+A1t/J04KAxHhv8bz/US8SQN5E3LnyMZUPSLLZdDmY3K a1LHKutm4uLOZKl57L6ZzYMDIDIAWuRW0Dr0yOR1O8GuriXQDw8ZT8eDCjR1c5YAe74S RG+Q== X-Gm-Message-State: AOAM530mohVE+GknfxtGjhUW12iwS5F+kPv8Cwnqr4PukW/VjAx2QciQ o4t3eqLiMRqTXkKBZDN2wjInZMhNgxEfZXwLiqLvr/UZ2vF+tA== X-Received: by 2002:a05:6e02:d0:: with SMTP id r16mr5229885ilq.112.1612554296621; Fri, 05 Feb 2021 11:44:56 -0800 (PST) MIME-Version: 1.0 References: <20210204220741.GA920417@kernel.org> <20210205152823.GD920417@kernel.org> In-Reply-To: Reply-To: sedat.dilek@gmail.com From: Sedat Dilek Date: Fri, 5 Feb 2021 20:44:45 +0100 Message-ID: Subject: Re: ERROR: INT DW_ATE_unsigned_1 Error emitting BTF type To: Yonghong Song Cc: Arnaldo Carvalho de Melo , dwarves@vger.kernel.org, Linux Kernel Mailing List , bpf@vger.kernel.org, Jiri Olsa , Jan Engelhardt , Domenico Andreoli , Matthias Schwarzott , Andrii Nakryiko , Mark Wieelard , Paul Moore , Ondrej Mosnacek , =?UTF-8?Q?Daniel_P=2E_Berrang=C3=A9?= , Tom Stellard , Fangrui Song Content-Type: multipart/mixed; boundary="0000000000000842f405ba9c0eb5" Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org --0000000000000842f405ba9c0eb5 Content-Type: text/plain; charset="UTF-8" On Fri, Feb 5, 2021 at 8:21 PM Yonghong Song wrote: > > > > On 2/5/21 11:15 AM, Sedat Dilek wrote: > > On Fri, Feb 5, 2021 at 8:10 PM Yonghong Song wrote: > >> > >> > >> > >> On 2/5/21 11:06 AM, Sedat Dilek wrote: > >>> On Fri, Feb 5, 2021 at 7:53 PM Sedat Dilek wrote: > >>>> > >>>> On Fri, Feb 5, 2021 at 6:48 PM Sedat Dilek wrote: > >>>>> > >>>>> On Fri, Feb 5, 2021 at 4:28 PM Arnaldo Carvalho de Melo > >>>>> wrote: > >>>>>> > >>>>>> Em Fri, Feb 05, 2021 at 04:23:59PM +0100, Sedat Dilek escreveu: > >>>>>>> On Fri, Feb 5, 2021 at 3:41 PM Sedat Dilek wrote: > >>>>>>>> > >>>>>>>> On Fri, Feb 5, 2021 at 3:37 PM Sedat Dilek wrote: > >>>>>>>>> > >>>>>>>>> Hi, > >>>>>>>>> > >>>>>>>>> when building with pahole v1.20 and binutils v2.35.2 plus Clang > >>>>>>>>> v12.0.0-rc1 and DWARF-v5 I see: > >>>>>>>>> ... > >>>>>>>>> + info BTF .btf.vmlinux.bin.o > >>>>>>>>> + [ != silent_ ] > >>>>>>>>> + printf %-7s %s\n BTF .btf.vmlinux.bin.o > >>>>>>>>> BTF .btf.vmlinux.bin.o > >>>>>>>>> + LLVM_OBJCOPY=/opt/binutils/bin/objcopy /opt/pahole/bin/pahole -J > >>>>>>>>> .tmp_vmlinux.btf > >>>>>>>>> [115] INT DW_ATE_unsigned_1 Error emitting BTF type > >>>>>>>>> Encountered error while encoding BTF. > >>>>>>>> > >>>>>>>> Grepping the pahole sources: > >>>>>>>> > >>>>>>>> $ git grep DW_ATE > >>>>>>>> dwarf_loader.c: bt->is_bool = encoding == DW_ATE_boolean; > >>>>>>>> dwarf_loader.c: bt->is_signed = encoding == DW_ATE_signed; > >>>>>>>> > >>>>>>>> Missing DW_ATE_unsigned encoding? > >>>>>>>> > >>>>>>> > >>>>>>> Checked the LLVM sources: > >>>>>>> > >>>>>>> clang/lib/CodeGen/CGDebugInfo.cpp: Encoding = > >>>>>>> llvm::dwarf::DW_ATE_unsigned_char; > >>>>>>> clang/lib/CodeGen/CGDebugInfo.cpp: Encoding = llvm::dwarf::DW_ATE_unsigned; > >>>>>>> clang/lib/CodeGen/CGDebugInfo.cpp: Encoding = > >>>>>>> llvm::dwarf::DW_ATE_unsigned_fixed; > >>>>>>> clang/lib/CodeGen/CGDebugInfo.cpp: > >>>>>>> ? llvm::dwarf::DW_ATE_unsigned > >>>>>>> ... > >>>>>>> lld/test/wasm/debuginfo.test:CHECK-NEXT: DW_AT_encoding > >>>>>>> (DW_ATE_unsigned) > >>>>>>> > >>>>>>> So, I will switch from GNU ld.bfd v2.35.2 to LLD-12. > >>>>>> > >>>>>> Thanks for the research, probably your conclusion is correct, can you go > >>>>>> the next step and add that part and check if the end result is the > >>>>>> expected one? > >>>>>> > >>>>> > >>>>> Still building... > >>>>> > >>>>> Can you give me a hand on what has to be changed in dwarves/pahole? > >>>>> > >>>>> I guess switching from ld.bfd to ld.lld will show the same ERROR. > >>>>> > >>>> > >>>> This builds successfully - untested: > >>>> > >>>> $ git diff > >>>> diff --git a/btf_loader.c b/btf_loader.c > >>>> index ec286f413f36..a39edd3362db 100644 > >>>> --- a/btf_loader.c > >>>> +++ b/btf_loader.c > >>>> @@ -107,6 +107,7 @@ static struct base_type *base_type__new(strings_t > >>>> name, uint32_t attrs, > >>>> bt->bit_size = size; > >>>> bt->is_signed = attrs & BTF_INT_SIGNED; > >>>> bt->is_bool = attrs & BTF_INT_BOOL; > >>>> + bt->is_unsigned = attrs & BTF_INT_UNSIGNED; > >>>> bt->name_has_encoding = false; > >>>> bt->float_type = float_type; > >>>> } > >>>> diff --git a/ctf.h b/ctf.h > >>>> index 25b79892bde3..9e47c3c74677 100644 > >>>> --- a/ctf.h > >>>> +++ b/ctf.h > >>>> @@ -100,6 +100,7 @@ struct ctf_full_type { > >>>> #define CTF_TYPE_INT_CHAR 0x2 > >>>> #define CTF_TYPE_INT_BOOL 0x4 > >>>> #define CTF_TYPE_INT_VARARGS 0x8 > >>>> +#define CTF_TYPE_INT_UNSIGNED 0x16 > >>>> > >>>> #define CTF_TYPE_FP_ATTRS(VAL) ((VAL) >> 24) > >>>> #define CTF_TYPE_FP_OFFSET(VAL) (((VAL) >> 16) & 0xff) > >>>> diff --git a/dwarf_loader.c b/dwarf_loader.c > >>>> index b73d7867e1e6..79d40f183c24 100644 > >>>> --- a/dwarf_loader.c > >>>> +++ b/dwarf_loader.c > >>>> @@ -473,6 +473,7 @@ static struct base_type *base_type__new(Dwarf_Die > >>>> *die, struct cu *cu) > >>>> bt->is_bool = encoding == DW_ATE_boolean; > >>>> bt->is_signed = encoding == DW_ATE_signed; > >>>> bt->is_varargs = false; > >>>> + bt->is_unsigned = encoding == DW_ATE_unsigned; > >>>> bt->name_has_encoding = true; > >>>> } > >>>> > >>>> diff --git a/dwarves.h b/dwarves.h > >>>> index 98caf1abc54d..edf32d2e6f80 100644 > >>>> --- a/dwarves.h > >>>> +++ b/dwarves.h > >>>> @@ -1261,6 +1261,7 @@ struct base_type { > >>>> uint8_t is_signed:1; > >>>> uint8_t is_bool:1; > >>>> uint8_t is_varargs:1; > >>>> + uint8_t is_unsigned:1; > >>>> uint8_t float_type:4; > >>>> }; > >>>> > >>>> diff --git a/lib/bpf b/lib/bpf > >>>> --- a/lib/bpf > >>>> +++ b/lib/bpf > >>>> @@ -1 +1 @@ > >>>> -Subproject commit 5af3d86b5a2c5fecdc3ab83822d083edd32b4396 > >>>> +Subproject commit 5af3d86b5a2c5fecdc3ab83822d083edd32b4396-dirty > >>>> diff --git a/libbtf.c b/libbtf.c > >>>> index 9f7628304495..a0661a7bbed9 100644 > >>>> --- a/libbtf.c > >>>> +++ b/libbtf.c > >>>> @@ -247,6 +247,8 @@ static const char * > >>>> btf_elf__int_encoding_str(uint8_t encoding) > >>>> return "CHAR"; > >>>> else if (encoding == BTF_INT_BOOL) > >>>> return "BOOL"; > >>>> + else if (encoding == BTF_INT_UNSIGNED) > >>>> + return "UNSIGNED"; > >>>> else > >>>> return "UNKN"; > >>>> } > >>>> @@ -379,6 +381,8 @@ int32_t btf_elf__add_base_type(struct btf_elf > >>>> *btfe, const struct base_type *bt, > >>>> encoding = BTF_INT_SIGNED; > >>>> } else if (bt->is_bool) { > >>>> encoding = BTF_INT_BOOL; > >>>> + } else if (bt->is_unsigned) { > >>>> + encoding = BTF_INT_UNSIGNED; > >>>> } else if (bt->float_type) { > >>>> fprintf(stderr, "float_type is not supported\n"); > >>>> return -1; > >>>> > >>>> Additionally - I cannot see it with `git diff`: > >>>> > >>>> [ lib/bpf/include/uapi/linux/btf.h ] > >>>> > >>>> /* Attributes stored in the BTF_INT_ENCODING */ > >>>> #define BTF_INT_SIGNED (1 << 0) > >>>> #define BTF_INT_CHAR (1 << 1) > >>>> #define BTF_INT_BOOL (1 << 2) > >>>> #define BTF_INT_UNSIGNED (1 << 3) > >>>> > >>>> Comments? > >>>> > >>> > >>> Hmmm... > >>> > >>> + info BTF .btf.vmlinux.bin.o > >>> + [ != silent_ ] > >>> + printf %-7s %s\n BTF .btf.vmlinux.bin.o > >>> BTF .btf.vmlinux.bin.o > >>> + LLVM_OBJCOPY=llvm-objcopy /opt/pahole/bin/pahole -J .tmp_vmlinux.btf > >>> [2] INT long unsigned int Error emitting BTF type > >>> Encountered error while encoding BTF. > >>> + llvm-objcopy --only-section=.BTF --set-section-flags > >>> .BTF=alloc,readonly --strip-all .tmp_vmlinux.btf .btf.vmlinux.bin.o > >>> ... > >>> + info BTFIDS vmlinux > >>> + [ != silent_ ] > >>> + printf %-7s %s\n BTFIDS vmlinux > >>> BTFIDS vmlinux > >>> + ./tools/bpf/resolve_btfids/resolve_btfids vmlinux > >>> FAILED: load BTF from vmlinux: Invalid argument > >>> + on_exit > >>> + [ 255 -ne 0 ] > >>> + cleanup > >>> + rm -f .btf.vmlinux.bin.o > >>> + rm -f .tmp_System.map > >>> + rm -f .tmp_vmlinux.btf .tmp_vmlinux.kallsyms1 > >>> .tmp_vmlinux.kallsyms1.S .tmp_vmlinux.kallsyms1.o > >>> .tmp_vmlinux.kallsyms2 .tmp_vmlinux.kallsyms2.S .tmp_vmlinux.kallsyms > >>> 2.o > >>> + rm -f System.map > >>> + rm -f vmlinux > >>> + rm -f vmlinux.o > >>> make[3]: *** [Makefile:1166: vmlinux] Error 255 > >>> > >>> Grepping through linux.git/tools I guess some BTF tools/libs need to > >>> know what BTF_INT_UNSIGNED is? > >> > >> BTF_INT_UNSIGNED needs kernel support. Maybe to teach pahole to > >> ignore this for now until kernel infrastructure is ready. > >> Not sure whether this information will be useful or not > >> for BTF. This needs to be discussed separately. > >> > > > > [ CC Fangrui ] > > > > How can I teach pahole to ignore BTF_INT_UNSIGNED? > > i mean for the following: > > @@ -379,6 +381,8 @@ int32_t btf_elf__add_base_type(struct btf_elf > *btfe, const struct base_type *bt, > encoding = BTF_INT_SIGNED; > } else if (bt->is_bool) { > encoding = BTF_INT_BOOL; > + } else if (bt->is_unsigned) { > + encoding = BTF_INT_UNSIGNED; > } else if (bt->float_type) { > fprintf(stderr, "float_type is not supported\n"); > return -1; > > You can do > > @@ -379,6 +381,8 @@ int32_t btf_elf__add_base_type(struct btf_elf > *btfe, const struct base_type *bt, > encoding = BTF_INT_SIGNED; > } else if (bt->is_bool) { > encoding = BTF_INT_BOOL; > + } else if (bt->is_unsigned) { > + ; /* ignored for now */ > } else if (bt->float_type) { > fprintf(stderr, "float_type is not supported\n"); > return -1; > > The default encoding is 0 which indicates an unsigned int. > With the attached diff I get again: + info BTF .btf.vmlinux.bin.o + [ != silent_ ] + printf %-7s %s\n BTF .btf.vmlinux.bin.o BTF .btf.vmlinux.bin.o + LLVM_OBJCOPY=llvm-objcopy /opt/pahole/bin/pahole -J .tmp_vmlinux.btf [115] INT DW_ATE_unsigned_1 Error emitting BTF type Encountered error while encoding BTF. + llvm-objcopy --only-section=.BTF --set-section-flags .BTF=alloc,readonly --strip-all .tmp_vmlinux.btf .btf.vmlinux.bin.o ... + info BTFIDS vmlinux + [ != silent_ ] + printf %-7s %s\n BTFIDS vmlinux BTFIDS vmlinux + ./tools/bpf/resolve_btfids/resolve_btfids vmlinux FAILED: load BTF from vmlinux: Invalid argument + on_exit Can someone please look at the attached diff? Thanks. - Sedat - > > > > Another tryout might be to use "-fbinutils-version=..." which is > > available for LLVM-12 according to Fangrui? > > Fangrui, which binutils versions can I pass and how? > > > > > Thanks. > > > > - Sedat - > > --0000000000000842f405ba9c0eb5 Content-Type: text/x-patch; charset="US-ASCII"; name="BTF_INT_UNSIGNED_ignored-is_unsigned.diff" Content-Disposition: attachment; filename="BTF_INT_UNSIGNED_ignored-is_unsigned.diff" Content-Transfer-Encoding: base64 Content-ID: X-Attachment-Id: f_kksp43f90 ZGlmZiAtLWdpdCBhL2J0Zl9sb2FkZXIuYyBiL2J0Zl9sb2FkZXIuYwppbmRleCBlYzI4NmY0MTNm MzYuLmEzOWVkZDMzNjJkYiAxMDA2NDQKLS0tIGEvYnRmX2xvYWRlci5jCisrKyBiL2J0Zl9sb2Fk ZXIuYwpAQCAtMTA3LDYgKzEwNyw3IEBAIHN0YXRpYyBzdHJ1Y3QgYmFzZV90eXBlICpiYXNlX3R5 cGVfX25ldyhzdHJpbmdzX3QgbmFtZSwgdWludDMyX3QgYXR0cnMsCiAJCWJ0LT5iaXRfc2l6ZSA9 IHNpemU7CiAJCWJ0LT5pc19zaWduZWQgPSBhdHRycyAmIEJURl9JTlRfU0lHTkVEOwogCQlidC0+ aXNfYm9vbCA9IGF0dHJzICYgQlRGX0lOVF9CT09MOworCQlidC0+aXNfdW5zaWduZWQgPSBhdHRy cyAmIEJURl9JTlRfVU5TSUdORUQ7CiAJCWJ0LT5uYW1lX2hhc19lbmNvZGluZyA9IGZhbHNlOwog CQlidC0+ZmxvYXRfdHlwZSA9IGZsb2F0X3R5cGU7CiAJfQpkaWZmIC0tZ2l0IGEvY3RmLmggYi9j dGYuaAppbmRleCAyNWI3OTg5MmJkZTMuLjllNDdjM2M3NDY3NyAxMDA2NDQKLS0tIGEvY3RmLmgK KysrIGIvY3RmLmgKQEAgLTEwMCw2ICsxMDAsNyBAQCBzdHJ1Y3QgY3RmX2Z1bGxfdHlwZSB7CiAj ZGVmaW5lIENURl9UWVBFX0lOVF9DSEFSCTB4MgogI2RlZmluZSBDVEZfVFlQRV9JTlRfQk9PTAkw eDQKICNkZWZpbmUgQ1RGX1RZUEVfSU5UX1ZBUkFSR1MJMHg4CisjZGVmaW5lIENURl9UWVBFX0lO VF9VTlNJR05FRAkweDE2CiAKICNkZWZpbmUgQ1RGX1RZUEVfRlBfQVRUUlMoVkFMKQkJKChWQUwp ID4+IDI0KQogI2RlZmluZSBDVEZfVFlQRV9GUF9PRkZTRVQoVkFMKQkJKCgoVkFMKSA+PiAxNikg JiAweGZmKQpkaWZmIC0tZ2l0IGEvZHdhcmZfbG9hZGVyLmMgYi9kd2FyZl9sb2FkZXIuYwppbmRl eCBiNzNkNzg2N2UxZTYuLjc5ZDQwZjE4M2MyNCAxMDA2NDQKLS0tIGEvZHdhcmZfbG9hZGVyLmMK KysrIGIvZHdhcmZfbG9hZGVyLmMKQEAgLTQ3Myw2ICs0NzMsNyBAQCBzdGF0aWMgc3RydWN0IGJh c2VfdHlwZSAqYmFzZV90eXBlX19uZXcoRHdhcmZfRGllICpkaWUsIHN0cnVjdCBjdSAqY3UpCiAJ CWJ0LT5pc19ib29sID0gZW5jb2RpbmcgPT0gRFdfQVRFX2Jvb2xlYW47CiAJCWJ0LT5pc19zaWdu ZWQgPSBlbmNvZGluZyA9PSBEV19BVEVfc2lnbmVkOwogCQlidC0+aXNfdmFyYXJncyA9IGZhbHNl OworCQlidC0+aXNfdW5zaWduZWQgPSBlbmNvZGluZyA9PSBEV19BVEVfdW5zaWduZWQ7CiAJCWJ0 LT5uYW1lX2hhc19lbmNvZGluZyA9IHRydWU7CiAJfQogCmRpZmYgLS1naXQgYS9kd2FydmVzLmgg Yi9kd2FydmVzLmgKaW5kZXggOThjYWYxYWJjNTRkLi5lZGYzMmQyZTZmODAgMTAwNjQ0Ci0tLSBh L2R3YXJ2ZXMuaAorKysgYi9kd2FydmVzLmgKQEAgLTEyNjEsNiArMTI2MSw3IEBAIHN0cnVjdCBi YXNlX3R5cGUgewogCXVpbnQ4X3QJCWlzX3NpZ25lZDoxOwogCXVpbnQ4X3QJCWlzX2Jvb2w6MTsK IAl1aW50OF90CQlpc192YXJhcmdzOjE7CisJdWludDhfdAkJaXNfdW5zaWduZWQ6MTsKIAl1aW50 OF90CQlmbG9hdF90eXBlOjQ7CiB9OwogCmRpZmYgLS1naXQgYS9saWIvYnBmIGIvbGliL2JwZgot LS0gYS9saWIvYnBmCisrKyBiL2xpYi9icGYKQEAgLTEgKzEgQEAKLVN1YnByb2plY3QgY29tbWl0 IDVhZjNkODZiNWEyYzVmZWNkYzNhYjgzODIyZDA4M2VkZDMyYjQzOTYKK1N1YnByb2plY3QgY29t bWl0IDVhZjNkODZiNWEyYzVmZWNkYzNhYjgzODIyZDA4M2VkZDMyYjQzOTYtZGlydHkKZGlmZiAt LWdpdCBhL2xpYmJ0Zi5jIGIvbGliYnRmLmMKaW5kZXggOWY3NjI4MzA0NDk1Li5mNDdkZTFlY2Qy MWUgMTAwNjQ0Ci0tLSBhL2xpYmJ0Zi5jCisrKyBiL2xpYmJ0Zi5jCkBAIC0yNDcsNiArMjQ3LDgg QEAgc3RhdGljIGNvbnN0IGNoYXIgKiBidGZfZWxmX19pbnRfZW5jb2Rpbmdfc3RyKHVpbnQ4X3Qg ZW5jb2RpbmcpCiAJCXJldHVybiAiQ0hBUiI7CiAJZWxzZSBpZiAoZW5jb2RpbmcgPT0gQlRGX0lO VF9CT09MKQogCQlyZXR1cm4gIkJPT0wiOworCWVsc2UgaWYgKGVuY29kaW5nID09IEJURl9JTlRf VU5TSUdORUQpCisJCXJldHVybiAiVU5TSUdORUQiOwogCWVsc2UKIAkJcmV0dXJuICJVTktOIjsK IH0KQEAgLTM3OSw2ICszODEsOCBAQCBpbnQzMl90IGJ0Zl9lbGZfX2FkZF9iYXNlX3R5cGUoc3Ry dWN0IGJ0Zl9lbGYgKmJ0ZmUsIGNvbnN0IHN0cnVjdCBiYXNlX3R5cGUgKmJ0LAogCQllbmNvZGlu ZyA9IEJURl9JTlRfU0lHTkVEOwogCX0gZWxzZSBpZiAoYnQtPmlzX2Jvb2wpIHsKIAkJZW5jb2Rp bmcgPSBCVEZfSU5UX0JPT0w7CisJfSBlbHNlIGlmIChidC0+aXNfdW5zaWduZWQpIHsKKwkJOyAv KiBpZ25vcmVkIGZvciBub3cgKi8KIAl9IGVsc2UgaWYgKGJ0LT5mbG9hdF90eXBlKSB7CiAJCWZw cmludGYoc3RkZXJyLCAiZmxvYXRfdHlwZSBpcyBub3Qgc3VwcG9ydGVkXG4iKTsKIAkJcmV0dXJu IC0xOwo= --0000000000000842f405ba9c0eb5--