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 Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id C40ADC433EF for ; Wed, 9 Mar 2022 01:06:38 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229758AbiCIBHe (ORCPT ); Tue, 8 Mar 2022 20:07:34 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:46064 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229998AbiCIBHR (ORCPT ); Tue, 8 Mar 2022 20:07:17 -0500 Received: from mail-il1-x14a.google.com (mail-il1-x14a.google.com [IPv6:2607:f8b0:4864:20::14a]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 56146424BE for ; Tue, 8 Mar 2022 16:47:16 -0800 (PST) Received: by mail-il1-x14a.google.com with SMTP id q1-20020a056e02106100b002c600d44e11so381062ilj.5 for ; Tue, 08 Mar 2022 16:47:16 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20210112; h=date:in-reply-to:message-id:mime-version:references:subject:from:to :cc:content-transfer-encoding; bh=Cu5ohpXQyGB/LN9psyyUg3w2aeSZEDuF/loYaKYfcDU=; b=Wa3pB8LeSurJtkKkFMf9FCPTUeRFw1mG+WkKqE/QXs3gK1dJ5JNBc3kqSglJwblMbx SB3VMh9JpFkou56/H5G4jlbSNT32D3qMsBBebH5qLB9gtuUvVEx4x/sKQYuhFdK+oiol I8pf121DOHGzETMy8UTj82hlq/r/K5x9FcHS7d19spi6ZTIYLclEBUgiaia1YHV0JXnY 8Gmi3moD4yywyKWHPc12YM8uSmqdkMTHes8s+u+vU5jekW19NQotdNGy1ppPJmavmm5X 5vDUfinBkQw9WlWSZGwMh7U6k5Lzn6nB84zg+oQ/skQEPLEbd06Caklcx6lmB+gOsI6K UT8g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:date:in-reply-to:message-id:mime-version :references:subject:from:to:cc:content-transfer-encoding; bh=Cu5ohpXQyGB/LN9psyyUg3w2aeSZEDuF/loYaKYfcDU=; b=gCQXJY/WbFgDNrvwzmcOR7147nwBcm2s1mgjlw4ALMwLCB5nq/NGYJ2b2OZlDuUs47 dkbRfgi9U0Qo+V6D4V/BCb0XiI6VF7fFgmSmKbdr4xi6AoU04Fn+ouNj3BLO5D+N19BW olCgX4o5it3Xras/MyJyJcDadv95qmUwh9Q+Up0UUaOwD9Eru3sRZKKQOY27cHSH49uS 9z8LfdDBPssJ+1JIsjHaWIZ9pXgs+DXi/9aChFrSn7AiUQD6xUaZEVV+5hLeGPePppsp LkSMrz/ff66PpM/SYDvcPQ9TEDcuNl7PxM5IrtHYRGg6VgM9/jWUysSEqCtPwnmXmkhi Vd6g== X-Gm-Message-State: AOAM531CW9lRe69X+h7MZLGACQfhiwxr+fcC3GhppwuM9Cku4JQ15YiK bl9lOqrq764GiIoiajWdspDh4/5IgZ8= X-Google-Smtp-Source: ABdhPJw8RnXT1Ad4uM5nnHd4ocqJAnpdV5vcHotUZ0Ax2MpaE6huHjMuVprpFNP+UDU3qLQSStt1W52OHpk= X-Received: from yuzhao.bld.corp.google.com ([2620:15c:183:200:57a6:54a6:aad1:c0a8]) (user=yuzhao job=sendgmr) by 2002:a05:6638:260f:b0:317:d4f3:cd24 with SMTP id m15-20020a056638260f00b00317d4f3cd24mr6264210jat.74.1646783319807; Tue, 08 Mar 2022 15:48:39 -0800 (PST) Date: Tue, 8 Mar 2022 16:47:21 -0700 In-Reply-To: <20220308234723.3834941-1-yuzhao@google.com> Message-Id: <20220308234723.3834941-12-yuzhao@google.com> Mime-Version: 1.0 References: <20220308234723.3834941-1-yuzhao@google.com> X-Mailer: git-send-email 2.35.1.616.g0bdcbb4464-goog Subject: [PATCH v8 11/14] mm: multi-gen LRU: thrashing prevention From: Yu Zhao To: Andrew Morton Cc: Andi Kleen , Aneesh Kumar , Catalin Marinas , Dave Hansen , Hillf Danton , Jens Axboe , Jesse Barnes , Johannes Weiner , Jonathan Corbet , Linus Torvalds , Matthew Wilcox , Mel Gorman , Michael Larabel , Michal Hocko , Mike Rapoport , Rik van Riel , Vlastimil Babka , Will Deacon , Ying Huang , linux-arm-kernel@lists.infradead.org, linux-doc@vger.kernel.org, linux-kernel@vger.kernel.org, linux-mm@kvack.org, page-reclaim@google.com, x86@kernel.org, Yu Zhao , Brian Geffon , Jan Alexander Steffens , Oleksandr Natalenko , Steven Barrett , Suleiman Souhlal , Daniel Byrne , Donald Carr , "=?UTF-8?q?Holger=20Hoffst=C3=A4tte?=" , Konstantin Kharlamov , Shuang Zhai , Sofia Trinh , Vaibhav Jain Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Add /sys/kernel/mm/lru_gen/min_ttl_ms for thrashing prevention, as requested by many desktop users [1]. When set to value N, it prevents the working set of N milliseconds from getting evicted. The OOM killer is triggered if this working set cannot be kept in memory. Based on the average human detectable lag (~100ms), N=3D1000 usually eliminates intolerable lags due to thrashing. Larger values like N=3D3000 make lags less noticeable at the risk of premature OOM kills. Compared with the size-based approach, e.g., [2], this time-based approach has the following advantages: 1. It is easier to configure because it is agnostic to applications and memory sizes. 2. It is more reliable because it is directly wired to the OOM killer. [1] https://lore.kernel.org/lkml/Ydza%2FzXKY9ATRoh6@google.com/ [2] https://lore.kernel.org/lkml/20211130201652.2218636d@mail.inbox.lv/ Signed-off-by: Yu Zhao Acked-by: Brian Geffon Acked-by: Jan Alexander Steffens (heftig) Acked-by: Oleksandr Natalenko Acked-by: Steven Barrett Acked-by: Suleiman Souhlal Tested-by: Daniel Byrne Tested-by: Donald Carr Tested-by: Holger Hoffst=C3=A4tte Tested-by: Konstantin Kharlamov Tested-by: Shuang Zhai Tested-by: Sofia Trinh Tested-by: Vaibhav Jain --- include/linux/mmzone.h | 2 ++ mm/vmscan.c | 69 +++++++++++++++++++++++++++++++++++++++--- 2 files changed, 67 insertions(+), 4 deletions(-) diff --git a/include/linux/mmzone.h b/include/linux/mmzone.h index 51e90e1eec3f..8d245c53ff29 100644 --- a/include/linux/mmzone.h +++ b/include/linux/mmzone.h @@ -391,6 +391,8 @@ struct lru_gen_struct { unsigned long max_seq; /* the eviction increments the oldest generation numbers */ unsigned long min_seq[ANON_AND_FILE]; + /* the birth time of each generation in jiffies */ + unsigned long timestamps[MAX_NR_GENS]; /* the multi-gen LRU lists */ struct list_head lists[MAX_NR_GENS][ANON_AND_FILE][MAX_NR_ZONES]; /* the sizes of the above lists */ diff --git a/mm/vmscan.c b/mm/vmscan.c index 55cc7d6b018b..6aa083b8bb26 100644 --- a/mm/vmscan.c +++ b/mm/vmscan.c @@ -4229,6 +4229,7 @@ static void inc_max_seq(struct lruvec *lruvec) for (type =3D 0; type < ANON_AND_FILE; type++) reset_ctrl_pos(lruvec, type, false); =20 + WRITE_ONCE(lrugen->timestamps[next], jiffies); /* make sure preceding modifications appear */ smp_store_release(&lrugen->max_seq, lrugen->max_seq + 1); =20 @@ -4340,7 +4341,8 @@ static long get_nr_evictable(struct lruvec *lruvec, u= nsigned long max_seq, return total > 0 ? total : 0; } =20 -static void age_lruvec(struct lruvec *lruvec, struct scan_control *sc) +static bool age_lruvec(struct lruvec *lruvec, struct scan_control *sc, + unsigned long min_ttl) { bool need_aging; long nr_to_scan; @@ -4349,14 +4351,22 @@ static void age_lruvec(struct lruvec *lruvec, struc= t scan_control *sc) DEFINE_MAX_SEQ(lruvec); DEFINE_MIN_SEQ(lruvec); =20 + if (min_ttl) { + int gen =3D lru_gen_from_seq(min_seq[LRU_GEN_FILE]); + unsigned long birth =3D READ_ONCE(lruvec->lrugen.timestamps[gen]); + + if (time_is_after_jiffies(birth + min_ttl)) + return false; + } + mem_cgroup_calculate_protection(NULL, memcg); =20 if (mem_cgroup_below_min(memcg)) - return; + return false; =20 nr_to_scan =3D get_nr_evictable(lruvec, max_seq, min_seq, swappiness, &ne= ed_aging); if (!nr_to_scan) - return; + return false; =20 nr_to_scan >>=3D sc->priority; =20 @@ -4365,11 +4375,18 @@ static void age_lruvec(struct lruvec *lruvec, struc= t scan_control *sc) =20 if (nr_to_scan && need_aging && (!mem_cgroup_below_low(memcg) || sc->memc= g_low_reclaim)) try_to_inc_max_seq(lruvec, max_seq, sc, swappiness, false); + + return true; } =20 +/* to protect the working set of the last N jiffies */ +static unsigned long lru_gen_min_ttl __read_mostly; + static void lru_gen_age_node(struct pglist_data *pgdat, struct scan_contro= l *sc) { struct mem_cgroup *memcg; + bool success =3D false; + unsigned long min_ttl =3D READ_ONCE(lru_gen_min_ttl); =20 VM_BUG_ON(!current_is_kswapd()); =20 @@ -4395,12 +4412,29 @@ static void lru_gen_age_node(struct pglist_data *pg= dat, struct scan_control *sc) do { struct lruvec *lruvec =3D mem_cgroup_lruvec(memcg, pgdat); =20 - age_lruvec(lruvec, sc); + if (age_lruvec(lruvec, sc, min_ttl)) + success =3D true; =20 cond_resched(); } while ((memcg =3D mem_cgroup_iter(NULL, memcg, NULL))); =20 current->reclaim_state->mm_walk =3D NULL; + + /* + * The main goal is to OOM kill if every generation from all memcgs is + * younger than min_ttl. However, another theoretical possibility is all + * memcgs are either below min or empty. + */ + if (!success && mutex_trylock(&oom_lock)) { + struct oom_control oc =3D { + .gfp_mask =3D sc->gfp_mask, + .order =3D sc->order, + }; + + out_of_memory(&oc); + + mutex_unlock(&oom_lock); + } } =20 /* @@ -5112,6 +5146,28 @@ static void lru_gen_change_state(bool enable) * sysfs interface *************************************************************************= *****/ =20 +static ssize_t show_min_ttl(struct kobject *kobj, struct kobj_attribute *a= ttr, char *buf) +{ + return sprintf(buf, "%u\n", jiffies_to_msecs(READ_ONCE(lru_gen_min_ttl)))= ; +} + +static ssize_t store_min_ttl(struct kobject *kobj, struct kobj_attribute *= attr, + const char *buf, size_t len) +{ + unsigned int msecs; + + if (kstrtouint(buf, 0, &msecs)) + return -EINVAL; + + WRITE_ONCE(lru_gen_min_ttl, msecs_to_jiffies(msecs)); + + return len; +} + +static struct kobj_attribute lru_gen_min_ttl_attr =3D __ATTR( + min_ttl_ms, 0644, show_min_ttl, store_min_ttl +); + static ssize_t show_enable(struct kobject *kobj, struct kobj_attribute *at= tr, char *buf) { unsigned int caps =3D 0; @@ -5160,6 +5216,7 @@ static struct kobj_attribute lru_gen_enabled_attr =3D= __ATTR( ); =20 static struct attribute *lru_gen_attrs[] =3D { + &lru_gen_min_ttl_attr.attr, &lru_gen_enabled_attr.attr, NULL }; @@ -5175,12 +5232,16 @@ static struct attribute_group lru_gen_attr_group = =3D { =20 void lru_gen_init_lruvec(struct lruvec *lruvec) { + int i; int gen, type, zone; struct lru_gen_struct *lrugen =3D &lruvec->lrugen; =20 lrugen->max_seq =3D MIN_NR_GENS + 1; lrugen->enabled =3D lru_gen_enabled(); =20 + for (i =3D 0; i <=3D MIN_NR_GENS + 1; i++) + lrugen->timestamps[i] =3D jiffies; + for_each_gen_type_zone(gen, type, zone) INIT_LIST_HEAD(&lrugen->lists[gen][type][zone]); =20 --=20 2.35.1.616.g0bdcbb4464-goog 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 Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id DBEB5C433EF for ; Tue, 8 Mar 2022 23:55:40 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:Cc:To:From:Subject:References: Mime-Version:Message-Id:In-Reply-To:Date:Reply-To:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:List-Owner; bh=DHxjo3FuKgq68oVgvGZ9wTjd2Tb0Zh6knNe/RefK6Lo=; b=e15H1/NsR5O4f1Rzia26cF28DR VGcy0/rw/lCa30xDYZODysi2Qdl5ltvmXJ/36OO0r324LvktOV5K+iPSr3UUxudgn6oGBM67kh9LK qoVkM/++oShcu/KrD2dJ/HsqGXV1IOVK7T8WakdJ5BZfIBU2p87dnRJFoZto7cgft/mCo/0KjASUU VMCbl7lBdt48WvTSCs9p5HLJnoiNB4kx9VWT1bg17rwImglj5lh9fa8pNCm6zPA4Mtq/nceasFElV zf0bQ47/DxKZZgLjkUi5R+G2G2BQcblbHBkGj1F+i0sHbnXnpbAtde0ZmXFOu67GKPgBeMTH5h836 LT12A1Uw==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1nRjeF-006cS4-Ei; Tue, 08 Mar 2022 23:53:49 +0000 Received: from mail-io1-xd4a.google.com ([2607:f8b0:4864:20::d4a]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1nRjZJ-006aRJ-8q for linux-arm-kernel@lists.infradead.org; Tue, 08 Mar 2022 23:48:54 +0000 Received: by mail-io1-xd4a.google.com with SMTP id z16-20020a05660217d000b006461c7cbee3so549855iox.21 for ; Tue, 08 Mar 2022 15:48:40 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20210112; h=date:in-reply-to:message-id:mime-version:references:subject:from:to :cc:content-transfer-encoding; bh=Cu5ohpXQyGB/LN9psyyUg3w2aeSZEDuF/loYaKYfcDU=; b=Wa3pB8LeSurJtkKkFMf9FCPTUeRFw1mG+WkKqE/QXs3gK1dJ5JNBc3kqSglJwblMbx SB3VMh9JpFkou56/H5G4jlbSNT32D3qMsBBebH5qLB9gtuUvVEx4x/sKQYuhFdK+oiol I8pf121DOHGzETMy8UTj82hlq/r/K5x9FcHS7d19spi6ZTIYLclEBUgiaia1YHV0JXnY 8Gmi3moD4yywyKWHPc12YM8uSmqdkMTHes8s+u+vU5jekW19NQotdNGy1ppPJmavmm5X 5vDUfinBkQw9WlWSZGwMh7U6k5Lzn6nB84zg+oQ/skQEPLEbd06Caklcx6lmB+gOsI6K UT8g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:date:in-reply-to:message-id:mime-version :references:subject:from:to:cc:content-transfer-encoding; bh=Cu5ohpXQyGB/LN9psyyUg3w2aeSZEDuF/loYaKYfcDU=; b=x7WfpTr6NvGm5d9in+pCxoQfTxrUgS1jbHW3Jey+HPusmVe7JjsukJYayXv9h4cHzj FMHXM0jpVSGolXlaIY5gL8FV4XD4zMjvAEdRi3cwzXUpRoqSbroPVnfkq9tASjO6BtNQ X23KzIeYVQE41EyjWIwDUsBKmO+xMwLYrJ35kUAOHrB06PdPGFQtE+oY/LvinnsnuDln u2OABdfDr6x1e2+UI2faVOtHqStRbt84AYz8/0VXG+aEBc1YmSS4bvV8s1r2INWGZw3I dW6oZzLLPqvwyN3NyEyokgZJQNvY4v53GbvtJNT7qSPoAtRKzxFOHPiEkM6s344NWrjn auSQ== X-Gm-Message-State: AOAM532ChAZcfoJfCdKMrT737//0EZNj0nwazsXNGOKpHBFQKcVSqQJC IObFVFbbQMCqonKlh7z+1w7JsQIVhCc= X-Google-Smtp-Source: ABdhPJw8RnXT1Ad4uM5nnHd4ocqJAnpdV5vcHotUZ0Ax2MpaE6huHjMuVprpFNP+UDU3qLQSStt1W52OHpk= X-Received: from yuzhao.bld.corp.google.com ([2620:15c:183:200:57a6:54a6:aad1:c0a8]) (user=yuzhao job=sendgmr) by 2002:a05:6638:260f:b0:317:d4f3:cd24 with SMTP id m15-20020a056638260f00b00317d4f3cd24mr6264210jat.74.1646783319807; Tue, 08 Mar 2022 15:48:39 -0800 (PST) Date: Tue, 8 Mar 2022 16:47:21 -0700 In-Reply-To: <20220308234723.3834941-1-yuzhao@google.com> Message-Id: <20220308234723.3834941-12-yuzhao@google.com> Mime-Version: 1.0 References: <20220308234723.3834941-1-yuzhao@google.com> X-Mailer: git-send-email 2.35.1.616.g0bdcbb4464-goog Subject: [PATCH v8 11/14] mm: multi-gen LRU: thrashing prevention From: Yu Zhao To: Andrew Morton Cc: Andi Kleen , Aneesh Kumar , Catalin Marinas , Dave Hansen , Hillf Danton , Jens Axboe , Jesse Barnes , Johannes Weiner , Jonathan Corbet , Linus Torvalds , Matthew Wilcox , Mel Gorman , Michael Larabel , Michal Hocko , Mike Rapoport , Rik van Riel , Vlastimil Babka , Will Deacon , Ying Huang , linux-arm-kernel@lists.infradead.org, linux-doc@vger.kernel.org, linux-kernel@vger.kernel.org, linux-mm@kvack.org, page-reclaim@google.com, x86@kernel.org, Yu Zhao , Brian Geffon , Jan Alexander Steffens , Oleksandr Natalenko , Steven Barrett , Suleiman Souhlal , Daniel Byrne , Donald Carr , "=?UTF-8?q?Holger=20Hoffst=C3=A4tte?=" , Konstantin Kharlamov , Shuang Zhai , Sofia Trinh , Vaibhav Jain X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20220308_154841_388330_D509E15A X-CRM114-Status: GOOD ( 21.17 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org QWRkIC9zeXMva2VybmVsL21tL2xydV9nZW4vbWluX3R0bF9tcyBmb3IgdGhyYXNoaW5nIHByZXZl bnRpb24sIGFzCnJlcXVlc3RlZCBieSBtYW55IGRlc2t0b3AgdXNlcnMgWzFdLgoKV2hlbiBzZXQg dG8gdmFsdWUgTiwgaXQgcHJldmVudHMgdGhlIHdvcmtpbmcgc2V0IG9mIE4gbWlsbGlzZWNvbmRz CmZyb20gZ2V0dGluZyBldmljdGVkLiBUaGUgT09NIGtpbGxlciBpcyB0cmlnZ2VyZWQgaWYgdGhp cyB3b3JraW5nIHNldApjYW5ub3QgYmUga2VwdCBpbiBtZW1vcnkuIEJhc2VkIG9uIHRoZSBhdmVy YWdlIGh1bWFuIGRldGVjdGFibGUgbGFnCih+MTAwbXMpLCBOPTEwMDAgdXN1YWxseSBlbGltaW5h dGVzIGludG9sZXJhYmxlIGxhZ3MgZHVlIHRvIHRocmFzaGluZy4KTGFyZ2VyIHZhbHVlcyBsaWtl IE49MzAwMCBtYWtlIGxhZ3MgbGVzcyBub3RpY2VhYmxlIGF0IHRoZSByaXNrIG9mCnByZW1hdHVy ZSBPT00ga2lsbHMuCgpDb21wYXJlZCB3aXRoIHRoZSBzaXplLWJhc2VkIGFwcHJvYWNoLCBlLmcu LCBbMl0sIHRoaXMgdGltZS1iYXNlZAphcHByb2FjaCBoYXMgdGhlIGZvbGxvd2luZyBhZHZhbnRh Z2VzOgoxLiBJdCBpcyBlYXNpZXIgdG8gY29uZmlndXJlIGJlY2F1c2UgaXQgaXMgYWdub3N0aWMg dG8gYXBwbGljYXRpb25zCiAgIGFuZCBtZW1vcnkgc2l6ZXMuCjIuIEl0IGlzIG1vcmUgcmVsaWFi bGUgYmVjYXVzZSBpdCBpcyBkaXJlY3RseSB3aXJlZCB0byB0aGUgT09NIGtpbGxlci4KClsxXSBo dHRwczovL2xvcmUua2VybmVsLm9yZy9sa21sL1lkemElMkZ6WEtZOUFUUm9oNkBnb29nbGUuY29t LwpbMl0gaHR0cHM6Ly9sb3JlLmtlcm5lbC5vcmcvbGttbC8yMDIxMTEzMDIwMTY1Mi4yMjE4NjM2 ZEBtYWlsLmluYm94Lmx2LwoKU2lnbmVkLW9mZi1ieTogWXUgWmhhbyA8eXV6aGFvQGdvb2dsZS5j b20+CkFja2VkLWJ5OiBCcmlhbiBHZWZmb24gPGJnZWZmb25AZ29vZ2xlLmNvbT4KQWNrZWQtYnk6 IEphbiBBbGV4YW5kZXIgU3RlZmZlbnMgKGhlZnRpZykgPGhlZnRpZ0BhcmNobGludXgub3JnPgpB Y2tlZC1ieTogT2xla3NhbmRyIE5hdGFsZW5rbyA8b2xla3NhbmRyQG5hdGFsZW5rby5uYW1lPgpB Y2tlZC1ieTogU3RldmVuIEJhcnJldHQgPHN0ZXZlbkBsaXF1b3JpeC5uZXQ+CkFja2VkLWJ5OiBT dWxlaW1hbiBTb3VobGFsIDxzdWxlaW1hbkBnb29nbGUuY29tPgpUZXN0ZWQtYnk6IERhbmllbCBC eXJuZSA8ZGpieXJuZUBtdHUuZWR1PgpUZXN0ZWQtYnk6IERvbmFsZCBDYXJyIDxkQGNoYW9zLXJl aW5zLmNvbT4KVGVzdGVkLWJ5OiBIb2xnZXIgSG9mZnN0w6R0dGUgPGhvbGdlckBhcHBsaWVkLWFz eW5jaHJvbnkuY29tPgpUZXN0ZWQtYnk6IEtvbnN0YW50aW4gS2hhcmxhbW92IDxIaS1BbmdlbEB5 YW5kZXgucnU+ClRlc3RlZC1ieTogU2h1YW5nIFpoYWkgPHN6aGFpMkBjcy5yb2NoZXN0ZXIuZWR1 PgpUZXN0ZWQtYnk6IFNvZmlhIFRyaW5oIDxzb2ZpYS50cmluaEBlZGkud29ya3M+ClRlc3RlZC1i eTogVmFpYmhhdiBKYWluIDx2YWliaGF2QGxpbnV4LmlibS5jb20+Ci0tLQogaW5jbHVkZS9saW51 eC9tbXpvbmUuaCB8ICAyICsrCiBtbS92bXNjYW4uYyAgICAgICAgICAgIHwgNjkgKysrKysrKysr KysrKysrKysrKysrKysrKysrKysrKysrKysrKysrLS0tCiAyIGZpbGVzIGNoYW5nZWQsIDY3IGlu c2VydGlvbnMoKyksIDQgZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEvaW5jbHVkZS9saW51eC9t bXpvbmUuaCBiL2luY2x1ZGUvbGludXgvbW16b25lLmgKaW5kZXggNTFlOTBlMWVlYzNmLi44ZDI0 NWM1M2ZmMjkgMTAwNjQ0Ci0tLSBhL2luY2x1ZGUvbGludXgvbW16b25lLmgKKysrIGIvaW5jbHVk ZS9saW51eC9tbXpvbmUuaApAQCAtMzkxLDYgKzM5MSw4IEBAIHN0cnVjdCBscnVfZ2VuX3N0cnVj dCB7CiAJdW5zaWduZWQgbG9uZyBtYXhfc2VxOwogCS8qIHRoZSBldmljdGlvbiBpbmNyZW1lbnRz IHRoZSBvbGRlc3QgZ2VuZXJhdGlvbiBudW1iZXJzICovCiAJdW5zaWduZWQgbG9uZyBtaW5fc2Vx W0FOT05fQU5EX0ZJTEVdOworCS8qIHRoZSBiaXJ0aCB0aW1lIG9mIGVhY2ggZ2VuZXJhdGlvbiBp biBqaWZmaWVzICovCisJdW5zaWduZWQgbG9uZyB0aW1lc3RhbXBzW01BWF9OUl9HRU5TXTsKIAkv KiB0aGUgbXVsdGktZ2VuIExSVSBsaXN0cyAqLwogCXN0cnVjdCBsaXN0X2hlYWQgbGlzdHNbTUFY X05SX0dFTlNdW0FOT05fQU5EX0ZJTEVdW01BWF9OUl9aT05FU107CiAJLyogdGhlIHNpemVzIG9m IHRoZSBhYm92ZSBsaXN0cyAqLwpkaWZmIC0tZ2l0IGEvbW0vdm1zY2FuLmMgYi9tbS92bXNjYW4u YwppbmRleCA1NWNjN2Q2YjAxOGIuLjZhYTA4M2I4YmIyNiAxMDA2NDQKLS0tIGEvbW0vdm1zY2Fu LmMKKysrIGIvbW0vdm1zY2FuLmMKQEAgLTQyMjksNiArNDIyOSw3IEBAIHN0YXRpYyB2b2lkIGlu Y19tYXhfc2VxKHN0cnVjdCBscnV2ZWMgKmxydXZlYykKIAlmb3IgKHR5cGUgPSAwOyB0eXBlIDwg QU5PTl9BTkRfRklMRTsgdHlwZSsrKQogCQlyZXNldF9jdHJsX3BvcyhscnV2ZWMsIHR5cGUsIGZh bHNlKTsKIAorCVdSSVRFX09OQ0UobHJ1Z2VuLT50aW1lc3RhbXBzW25leHRdLCBqaWZmaWVzKTsK IAkvKiBtYWtlIHN1cmUgcHJlY2VkaW5nIG1vZGlmaWNhdGlvbnMgYXBwZWFyICovCiAJc21wX3N0 b3JlX3JlbGVhc2UoJmxydWdlbi0+bWF4X3NlcSwgbHJ1Z2VuLT5tYXhfc2VxICsgMSk7CiAKQEAg LTQzNDAsNyArNDM0MSw4IEBAIHN0YXRpYyBsb25nIGdldF9ucl9ldmljdGFibGUoc3RydWN0IGxy dXZlYyAqbHJ1dmVjLCB1bnNpZ25lZCBsb25nIG1heF9zZXEsCiAJcmV0dXJuIHRvdGFsID4gMCA/ IHRvdGFsIDogMDsKIH0KIAotc3RhdGljIHZvaWQgYWdlX2xydXZlYyhzdHJ1Y3QgbHJ1dmVjICps cnV2ZWMsIHN0cnVjdCBzY2FuX2NvbnRyb2wgKnNjKQorc3RhdGljIGJvb2wgYWdlX2xydXZlYyhz dHJ1Y3QgbHJ1dmVjICpscnV2ZWMsIHN0cnVjdCBzY2FuX2NvbnRyb2wgKnNjLAorCQkgICAgICAg dW5zaWduZWQgbG9uZyBtaW5fdHRsKQogewogCWJvb2wgbmVlZF9hZ2luZzsKIAlsb25nIG5yX3Rv X3NjYW47CkBAIC00MzQ5LDE0ICs0MzUxLDIyIEBAIHN0YXRpYyB2b2lkIGFnZV9scnV2ZWMoc3Ry dWN0IGxydXZlYyAqbHJ1dmVjLCBzdHJ1Y3Qgc2Nhbl9jb250cm9sICpzYykKIAlERUZJTkVfTUFY X1NFUShscnV2ZWMpOwogCURFRklORV9NSU5fU0VRKGxydXZlYyk7CiAKKwlpZiAobWluX3R0bCkg eworCQlpbnQgZ2VuID0gbHJ1X2dlbl9mcm9tX3NlcShtaW5fc2VxW0xSVV9HRU5fRklMRV0pOwor CQl1bnNpZ25lZCBsb25nIGJpcnRoID0gUkVBRF9PTkNFKGxydXZlYy0+bHJ1Z2VuLnRpbWVzdGFt cHNbZ2VuXSk7CisKKwkJaWYgKHRpbWVfaXNfYWZ0ZXJfamlmZmllcyhiaXJ0aCArIG1pbl90dGwp KQorCQkJcmV0dXJuIGZhbHNlOworCX0KKwogCW1lbV9jZ3JvdXBfY2FsY3VsYXRlX3Byb3RlY3Rp b24oTlVMTCwgbWVtY2cpOwogCiAJaWYgKG1lbV9jZ3JvdXBfYmVsb3dfbWluKG1lbWNnKSkKLQkJ cmV0dXJuOworCQlyZXR1cm4gZmFsc2U7CiAKIAlucl90b19zY2FuID0gZ2V0X25yX2V2aWN0YWJs ZShscnV2ZWMsIG1heF9zZXEsIG1pbl9zZXEsIHN3YXBwaW5lc3MsICZuZWVkX2FnaW5nKTsKIAlp ZiAoIW5yX3RvX3NjYW4pCi0JCXJldHVybjsKKwkJcmV0dXJuIGZhbHNlOwogCiAJbnJfdG9fc2Nh biA+Pj0gc2MtPnByaW9yaXR5OwogCkBAIC00MzY1LDExICs0Mzc1LDE4IEBAIHN0YXRpYyB2b2lk IGFnZV9scnV2ZWMoc3RydWN0IGxydXZlYyAqbHJ1dmVjLCBzdHJ1Y3Qgc2Nhbl9jb250cm9sICpz YykKIAogCWlmIChucl90b19zY2FuICYmIG5lZWRfYWdpbmcgJiYgKCFtZW1fY2dyb3VwX2JlbG93 X2xvdyhtZW1jZykgfHwgc2MtPm1lbWNnX2xvd19yZWNsYWltKSkKIAkJdHJ5X3RvX2luY19tYXhf c2VxKGxydXZlYywgbWF4X3NlcSwgc2MsIHN3YXBwaW5lc3MsIGZhbHNlKTsKKworCXJldHVybiB0 cnVlOwogfQogCisvKiB0byBwcm90ZWN0IHRoZSB3b3JraW5nIHNldCBvZiB0aGUgbGFzdCBOIGpp ZmZpZXMgKi8KK3N0YXRpYyB1bnNpZ25lZCBsb25nIGxydV9nZW5fbWluX3R0bCBfX3JlYWRfbW9z dGx5OworCiBzdGF0aWMgdm9pZCBscnVfZ2VuX2FnZV9ub2RlKHN0cnVjdCBwZ2xpc3RfZGF0YSAq cGdkYXQsIHN0cnVjdCBzY2FuX2NvbnRyb2wgKnNjKQogewogCXN0cnVjdCBtZW1fY2dyb3VwICpt ZW1jZzsKKwlib29sIHN1Y2Nlc3MgPSBmYWxzZTsKKwl1bnNpZ25lZCBsb25nIG1pbl90dGwgPSBS RUFEX09OQ0UobHJ1X2dlbl9taW5fdHRsKTsKIAogCVZNX0JVR19PTighY3VycmVudF9pc19rc3dh cGQoKSk7CiAKQEAgLTQzOTUsMTIgKzQ0MTIsMjkgQEAgc3RhdGljIHZvaWQgbHJ1X2dlbl9hZ2Vf bm9kZShzdHJ1Y3QgcGdsaXN0X2RhdGEgKnBnZGF0LCBzdHJ1Y3Qgc2Nhbl9jb250cm9sICpzYykK IAlkbyB7CiAJCXN0cnVjdCBscnV2ZWMgKmxydXZlYyA9IG1lbV9jZ3JvdXBfbHJ1dmVjKG1lbWNn LCBwZ2RhdCk7CiAKLQkJYWdlX2xydXZlYyhscnV2ZWMsIHNjKTsKKwkJaWYgKGFnZV9scnV2ZWMo bHJ1dmVjLCBzYywgbWluX3R0bCkpCisJCQlzdWNjZXNzID0gdHJ1ZTsKIAogCQljb25kX3Jlc2No ZWQoKTsKIAl9IHdoaWxlICgobWVtY2cgPSBtZW1fY2dyb3VwX2l0ZXIoTlVMTCwgbWVtY2csIE5V TEwpKSk7CiAKIAljdXJyZW50LT5yZWNsYWltX3N0YXRlLT5tbV93YWxrID0gTlVMTDsKKworCS8q CisJICogVGhlIG1haW4gZ29hbCBpcyB0byBPT00ga2lsbCBpZiBldmVyeSBnZW5lcmF0aW9uIGZy b20gYWxsIG1lbWNncyBpcworCSAqIHlvdW5nZXIgdGhhbiBtaW5fdHRsLiBIb3dldmVyLCBhbm90 aGVyIHRoZW9yZXRpY2FsIHBvc3NpYmlsaXR5IGlzIGFsbAorCSAqIG1lbWNncyBhcmUgZWl0aGVy IGJlbG93IG1pbiBvciBlbXB0eS4KKwkgKi8KKwlpZiAoIXN1Y2Nlc3MgJiYgbXV0ZXhfdHJ5bG9j aygmb29tX2xvY2spKSB7CisJCXN0cnVjdCBvb21fY29udHJvbCBvYyA9IHsKKwkJCS5nZnBfbWFz ayA9IHNjLT5nZnBfbWFzaywKKwkJCS5vcmRlciA9IHNjLT5vcmRlciwKKwkJfTsKKworCQlvdXRf b2ZfbWVtb3J5KCZvYyk7CisKKwkJbXV0ZXhfdW5sb2NrKCZvb21fbG9jayk7CisJfQogfQogCiAv KgpAQCAtNTExMiw2ICs1MTQ2LDI4IEBAIHN0YXRpYyB2b2lkIGxydV9nZW5fY2hhbmdlX3N0YXRl KGJvb2wgZW5hYmxlKQogICogICAgICAgICAgICAgICAgICAgICAgICAgIHN5c2ZzIGludGVyZmFj ZQogICoqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioq KioqKioqKioqKioqKioqKioqKioqKioqKi8KIAorc3RhdGljIHNzaXplX3Qgc2hvd19taW5fdHRs KHN0cnVjdCBrb2JqZWN0ICprb2JqLCBzdHJ1Y3Qga29ial9hdHRyaWJ1dGUgKmF0dHIsIGNoYXIg KmJ1ZikKK3sKKwlyZXR1cm4gc3ByaW50ZihidWYsICIldVxuIiwgamlmZmllc190b19tc2VjcyhS RUFEX09OQ0UobHJ1X2dlbl9taW5fdHRsKSkpOworfQorCitzdGF0aWMgc3NpemVfdCBzdG9yZV9t aW5fdHRsKHN0cnVjdCBrb2JqZWN0ICprb2JqLCBzdHJ1Y3Qga29ial9hdHRyaWJ1dGUgKmF0dHIs CisJCQkgICAgIGNvbnN0IGNoYXIgKmJ1Ziwgc2l6ZV90IGxlbikKK3sKKwl1bnNpZ25lZCBpbnQg bXNlY3M7CisKKwlpZiAoa3N0cnRvdWludChidWYsIDAsICZtc2VjcykpCisJCXJldHVybiAtRUlO VkFMOworCisJV1JJVEVfT05DRShscnVfZ2VuX21pbl90dGwsIG1zZWNzX3RvX2ppZmZpZXMobXNl Y3MpKTsKKworCXJldHVybiBsZW47Cit9CisKK3N0YXRpYyBzdHJ1Y3Qga29ial9hdHRyaWJ1dGUg bHJ1X2dlbl9taW5fdHRsX2F0dHIgPSBfX0FUVFIoCisJbWluX3R0bF9tcywgMDY0NCwgc2hvd19t aW5fdHRsLCBzdG9yZV9taW5fdHRsCispOworCiBzdGF0aWMgc3NpemVfdCBzaG93X2VuYWJsZShz dHJ1Y3Qga29iamVjdCAqa29iaiwgc3RydWN0IGtvYmpfYXR0cmlidXRlICphdHRyLCBjaGFyICpi dWYpCiB7CiAJdW5zaWduZWQgaW50IGNhcHMgPSAwOwpAQCAtNTE2MCw2ICs1MjE2LDcgQEAgc3Rh dGljIHN0cnVjdCBrb2JqX2F0dHJpYnV0ZSBscnVfZ2VuX2VuYWJsZWRfYXR0ciA9IF9fQVRUUigK ICk7CiAKIHN0YXRpYyBzdHJ1Y3QgYXR0cmlidXRlICpscnVfZ2VuX2F0dHJzW10gPSB7CisJJmxy dV9nZW5fbWluX3R0bF9hdHRyLmF0dHIsCiAJJmxydV9nZW5fZW5hYmxlZF9hdHRyLmF0dHIsCiAJ TlVMTAogfTsKQEAgLTUxNzUsMTIgKzUyMzIsMTYgQEAgc3RhdGljIHN0cnVjdCBhdHRyaWJ1dGVf Z3JvdXAgbHJ1X2dlbl9hdHRyX2dyb3VwID0gewogCiB2b2lkIGxydV9nZW5faW5pdF9scnV2ZWMo c3RydWN0IGxydXZlYyAqbHJ1dmVjKQogeworCWludCBpOwogCWludCBnZW4sIHR5cGUsIHpvbmU7 CiAJc3RydWN0IGxydV9nZW5fc3RydWN0ICpscnVnZW4gPSAmbHJ1dmVjLT5scnVnZW47CiAKIAls cnVnZW4tPm1heF9zZXEgPSBNSU5fTlJfR0VOUyArIDE7CiAJbHJ1Z2VuLT5lbmFibGVkID0gbHJ1 X2dlbl9lbmFibGVkKCk7CiAKKwlmb3IgKGkgPSAwOyBpIDw9IE1JTl9OUl9HRU5TICsgMTsgaSsr KQorCQlscnVnZW4tPnRpbWVzdGFtcHNbaV0gPSBqaWZmaWVzOworCiAJZm9yX2VhY2hfZ2VuX3R5 cGVfem9uZShnZW4sIHR5cGUsIHpvbmUpCiAJCUlOSVRfTElTVF9IRUFEKCZscnVnZW4tPmxpc3Rz W2dlbl1bdHlwZV1bem9uZV0pOwogCi0tIAoyLjM1LjEuNjE2LmcwYmRjYmI0NDY0LWdvb2cKCgpf X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fXwpsaW51eC1hcm0t a2VybmVsIG1haWxpbmcgbGlzdApsaW51eC1hcm0ta2VybmVsQGxpc3RzLmluZnJhZGVhZC5vcmcK aHR0cDovL2xpc3RzLmluZnJhZGVhZC5vcmcvbWFpbG1hbi9saXN0aW5mby9saW51eC1hcm0ta2Vy bmVsCg==