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 4232EC433F5 for ; Thu, 7 Apr 2022 03:16:45 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S239751AbiDGDSh (ORCPT ); Wed, 6 Apr 2022 23:18:37 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:42654 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S239831AbiDGDSA (ORCPT ); Wed, 6 Apr 2022 23:18:00 -0400 Received: from mail-io1-xd4a.google.com (mail-io1-xd4a.google.com [IPv6:2607:f8b0:4864:20::d4a]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 56C5256209 for ; Wed, 6 Apr 2022 20:16:02 -0700 (PDT) Received: by mail-io1-xd4a.google.com with SMTP id y3-20020a056602178300b00645d25c30c1so2865893iox.6 for ; Wed, 06 Apr 2022 20:16:02 -0700 (PDT) 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=HWUMxX2GHTS2sU7fxsre8OtJa702AlX1YTnPsDpNr8g=; b=kEWUDg82syhNmhp0q7HqjSi4vFJg5Mty4gsGp6NRMkxh+MCtLCXh7q7Rzwxf2Q2REl ie+GOC4+EdvR+L9kohnAjyipDQ1jAgxBdI+KbUWtBeOKN/TMwA497dxdq13ArcbYq9Q7 W+Uajrf4CuwPO0Tefvr9x6hpDeHQ4xF7duBX/Ak4bMe8ruBSOYuFmkrdeLOdWHywfsrA u1VIEVtXVvsW0hcmdR4mReTX5fvzmpEntQ7R9rbWadDXQSb54Htj4pdZnz/GSF0QGbMr mbTw93nrTfhV2KtfABiIqkWfWYlW8Nqm+WXEoxuRbsznMiKgezd1gYQEwzgM021DZhOE ySCA== 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=HWUMxX2GHTS2sU7fxsre8OtJa702AlX1YTnPsDpNr8g=; b=5TKMdz1nBriQH4zOwQ8p5WYhaflv6w2R4t5pK1Iuhl3Y753Cgs3CmOCdkuaJv2FFtv rBi9nMVVY7qhB0GEI9oyp0Gebhf0uP2naPCY1QXe4ugNLDtfWiPCPTuRhm+SDGvKwYKy jZ79C8KBjpnAgaDIr5zsaic2jPFYIfhkww691MHYOY8sfD3Uek7iyovWyB66tM26ps2q vDKR66+8fua7OD5xbTn0zAsXBp7rM2bzk9jZhG3/8E0UNSqz5OAyMgT4QpFOeL1qVIuE iJjZQivu9tWceo36nqeeetOOYLVHcjLAb8tWGg92Bub2nNejjr3WTRoTzirldCGZL4k1 qJ7g== X-Gm-Message-State: AOAM532tG3TEEasQtMT7L5fUZSBJ0bA/ZpG7o1clco9Oo5+/yvSDw39G nyM8AEFwcVGR6Lx8Ia7WIMpWqSiaAXs= X-Google-Smtp-Source: ABdhPJwb4wEQfjqHqohpxKj+YJeCn5tBx/D54ak9fb5cGlgOENd8TrZRM2TWzSCsc2kdIv61Clqndub2Zyc= X-Received: from yuzhao.bld.corp.google.com ([2620:15c:183:200:9ea2:c755:ae22:6862]) (user=yuzhao job=sendgmr) by 2002:a92:cac3:0:b0:2c9:a265:4cab with SMTP id m3-20020a92cac3000000b002c9a2654cabmr5577295ilq.241.1649301361611; Wed, 06 Apr 2022 20:16:01 -0700 (PDT) Date: Wed, 6 Apr 2022 21:15:15 -0600 In-Reply-To: <20220407031525.2368067-1-yuzhao@google.com> Message-Id: <20220407031525.2368067-4-yuzhao@google.com> Mime-Version: 1.0 References: <20220407031525.2368067-1-yuzhao@google.com> X-Mailer: git-send-email 2.35.1.1094.g7c7d902a7c-goog Subject: [PATCH v10 03/14] mm/vmscan.c: refactor shrink_node() From: Yu Zhao To: Stephen Rothwell , linux-mm@kvack.org Cc: Andi Kleen , Andrew Morton , Aneesh Kumar , Barry Song <21cnbao@gmail.com>, 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, page-reclaim@google.com, x86@kernel.org, Yu Zhao , Barry Song , 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 This patch refactors shrink_node() to improve readability for the upcoming changes to mm/vmscan.c. Signed-off-by: Yu Zhao Reviewed-by: Barry Song 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 --- mm/vmscan.c | 198 +++++++++++++++++++++++++++------------------------- 1 file changed, 104 insertions(+), 94 deletions(-) diff --git a/mm/vmscan.c b/mm/vmscan.c index 1678802e03e7..2232cb55af41 100644 --- a/mm/vmscan.c +++ b/mm/vmscan.c @@ -2644,6 +2644,109 @@ enum scan_balance { SCAN_FILE, }; =20 +static void prepare_scan_count(pg_data_t *pgdat, struct scan_control *sc) +{ + unsigned long file; + struct lruvec *target_lruvec; + + target_lruvec =3D mem_cgroup_lruvec(sc->target_mem_cgroup, pgdat); + + /* + * Flush the memory cgroup stats, so that we read accurate per-memcg + * lruvec stats for heuristics. + */ + mem_cgroup_flush_stats(); + + /* + * Determine the scan balance between anon and file LRUs. + */ + spin_lock_irq(&target_lruvec->lru_lock); + sc->anon_cost =3D target_lruvec->anon_cost; + sc->file_cost =3D target_lruvec->file_cost; + spin_unlock_irq(&target_lruvec->lru_lock); + + /* + * Target desirable inactive:active list ratios for the anon + * and file LRU lists. + */ + if (!sc->force_deactivate) { + unsigned long refaults; + + refaults =3D lruvec_page_state(target_lruvec, + WORKINGSET_ACTIVATE_ANON); + if (refaults !=3D target_lruvec->refaults[0] || + inactive_is_low(target_lruvec, LRU_INACTIVE_ANON)) + sc->may_deactivate |=3D DEACTIVATE_ANON; + else + sc->may_deactivate &=3D ~DEACTIVATE_ANON; + + /* + * When refaults are being observed, it means a new + * workingset is being established. Deactivate to get + * rid of any stale active pages quickly. + */ + refaults =3D lruvec_page_state(target_lruvec, + WORKINGSET_ACTIVATE_FILE); + if (refaults !=3D target_lruvec->refaults[1] || + inactive_is_low(target_lruvec, LRU_INACTIVE_FILE)) + sc->may_deactivate |=3D DEACTIVATE_FILE; + else + sc->may_deactivate &=3D ~DEACTIVATE_FILE; + } else + sc->may_deactivate =3D DEACTIVATE_ANON | DEACTIVATE_FILE; + + /* + * If we have plenty of inactive file pages that aren't + * thrashing, try to reclaim those first before touching + * anonymous pages. + */ + file =3D lruvec_page_state(target_lruvec, NR_INACTIVE_FILE); + if (file >> sc->priority && !(sc->may_deactivate & DEACTIVATE_FILE)) + sc->cache_trim_mode =3D 1; + else + sc->cache_trim_mode =3D 0; + + /* + * Prevent the reclaimer from falling into the cache trap: as + * cache pages start out inactive, every cache fault will tip + * the scan balance towards the file LRU. And as the file LRU + * shrinks, so does the window for rotation from references. + * This means we have a runaway feedback loop where a tiny + * thrashing file LRU becomes infinitely more attractive than + * anon pages. Try to detect this based on file LRU size. + */ + if (!cgroup_reclaim(sc)) { + unsigned long total_high_wmark =3D 0; + unsigned long free, anon; + int z; + + free =3D sum_zone_node_page_state(pgdat->node_id, NR_FREE_PAGES); + file =3D node_page_state(pgdat, NR_ACTIVE_FILE) + + node_page_state(pgdat, NR_INACTIVE_FILE); + + for (z =3D 0; z < MAX_NR_ZONES; z++) { + struct zone *zone =3D &pgdat->node_zones[z]; + + if (!managed_zone(zone)) + continue; + + total_high_wmark +=3D high_wmark_pages(zone); + } + + /* + * Consider anon: if that's low too, this isn't a + * runaway file reclaim problem, but rather just + * extreme pressure. Reclaim as per usual then. + */ + anon =3D node_page_state(pgdat, NR_INACTIVE_ANON); + + sc->file_is_tiny =3D + file + free <=3D total_high_wmark && + !(sc->may_deactivate & DEACTIVATE_ANON) && + anon >> sc->priority; + } +} + /* * Determine how aggressively the anon and file LRU lists should be * scanned. The relative value of each set of LRU lists is determined @@ -3114,109 +3217,16 @@ static void shrink_node(pg_data_t *pgdat, struct s= can_control *sc) unsigned long nr_reclaimed, nr_scanned; struct lruvec *target_lruvec; bool reclaimable =3D false; - unsigned long file; =20 target_lruvec =3D mem_cgroup_lruvec(sc->target_mem_cgroup, pgdat); =20 again: - /* - * Flush the memory cgroup stats, so that we read accurate per-memcg - * lruvec stats for heuristics. - */ - mem_cgroup_flush_stats(); - memset(&sc->nr, 0, sizeof(sc->nr)); =20 nr_reclaimed =3D sc->nr_reclaimed; nr_scanned =3D sc->nr_scanned; =20 - /* - * Determine the scan balance between anon and file LRUs. - */ - spin_lock_irq(&target_lruvec->lru_lock); - sc->anon_cost =3D target_lruvec->anon_cost; - sc->file_cost =3D target_lruvec->file_cost; - spin_unlock_irq(&target_lruvec->lru_lock); - - /* - * Target desirable inactive:active list ratios for the anon - * and file LRU lists. - */ - if (!sc->force_deactivate) { - unsigned long refaults; - - refaults =3D lruvec_page_state(target_lruvec, - WORKINGSET_ACTIVATE_ANON); - if (refaults !=3D target_lruvec->refaults[0] || - inactive_is_low(target_lruvec, LRU_INACTIVE_ANON)) - sc->may_deactivate |=3D DEACTIVATE_ANON; - else - sc->may_deactivate &=3D ~DEACTIVATE_ANON; - - /* - * When refaults are being observed, it means a new - * workingset is being established. Deactivate to get - * rid of any stale active pages quickly. - */ - refaults =3D lruvec_page_state(target_lruvec, - WORKINGSET_ACTIVATE_FILE); - if (refaults !=3D target_lruvec->refaults[1] || - inactive_is_low(target_lruvec, LRU_INACTIVE_FILE)) - sc->may_deactivate |=3D DEACTIVATE_FILE; - else - sc->may_deactivate &=3D ~DEACTIVATE_FILE; - } else - sc->may_deactivate =3D DEACTIVATE_ANON | DEACTIVATE_FILE; - - /* - * If we have plenty of inactive file pages that aren't - * thrashing, try to reclaim those first before touching - * anonymous pages. - */ - file =3D lruvec_page_state(target_lruvec, NR_INACTIVE_FILE); - if (file >> sc->priority && !(sc->may_deactivate & DEACTIVATE_FILE)) - sc->cache_trim_mode =3D 1; - else - sc->cache_trim_mode =3D 0; - - /* - * Prevent the reclaimer from falling into the cache trap: as - * cache pages start out inactive, every cache fault will tip - * the scan balance towards the file LRU. And as the file LRU - * shrinks, so does the window for rotation from references. - * This means we have a runaway feedback loop where a tiny - * thrashing file LRU becomes infinitely more attractive than - * anon pages. Try to detect this based on file LRU size. - */ - if (!cgroup_reclaim(sc)) { - unsigned long total_high_wmark =3D 0; - unsigned long free, anon; - int z; - - free =3D sum_zone_node_page_state(pgdat->node_id, NR_FREE_PAGES); - file =3D node_page_state(pgdat, NR_ACTIVE_FILE) + - node_page_state(pgdat, NR_INACTIVE_FILE); - - for (z =3D 0; z < MAX_NR_ZONES; z++) { - struct zone *zone =3D &pgdat->node_zones[z]; - if (!managed_zone(zone)) - continue; - - total_high_wmark +=3D high_wmark_pages(zone); - } - - /* - * Consider anon: if that's low too, this isn't a - * runaway file reclaim problem, but rather just - * extreme pressure. Reclaim as per usual then. - */ - anon =3D node_page_state(pgdat, NR_INACTIVE_ANON); - - sc->file_is_tiny =3D - file + free <=3D total_high_wmark && - !(sc->may_deactivate & DEACTIVATE_ANON) && - anon >> sc->priority; - } + prepare_scan_count(pgdat, sc); =20 shrink_node_memcgs(pgdat, sc); =20 --=20 2.35.1.1094.g7c7d902a7c-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 4B68AC433F5 for ; Thu, 7 Apr 2022 03:26:19 +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=NPSejvUtzejJnfilwKJvL8ua3/JMWreJmlv/N7LRXeM=; b=CmLXjMMiBsAgU8ywsFeBE1hxCI 2AP2eqrK5ooAPpWcUBTS8tlhEXxt29KyeHNXwmHK1Flpq31ppXwR7w9iHX74/IFDs35OgMET6KFVG BUbXGJgAiNaTxs9mRaf9E9NQ4nxbPg4E5aOOfpY2a2VkduDz29vAkbvwNBXTKmWmmNCUPM/lx0r0G UASASmMMBBIavnoDGQjARSz/GU3KRJgRJgJTBkwhhl15lWeeP/SQLkyk26VC+2rAbNWrzHvkzzZ91 stK72j3W2FB39wm7/bOiS3xwk/Sh9EHWRjI5zJhUBm7N1GGVIYPFbZxkpJXYv4EePQkSo6WFLl+RK 4PdIyIeQ==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1ncIkt-0094kk-D3; Thu, 07 Apr 2022 03:24:21 +0000 Received: from mail-io1-xd49.google.com ([2607:f8b0:4864:20::d49]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1ncIcu-0091Wu-3y for linux-arm-kernel@lists.infradead.org; Thu, 07 Apr 2022 03:16:09 +0000 Received: by mail-io1-xd49.google.com with SMTP id f5-20020a6be805000000b00649b9faf257so2862626ioh.9 for ; Wed, 06 Apr 2022 20:16:02 -0700 (PDT) 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=HWUMxX2GHTS2sU7fxsre8OtJa702AlX1YTnPsDpNr8g=; b=kEWUDg82syhNmhp0q7HqjSi4vFJg5Mty4gsGp6NRMkxh+MCtLCXh7q7Rzwxf2Q2REl ie+GOC4+EdvR+L9kohnAjyipDQ1jAgxBdI+KbUWtBeOKN/TMwA497dxdq13ArcbYq9Q7 W+Uajrf4CuwPO0Tefvr9x6hpDeHQ4xF7duBX/Ak4bMe8ruBSOYuFmkrdeLOdWHywfsrA u1VIEVtXVvsW0hcmdR4mReTX5fvzmpEntQ7R9rbWadDXQSb54Htj4pdZnz/GSF0QGbMr mbTw93nrTfhV2KtfABiIqkWfWYlW8Nqm+WXEoxuRbsznMiKgezd1gYQEwzgM021DZhOE ySCA== 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=HWUMxX2GHTS2sU7fxsre8OtJa702AlX1YTnPsDpNr8g=; b=PXk+Zn2OU0DkQquiQXy6tGrOt7uK5uMivRqpuEp4tC0MRhSbgvlV9oN0LDdr6x3RUn GcCC5VhdrxZMWky9+XqiLHTpcVlb6fx7Gk69pkzIzKbaDZIMsNpCtG+/9TxuZWIBAIWs rhzPzlqMoEUZNt+z2rISrAnC2XPIEYAsSSu957zc5WEOnR3YKZvftGce5tJ/eox3JP+N OzBUBImtoltJLJjgXoLJVNAYfCjSLPE5gP5NlFLPv0Z1zmz6r7mqEE5t0gz9UOUY2Hto lt8uTn1xgS6UkmcpQtrhYzrbn6jbB2L7MB2Xgj/z73WddYJLe6fzMJ/qNZAMlP3F+xjJ f0yQ== X-Gm-Message-State: AOAM532qXbVRNRx8gQEmrwOA08fzp191+HI4ctoheuLRH8P3VO7iKGBB 2euV14bC24j0Y11VeZ2TcAW45BlxrNc= X-Google-Smtp-Source: ABdhPJwb4wEQfjqHqohpxKj+YJeCn5tBx/D54ak9fb5cGlgOENd8TrZRM2TWzSCsc2kdIv61Clqndub2Zyc= X-Received: from yuzhao.bld.corp.google.com ([2620:15c:183:200:9ea2:c755:ae22:6862]) (user=yuzhao job=sendgmr) by 2002:a92:cac3:0:b0:2c9:a265:4cab with SMTP id m3-20020a92cac3000000b002c9a2654cabmr5577295ilq.241.1649301361611; Wed, 06 Apr 2022 20:16:01 -0700 (PDT) Date: Wed, 6 Apr 2022 21:15:15 -0600 In-Reply-To: <20220407031525.2368067-1-yuzhao@google.com> Message-Id: <20220407031525.2368067-4-yuzhao@google.com> Mime-Version: 1.0 References: <20220407031525.2368067-1-yuzhao@google.com> X-Mailer: git-send-email 2.35.1.1094.g7c7d902a7c-goog Subject: [PATCH v10 03/14] mm/vmscan.c: refactor shrink_node() From: Yu Zhao To: Stephen Rothwell , linux-mm@kvack.org Cc: Andi Kleen , Andrew Morton , Aneesh Kumar , Barry Song <21cnbao@gmail.com>, 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, page-reclaim@google.com, x86@kernel.org, Yu Zhao , Barry Song , 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-20220406_201604_229090_4D8A94C3 X-CRM114-Status: GOOD ( 21.89 ) 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 VGhpcyBwYXRjaCByZWZhY3RvcnMgc2hyaW5rX25vZGUoKSB0byBpbXByb3ZlIHJlYWRhYmlsaXR5 IGZvciB0aGUKdXBjb21pbmcgY2hhbmdlcyB0byBtbS92bXNjYW4uYy4KClNpZ25lZC1vZmYtYnk6 IFl1IFpoYW8gPHl1emhhb0Bnb29nbGUuY29tPgpSZXZpZXdlZC1ieTogQmFycnkgU29uZyA8YmFv aHVhQGtlcm5lbC5vcmc+CkFja2VkLWJ5OiBCcmlhbiBHZWZmb24gPGJnZWZmb25AZ29vZ2xlLmNv bT4KQWNrZWQtYnk6IEphbiBBbGV4YW5kZXIgU3RlZmZlbnMgKGhlZnRpZykgPGhlZnRpZ0BhcmNo bGludXgub3JnPgpBY2tlZC1ieTogT2xla3NhbmRyIE5hdGFsZW5rbyA8b2xla3NhbmRyQG5hdGFs ZW5rby5uYW1lPgpBY2tlZC1ieTogU3RldmVuIEJhcnJldHQgPHN0ZXZlbkBsaXF1b3JpeC5uZXQ+ CkFja2VkLWJ5OiBTdWxlaW1hbiBTb3VobGFsIDxzdWxlaW1hbkBnb29nbGUuY29tPgpUZXN0ZWQt Ynk6IERhbmllbCBCeXJuZSA8ZGpieXJuZUBtdHUuZWR1PgpUZXN0ZWQtYnk6IERvbmFsZCBDYXJy IDxkQGNoYW9zLXJlaW5zLmNvbT4KVGVzdGVkLWJ5OiBIb2xnZXIgSG9mZnN0w6R0dGUgPGhvbGdl ckBhcHBsaWVkLWFzeW5jaHJvbnkuY29tPgpUZXN0ZWQtYnk6IEtvbnN0YW50aW4gS2hhcmxhbW92 IDxIaS1BbmdlbEB5YW5kZXgucnU+ClRlc3RlZC1ieTogU2h1YW5nIFpoYWkgPHN6aGFpMkBjcy5y b2NoZXN0ZXIuZWR1PgpUZXN0ZWQtYnk6IFNvZmlhIFRyaW5oIDxzb2ZpYS50cmluaEBlZGkud29y a3M+ClRlc3RlZC1ieTogVmFpYmhhdiBKYWluIDx2YWliaGF2QGxpbnV4LmlibS5jb20+Ci0tLQog bW0vdm1zY2FuLmMgfCAxOTggKysrKysrKysrKysrKysrKysrKysrKysrKysrLS0tLS0tLS0tLS0t LS0tLS0tLS0tLS0tLQogMSBmaWxlIGNoYW5nZWQsIDEwNCBpbnNlcnRpb25zKCspLCA5NCBkZWxl dGlvbnMoLSkKCmRpZmYgLS1naXQgYS9tbS92bXNjYW4uYyBiL21tL3Ztc2Nhbi5jCmluZGV4IDE2 Nzg4MDJlMDNlNy4uMjIzMmNiNTVhZjQxIDEwMDY0NAotLS0gYS9tbS92bXNjYW4uYworKysgYi9t bS92bXNjYW4uYwpAQCAtMjY0NCw2ICsyNjQ0LDEwOSBAQCBlbnVtIHNjYW5fYmFsYW5jZSB7CiAJ U0NBTl9GSUxFLAogfTsKIAorc3RhdGljIHZvaWQgcHJlcGFyZV9zY2FuX2NvdW50KHBnX2RhdGFf dCAqcGdkYXQsIHN0cnVjdCBzY2FuX2NvbnRyb2wgKnNjKQoreworCXVuc2lnbmVkIGxvbmcgZmls ZTsKKwlzdHJ1Y3QgbHJ1dmVjICp0YXJnZXRfbHJ1dmVjOworCisJdGFyZ2V0X2xydXZlYyA9IG1l bV9jZ3JvdXBfbHJ1dmVjKHNjLT50YXJnZXRfbWVtX2Nncm91cCwgcGdkYXQpOworCisJLyoKKwkg KiBGbHVzaCB0aGUgbWVtb3J5IGNncm91cCBzdGF0cywgc28gdGhhdCB3ZSByZWFkIGFjY3VyYXRl IHBlci1tZW1jZworCSAqIGxydXZlYyBzdGF0cyBmb3IgaGV1cmlzdGljcy4KKwkgKi8KKwltZW1f Y2dyb3VwX2ZsdXNoX3N0YXRzKCk7CisKKwkvKgorCSAqIERldGVybWluZSB0aGUgc2NhbiBiYWxh bmNlIGJldHdlZW4gYW5vbiBhbmQgZmlsZSBMUlVzLgorCSAqLworCXNwaW5fbG9ja19pcnEoJnRh cmdldF9scnV2ZWMtPmxydV9sb2NrKTsKKwlzYy0+YW5vbl9jb3N0ID0gdGFyZ2V0X2xydXZlYy0+ YW5vbl9jb3N0OworCXNjLT5maWxlX2Nvc3QgPSB0YXJnZXRfbHJ1dmVjLT5maWxlX2Nvc3Q7CisJ c3Bpbl91bmxvY2tfaXJxKCZ0YXJnZXRfbHJ1dmVjLT5scnVfbG9jayk7CisKKwkvKgorCSAqIFRh cmdldCBkZXNpcmFibGUgaW5hY3RpdmU6YWN0aXZlIGxpc3QgcmF0aW9zIGZvciB0aGUgYW5vbgor CSAqIGFuZCBmaWxlIExSVSBsaXN0cy4KKwkgKi8KKwlpZiAoIXNjLT5mb3JjZV9kZWFjdGl2YXRl KSB7CisJCXVuc2lnbmVkIGxvbmcgcmVmYXVsdHM7CisKKwkJcmVmYXVsdHMgPSBscnV2ZWNfcGFn ZV9zdGF0ZSh0YXJnZXRfbHJ1dmVjLAorCQkJCVdPUktJTkdTRVRfQUNUSVZBVEVfQU5PTik7CisJ CWlmIChyZWZhdWx0cyAhPSB0YXJnZXRfbHJ1dmVjLT5yZWZhdWx0c1swXSB8fAorCQkJaW5hY3Rp dmVfaXNfbG93KHRhcmdldF9scnV2ZWMsIExSVV9JTkFDVElWRV9BTk9OKSkKKwkJCXNjLT5tYXlf ZGVhY3RpdmF0ZSB8PSBERUFDVElWQVRFX0FOT047CisJCWVsc2UKKwkJCXNjLT5tYXlfZGVhY3Rp dmF0ZSAmPSB+REVBQ1RJVkFURV9BTk9OOworCisJCS8qCisJCSAqIFdoZW4gcmVmYXVsdHMgYXJl IGJlaW5nIG9ic2VydmVkLCBpdCBtZWFucyBhIG5ldworCQkgKiB3b3JraW5nc2V0IGlzIGJlaW5n IGVzdGFibGlzaGVkLiBEZWFjdGl2YXRlIHRvIGdldAorCQkgKiByaWQgb2YgYW55IHN0YWxlIGFj dGl2ZSBwYWdlcyBxdWlja2x5LgorCQkgKi8KKwkJcmVmYXVsdHMgPSBscnV2ZWNfcGFnZV9zdGF0 ZSh0YXJnZXRfbHJ1dmVjLAorCQkJCVdPUktJTkdTRVRfQUNUSVZBVEVfRklMRSk7CisJCWlmIChy ZWZhdWx0cyAhPSB0YXJnZXRfbHJ1dmVjLT5yZWZhdWx0c1sxXSB8fAorCQkgICAgaW5hY3RpdmVf aXNfbG93KHRhcmdldF9scnV2ZWMsIExSVV9JTkFDVElWRV9GSUxFKSkKKwkJCXNjLT5tYXlfZGVh Y3RpdmF0ZSB8PSBERUFDVElWQVRFX0ZJTEU7CisJCWVsc2UKKwkJCXNjLT5tYXlfZGVhY3RpdmF0 ZSAmPSB+REVBQ1RJVkFURV9GSUxFOworCX0gZWxzZQorCQlzYy0+bWF5X2RlYWN0aXZhdGUgPSBE RUFDVElWQVRFX0FOT04gfCBERUFDVElWQVRFX0ZJTEU7CisKKwkvKgorCSAqIElmIHdlIGhhdmUg cGxlbnR5IG9mIGluYWN0aXZlIGZpbGUgcGFnZXMgdGhhdCBhcmVuJ3QKKwkgKiB0aHJhc2hpbmcs IHRyeSB0byByZWNsYWltIHRob3NlIGZpcnN0IGJlZm9yZSB0b3VjaGluZworCSAqIGFub255bW91 cyBwYWdlcy4KKwkgKi8KKwlmaWxlID0gbHJ1dmVjX3BhZ2Vfc3RhdGUodGFyZ2V0X2xydXZlYywg TlJfSU5BQ1RJVkVfRklMRSk7CisJaWYgKGZpbGUgPj4gc2MtPnByaW9yaXR5ICYmICEoc2MtPm1h eV9kZWFjdGl2YXRlICYgREVBQ1RJVkFURV9GSUxFKSkKKwkJc2MtPmNhY2hlX3RyaW1fbW9kZSA9 IDE7CisJZWxzZQorCQlzYy0+Y2FjaGVfdHJpbV9tb2RlID0gMDsKKworCS8qCisJICogUHJldmVu dCB0aGUgcmVjbGFpbWVyIGZyb20gZmFsbGluZyBpbnRvIHRoZSBjYWNoZSB0cmFwOiBhcworCSAq IGNhY2hlIHBhZ2VzIHN0YXJ0IG91dCBpbmFjdGl2ZSwgZXZlcnkgY2FjaGUgZmF1bHQgd2lsbCB0 aXAKKwkgKiB0aGUgc2NhbiBiYWxhbmNlIHRvd2FyZHMgdGhlIGZpbGUgTFJVLiAgQW5kIGFzIHRo ZSBmaWxlIExSVQorCSAqIHNocmlua3MsIHNvIGRvZXMgdGhlIHdpbmRvdyBmb3Igcm90YXRpb24g ZnJvbSByZWZlcmVuY2VzLgorCSAqIFRoaXMgbWVhbnMgd2UgaGF2ZSBhIHJ1bmF3YXkgZmVlZGJh Y2sgbG9vcCB3aGVyZSBhIHRpbnkKKwkgKiB0aHJhc2hpbmcgZmlsZSBMUlUgYmVjb21lcyBpbmZp bml0ZWx5IG1vcmUgYXR0cmFjdGl2ZSB0aGFuCisJICogYW5vbiBwYWdlcy4gIFRyeSB0byBkZXRl Y3QgdGhpcyBiYXNlZCBvbiBmaWxlIExSVSBzaXplLgorCSAqLworCWlmICghY2dyb3VwX3JlY2xh aW0oc2MpKSB7CisJCXVuc2lnbmVkIGxvbmcgdG90YWxfaGlnaF93bWFyayA9IDA7CisJCXVuc2ln bmVkIGxvbmcgZnJlZSwgYW5vbjsKKwkJaW50IHo7CisKKwkJZnJlZSA9IHN1bV96b25lX25vZGVf cGFnZV9zdGF0ZShwZ2RhdC0+bm9kZV9pZCwgTlJfRlJFRV9QQUdFUyk7CisJCWZpbGUgPSBub2Rl X3BhZ2Vfc3RhdGUocGdkYXQsIE5SX0FDVElWRV9GSUxFKSArCisJCQkgICBub2RlX3BhZ2Vfc3Rh dGUocGdkYXQsIE5SX0lOQUNUSVZFX0ZJTEUpOworCisJCWZvciAoeiA9IDA7IHogPCBNQVhfTlJf Wk9ORVM7IHorKykgeworCQkJc3RydWN0IHpvbmUgKnpvbmUgPSAmcGdkYXQtPm5vZGVfem9uZXNb el07CisKKwkJCWlmICghbWFuYWdlZF96b25lKHpvbmUpKQorCQkJCWNvbnRpbnVlOworCisJCQl0 b3RhbF9oaWdoX3dtYXJrICs9IGhpZ2hfd21hcmtfcGFnZXMoem9uZSk7CisJCX0KKworCQkvKgor CQkgKiBDb25zaWRlciBhbm9uOiBpZiB0aGF0J3MgbG93IHRvbywgdGhpcyBpc24ndCBhCisJCSAq IHJ1bmF3YXkgZmlsZSByZWNsYWltIHByb2JsZW0sIGJ1dCByYXRoZXIganVzdAorCQkgKiBleHRy ZW1lIHByZXNzdXJlLiBSZWNsYWltIGFzIHBlciB1c3VhbCB0aGVuLgorCQkgKi8KKwkJYW5vbiA9 IG5vZGVfcGFnZV9zdGF0ZShwZ2RhdCwgTlJfSU5BQ1RJVkVfQU5PTik7CisKKwkJc2MtPmZpbGVf aXNfdGlueSA9CisJCQlmaWxlICsgZnJlZSA8PSB0b3RhbF9oaWdoX3dtYXJrICYmCisJCQkhKHNj LT5tYXlfZGVhY3RpdmF0ZSAmIERFQUNUSVZBVEVfQU5PTikgJiYKKwkJCWFub24gPj4gc2MtPnBy aW9yaXR5OworCX0KK30KKwogLyoKICAqIERldGVybWluZSBob3cgYWdncmVzc2l2ZWx5IHRoZSBh bm9uIGFuZCBmaWxlIExSVSBsaXN0cyBzaG91bGQgYmUKICAqIHNjYW5uZWQuICBUaGUgcmVsYXRp dmUgdmFsdWUgb2YgZWFjaCBzZXQgb2YgTFJVIGxpc3RzIGlzIGRldGVybWluZWQKQEAgLTMxMTQs MTA5ICszMjE3LDE2IEBAIHN0YXRpYyB2b2lkIHNocmlua19ub2RlKHBnX2RhdGFfdCAqcGdkYXQs IHN0cnVjdCBzY2FuX2NvbnRyb2wgKnNjKQogCXVuc2lnbmVkIGxvbmcgbnJfcmVjbGFpbWVkLCBu cl9zY2FubmVkOwogCXN0cnVjdCBscnV2ZWMgKnRhcmdldF9scnV2ZWM7CiAJYm9vbCByZWNsYWlt YWJsZSA9IGZhbHNlOwotCXVuc2lnbmVkIGxvbmcgZmlsZTsKIAogCXRhcmdldF9scnV2ZWMgPSBt ZW1fY2dyb3VwX2xydXZlYyhzYy0+dGFyZ2V0X21lbV9jZ3JvdXAsIHBnZGF0KTsKIAogYWdhaW46 Ci0JLyoKLQkgKiBGbHVzaCB0aGUgbWVtb3J5IGNncm91cCBzdGF0cywgc28gdGhhdCB3ZSByZWFk IGFjY3VyYXRlIHBlci1tZW1jZwotCSAqIGxydXZlYyBzdGF0cyBmb3IgaGV1cmlzdGljcy4KLQkg Ki8KLQltZW1fY2dyb3VwX2ZsdXNoX3N0YXRzKCk7Ci0KIAltZW1zZXQoJnNjLT5uciwgMCwgc2l6 ZW9mKHNjLT5ucikpOwogCiAJbnJfcmVjbGFpbWVkID0gc2MtPm5yX3JlY2xhaW1lZDsKIAlucl9z Y2FubmVkID0gc2MtPm5yX3NjYW5uZWQ7CiAKLQkvKgotCSAqIERldGVybWluZSB0aGUgc2NhbiBi YWxhbmNlIGJldHdlZW4gYW5vbiBhbmQgZmlsZSBMUlVzLgotCSAqLwotCXNwaW5fbG9ja19pcnEo JnRhcmdldF9scnV2ZWMtPmxydV9sb2NrKTsKLQlzYy0+YW5vbl9jb3N0ID0gdGFyZ2V0X2xydXZl Yy0+YW5vbl9jb3N0OwotCXNjLT5maWxlX2Nvc3QgPSB0YXJnZXRfbHJ1dmVjLT5maWxlX2Nvc3Q7 Ci0Jc3Bpbl91bmxvY2tfaXJxKCZ0YXJnZXRfbHJ1dmVjLT5scnVfbG9jayk7Ci0KLQkvKgotCSAq IFRhcmdldCBkZXNpcmFibGUgaW5hY3RpdmU6YWN0aXZlIGxpc3QgcmF0aW9zIGZvciB0aGUgYW5v bgotCSAqIGFuZCBmaWxlIExSVSBsaXN0cy4KLQkgKi8KLQlpZiAoIXNjLT5mb3JjZV9kZWFjdGl2 YXRlKSB7Ci0JCXVuc2lnbmVkIGxvbmcgcmVmYXVsdHM7Ci0KLQkJcmVmYXVsdHMgPSBscnV2ZWNf cGFnZV9zdGF0ZSh0YXJnZXRfbHJ1dmVjLAotCQkJCVdPUktJTkdTRVRfQUNUSVZBVEVfQU5PTik7 Ci0JCWlmIChyZWZhdWx0cyAhPSB0YXJnZXRfbHJ1dmVjLT5yZWZhdWx0c1swXSB8fAotCQkJaW5h Y3RpdmVfaXNfbG93KHRhcmdldF9scnV2ZWMsIExSVV9JTkFDVElWRV9BTk9OKSkKLQkJCXNjLT5t YXlfZGVhY3RpdmF0ZSB8PSBERUFDVElWQVRFX0FOT047Ci0JCWVsc2UKLQkJCXNjLT5tYXlfZGVh Y3RpdmF0ZSAmPSB+REVBQ1RJVkFURV9BTk9OOwotCi0JCS8qCi0JCSAqIFdoZW4gcmVmYXVsdHMg YXJlIGJlaW5nIG9ic2VydmVkLCBpdCBtZWFucyBhIG5ldwotCQkgKiB3b3JraW5nc2V0IGlzIGJl aW5nIGVzdGFibGlzaGVkLiBEZWFjdGl2YXRlIHRvIGdldAotCQkgKiByaWQgb2YgYW55IHN0YWxl IGFjdGl2ZSBwYWdlcyBxdWlja2x5LgotCQkgKi8KLQkJcmVmYXVsdHMgPSBscnV2ZWNfcGFnZV9z dGF0ZSh0YXJnZXRfbHJ1dmVjLAotCQkJCVdPUktJTkdTRVRfQUNUSVZBVEVfRklMRSk7Ci0JCWlm IChyZWZhdWx0cyAhPSB0YXJnZXRfbHJ1dmVjLT5yZWZhdWx0c1sxXSB8fAotCQkgICAgaW5hY3Rp dmVfaXNfbG93KHRhcmdldF9scnV2ZWMsIExSVV9JTkFDVElWRV9GSUxFKSkKLQkJCXNjLT5tYXlf ZGVhY3RpdmF0ZSB8PSBERUFDVElWQVRFX0ZJTEU7Ci0JCWVsc2UKLQkJCXNjLT5tYXlfZGVhY3Rp dmF0ZSAmPSB+REVBQ1RJVkFURV9GSUxFOwotCX0gZWxzZQotCQlzYy0+bWF5X2RlYWN0aXZhdGUg PSBERUFDVElWQVRFX0FOT04gfCBERUFDVElWQVRFX0ZJTEU7Ci0KLQkvKgotCSAqIElmIHdlIGhh dmUgcGxlbnR5IG9mIGluYWN0aXZlIGZpbGUgcGFnZXMgdGhhdCBhcmVuJ3QKLQkgKiB0aHJhc2hp bmcsIHRyeSB0byByZWNsYWltIHRob3NlIGZpcnN0IGJlZm9yZSB0b3VjaGluZwotCSAqIGFub255 bW91cyBwYWdlcy4KLQkgKi8KLQlmaWxlID0gbHJ1dmVjX3BhZ2Vfc3RhdGUodGFyZ2V0X2xydXZl YywgTlJfSU5BQ1RJVkVfRklMRSk7Ci0JaWYgKGZpbGUgPj4gc2MtPnByaW9yaXR5ICYmICEoc2Mt Pm1heV9kZWFjdGl2YXRlICYgREVBQ1RJVkFURV9GSUxFKSkKLQkJc2MtPmNhY2hlX3RyaW1fbW9k ZSA9IDE7Ci0JZWxzZQotCQlzYy0+Y2FjaGVfdHJpbV9tb2RlID0gMDsKLQotCS8qCi0JICogUHJl dmVudCB0aGUgcmVjbGFpbWVyIGZyb20gZmFsbGluZyBpbnRvIHRoZSBjYWNoZSB0cmFwOiBhcwot CSAqIGNhY2hlIHBhZ2VzIHN0YXJ0IG91dCBpbmFjdGl2ZSwgZXZlcnkgY2FjaGUgZmF1bHQgd2ls bCB0aXAKLQkgKiB0aGUgc2NhbiBiYWxhbmNlIHRvd2FyZHMgdGhlIGZpbGUgTFJVLiAgQW5kIGFz IHRoZSBmaWxlIExSVQotCSAqIHNocmlua3MsIHNvIGRvZXMgdGhlIHdpbmRvdyBmb3Igcm90YXRp b24gZnJvbSByZWZlcmVuY2VzLgotCSAqIFRoaXMgbWVhbnMgd2UgaGF2ZSBhIHJ1bmF3YXkgZmVl ZGJhY2sgbG9vcCB3aGVyZSBhIHRpbnkKLQkgKiB0aHJhc2hpbmcgZmlsZSBMUlUgYmVjb21lcyBp bmZpbml0ZWx5IG1vcmUgYXR0cmFjdGl2ZSB0aGFuCi0JICogYW5vbiBwYWdlcy4gIFRyeSB0byBk ZXRlY3QgdGhpcyBiYXNlZCBvbiBmaWxlIExSVSBzaXplLgotCSAqLwotCWlmICghY2dyb3VwX3Jl Y2xhaW0oc2MpKSB7Ci0JCXVuc2lnbmVkIGxvbmcgdG90YWxfaGlnaF93bWFyayA9IDA7Ci0JCXVu c2lnbmVkIGxvbmcgZnJlZSwgYW5vbjsKLQkJaW50IHo7Ci0KLQkJZnJlZSA9IHN1bV96b25lX25v ZGVfcGFnZV9zdGF0ZShwZ2RhdC0+bm9kZV9pZCwgTlJfRlJFRV9QQUdFUyk7Ci0JCWZpbGUgPSBu b2RlX3BhZ2Vfc3RhdGUocGdkYXQsIE5SX0FDVElWRV9GSUxFKSArCi0JCQkgICBub2RlX3BhZ2Vf c3RhdGUocGdkYXQsIE5SX0lOQUNUSVZFX0ZJTEUpOwotCi0JCWZvciAoeiA9IDA7IHogPCBNQVhf TlJfWk9ORVM7IHorKykgewotCQkJc3RydWN0IHpvbmUgKnpvbmUgPSAmcGdkYXQtPm5vZGVfem9u ZXNbel07Ci0JCQlpZiAoIW1hbmFnZWRfem9uZSh6b25lKSkKLQkJCQljb250aW51ZTsKLQotCQkJ dG90YWxfaGlnaF93bWFyayArPSBoaWdoX3dtYXJrX3BhZ2VzKHpvbmUpOwotCQl9Ci0KLQkJLyoK LQkJICogQ29uc2lkZXIgYW5vbjogaWYgdGhhdCdzIGxvdyB0b28sIHRoaXMgaXNuJ3QgYQotCQkg KiBydW5hd2F5IGZpbGUgcmVjbGFpbSBwcm9ibGVtLCBidXQgcmF0aGVyIGp1c3QKLQkJICogZXh0 cmVtZSBwcmVzc3VyZS4gUmVjbGFpbSBhcyBwZXIgdXN1YWwgdGhlbi4KLQkJICovCi0JCWFub24g PSBub2RlX3BhZ2Vfc3RhdGUocGdkYXQsIE5SX0lOQUNUSVZFX0FOT04pOwotCi0JCXNjLT5maWxl X2lzX3RpbnkgPQotCQkJZmlsZSArIGZyZWUgPD0gdG90YWxfaGlnaF93bWFyayAmJgotCQkJIShz Yy0+bWF5X2RlYWN0aXZhdGUgJiBERUFDVElWQVRFX0FOT04pICYmCi0JCQlhbm9uID4+IHNjLT5w cmlvcml0eTsKLQl9CisJcHJlcGFyZV9zY2FuX2NvdW50KHBnZGF0LCBzYyk7CiAKIAlzaHJpbmtf bm9kZV9tZW1jZ3MocGdkYXQsIHNjKTsKIAotLSAKMi4zNS4xLjEwOTQuZzdjN2Q5MDJhN2MtZ29v ZwoKCl9fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fCmxpbnV4 LWFybS1rZXJuZWwgbWFpbGluZyBsaXN0CmxpbnV4LWFybS1rZXJuZWxAbGlzdHMuaW5mcmFkZWFk Lm9yZwpodHRwOi8vbGlzdHMuaW5mcmFkZWFkLm9yZy9tYWlsbWFuL2xpc3RpbmZvL2xpbnV4LWFy bS1rZXJuZWwK