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=-6.5 required=3.0 tests=DKIM_INVALID,DKIM_SIGNED, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED 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 D7F68C34053 for ; Wed, 19 Feb 2020 16:19:09 +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 9B7102464E for ; Wed, 19 Feb 2020 16:19:09 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="AM0G48AR" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 9B7102464E Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=redhat.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 1j4S3h-0000Pg-K7; Wed, 19 Feb 2020 16:18:45 +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 1j4S3f-0000Pb-O6 for xen-devel@lists.xenproject.org; Wed, 19 Feb 2020 16:18:43 +0000 X-Inumbo-ID: 7d7a37d7-5333-11ea-83c6-12813bfff9fa Received: from us-smtp-1.mimecast.com (unknown [205.139.110.61]) by us1-amaz-eas2.inumbo.com (Halon) with ESMTP id 7d7a37d7-5333-11ea-83c6-12813bfff9fa; Wed, 19 Feb 2020 16:18:41 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1582129121; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=8PhGid55mGXBt3QR7+iEAUfsznHM9i37dSidt+A/ALk=; b=AM0G48ARtQgOssSiiOF8Y0vcyKbkMW8D+0cNF+RLG13LJuxqNCEHHy6o5B4qobdpQeW2Zv hk7C5SjCiZm3wZ44KuAh9LO3toW2m3wp4WSGHddt9+v2TCKz13ACxdA62dLE06XF+Z/MN/ 9KLfhaJIl2DRQXQ2Tb7TH/ZVqxmsbQg= Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-68-L6T8MO6bOrWJNOXAQQPg5g-1; Wed, 19 Feb 2020 11:18:36 -0500 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 8C3CB8EDBC1; Wed, 19 Feb 2020 16:18:35 +0000 (UTC) Received: from t480s.redhat.com (ovpn-116-151.ams2.redhat.com [10.36.116.151]) by smtp.corp.redhat.com (Postfix) with ESMTP id C49D0857BF; Wed, 19 Feb 2020 16:18:22 +0000 (UTC) From: David Hildenbrand To: qemu-devel@nongnu.org Date: Wed, 19 Feb 2020 17:17:15 +0100 Message-Id: <20200219161725.115218-4-david@redhat.com> In-Reply-To: <20200219161725.115218-1-david@redhat.com> References: <20200219161725.115218-1-david@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 X-MC-Unique: L6T8MO6bOrWJNOXAQQPg5g-1 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Subject: [Xen-devel] [PATCH v1 03/13] numa: Teach ram block notifiers about resizeable ram blocks X-BeenThere: xen-devel@lists.xenproject.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Cc: Stefano Stabellini , Eduardo Habkost , Juan Quintela , David Hildenbrand , "Dr . David Alan Gilbert" , Peter Xu , Paul Durrant , Igor Mammedov , "Michael S. Tsirkin" , Marcel Apfelbaum , xen-devel@lists.xenproject.org, Anthony Perard , Paolo Bonzini , Richard Henderson Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Errors-To: xen-devel-bounces@lists.xenproject.org Sender: "Xen-devel" UmFtIGJsb2NrIG5vdGlmaWVycyBhcmUgY3VycmVudGx5IG5vdCBhd2FyZSBvZiByZXNpemVzLiBF c3BlY2lhbGx5IHRvCmhhbmRsZSByZXNpemVzIGR1cmluZyBtaWdyYXRpb24sIGJ1dCBhbHNvIHRv IGltcGxlbWVudCBhY3R1YWxseSByZXNpemVhYmxlCnJhbSBibG9ja3MgKG1ha2UgZXZlcnl0aGlu ZyBiZXR3ZWVuIHVzZWRfbGVuZ3RoIGFuZCBtYXhfbGVuZ3RoCmluYWNjZXNzaWJsZSksIHdlIHdh bnQgdG8gdGVhY2ggcmFtIGJsb2NrIG5vdGlmaWVycyBhYm91dCByZXNpemVhYmxlCnJhbS4KCklu dHJvZHVjZSB0aGUgYmFzaWMgaW5mcmFzdHJ1Y3R1cmUgYnV0IGtlZXAgdXNpbmcgbWF4X3NpemUg aW4gdGhlCmV4aXN0aW5nIG5vdGlmaWVycy4gU3VwcGx5IHRoZSBtYXhfc2l6ZSB3aGVuIGFkZGlu ZyBhbmQgcmVtb3ZpbmcgcmFtCmJsb2Nrcy4gQWxzbywgbm90aWZ5IG9uIHJlc2l6ZXMuCgpBY2tl ZC1ieTogUGF1bCBEdXJyYW50IDxwYXVsQHhlbi5vcmc+CkNjOiBSaWNoYXJkIEhlbmRlcnNvbiA8 cnRoQHR3aWRkbGUubmV0PgpDYzogUGFvbG8gQm9uemluaSA8cGJvbnppbmlAcmVkaGF0LmNvbT4K Q2M6ICJEci4gRGF2aWQgQWxhbiBHaWxiZXJ0IiA8ZGdpbGJlcnRAcmVkaGF0LmNvbT4KQ2M6IEVk dWFyZG8gSGFia29zdCA8ZWhhYmtvc3RAcmVkaGF0LmNvbT4KQ2M6IE1hcmNlbCBBcGZlbGJhdW0g PG1hcmNlbC5hcGZlbGJhdW1AZ21haWwuY29tPgpDYzogU3RlZmFubyBTdGFiZWxsaW5pIDxzc3Rh YmVsbGluaUBrZXJuZWwub3JnPgpDYzogQW50aG9ueSBQZXJhcmQgPGFudGhvbnkucGVyYXJkQGNp dHJpeC5jb20+CkNjOiBQYXVsIER1cnJhbnQgPHBhdWxAeGVuLm9yZz4KQ2M6ICJNaWNoYWVsIFMu IFRzaXJraW4iIDxtc3RAcmVkaGF0LmNvbT4KQ2M6IHhlbi1kZXZlbEBsaXN0cy54ZW5wcm9qZWN0 Lm9yZwpDYzogSWdvciBNYW1tZWRvdiA8aW1hbW1lZG9AcmVkaGF0LmNvbT4KU2lnbmVkLW9mZi1i eTogRGF2aWQgSGlsZGVuYnJhbmQgPGRhdmlkQHJlZGhhdC5jb20+Ci0tLQogZXhlYy5jICAgICAg ICAgICAgICAgICAgICAgfCAxMyArKysrKysrKysrKy0tCiBody9jb3JlL251bWEuYyAgICAgICAg ICAgICB8IDIyICsrKysrKysrKysrKysrKysrLS0tLS0KIGh3L2kzODYveGVuL3hlbi1tYXBjYWNo ZS5jIHwgIDcgKysrKy0tLQogaW5jbHVkZS9leGVjL3JhbWxpc3QuaCAgICAgfCAxMyArKysrKysr KystLS0tCiB0YXJnZXQvaTM4Ni9oYXgtbWVtLmMgICAgICB8ICA1ICsrKy0tCiB0YXJnZXQvaTM4 Ni9zZXYuYyAgICAgICAgICB8IDE4ICsrKysrKysrKystLS0tLS0tLQogdXRpbC92ZmlvLWhlbHBl cnMuYyAgICAgICAgfCAxNyArKysrKysrKystLS0tLS0tLQogNyBmaWxlcyBjaGFuZ2VkLCA2MyBp bnNlcnRpb25zKCspLCAzMiBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQgYS9leGVjLmMgYi9leGVj LmMKaW5kZXggZGZkNDNkMjdjNi4uYjc1MjUwZTc3MyAxMDA2NDQKLS0tIGEvZXhlYy5jCisrKyBi L2V4ZWMuYwpAQCAtMjEyOSw2ICsyMTI5LDggQEAgc3RhdGljIGludCBtZW1vcnlfdHJ5X2VuYWJs ZV9tZXJnaW5nKHZvaWQgKmFkZHIsIHNpemVfdCBsZW4pCiAgKi8KIGludCBxZW11X3JhbV9yZXNp emUoUkFNQmxvY2sgKmJsb2NrLCByYW1fYWRkcl90IG5ld3NpemUsIEVycm9yICoqZXJycCkKIHsK KyAgICBjb25zdCByYW1fYWRkcl90IG9sZHNpemUgPSBibG9jay0+dXNlZF9sZW5ndGg7CisKICAg ICBhc3NlcnQoYmxvY2spOwogCiAgICAgbmV3c2l6ZSA9IEhPU1RfUEFHRV9BTElHTihuZXdzaXpl KTsKQEAgLTIxNTMsNiArMjE1NSwxMSBAQCBpbnQgcWVtdV9yYW1fcmVzaXplKFJBTUJsb2NrICpi bG9jaywgcmFtX2FkZHJfdCBuZXdzaXplLCBFcnJvciAqKmVycnApCiAgICAgICAgIHJldHVybiAt RUlOVkFMOwogICAgIH0KIAorICAgIC8qIE5vdGlmeSBiZWZvcmUgbW9kaWZ5aW5nIHRoZSByYW0g YmxvY2sgYW5kIHRvdWNoaW5nIHRoZSBiaXRtYXBzLiAqLworICAgIGlmIChibG9jay0+aG9zdCkg eworICAgICAgICByYW1fYmxvY2tfbm90aWZ5X3Jlc2l6ZShibG9jay0+aG9zdCwgb2xkc2l6ZSwg bmV3c2l6ZSk7CisgICAgfQorCiAgICAgY3B1X3BoeXNpY2FsX21lbW9yeV9jbGVhcl9kaXJ0eV9y YW5nZShibG9jay0+b2Zmc2V0LCBibG9jay0+dXNlZF9sZW5ndGgpOwogICAgIGJsb2NrLT51c2Vk X2xlbmd0aCA9IG5ld3NpemU7CiAgICAgY3B1X3BoeXNpY2FsX21lbW9yeV9zZXRfZGlydHlfcmFu Z2UoYmxvY2stPm9mZnNldCwgYmxvY2stPnVzZWRfbGVuZ3RoLApAQCAtMjMxMiw3ICsyMzE5LDgg QEAgc3RhdGljIHZvaWQgcmFtX2Jsb2NrX2FkZChSQU1CbG9jayAqbmV3X2Jsb2NrLCBFcnJvciAq KmVycnAsIGJvb2wgc2hhcmVkKQogICAgICAgICBxZW11X21hZHZpc2UobmV3X2Jsb2NrLT5ob3N0 LCBuZXdfYmxvY2stPm1heF9sZW5ndGgsIFFFTVVfTUFEVl9IVUdFUEFHRSk7CiAgICAgICAgIC8q IE1BRFZfRE9OVEZPUksgaXMgYWxzbyBuZWVkZWQgYnkgS1ZNIGluIGFic2VuY2Ugb2Ygc3luY2hy b25vdXMgTU1VICovCiAgICAgICAgIHFlbXVfbWFkdmlzZShuZXdfYmxvY2stPmhvc3QsIG5ld19i bG9jay0+bWF4X2xlbmd0aCwgUUVNVV9NQURWX0RPTlRGT1JLKTsKLSAgICAgICAgcmFtX2Jsb2Nr X25vdGlmeV9hZGQobmV3X2Jsb2NrLT5ob3N0LCBuZXdfYmxvY2stPm1heF9sZW5ndGgpOworICAg ICAgICByYW1fYmxvY2tfbm90aWZ5X2FkZChuZXdfYmxvY2stPmhvc3QsIG5ld19ibG9jay0+dXNl ZF9sZW5ndGgsCisgICAgICAgICAgICAgICAgICAgICAgICAgICAgIG5ld19ibG9jay0+bWF4X2xl bmd0aCk7CiAgICAgfQogfQogCkBAIC0yNDkyLDcgKzI1MDAsOCBAQCB2b2lkIHFlbXVfcmFtX2Zy ZWUoUkFNQmxvY2sgKmJsb2NrKQogICAgIH0KIAogICAgIGlmIChibG9jay0+aG9zdCkgewotICAg ICAgICByYW1fYmxvY2tfbm90aWZ5X3JlbW92ZShibG9jay0+aG9zdCwgYmxvY2stPm1heF9sZW5n dGgpOworICAgICAgICByYW1fYmxvY2tfbm90aWZ5X3JlbW92ZShibG9jay0+aG9zdCwgYmxvY2st PnVzZWRfbGVuZ3RoLAorICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBibG9jay0+bWF4 X2xlbmd0aCk7CiAgICAgfQogCiAgICAgcWVtdV9tdXRleF9sb2NrX3JhbWxpc3QoKTsKZGlmZiAt LWdpdCBhL2h3L2NvcmUvbnVtYS5jIGIvaHcvY29yZS9udW1hLmMKaW5kZXggNjU5OWM2OWUwNS4u ZTI4YWQyNGZjZCAxMDA2NDQKLS0tIGEvaHcvY29yZS9udW1hLmMKKysrIGIvaHcvY29yZS9udW1h LmMKQEAgLTkwMiwxMSArOTAyLDEyIEBAIHZvaWQgcXVlcnlfbnVtYV9ub2RlX21lbShOdW1hTm9k ZU1lbSBub2RlX21lbVtdLCBNYWNoaW5lU3RhdGUgKm1zKQogc3RhdGljIGludCByYW1fYmxvY2tf bm90aWZ5X2FkZF9zaW5nbGUoUkFNQmxvY2sgKnJiLCB2b2lkICpvcGFxdWUpCiB7CiAgICAgY29u c3QgcmFtX2FkZHJfdCBtYXhfc2l6ZSA9IHFlbXVfcmFtX2dldF9tYXhfbGVuZ3RoKHJiKTsKKyAg ICBjb25zdCByYW1fYWRkcl90IHNpemUgPSBxZW11X3JhbV9nZXRfdXNlZF9sZW5ndGgocmIpOwog ICAgIHZvaWQgKmhvc3QgPSBxZW11X3JhbV9nZXRfaG9zdF9hZGRyKHJiKTsKICAgICBSQU1CbG9j a05vdGlmaWVyICpub3RpZmllciA9IG9wYXF1ZTsKIAogICAgIGlmIChob3N0KSB7Ci0gICAgICAg IG5vdGlmaWVyLT5yYW1fYmxvY2tfYWRkZWQobm90aWZpZXIsIGhvc3QsIG1heF9zaXplKTsKKyAg ICAgICAgbm90aWZpZXItPnJhbV9ibG9ja19hZGRlZChub3RpZmllciwgaG9zdCwgc2l6ZSwgbWF4 X3NpemUpOwogICAgIH0KICAgICByZXR1cm4gMDsKIH0KQEAgLTkyMywyMCArOTI0LDMxIEBAIHZv aWQgcmFtX2Jsb2NrX25vdGlmaWVyX3JlbW92ZShSQU1CbG9ja05vdGlmaWVyICpuKQogICAgIFFM SVNUX1JFTU9WRShuLCBuZXh0KTsKIH0KIAotdm9pZCByYW1fYmxvY2tfbm90aWZ5X2FkZCh2b2lk ICpob3N0LCBzaXplX3Qgc2l6ZSkKK3ZvaWQgcmFtX2Jsb2NrX25vdGlmeV9hZGQodm9pZCAqaG9z dCwgc2l6ZV90IHNpemUsIHNpemVfdCBtYXhfc2l6ZSkKIHsKICAgICBSQU1CbG9ja05vdGlmaWVy ICpub3RpZmllcjsKIAogICAgIFFMSVNUX0ZPUkVBQ0gobm90aWZpZXIsICZyYW1fbGlzdC5yYW1i bG9ja19ub3RpZmllcnMsIG5leHQpIHsKLSAgICAgICAgbm90aWZpZXItPnJhbV9ibG9ja19hZGRl ZChub3RpZmllciwgaG9zdCwgc2l6ZSk7CisgICAgICAgIG5vdGlmaWVyLT5yYW1fYmxvY2tfYWRk ZWQobm90aWZpZXIsIGhvc3QsIHNpemUsIG1heF9zaXplKTsKICAgICB9CiB9CiAKLXZvaWQgcmFt X2Jsb2NrX25vdGlmeV9yZW1vdmUodm9pZCAqaG9zdCwgc2l6ZV90IHNpemUpCit2b2lkIHJhbV9i bG9ja19ub3RpZnlfcmVtb3ZlKHZvaWQgKmhvc3QsIHNpemVfdCBzaXplLCBzaXplX3QgbWF4X3Np emUpCiB7CiAgICAgUkFNQmxvY2tOb3RpZmllciAqbm90aWZpZXI7CiAKICAgICBRTElTVF9GT1JF QUNIKG5vdGlmaWVyLCAmcmFtX2xpc3QucmFtYmxvY2tfbm90aWZpZXJzLCBuZXh0KSB7Ci0gICAg ICAgIG5vdGlmaWVyLT5yYW1fYmxvY2tfcmVtb3ZlZChub3RpZmllciwgaG9zdCwgc2l6ZSk7Cisg ICAgICAgIG5vdGlmaWVyLT5yYW1fYmxvY2tfcmVtb3ZlZChub3RpZmllciwgaG9zdCwgc2l6ZSwg bWF4X3NpemUpOworICAgIH0KK30KKwordm9pZCByYW1fYmxvY2tfbm90aWZ5X3Jlc2l6ZSh2b2lk ICpob3N0LCBzaXplX3Qgb2xkX3NpemUsIHNpemVfdCBuZXdfc2l6ZSkKK3sKKyAgICBSQU1CbG9j a05vdGlmaWVyICpub3RpZmllcjsKKworICAgIFFMSVNUX0ZPUkVBQ0gobm90aWZpZXIsICZyYW1f bGlzdC5yYW1ibG9ja19ub3RpZmllcnMsIG5leHQpIHsKKyAgICAgICAgaWYgKG5vdGlmaWVyLT5y YW1fYmxvY2tfcmVzaXplZCkgeworICAgICAgICAgICAgbm90aWZpZXItPnJhbV9ibG9ja19yZXNp emVkKG5vdGlmaWVyLCBob3N0LCBvbGRfc2l6ZSwgbmV3X3NpemUpOworICAgICAgICB9CiAgICAg fQogfQpkaWZmIC0tZ2l0IGEvaHcvaTM4Ni94ZW4veGVuLW1hcGNhY2hlLmMgYi9ody9pMzg2L3hl bi94ZW4tbWFwY2FjaGUuYwppbmRleCA1YjEyMGVkNDRiLi5kNmRjZWE2NWQxIDEwMDY0NAotLS0g YS9ody9pMzg2L3hlbi94ZW4tbWFwY2FjaGUuYworKysgYi9ody9pMzg2L3hlbi94ZW4tbWFwY2Fj aGUuYwpAQCAtMTY5LDcgKzE2OSw4IEBAIHN0YXRpYyB2b2lkIHhlbl9yZW1hcF9idWNrZXQoTWFw Q2FjaGVFbnRyeSAqZW50cnksCiAKICAgICBpZiAoZW50cnktPnZhZGRyX2Jhc2UgIT0gTlVMTCkg ewogICAgICAgICBpZiAoIShlbnRyeS0+ZmxhZ3MgJiBYRU5fTUFQQ0FDSEVfRU5UUllfRFVNTVkp KSB7Ci0gICAgICAgICAgICByYW1fYmxvY2tfbm90aWZ5X3JlbW92ZShlbnRyeS0+dmFkZHJfYmFz ZSwgZW50cnktPnNpemUpOworICAgICAgICAgICAgcmFtX2Jsb2NrX25vdGlmeV9yZW1vdmUoZW50 cnktPnZhZGRyX2Jhc2UsIGVudHJ5LT5zaXplLAorICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgZW50cnktPnNpemUpOwogICAgICAgICB9CiAgICAgICAgIGlmIChtdW5tYXAoZW50 cnktPnZhZGRyX2Jhc2UsIGVudHJ5LT5zaXplKSAhPSAwKSB7CiAgICAgICAgICAgICBwZXJyb3Io InVubWFwIGZhaWxzIik7CkBAIC0yMTEsNyArMjEyLDcgQEAgc3RhdGljIHZvaWQgeGVuX3JlbWFw X2J1Y2tldChNYXBDYWNoZUVudHJ5ICplbnRyeSwKICAgICB9CiAKICAgICBpZiAoIShlbnRyeS0+ ZmxhZ3MgJiBYRU5fTUFQQ0FDSEVfRU5UUllfRFVNTVkpKSB7Ci0gICAgICAgIHJhbV9ibG9ja19u b3RpZnlfYWRkKHZhZGRyX2Jhc2UsIHNpemUpOworICAgICAgICByYW1fYmxvY2tfbm90aWZ5X2Fk ZCh2YWRkcl9iYXNlLCBzaXplLCBzaXplKTsKICAgICB9CiAKICAgICBlbnRyeS0+dmFkZHJfYmFz ZSA9IHZhZGRyX2Jhc2U7CkBAIC00NTIsNyArNDUzLDcgQEAgc3RhdGljIHZvaWQgeGVuX2ludmFs aWRhdGVfbWFwX2NhY2hlX2VudHJ5X3VubG9ja2VkKHVpbnQ4X3QgKmJ1ZmZlcikKICAgICB9CiAK ICAgICBwZW50cnktPm5leHQgPSBlbnRyeS0+bmV4dDsKLSAgICByYW1fYmxvY2tfbm90aWZ5X3Jl bW92ZShlbnRyeS0+dmFkZHJfYmFzZSwgZW50cnktPnNpemUpOworICAgIHJhbV9ibG9ja19ub3Rp ZnlfcmVtb3ZlKGVudHJ5LT52YWRkcl9iYXNlLCBlbnRyeS0+c2l6ZSwgZW50cnktPnNpemUpOwog ICAgIGlmIChtdW5tYXAoZW50cnktPnZhZGRyX2Jhc2UsIGVudHJ5LT5zaXplKSAhPSAwKSB7CiAg ICAgICAgIHBlcnJvcigidW5tYXAgZmFpbHMiKTsKICAgICAgICAgZXhpdCgtMSk7CmRpZmYgLS1n aXQgYS9pbmNsdWRlL2V4ZWMvcmFtbGlzdC5oIGIvaW5jbHVkZS9leGVjL3JhbWxpc3QuaAppbmRl eCBiYzRmYWExYjAwLi4yOTNjMGRkYWJlIDEwMDY0NAotLS0gYS9pbmNsdWRlL2V4ZWMvcmFtbGlz dC5oCisrKyBiL2luY2x1ZGUvZXhlYy9yYW1saXN0LmgKQEAgLTY1LDE1ICs2NSwyMCBAQCB2b2lk IHFlbXVfbXV0ZXhfbG9ja19yYW1saXN0KHZvaWQpOwogdm9pZCBxZW11X211dGV4X3VubG9ja19y YW1saXN0KHZvaWQpOwogCiBzdHJ1Y3QgUkFNQmxvY2tOb3RpZmllciB7Ci0gICAgdm9pZCAoKnJh bV9ibG9ja19hZGRlZCkoUkFNQmxvY2tOb3RpZmllciAqbiwgdm9pZCAqaG9zdCwgc2l6ZV90IHNp emUpOwotICAgIHZvaWQgKCpyYW1fYmxvY2tfcmVtb3ZlZCkoUkFNQmxvY2tOb3RpZmllciAqbiwg dm9pZCAqaG9zdCwgc2l6ZV90IHNpemUpOworICAgIHZvaWQgKCpyYW1fYmxvY2tfYWRkZWQpKFJB TUJsb2NrTm90aWZpZXIgKm4sIHZvaWQgKmhvc3QsIHNpemVfdCBzaXplLAorICAgICAgICAgICAg ICAgICAgICAgICAgICAgIHNpemVfdCBtYXhfc2l6ZSk7CisgICAgdm9pZCAoKnJhbV9ibG9ja19y ZW1vdmVkKShSQU1CbG9ja05vdGlmaWVyICpuLCB2b2lkICpob3N0LCBzaXplX3Qgc2l6ZSwKKyAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgIHNpemVfdCBtYXhfc2l6ZSk7CisgICAgdm9pZCAo KnJhbV9ibG9ja19yZXNpemVkKShSQU1CbG9ja05vdGlmaWVyICpuLCB2b2lkICpob3N0LCBzaXpl X3Qgb2xkX3NpemUsCisgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBzaXplX3QgbmV3X3Np emUpOwogICAgIFFMSVNUX0VOVFJZKFJBTUJsb2NrTm90aWZpZXIpIG5leHQ7CiB9OwogCiB2b2lk IHJhbV9ibG9ja19ub3RpZmllcl9hZGQoUkFNQmxvY2tOb3RpZmllciAqbik7CiB2b2lkIHJhbV9i bG9ja19ub3RpZmllcl9yZW1vdmUoUkFNQmxvY2tOb3RpZmllciAqbik7Ci12b2lkIHJhbV9ibG9j a19ub3RpZnlfYWRkKHZvaWQgKmhvc3QsIHNpemVfdCBzaXplKTsKLXZvaWQgcmFtX2Jsb2NrX25v dGlmeV9yZW1vdmUodm9pZCAqaG9zdCwgc2l6ZV90IHNpemUpOwordm9pZCByYW1fYmxvY2tfbm90 aWZ5X2FkZCh2b2lkICpob3N0LCBzaXplX3Qgc2l6ZSwgc2l6ZV90IG1heF9zaXplKTsKK3ZvaWQg cmFtX2Jsb2NrX25vdGlmeV9yZW1vdmUodm9pZCAqaG9zdCwgc2l6ZV90IHNpemUsIHNpemVfdCBt YXhfc2l6ZSk7Cit2b2lkIHJhbV9ibG9ja19ub3RpZnlfcmVzaXplKHZvaWQgKmhvc3QsIHNpemVf dCBvbGRfc2l6ZSwgc2l6ZV90IG5ld19zaXplKTsKIAogdm9pZCByYW1fYmxvY2tfZHVtcChNb25p dG9yICptb24pOwogCmRpZmYgLS1naXQgYS90YXJnZXQvaTM4Ni9oYXgtbWVtLmMgYi90YXJnZXQv aTM4Ni9oYXgtbWVtLmMKaW5kZXggNmJiNWEyNDkxNy4uNDU0ZDdmYjIxMiAxMDA2NDQKLS0tIGEv dGFyZ2V0L2kzODYvaGF4LW1lbS5jCisrKyBiL3RhcmdldC9pMzg2L2hheC1tZW0uYwpAQCAtMjkz LDcgKzI5Myw4IEBAIHN0YXRpYyBNZW1vcnlMaXN0ZW5lciBoYXhfbWVtb3J5X2xpc3RlbmVyID0g ewogICAgIC5wcmlvcml0eSA9IDEwLAogfTsKIAotc3RhdGljIHZvaWQgaGF4X3JhbV9ibG9ja19h ZGRlZChSQU1CbG9ja05vdGlmaWVyICpuLCB2b2lkICpob3N0LCBzaXplX3Qgc2l6ZSkKK3N0YXRp YyB2b2lkIGhheF9yYW1fYmxvY2tfYWRkZWQoUkFNQmxvY2tOb3RpZmllciAqbiwgdm9pZCAqaG9z dCwgc2l6ZV90IHNpemUsCisgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIHNpemVfdCBt YXhfc2l6ZSkKIHsKICAgICAvKgogICAgICAqIFdlIG11c3QgcmVnaXN0ZXIgZWFjaCBSQU0gYmxv Y2sgd2l0aCB0aGUgSEFYTSBrZXJuZWwgbW9kdWxlLCBvcgpAQCAtMzA0LDcgKzMwNSw3IEBAIHN0 YXRpYyB2b2lkIGhheF9yYW1fYmxvY2tfYWRkZWQoUkFNQmxvY2tOb3RpZmllciAqbiwgdm9pZCAq aG9zdCwgc2l6ZV90IHNpemUpCiAgICAgICogaG9zdCBwaHlzaWNhbCBwYWdlcyBmb3IgdGhlIFJB TSBibG9jayBhcyBwYXJ0IG9mIHRoaXMgcmVnaXN0cmF0aW9uCiAgICAgICogcHJvY2VzcywgaGVu Y2UgdGhlIG5hbWUgaGF4X3BvcHVsYXRlX3JhbSgpLgogICAgICAqLwotICAgIGlmIChoYXhfcG9w dWxhdGVfcmFtKCh1aW50NjRfdCkodWludHB0cl90KWhvc3QsIHNpemUpIDwgMCkgeworICAgIGlm IChoYXhfcG9wdWxhdGVfcmFtKCh1aW50NjRfdCkodWludHB0cl90KWhvc3QsIG1heF9zaXplKSA8 IDApIHsKICAgICAgICAgZnByaW50ZihzdGRlcnIsICJIQVggZmFpbGVkIHRvIHBvcHVsYXRlIFJB TVxuIik7CiAgICAgICAgIGFib3J0KCk7CiAgICAgfQpkaWZmIC0tZ2l0IGEvdGFyZ2V0L2kzODYv c2V2LmMgYi90YXJnZXQvaTM4Ni9zZXYuYwppbmRleCAwMjRiYjI0ZTUxLi42YjRjZWUyNGEyIDEw MDY0NAotLS0gYS90YXJnZXQvaTM4Ni9zZXYuYworKysgYi90YXJnZXQvaTM4Ni9zZXYuYwpAQCAt MTI5LDcgKzEyOSw4IEBAIHNldl9zZXRfZ3Vlc3Rfc3RhdGUoU2V2U3RhdGUgbmV3X3N0YXRlKQog fQogCiBzdGF0aWMgdm9pZAotc2V2X3JhbV9ibG9ja19hZGRlZChSQU1CbG9ja05vdGlmaWVyICpu LCB2b2lkICpob3N0LCBzaXplX3Qgc2l6ZSkKK3Nldl9yYW1fYmxvY2tfYWRkZWQoUkFNQmxvY2tO b3RpZmllciAqbiwgdm9pZCAqaG9zdCwgc2l6ZV90IHNpemUsCisgICAgICAgICAgICAgICAgICAg IHNpemVfdCBtYXhfc2l6ZSkKIHsKICAgICBpbnQgcjsKICAgICBzdHJ1Y3Qga3ZtX2VuY19yZWdp b24gcmFuZ2U7CkBAIC0xNDYsMTkgKzE0NywyMCBAQCBzZXZfcmFtX2Jsb2NrX2FkZGVkKFJBTUJs b2NrTm90aWZpZXIgKm4sIHZvaWQgKmhvc3QsIHNpemVfdCBzaXplKQogICAgIH0KIAogICAgIHJh bmdlLmFkZHIgPSAoX191NjQpKHVuc2lnbmVkIGxvbmcpaG9zdDsKLSAgICByYW5nZS5zaXplID0g c2l6ZTsKKyAgICByYW5nZS5zaXplID0gbWF4X3NpemU7CiAKLSAgICB0cmFjZV9rdm1fbWVtY3J5 cHRfcmVnaXN0ZXJfcmVnaW9uKGhvc3QsIHNpemUpOworICAgIHRyYWNlX2t2bV9tZW1jcnlwdF9y ZWdpc3Rlcl9yZWdpb24oaG9zdCwgbWF4X3NpemUpOwogICAgIHIgPSBrdm1fdm1faW9jdGwoa3Zt X3N0YXRlLCBLVk1fTUVNT1JZX0VOQ1JZUFRfUkVHX1JFR0lPTiwgJnJhbmdlKTsKICAgICBpZiAo cikgewogICAgICAgICBlcnJvcl9yZXBvcnQoIiVzOiBmYWlsZWQgdG8gcmVnaXN0ZXIgcmVnaW9u ICglcCslI3p4KSBlcnJvciAnJXMnIiwKLSAgICAgICAgICAgICAgICAgICAgIF9fZnVuY19fLCBo b3N0LCBzaXplLCBzdHJlcnJvcihlcnJubykpOworICAgICAgICAgICAgICAgICAgICAgX19mdW5j X18sIGhvc3QsIG1heF9zaXplLCBzdHJlcnJvcihlcnJubykpOwogICAgICAgICBleGl0KDEpOwog ICAgIH0KIH0KIAogc3RhdGljIHZvaWQKLXNldl9yYW1fYmxvY2tfcmVtb3ZlZChSQU1CbG9ja05v dGlmaWVyICpuLCB2b2lkICpob3N0LCBzaXplX3Qgc2l6ZSkKK3Nldl9yYW1fYmxvY2tfcmVtb3Zl ZChSQU1CbG9ja05vdGlmaWVyICpuLCB2b2lkICpob3N0LCBzaXplX3Qgc2l6ZSwKKyAgICAgICAg ICAgICAgICAgICAgICBzaXplX3QgbWF4X3NpemUpCiB7CiAgICAgaW50IHI7CiAgICAgc3RydWN0 IGt2bV9lbmNfcmVnaW9uIHJhbmdlOwpAQCAtMTc1LDEzICsxNzcsMTMgQEAgc2V2X3JhbV9ibG9j a19yZW1vdmVkKFJBTUJsb2NrTm90aWZpZXIgKm4sIHZvaWQgKmhvc3QsIHNpemVfdCBzaXplKQog ICAgIH0KIAogICAgIHJhbmdlLmFkZHIgPSAoX191NjQpKHVuc2lnbmVkIGxvbmcpaG9zdDsKLSAg ICByYW5nZS5zaXplID0gc2l6ZTsKKyAgICByYW5nZS5zaXplID0gbWF4X3NpemU7CiAKLSAgICB0 cmFjZV9rdm1fbWVtY3J5cHRfdW5yZWdpc3Rlcl9yZWdpb24oaG9zdCwgc2l6ZSk7CisgICAgdHJh Y2Vfa3ZtX21lbWNyeXB0X3VucmVnaXN0ZXJfcmVnaW9uKGhvc3QsIG1heF9zaXplKTsKICAgICBy ID0ga3ZtX3ZtX2lvY3RsKGt2bV9zdGF0ZSwgS1ZNX01FTU9SWV9FTkNSWVBUX1VOUkVHX1JFR0lP TiwgJnJhbmdlKTsKICAgICBpZiAocikgewogICAgICAgICBlcnJvcl9yZXBvcnQoIiVzOiBmYWls ZWQgdG8gdW5yZWdpc3RlciByZWdpb24gKCVwKyUjengpIiwKLSAgICAgICAgICAgICAgICAgICAg IF9fZnVuY19fLCBob3N0LCBzaXplKTsKKyAgICAgICAgICAgICAgICAgICAgIF9fZnVuY19fLCBo b3N0LCBtYXhfc2l6ZSk7CiAgICAgfQogfQogCmRpZmYgLS1naXQgYS91dGlsL3ZmaW8taGVscGVy cy5jIGIvdXRpbC92ZmlvLWhlbHBlcnMuYwppbmRleCA3MWUwMmU3ZjM1Li42MWEwY2Y2ZTEyIDEw MDY0NAotLS0gYS91dGlsL3ZmaW8taGVscGVycy5jCisrKyBiL3V0aWwvdmZpby1oZWxwZXJzLmMK QEAgLTM3MiwyNSArMzcyLDI2IEBAIGZhaWxfY29udGFpbmVyOgogICAgIHJldHVybiByZXQ7CiB9 CiAKLXN0YXRpYyB2b2lkIHFlbXVfdmZpb19yYW1fYmxvY2tfYWRkZWQoUkFNQmxvY2tOb3RpZmll ciAqbiwKLSAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgdm9pZCAqaG9zdCwg c2l6ZV90IHNpemUpCitzdGF0aWMgdm9pZCBxZW11X3ZmaW9fcmFtX2Jsb2NrX2FkZGVkKFJBTUJs b2NrTm90aWZpZXIgKm4sIHZvaWQgKmhvc3QsCisgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgIHNpemVfdCBzaXplLCBzaXplX3QgbWF4X3NpemUpCiB7CiAgICAgUUVNVVZGSU9T dGF0ZSAqcyA9IGNvbnRhaW5lcl9vZihuLCBRRU1VVkZJT1N0YXRlLCByYW1fbm90aWZpZXIpOwog ICAgIGludCByZXQ7CiAKLSAgICB0cmFjZV9xZW11X3ZmaW9fcmFtX2Jsb2NrX2FkZGVkKHMsIGhv c3QsIHNpemUpOwotICAgIHJldCA9IHFlbXVfdmZpb19kbWFfbWFwKHMsIGhvc3QsIHNpemUsIGZh bHNlLCBOVUxMKTsKKyAgICB0cmFjZV9xZW11X3ZmaW9fcmFtX2Jsb2NrX2FkZGVkKHMsIGhvc3Qs IG1heF9zaXplKTsKKyAgICByZXQgPSBxZW11X3ZmaW9fZG1hX21hcChzLCBob3N0LCBtYXhfc2l6 ZSwgZmFsc2UsIE5VTEwpOwogICAgIGlmIChyZXQpIHsKLSAgICAgICAgZXJyb3JfcmVwb3J0KCJx ZW11X3ZmaW9fZG1hX21hcCglcCwgJXp1KSBmYWlsZWQ6ICVkIiwgaG9zdCwgc2l6ZSwgcmV0KTsK KyAgICAgICAgZXJyb3JfcmVwb3J0KCJxZW11X3ZmaW9fZG1hX21hcCglcCwgJXp1KSBmYWlsZWQ6 ICVkIiwgaG9zdCwKKyAgICAgICAgICAgICAgICAgICAgIG1heF9zaXplLCByZXQpOwogICAgIH0K IH0KIAotc3RhdGljIHZvaWQgcWVtdV92ZmlvX3JhbV9ibG9ja19yZW1vdmVkKFJBTUJsb2NrTm90 aWZpZXIgKm4sCi0gICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgdm9pZCAq aG9zdCwgc2l6ZV90IHNpemUpCitzdGF0aWMgdm9pZCBxZW11X3ZmaW9fcmFtX2Jsb2NrX3JlbW92 ZWQoUkFNQmxvY2tOb3RpZmllciAqbiwgdm9pZCAqaG9zdCwKKyAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICBzaXplX3Qgc2l6ZSwgc2l6ZV90IG1heF9zaXplKQogewogICAg IFFFTVVWRklPU3RhdGUgKnMgPSBjb250YWluZXJfb2YobiwgUUVNVVZGSU9TdGF0ZSwgcmFtX25v dGlmaWVyKTsKICAgICBpZiAoaG9zdCkgewotICAgICAgICB0cmFjZV9xZW11X3ZmaW9fcmFtX2Js b2NrX3JlbW92ZWQocywgaG9zdCwgc2l6ZSk7CisgICAgICAgIHRyYWNlX3FlbXVfdmZpb19yYW1f YmxvY2tfcmVtb3ZlZChzLCBob3N0LCBtYXhfc2l6ZSk7CiAgICAgICAgIHFlbXVfdmZpb19kbWFf dW5tYXAocywgaG9zdCk7CiAgICAgfQogfQotLSAKMi4yNC4xCgoKX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX18KWGVuLWRldmVsIG1haWxpbmcgbGlzdApYZW4t ZGV2ZWxAbGlzdHMueGVucHJvamVjdC5vcmcKaHR0cHM6Ly9saXN0cy54ZW5wcm9qZWN0Lm9yZy9t YWlsbWFuL2xpc3RpbmZvL3hlbi1kZXZlbA==