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 0E9C2C3F6B0 for ; Mon, 15 Aug 2022 07:15:51 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S241598AbiHOHPk (ORCPT ); Mon, 15 Aug 2022 03:15:40 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:46778 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S241481AbiHOHPG (ORCPT ); Mon, 15 Aug 2022 03:15:06 -0400 Received: from mail-yw1-x114a.google.com (mail-yw1-x114a.google.com [IPv6:2607:f8b0:4864:20::114a]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id A4FEE1D0C4 for ; Mon, 15 Aug 2022 00:14:30 -0700 (PDT) Received: by mail-yw1-x114a.google.com with SMTP id 00721157ae682-31f4450c963so51610597b3.19 for ; Mon, 15 Aug 2022 00:14:30 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20210112; h=content-transfer-encoding:cc:to:from:subject:references :mime-version:message-id:in-reply-to:date:from:to:cc; bh=ZVZnfUOowkkoPsI8h5bMF1in9hHbeOK510g3NynOpVI=; b=G+7/wtwFGz44gYsEx4BnZB/tufCcUsktz0CnefTEdu5QflQPVdJtDzg+lhOhC2eslS 5EV+GqRnAlSCGaaNir/Uwe4V4LOS8MLSaPsPiU7NjH4MIFjRrXAfDGmVoVfJ//GQ556l A2hSH8z5PtRv0KUXtHBcEynh1iiqviKbgTUqImAlQK0aLxjH6byapkAXTkAN76rgsMvG uzSnWNQbwcIjxDSnpzxO1SnCebeBio07VwdTEEl9EEPm8oFN6NIalLRqf4CuhPTikyZe XUDVYs7oo6j9ZbsO6MFHqZfyd218jJE8yNmCViAi5BaRPE515XOjkyaAYUG+4Ygy8wDz Tiwg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:cc:to:from:subject:references :mime-version:message-id:in-reply-to:date:x-gm-message-state:from:to :cc; bh=ZVZnfUOowkkoPsI8h5bMF1in9hHbeOK510g3NynOpVI=; b=2LOM2DdCOk667KhBJ6mQqhVJrrJRT0Ea7+VM+q9B6aib03X5FBmPzznbSOjbez5PzT KaTVEoazYIv0Pn/DZN/xr0t1AutQ8LAx5tf5KQQ5pQNQAZpdVmmm5RTUtYZpnggNy9RX RSoKItA130NoA1WtE8X8BhUXmkMHfcGe9BzfIfVHfUg073QJ8x+46KHgihmVDBUIR/UB rVAcE4cgYyeOzQvAdshSBsGutak/PPXGR756ZQHCD2ftXkmYCB1kGDNiVWJfWxxEkreO 3LFK8x7o6DATW42X2eUhtk0VN7iUPeZU4mZIfWQe1fF/IlyAdhVcWPWEtYimiHOjyVkM Ag2g== X-Gm-Message-State: ACgBeo00L1o2S5DzJBxGliM/nmS3OOurGugXj8iQuaVh455fTvnCKmTI XWLQ1++DiG/jvFohxUV+lPmrKqRogDo= X-Google-Smtp-Source: AA6agR5nBs6VfOw78IT5aTAEoBSIvIu3gVqPaKS2BwbV7jH3AoxMDc+MitmVIBBk/YEeJwQN0b04SoteyIQ= X-Received: from yuzhao.bld.corp.google.com ([2620:15c:183:200:d91:5887:ac93:ddf0]) (user=yuzhao job=sendgmr) by 2002:a81:6a06:0:b0:31f:3df9:ec10 with SMTP id f6-20020a816a06000000b0031f3df9ec10mr11850348ywc.223.1660547669627; Mon, 15 Aug 2022 00:14:29 -0700 (PDT) Date: Mon, 15 Aug 2022 01:13:30 -0600 In-Reply-To: <20220815071332.627393-1-yuzhao@google.com> Message-Id: <20220815071332.627393-12-yuzhao@google.com> Mime-Version: 1.0 References: <20220815071332.627393-1-yuzhao@google.com> X-Mailer: git-send-email 2.37.1.595.g718a3a8f04-goog Subject: [PATCH v14 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 , Johannes Weiner , Jonathan Corbet , Linus Torvalds , Matthew Wilcox , Mel Gorman , Michael Larabel , Michal Hocko , Mike Rapoport , Peter Zijlstra , Tejun Heo , Vlastimil Babka , Will Deacon , linux-arm-kernel@lists.infradead.org, linux-doc@vger.kernel.org, linux-kernel@vger.kernel.org, linux-mm@kvack.org, x86@kernel.org, page-reclaim@google.com, 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 [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/r/Ydza%2FzXKY9ATRoh6@google.com/ [2] https://lore.kernel.org/r/20101028191523.GA14972@google.com/ 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 | 75 +++++++++++++++++++++++++++++++++++++++--- 2 files changed, 73 insertions(+), 4 deletions(-) diff --git a/include/linux/mmzone.h b/include/linux/mmzone.h index 7f8c529b46ad..2558b57a05bc 100644 --- a/include/linux/mmzone.h +++ b/include/linux/mmzone.h @@ -422,6 +422,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, lazily sorted on eviction */ struct list_head lists[MAX_NR_GENS][ANON_AND_FILE][MAX_NR_ZONES]; /* the multi-gen LRU sizes, eventually consistent */ diff --git a/mm/vmscan.c b/mm/vmscan.c index 5502c553e32e..08727f3b7171 100644 --- a/mm/vmscan.c +++ b/mm/vmscan.c @@ -4298,6 +4298,7 @@ static void inc_max_seq(struct lruvec *lruvec, bool c= an_swap) 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 @@ -4424,7 +4425,7 @@ static unsigned long get_nr_evictable(struct lruvec *= lruvec, unsigned long max_s return total; } =20 -static void age_lruvec(struct lruvec *lruvec, struct scan_control *sc) +static bool age_lruvec(struct lruvec *lruvec, struct scan_control *sc, uns= igned long min_ttl) { bool need_aging; unsigned long nr_to_scan; @@ -4438,21 +4439,40 @@ static void age_lruvec(struct lruvec *lruvec, struc= t scan_control *sc) 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 mem_cgroup_online(memcg) ? sc->priority : 0; =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; + + /* the size is likely too small to be helpful */ + if (!nr_to_scan && sc->priority !=3D DEF_PRIORITY) + return false; + } + if (nr_to_scan && need_aging) try_to_inc_max_seq(lruvec, max_seq, sc, swappiness); + + 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_WARN_ON_ONCE(!current_is_kswapd()); =20 @@ -4478,12 +4498,32 @@ 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 clear_mm_walk(); + + /* check the order to exclude compaction-induced reclaim */ + if (success || !min_ttl || sc->order) + return; + + /* + * The main goal is to OOM kill if every generation from all memcgs is + * younger than min_ttl. However, another possibility is all memcgs are + * either below min or empty. + */ + if (mutex_trylock(&oom_lock)) { + struct oom_control oc =3D { + .gfp_mask =3D sc->gfp_mask, + }; + + out_of_memory(&oc); + + mutex_unlock(&oom_lock); + } } =20 /* @@ -5210,6 +5250,28 @@ static void lru_gen_change_state(bool enabled) * 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_enabled(struct kobject *kobj, struct kobj_attribute *a= ttr, char *buf) { unsigned int caps =3D 0; @@ -5258,6 +5320,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 }; @@ -5273,12 +5336,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.37.1.595.g718a3a8f04-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 B9023C00140 for ; Mon, 15 Aug 2022 07:17:37 +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=igNDv7XlU7hKefddVT7yvOucT65ORN2cxqSVDQC07TY=; b=nHDsZJJxS5ncOcbGYKY6rHghYw SY7yblLDPTBw42FUE/bUHrUv4E8+IvWveVdX6Aua+eLJ2R9ff1cR9juZCbqBgP4nKW11gGl+nZ+qP 5HUY9GLIdEvgfdF5vixi3vTB67Br99ZKIuOrR9tkInT7ClkWWU3KDBiMHQjY3vEFs92gZid3omq9l 7Oa3cmCiZSz/SjEzq+37tjoPisnIaEmOs/didbtzqiiAg9QRN52ZSZNmGtwlJt/jC8ZcYxXAAly5o J1lTOsXjELyWrqUkuOHUC6S9OSvIiZ4s/L9iz1pbb8jjx2UAFsklu1kHEBbWO4xEH9nR7xsjgiUrq 6tlIXPvw==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1oNUKY-00COoR-Qc; Mon, 15 Aug 2022 07:16:11 +0000 Received: from mail-yw1-x114a.google.com ([2607:f8b0:4864:20::114a]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1oNUIx-00CNcs-2Z for linux-arm-kernel@lists.infradead.org; Mon, 15 Aug 2022 07:14:34 +0000 Received: by mail-yw1-x114a.google.com with SMTP id 00721157ae682-3238ce833beso51499087b3.11 for ; Mon, 15 Aug 2022 00:14:29 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20210112; h=content-transfer-encoding:cc:to:from:subject:references :mime-version:message-id:in-reply-to:date:from:to:cc; bh=ZVZnfUOowkkoPsI8h5bMF1in9hHbeOK510g3NynOpVI=; b=G+7/wtwFGz44gYsEx4BnZB/tufCcUsktz0CnefTEdu5QflQPVdJtDzg+lhOhC2eslS 5EV+GqRnAlSCGaaNir/Uwe4V4LOS8MLSaPsPiU7NjH4MIFjRrXAfDGmVoVfJ//GQ556l A2hSH8z5PtRv0KUXtHBcEynh1iiqviKbgTUqImAlQK0aLxjH6byapkAXTkAN76rgsMvG uzSnWNQbwcIjxDSnpzxO1SnCebeBio07VwdTEEl9EEPm8oFN6NIalLRqf4CuhPTikyZe XUDVYs7oo6j9ZbsO6MFHqZfyd218jJE8yNmCViAi5BaRPE515XOjkyaAYUG+4Ygy8wDz Tiwg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:cc:to:from:subject:references :mime-version:message-id:in-reply-to:date:x-gm-message-state:from:to :cc; bh=ZVZnfUOowkkoPsI8h5bMF1in9hHbeOK510g3NynOpVI=; b=3CnTNuDvvG+MfK8nEu+HPJ4SA23sw3imjD+iRVZ61eUzoKlfGcjE6OcyHJmDawvalb SGq6iderfe2qKiRrLSdzoZ1SAEgba/Y4lwN7QXGko0X2o7fiIKLhNpes3vrB2cIkxuAG U5YAEv3Y8Xr7cHarnPScyfutc7nzpu46cMago10N7yFCXmdAlFWj8+zCblq3egyDfbBn tWcTvaRHzUj4aGG6nhAdGNTdJ/vujP3Qe37Q6gpO15KjMjKDf2Gc2p200mBXf/52Qwtl c4Ad1vFlbp1mQGOesHl178KRoL4/w7QSnTfDMRvz/Nu7MaJVUtL4LgKERW2tcnrazHam YGAA== X-Gm-Message-State: ACgBeo2mXgMIeuflUm4xUdXLrRHaL/taGPJ6W3dQsB5/TwTEmmwOyjY3 4izzio6thYRfDAo77hbMP7yETFJhFGs= X-Google-Smtp-Source: AA6agR5nBs6VfOw78IT5aTAEoBSIvIu3gVqPaKS2BwbV7jH3AoxMDc+MitmVIBBk/YEeJwQN0b04SoteyIQ= X-Received: from yuzhao.bld.corp.google.com ([2620:15c:183:200:d91:5887:ac93:ddf0]) (user=yuzhao job=sendgmr) by 2002:a81:6a06:0:b0:31f:3df9:ec10 with SMTP id f6-20020a816a06000000b0031f3df9ec10mr11850348ywc.223.1660547669627; Mon, 15 Aug 2022 00:14:29 -0700 (PDT) Date: Mon, 15 Aug 2022 01:13:30 -0600 In-Reply-To: <20220815071332.627393-1-yuzhao@google.com> Message-Id: <20220815071332.627393-12-yuzhao@google.com> Mime-Version: 1.0 References: <20220815071332.627393-1-yuzhao@google.com> X-Mailer: git-send-email 2.37.1.595.g718a3a8f04-goog Subject: [PATCH v14 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 , Johannes Weiner , Jonathan Corbet , Linus Torvalds , Matthew Wilcox , Mel Gorman , Michael Larabel , Michal Hocko , Mike Rapoport , Peter Zijlstra , Tejun Heo , Vlastimil Babka , Will Deacon , linux-arm-kernel@lists.infradead.org, linux-doc@vger.kernel.org, linux-kernel@vger.kernel.org, linux-mm@kvack.org, x86@kernel.org, page-reclaim@google.com, 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-20220815_001431_175874_CBB1C20B X-CRM114-Status: GOOD ( 23.28 ) 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 ZSBPT00ga2lsbHMuCgpDb21wYXJlZCB3aXRoIHRoZSBzaXplLWJhc2VkIGFwcHJvYWNoIFsyXSwg dGhpcyB0aW1lLWJhc2VkIGFwcHJvYWNoCmhhcyB0aGUgZm9sbG93aW5nIGFkdmFudGFnZXM6CjEu IEl0IGlzIGVhc2llciB0byBjb25maWd1cmUgYmVjYXVzZSBpdCBpcyBhZ25vc3RpYyB0byBhcHBs aWNhdGlvbnMKICAgYW5kIG1lbW9yeSBzaXplcy4KMi4gSXQgaXMgbW9yZSByZWxpYWJsZSBiZWNh dXNlIGl0IGlzIGRpcmVjdGx5IHdpcmVkIHRvIHRoZSBPT00ga2lsbGVyLgoKWzFdIGh0dHBzOi8v bG9yZS5rZXJuZWwub3JnL3IvWWR6YSUyRnpYS1k5QVRSb2g2QGdvb2dsZS5jb20vClsyXSBodHRw czovL2xvcmUua2VybmVsLm9yZy9yLzIwMTAxMDI4MTkxNTIzLkdBMTQ5NzJAZ29vZ2xlLmNvbS8K ClNpZ25lZC1vZmYtYnk6IFl1IFpoYW8gPHl1emhhb0Bnb29nbGUuY29tPgpBY2tlZC1ieTogQnJp YW4gR2VmZm9uIDxiZ2VmZm9uQGdvb2dsZS5jb20+CkFja2VkLWJ5OiBKYW4gQWxleGFuZGVyIFN0 ZWZmZW5zIChoZWZ0aWcpIDxoZWZ0aWdAYXJjaGxpbnV4Lm9yZz4KQWNrZWQtYnk6IE9sZWtzYW5k ciBOYXRhbGVua28gPG9sZWtzYW5kckBuYXRhbGVua28ubmFtZT4KQWNrZWQtYnk6IFN0ZXZlbiBC YXJyZXR0IDxzdGV2ZW5AbGlxdW9yaXgubmV0PgpBY2tlZC1ieTogU3VsZWltYW4gU291aGxhbCA8 c3VsZWltYW5AZ29vZ2xlLmNvbT4KVGVzdGVkLWJ5OiBEYW5pZWwgQnlybmUgPGRqYnlybmVAbXR1 LmVkdT4KVGVzdGVkLWJ5OiBEb25hbGQgQ2FyciA8ZEBjaGFvcy1yZWlucy5jb20+ClRlc3RlZC1i eTogSG9sZ2VyIEhvZmZzdMOkdHRlIDxob2xnZXJAYXBwbGllZC1hc3luY2hyb255LmNvbT4KVGVz dGVkLWJ5OiBLb25zdGFudGluIEtoYXJsYW1vdiA8SGktQW5nZWxAeWFuZGV4LnJ1PgpUZXN0ZWQt Ynk6IFNodWFuZyBaaGFpIDxzemhhaTJAY3Mucm9jaGVzdGVyLmVkdT4KVGVzdGVkLWJ5OiBTb2Zp YSBUcmluaCA8c29maWEudHJpbmhAZWRpLndvcmtzPgpUZXN0ZWQtYnk6IFZhaWJoYXYgSmFpbiA8 dmFpYmhhdkBsaW51eC5pYm0uY29tPgotLS0KIGluY2x1ZGUvbGludXgvbW16b25lLmggfCAgMiAr KwogbW0vdm1zY2FuLmMgICAgICAgICAgICB8IDc1ICsrKysrKysrKysrKysrKysrKysrKysrKysr KysrKysrKysrKysrKy0tLQogMiBmaWxlcyBjaGFuZ2VkLCA3MyBpbnNlcnRpb25zKCspLCA0IGRl bGV0aW9ucygtKQoKZGlmZiAtLWdpdCBhL2luY2x1ZGUvbGludXgvbW16b25lLmggYi9pbmNsdWRl L2xpbnV4L21tem9uZS5oCmluZGV4IDdmOGM1MjliNDZhZC4uMjU1OGI1N2EwNWJjIDEwMDY0NAot LS0gYS9pbmNsdWRlL2xpbnV4L21tem9uZS5oCisrKyBiL2luY2x1ZGUvbGludXgvbW16b25lLmgK QEAgLTQyMiw2ICs0MjIsOCBAQCBzdHJ1Y3QgbHJ1X2dlbl9zdHJ1Y3QgewogCXVuc2lnbmVkIGxv bmcgbWF4X3NlcTsKIAkvKiB0aGUgZXZpY3Rpb24gaW5jcmVtZW50cyB0aGUgb2xkZXN0IGdlbmVy YXRpb24gbnVtYmVycyAqLwogCXVuc2lnbmVkIGxvbmcgbWluX3NlcVtBTk9OX0FORF9GSUxFXTsK KwkvKiB0aGUgYmlydGggdGltZSBvZiBlYWNoIGdlbmVyYXRpb24gaW4gamlmZmllcyAqLworCXVu c2lnbmVkIGxvbmcgdGltZXN0YW1wc1tNQVhfTlJfR0VOU107CiAJLyogdGhlIG11bHRpLWdlbiBM UlUgbGlzdHMsIGxhemlseSBzb3J0ZWQgb24gZXZpY3Rpb24gKi8KIAlzdHJ1Y3QgbGlzdF9oZWFk IGxpc3RzW01BWF9OUl9HRU5TXVtBTk9OX0FORF9GSUxFXVtNQVhfTlJfWk9ORVNdOwogCS8qIHRo ZSBtdWx0aS1nZW4gTFJVIHNpemVzLCBldmVudHVhbGx5IGNvbnNpc3RlbnQgKi8KZGlmZiAtLWdp dCBhL21tL3Ztc2Nhbi5jIGIvbW0vdm1zY2FuLmMKaW5kZXggNTUwMmM1NTNlMzJlLi4wODcyN2Yz YjcxNzEgMTAwNjQ0Ci0tLSBhL21tL3Ztc2Nhbi5jCisrKyBiL21tL3Ztc2Nhbi5jCkBAIC00Mjk4 LDYgKzQyOTgsNyBAQCBzdGF0aWMgdm9pZCBpbmNfbWF4X3NlcShzdHJ1Y3QgbHJ1dmVjICpscnV2 ZWMsIGJvb2wgY2FuX3N3YXApCiAJZm9yICh0eXBlID0gMDsgdHlwZSA8IEFOT05fQU5EX0ZJTEU7 IHR5cGUrKykKIAkJcmVzZXRfY3RybF9wb3MobHJ1dmVjLCB0eXBlLCBmYWxzZSk7CiAKKwlXUklU RV9PTkNFKGxydWdlbi0+dGltZXN0YW1wc1tuZXh0XSwgamlmZmllcyk7CiAJLyogbWFrZSBzdXJl IHByZWNlZGluZyBtb2RpZmljYXRpb25zIGFwcGVhciAqLwogCXNtcF9zdG9yZV9yZWxlYXNlKCZs cnVnZW4tPm1heF9zZXEsIGxydWdlbi0+bWF4X3NlcSArIDEpOwogCkBAIC00NDI0LDcgKzQ0MjUs NyBAQCBzdGF0aWMgdW5zaWduZWQgbG9uZyBnZXRfbnJfZXZpY3RhYmxlKHN0cnVjdCBscnV2ZWMg KmxydXZlYywgdW5zaWduZWQgbG9uZyBtYXhfcwogCXJldHVybiB0b3RhbDsKIH0KIAotc3RhdGlj IHZvaWQgYWdlX2xydXZlYyhzdHJ1Y3QgbHJ1dmVjICpscnV2ZWMsIHN0cnVjdCBzY2FuX2NvbnRy b2wgKnNjKQorc3RhdGljIGJvb2wgYWdlX2xydXZlYyhzdHJ1Y3QgbHJ1dmVjICpscnV2ZWMsIHN0 cnVjdCBzY2FuX2NvbnRyb2wgKnNjLCB1bnNpZ25lZCBsb25nIG1pbl90dGwpCiB7CiAJYm9vbCBu ZWVkX2FnaW5nOwogCXVuc2lnbmVkIGxvbmcgbnJfdG9fc2NhbjsKQEAgLTQ0MzgsMjEgKzQ0Mzks NDAgQEAgc3RhdGljIHZvaWQgYWdlX2xydXZlYyhzdHJ1Y3QgbHJ1dmVjICpscnV2ZWMsIHN0cnVj dCBzY2FuX2NvbnRyb2wgKnNjKQogCW1lbV9jZ3JvdXBfY2FsY3VsYXRlX3Byb3RlY3Rpb24oTlVM TCwgbWVtY2cpOwogCiAJaWYgKG1lbV9jZ3JvdXBfYmVsb3dfbWluKG1lbWNnKSkKLQkJcmV0dXJu OworCQlyZXR1cm4gZmFsc2U7CiAKIAlucl90b19zY2FuID0gZ2V0X25yX2V2aWN0YWJsZShscnV2 ZWMsIG1heF9zZXEsIG1pbl9zZXEsIHN3YXBwaW5lc3MsICZuZWVkX2FnaW5nKTsKIAlpZiAoIW5y X3RvX3NjYW4pCi0JCXJldHVybjsKKwkJcmV0dXJuIGZhbHNlOwogCiAJbnJfdG9fc2NhbiA+Pj0g bWVtX2Nncm91cF9vbmxpbmUobWVtY2cpID8gc2MtPnByaW9yaXR5IDogMDsKIAorCWlmIChtaW5f dHRsKSB7CisJCWludCBnZW4gPSBscnVfZ2VuX2Zyb21fc2VxKG1pbl9zZXFbTFJVX0dFTl9GSUxF XSk7CisJCXVuc2lnbmVkIGxvbmcgYmlydGggPSBSRUFEX09OQ0UobHJ1dmVjLT5scnVnZW4udGlt ZXN0YW1wc1tnZW5dKTsKKworCQlpZiAodGltZV9pc19hZnRlcl9qaWZmaWVzKGJpcnRoICsgbWlu X3R0bCkpCisJCQlyZXR1cm4gZmFsc2U7CisKKwkJLyogdGhlIHNpemUgaXMgbGlrZWx5IHRvbyBz bWFsbCB0byBiZSBoZWxwZnVsICovCisJCWlmICghbnJfdG9fc2NhbiAmJiBzYy0+cHJpb3JpdHkg IT0gREVGX1BSSU9SSVRZKQorCQkJcmV0dXJuIGZhbHNlOworCX0KKwogCWlmIChucl90b19zY2Fu ICYmIG5lZWRfYWdpbmcpCiAJCXRyeV90b19pbmNfbWF4X3NlcShscnV2ZWMsIG1heF9zZXEsIHNj LCBzd2FwcGluZXNzKTsKKworCXJldHVybiB0cnVlOwogfQogCisvKiB0byBwcm90ZWN0IHRoZSB3 b3JraW5nIHNldCBvZiB0aGUgbGFzdCBOIGppZmZpZXMgKi8KK3N0YXRpYyB1bnNpZ25lZCBsb25n IGxydV9nZW5fbWluX3R0bCBfX3JlYWRfbW9zdGx5OworCiBzdGF0aWMgdm9pZCBscnVfZ2VuX2Fn ZV9ub2RlKHN0cnVjdCBwZ2xpc3RfZGF0YSAqcGdkYXQsIHN0cnVjdCBzY2FuX2NvbnRyb2wgKnNj KQogewogCXN0cnVjdCBtZW1fY2dyb3VwICptZW1jZzsKKwlib29sIHN1Y2Nlc3MgPSBmYWxzZTsK Kwl1bnNpZ25lZCBsb25nIG1pbl90dGwgPSBSRUFEX09OQ0UobHJ1X2dlbl9taW5fdHRsKTsKIAog CVZNX1dBUk5fT05fT05DRSghY3VycmVudF9pc19rc3dhcGQoKSk7CiAKQEAgLTQ0NzgsMTIgKzQ0 OTgsMzIgQEAgc3RhdGljIHZvaWQgbHJ1X2dlbl9hZ2Vfbm9kZShzdHJ1Y3QgcGdsaXN0X2RhdGEg KnBnZGF0LCBzdHJ1Y3Qgc2Nhbl9jb250cm9sICpzYykKIAlkbyB7CiAJCXN0cnVjdCBscnV2ZWMg KmxydXZlYyA9IG1lbV9jZ3JvdXBfbHJ1dmVjKG1lbWNnLCBwZ2RhdCk7CiAKLQkJYWdlX2xydXZl YyhscnV2ZWMsIHNjKTsKKwkJaWYgKGFnZV9scnV2ZWMobHJ1dmVjLCBzYywgbWluX3R0bCkpCisJ CQlzdWNjZXNzID0gdHJ1ZTsKIAogCQljb25kX3Jlc2NoZWQoKTsKIAl9IHdoaWxlICgobWVtY2cg PSBtZW1fY2dyb3VwX2l0ZXIoTlVMTCwgbWVtY2csIE5VTEwpKSk7CiAKIAljbGVhcl9tbV93YWxr KCk7CisKKwkvKiBjaGVjayB0aGUgb3JkZXIgdG8gZXhjbHVkZSBjb21wYWN0aW9uLWluZHVjZWQg cmVjbGFpbSAqLworCWlmIChzdWNjZXNzIHx8ICFtaW5fdHRsIHx8IHNjLT5vcmRlcikKKwkJcmV0 dXJuOworCisJLyoKKwkgKiBUaGUgbWFpbiBnb2FsIGlzIHRvIE9PTSBraWxsIGlmIGV2ZXJ5IGdl bmVyYXRpb24gZnJvbSBhbGwgbWVtY2dzIGlzCisJICogeW91bmdlciB0aGFuIG1pbl90dGwuIEhv d2V2ZXIsIGFub3RoZXIgcG9zc2liaWxpdHkgaXMgYWxsIG1lbWNncyBhcmUKKwkgKiBlaXRoZXIg YmVsb3cgbWluIG9yIGVtcHR5LgorCSAqLworCWlmIChtdXRleF90cnlsb2NrKCZvb21fbG9jaykp IHsKKwkJc3RydWN0IG9vbV9jb250cm9sIG9jID0geworCQkJLmdmcF9tYXNrID0gc2MtPmdmcF9t YXNrLAorCQl9OworCisJCW91dF9vZl9tZW1vcnkoJm9jKTsKKworCQltdXRleF91bmxvY2soJm9v bV9sb2NrKTsKKwl9CiB9CiAKIC8qCkBAIC01MjEwLDYgKzUyNTAsMjggQEAgc3RhdGljIHZvaWQg bHJ1X2dlbl9jaGFuZ2Vfc3RhdGUoYm9vbCBlbmFibGVkKQogICogICAgICAgICAgICAgICAgICAg ICAgICAgIHN5c2ZzIGludGVyZmFjZQogICoqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioq KioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKi8KIAorc3RhdGlj IHNzaXplX3Qgc2hvd19taW5fdHRsKHN0cnVjdCBrb2JqZWN0ICprb2JqLCBzdHJ1Y3Qga29ial9h dHRyaWJ1dGUgKmF0dHIsIGNoYXIgKmJ1ZikKK3sKKwlyZXR1cm4gc3ByaW50ZihidWYsICIldVxu IiwgamlmZmllc190b19tc2VjcyhSRUFEX09OQ0UobHJ1X2dlbl9taW5fdHRsKSkpOworfQorCitz dGF0aWMgc3NpemVfdCBzdG9yZV9taW5fdHRsKHN0cnVjdCBrb2JqZWN0ICprb2JqLCBzdHJ1Y3Qg a29ial9hdHRyaWJ1dGUgKmF0dHIsCisJCQkgICAgIGNvbnN0IGNoYXIgKmJ1Ziwgc2l6ZV90IGxl bikKK3sKKwl1bnNpZ25lZCBpbnQgbXNlY3M7CisKKwlpZiAoa3N0cnRvdWludChidWYsIDAsICZt c2VjcykpCisJCXJldHVybiAtRUlOVkFMOworCisJV1JJVEVfT05DRShscnVfZ2VuX21pbl90dGws IG1zZWNzX3RvX2ppZmZpZXMobXNlY3MpKTsKKworCXJldHVybiBsZW47Cit9CisKK3N0YXRpYyBz dHJ1Y3Qga29ial9hdHRyaWJ1dGUgbHJ1X2dlbl9taW5fdHRsX2F0dHIgPSBfX0FUVFIoCisJbWlu X3R0bF9tcywgMDY0NCwgc2hvd19taW5fdHRsLCBzdG9yZV9taW5fdHRsCispOworCiBzdGF0aWMg c3NpemVfdCBzaG93X2VuYWJsZWQoc3RydWN0IGtvYmplY3QgKmtvYmosIHN0cnVjdCBrb2JqX2F0 dHJpYnV0ZSAqYXR0ciwgY2hhciAqYnVmKQogewogCXVuc2lnbmVkIGludCBjYXBzID0gMDsKQEAg LTUyNTgsNiArNTMyMCw3IEBAIHN0YXRpYyBzdHJ1Y3Qga29ial9hdHRyaWJ1dGUgbHJ1X2dlbl9l bmFibGVkX2F0dHIgPSBfX0FUVFIoCiApOwogCiBzdGF0aWMgc3RydWN0IGF0dHJpYnV0ZSAqbHJ1 X2dlbl9hdHRyc1tdID0geworCSZscnVfZ2VuX21pbl90dGxfYXR0ci5hdHRyLAogCSZscnVfZ2Vu X2VuYWJsZWRfYXR0ci5hdHRyLAogCU5VTEwKIH07CkBAIC01MjczLDEyICs1MzM2LDE2IEBAIHN0 YXRpYyBzdHJ1Y3QgYXR0cmlidXRlX2dyb3VwIGxydV9nZW5fYXR0cl9ncm91cCA9IHsKIAogdm9p ZCBscnVfZ2VuX2luaXRfbHJ1dmVjKHN0cnVjdCBscnV2ZWMgKmxydXZlYykKIHsKKwlpbnQgaTsK IAlpbnQgZ2VuLCB0eXBlLCB6b25lOwogCXN0cnVjdCBscnVfZ2VuX3N0cnVjdCAqbHJ1Z2VuID0g JmxydXZlYy0+bHJ1Z2VuOwogCiAJbHJ1Z2VuLT5tYXhfc2VxID0gTUlOX05SX0dFTlMgKyAxOwog CWxydWdlbi0+ZW5hYmxlZCA9IGxydV9nZW5fZW5hYmxlZCgpOwogCisJZm9yIChpID0gMDsgaSA8 PSBNSU5fTlJfR0VOUyArIDE7IGkrKykKKwkJbHJ1Z2VuLT50aW1lc3RhbXBzW2ldID0gamlmZmll czsKKwogCWZvcl9lYWNoX2dlbl90eXBlX3pvbmUoZ2VuLCB0eXBlLCB6b25lKQogCQlJTklUX0xJ U1RfSEVBRCgmbHJ1Z2VuLT5saXN0c1tnZW5dW3R5cGVdW3pvbmVdKTsKIAotLSAKMi4zNy4xLjU5 NS5nNzE4YTNhOGYwNC1nb29nCgoKX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX18KbGludXgtYXJtLWtlcm5lbCBtYWlsaW5nIGxpc3QKbGludXgtYXJtLWtlcm5l bEBsaXN0cy5pbmZyYWRlYWQub3JnCmh0dHA6Ly9saXN0cy5pbmZyYWRlYWQub3JnL21haWxtYW4v bGlzdGluZm8vbGludXgtYXJtLWtlcm5lbAo=