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 E9E18C4332F for ; Wed, 18 May 2022 01:47:24 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234004AbiERBrW (ORCPT ); Tue, 17 May 2022 21:47:22 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:56326 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233820AbiERBrC (ORCPT ); Tue, 17 May 2022 21:47:02 -0400 Received: from mail-il1-x149.google.com (mail-il1-x149.google.com [IPv6:2607:f8b0:4864:20::149]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 13DA6546A8 for ; Tue, 17 May 2022 18:47:00 -0700 (PDT) Received: by mail-il1-x149.google.com with SMTP id g11-20020a056e021a2b00b002cf48b48824so424976ile.21 for ; Tue, 17 May 2022 18:47:00 -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=z51FPcNwNvxNlVX8smn5vw9si1mnZZRQUKLtiLkXezM=; b=bCWp0sxEaC4g9CBSBbnutqBccAuxHsQs55of/Bt/jQWSINgjftl7w0Qt/PscXsiDqm zo8beAASkyshZHQ/ySdD5c9QF2x4BrjCGYmJvRIWAhiyUIgN1LhHmdXB/deeb15U3Tof tsHB+3K36syq88/p+mLTk0E+rKdS4VUlpmSb7BXaN4Grd3kC8N39Xew3W2+xiAJduUS9 p5s7aLH7cPd6cBs31D0FdGB5VV3317OlZ+lXjPOnmjlO3V6JtdBmJGAEyfE7GlHFS8PA qgIqTztNPP+Hk3oqchsF9QItKApyWLPPMxpDQfIkFOWX9dkx74wWxgvcRLr78juMnh/V 1lEw== 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=z51FPcNwNvxNlVX8smn5vw9si1mnZZRQUKLtiLkXezM=; b=F/LuGmUEdk1I31xzEjvMtsiQrE4/qk0Z9WoexW04RFIAyl0YM1qrwr7PJBXXCpMVUQ nIeOOfwgPzS/lzjUkqRiftORf6PoYO4onFZZDKjlg1esWJC4d9Fcpn5XSrsYQg14dUCZ FNSegnQsODIGHhrEfZO1FtpFOuDKTma3WV+h5hc/Mp+RH+hv6MKCbHhZgJh/L+fXEOOn NEgG7IUenyohSXvM5+6PzbgziAkyJPpy61J8K9AUqHCXk9QqpFIDGrttr6RzruAPq0Aa tRCkUiwVIZXgmp8ccwJgoKoS6LlobqbL8vNHHOZBuqGpnHMF6mMI/cxfuqK/32sxC/Wd Vxqg== X-Gm-Message-State: AOAM531B6ZpWDlebHmBy+s91swAY55M13s6jBXjjQWMh0zxoBA2VsNSR TWAJRcZA9IjGsg0LHgs5F3B+RUNnrP4= X-Google-Smtp-Source: ABdhPJyaU1KModtGurKuZbvm5GQ4iXAgX0NK43+WD6/J/2/U88t/+Dj+unOyz4fkoFhBf5nRjHUp6XY00V0= X-Received: from yuzhao.bld.corp.google.com ([2620:15c:183:200:f7bc:90c9:d86e:4ea8]) (user=yuzhao job=sendgmr) by 2002:a6b:3fc2:0:b0:65a:4236:bb42 with SMTP id m185-20020a6b3fc2000000b0065a4236bb42mr11514573ioa.215.1652838419082; Tue, 17 May 2022 18:46:59 -0700 (PDT) Date: Tue, 17 May 2022 19:46:22 -0600 In-Reply-To: <20220518014632.922072-1-yuzhao@google.com> Message-Id: <20220518014632.922072-4-yuzhao@google.com> Mime-Version: 1.0 References: <20220518014632.922072-1-yuzhao@google.com> X-Mailer: git-send-email 2.36.0.550.gb090851708-goog Subject: [PATCH v11 03/14] mm/vmscan.c: refactor shrink_node() From: Yu Zhao To: Andrew Morton , linux-mm@kvack.org 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, x86@kernel.org, page-reclaim@google.com, Yu Zhao , Barry Song , Miaohe Lin , 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 Reviewed-by: Miaohe Lin 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.36.0.550.gb090851708-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 E2B01C433EF for ; Wed, 18 May 2022 03:01:31 +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=cHQdajLW/YryFs0qo3R/bdi8UaHBD18JuUKVlW/LN9k=; b=FWgFJEflJANUXvtbce6MJTnx0d Xra5NMS7xZqulmH5a2Fr8csiahe64aY/viN05dD/CSFlSIFB8E3FVO6UtFudga8vlOGwlq5pysVPc NQN76zPkDi99hCBI9tzaeC1u4XnhaA+b5q5mnujOnP8JKSQGkdkiH81xIqSMo5fOYfd4YKbENCMiL 0169IQ7P0lV0NXb81skf1/ZcYOX/lJBNaoxfbGFaN93UxNR2TNjMu5Ut6yqPbZw5OC14eH6xealTC aH8mO/JgJMC7PNG/CSnWs8Rdpny8UlZQd76PeUh19YLtaJ9bg/3ml7ZrfTRtmvWaHLpkKD4F+JJlk sAhxb2Ew==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1nr9vd-00Glz9-Go; Wed, 18 May 2022 03:00:49 +0000 Received: from mail-il1-x14a.google.com ([2607:f8b0:4864:20::14a]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1nr8mD-00Gd5l-Py for linux-arm-kernel@lists.infradead.org; Wed, 18 May 2022 01:47:06 +0000 Received: by mail-il1-x14a.google.com with SMTP id g11-20020a056e021a2b00b002cf48b48824so424978ile.21 for ; Tue, 17 May 2022 18:46:59 -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=z51FPcNwNvxNlVX8smn5vw9si1mnZZRQUKLtiLkXezM=; b=bCWp0sxEaC4g9CBSBbnutqBccAuxHsQs55of/Bt/jQWSINgjftl7w0Qt/PscXsiDqm zo8beAASkyshZHQ/ySdD5c9QF2x4BrjCGYmJvRIWAhiyUIgN1LhHmdXB/deeb15U3Tof tsHB+3K36syq88/p+mLTk0E+rKdS4VUlpmSb7BXaN4Grd3kC8N39Xew3W2+xiAJduUS9 p5s7aLH7cPd6cBs31D0FdGB5VV3317OlZ+lXjPOnmjlO3V6JtdBmJGAEyfE7GlHFS8PA qgIqTztNPP+Hk3oqchsF9QItKApyWLPPMxpDQfIkFOWX9dkx74wWxgvcRLr78juMnh/V 1lEw== 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=z51FPcNwNvxNlVX8smn5vw9si1mnZZRQUKLtiLkXezM=; b=234xZ4/z+BXrpCOMk4yvFXeNYv3wB0bkegzMocuNWTsTBnkGoQumo7B99k8diI76O4 cxLe4LQHIH9NP+c8bVg2yy1032A1E6oSKzTN+j0tn10hUTkZYAzffhIH+zjb4IdHK+Zz 51AVVdnuUOvr7OV5VWBj7zBwlmJpG6B1nwdX0KqCP+Np9TtAgD203XQj6m0cMiZVQFRi 0lkkb3zMtfqZbTx7qM6ssAyiU4pDNzZL4Lqnh+9T9k/g8ntvavLFuxZ5HvE7iBQXDTxy Sy+lctDlX9F2H1CXbAfkCSWOnbaKk714dZ6zCPN/fl36sRSHwCmkCGYp0SXChZ4cCuv3 r76w== X-Gm-Message-State: AOAM531y7wWaYTUnUXo5CBgncHXrpVREzJgkWmSMo5rJRRzgEgedj+EX i148octAW80kRZuR6d3/yth2fvM0ens= X-Google-Smtp-Source: ABdhPJyaU1KModtGurKuZbvm5GQ4iXAgX0NK43+WD6/J/2/U88t/+Dj+unOyz4fkoFhBf5nRjHUp6XY00V0= X-Received: from yuzhao.bld.corp.google.com ([2620:15c:183:200:f7bc:90c9:d86e:4ea8]) (user=yuzhao job=sendgmr) by 2002:a6b:3fc2:0:b0:65a:4236:bb42 with SMTP id m185-20020a6b3fc2000000b0065a4236bb42mr11514573ioa.215.1652838419082; Tue, 17 May 2022 18:46:59 -0700 (PDT) Date: Tue, 17 May 2022 19:46:22 -0600 In-Reply-To: <20220518014632.922072-1-yuzhao@google.com> Message-Id: <20220518014632.922072-4-yuzhao@google.com> Mime-Version: 1.0 References: <20220518014632.922072-1-yuzhao@google.com> X-Mailer: git-send-email 2.36.0.550.gb090851708-goog Subject: [PATCH v11 03/14] mm/vmscan.c: refactor shrink_node() From: Yu Zhao To: Andrew Morton , linux-mm@kvack.org 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, x86@kernel.org, page-reclaim@google.com, Yu Zhao , Barry Song , Miaohe Lin , 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-20220517_184701_913638_24BC25D0 X-CRM114-Status: GOOD ( 22.21 ) 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+ClJldmlld2VkLWJ5OiBNaWFvaGUgTGluIDxsaW5taWFvaGVAaHVhd2Vp LmNvbT4KQWNrZWQtYnk6IEJyaWFuIEdlZmZvbiA8YmdlZmZvbkBnb29nbGUuY29tPgpBY2tlZC1i eTogSmFuIEFsZXhhbmRlciBTdGVmZmVucyAoaGVmdGlnKSA8aGVmdGlnQGFyY2hsaW51eC5vcmc+ CkFja2VkLWJ5OiBPbGVrc2FuZHIgTmF0YWxlbmtvIDxvbGVrc2FuZHJAbmF0YWxlbmtvLm5hbWU+ CkFja2VkLWJ5OiBTdGV2ZW4gQmFycmV0dCA8c3RldmVuQGxpcXVvcml4Lm5ldD4KQWNrZWQtYnk6 IFN1bGVpbWFuIFNvdWhsYWwgPHN1bGVpbWFuQGdvb2dsZS5jb20+ClRlc3RlZC1ieTogRGFuaWVs IEJ5cm5lIDxkamJ5cm5lQG10dS5lZHU+ClRlc3RlZC1ieTogRG9uYWxkIENhcnIgPGRAY2hhb3Mt cmVpbnMuY29tPgpUZXN0ZWQtYnk6IEhvbGdlciBIb2Zmc3TDpHR0ZSA8aG9sZ2VyQGFwcGxpZWQt YXN5bmNocm9ueS5jb20+ClRlc3RlZC1ieTogS29uc3RhbnRpbiBLaGFybGFtb3YgPEhpLUFuZ2Vs QHlhbmRleC5ydT4KVGVzdGVkLWJ5OiBTaHVhbmcgWmhhaSA8c3poYWkyQGNzLnJvY2hlc3Rlci5l ZHU+ClRlc3RlZC1ieTogU29maWEgVHJpbmggPHNvZmlhLnRyaW5oQGVkaS53b3Jrcz4KVGVzdGVk LWJ5OiBWYWliaGF2IEphaW4gPHZhaWJoYXZAbGludXguaWJtLmNvbT4KLS0tCiBtbS92bXNjYW4u YyB8IDE5OCArKysrKysrKysrKysrKysrKysrKysrKysrKystLS0tLS0tLS0tLS0tLS0tLS0tLS0t LS0tCiAxIGZpbGUgY2hhbmdlZCwgMTA0IGluc2VydGlvbnMoKyksIDk0IGRlbGV0aW9ucygtKQoK ZGlmZiAtLWdpdCBhL21tL3Ztc2Nhbi5jIGIvbW0vdm1zY2FuLmMKaW5kZXggMTY3ODgwMmUwM2U3 Li4yMjMyY2I1NWFmNDEgMTAwNjQ0Ci0tLSBhL21tL3Ztc2Nhbi5jCisrKyBiL21tL3Ztc2Nhbi5j CkBAIC0yNjQ0LDYgKzI2NDQsMTA5IEBAIGVudW0gc2Nhbl9iYWxhbmNlIHsKIAlTQ0FOX0ZJTEUs CiB9OwogCitzdGF0aWMgdm9pZCBwcmVwYXJlX3NjYW5fY291bnQocGdfZGF0YV90ICpwZ2RhdCwg c3RydWN0IHNjYW5fY29udHJvbCAqc2MpCit7CisJdW5zaWduZWQgbG9uZyBmaWxlOworCXN0cnVj dCBscnV2ZWMgKnRhcmdldF9scnV2ZWM7CisKKwl0YXJnZXRfbHJ1dmVjID0gbWVtX2Nncm91cF9s cnV2ZWMoc2MtPnRhcmdldF9tZW1fY2dyb3VwLCBwZ2RhdCk7CisKKwkvKgorCSAqIEZsdXNoIHRo ZSBtZW1vcnkgY2dyb3VwIHN0YXRzLCBzbyB0aGF0IHdlIHJlYWQgYWNjdXJhdGUgcGVyLW1lbWNn CisJICogbHJ1dmVjIHN0YXRzIGZvciBoZXVyaXN0aWNzLgorCSAqLworCW1lbV9jZ3JvdXBfZmx1 c2hfc3RhdHMoKTsKKworCS8qCisJICogRGV0ZXJtaW5lIHRoZSBzY2FuIGJhbGFuY2UgYmV0d2Vl biBhbm9uIGFuZCBmaWxlIExSVXMuCisJICovCisJc3Bpbl9sb2NrX2lycSgmdGFyZ2V0X2xydXZl Yy0+bHJ1X2xvY2spOworCXNjLT5hbm9uX2Nvc3QgPSB0YXJnZXRfbHJ1dmVjLT5hbm9uX2Nvc3Q7 CisJc2MtPmZpbGVfY29zdCA9IHRhcmdldF9scnV2ZWMtPmZpbGVfY29zdDsKKwlzcGluX3VubG9j a19pcnEoJnRhcmdldF9scnV2ZWMtPmxydV9sb2NrKTsKKworCS8qCisJICogVGFyZ2V0IGRlc2ly YWJsZSBpbmFjdGl2ZTphY3RpdmUgbGlzdCByYXRpb3MgZm9yIHRoZSBhbm9uCisJICogYW5kIGZp bGUgTFJVIGxpc3RzLgorCSAqLworCWlmICghc2MtPmZvcmNlX2RlYWN0aXZhdGUpIHsKKwkJdW5z aWduZWQgbG9uZyByZWZhdWx0czsKKworCQlyZWZhdWx0cyA9IGxydXZlY19wYWdlX3N0YXRlKHRh cmdldF9scnV2ZWMsCisJCQkJV09SS0lOR1NFVF9BQ1RJVkFURV9BTk9OKTsKKwkJaWYgKHJlZmF1 bHRzICE9IHRhcmdldF9scnV2ZWMtPnJlZmF1bHRzWzBdIHx8CisJCQlpbmFjdGl2ZV9pc19sb3co dGFyZ2V0X2xydXZlYywgTFJVX0lOQUNUSVZFX0FOT04pKQorCQkJc2MtPm1heV9kZWFjdGl2YXRl IHw9IERFQUNUSVZBVEVfQU5PTjsKKwkJZWxzZQorCQkJc2MtPm1heV9kZWFjdGl2YXRlICY9IH5E RUFDVElWQVRFX0FOT047CisKKwkJLyoKKwkJICogV2hlbiByZWZhdWx0cyBhcmUgYmVpbmcgb2Jz ZXJ2ZWQsIGl0IG1lYW5zIGEgbmV3CisJCSAqIHdvcmtpbmdzZXQgaXMgYmVpbmcgZXN0YWJsaXNo ZWQuIERlYWN0aXZhdGUgdG8gZ2V0CisJCSAqIHJpZCBvZiBhbnkgc3RhbGUgYWN0aXZlIHBhZ2Vz IHF1aWNrbHkuCisJCSAqLworCQlyZWZhdWx0cyA9IGxydXZlY19wYWdlX3N0YXRlKHRhcmdldF9s cnV2ZWMsCisJCQkJV09SS0lOR1NFVF9BQ1RJVkFURV9GSUxFKTsKKwkJaWYgKHJlZmF1bHRzICE9 IHRhcmdldF9scnV2ZWMtPnJlZmF1bHRzWzFdIHx8CisJCSAgICBpbmFjdGl2ZV9pc19sb3codGFy Z2V0X2xydXZlYywgTFJVX0lOQUNUSVZFX0ZJTEUpKQorCQkJc2MtPm1heV9kZWFjdGl2YXRlIHw9 IERFQUNUSVZBVEVfRklMRTsKKwkJZWxzZQorCQkJc2MtPm1heV9kZWFjdGl2YXRlICY9IH5ERUFD VElWQVRFX0ZJTEU7CisJfSBlbHNlCisJCXNjLT5tYXlfZGVhY3RpdmF0ZSA9IERFQUNUSVZBVEVf QU5PTiB8IERFQUNUSVZBVEVfRklMRTsKKworCS8qCisJICogSWYgd2UgaGF2ZSBwbGVudHkgb2Yg aW5hY3RpdmUgZmlsZSBwYWdlcyB0aGF0IGFyZW4ndAorCSAqIHRocmFzaGluZywgdHJ5IHRvIHJl Y2xhaW0gdGhvc2UgZmlyc3QgYmVmb3JlIHRvdWNoaW5nCisJICogYW5vbnltb3VzIHBhZ2VzLgor CSAqLworCWZpbGUgPSBscnV2ZWNfcGFnZV9zdGF0ZSh0YXJnZXRfbHJ1dmVjLCBOUl9JTkFDVElW RV9GSUxFKTsKKwlpZiAoZmlsZSA+PiBzYy0+cHJpb3JpdHkgJiYgIShzYy0+bWF5X2RlYWN0aXZh dGUgJiBERUFDVElWQVRFX0ZJTEUpKQorCQlzYy0+Y2FjaGVfdHJpbV9tb2RlID0gMTsKKwllbHNl CisJCXNjLT5jYWNoZV90cmltX21vZGUgPSAwOworCisJLyoKKwkgKiBQcmV2ZW50IHRoZSByZWNs YWltZXIgZnJvbSBmYWxsaW5nIGludG8gdGhlIGNhY2hlIHRyYXA6IGFzCisJICogY2FjaGUgcGFn ZXMgc3RhcnQgb3V0IGluYWN0aXZlLCBldmVyeSBjYWNoZSBmYXVsdCB3aWxsIHRpcAorCSAqIHRo ZSBzY2FuIGJhbGFuY2UgdG93YXJkcyB0aGUgZmlsZSBMUlUuICBBbmQgYXMgdGhlIGZpbGUgTFJV CisJICogc2hyaW5rcywgc28gZG9lcyB0aGUgd2luZG93IGZvciByb3RhdGlvbiBmcm9tIHJlZmVy ZW5jZXMuCisJICogVGhpcyBtZWFucyB3ZSBoYXZlIGEgcnVuYXdheSBmZWVkYmFjayBsb29wIHdo ZXJlIGEgdGlueQorCSAqIHRocmFzaGluZyBmaWxlIExSVSBiZWNvbWVzIGluZmluaXRlbHkgbW9y ZSBhdHRyYWN0aXZlIHRoYW4KKwkgKiBhbm9uIHBhZ2VzLiAgVHJ5IHRvIGRldGVjdCB0aGlzIGJh c2VkIG9uIGZpbGUgTFJVIHNpemUuCisJICovCisJaWYgKCFjZ3JvdXBfcmVjbGFpbShzYykpIHsK KwkJdW5zaWduZWQgbG9uZyB0b3RhbF9oaWdoX3dtYXJrID0gMDsKKwkJdW5zaWduZWQgbG9uZyBm cmVlLCBhbm9uOworCQlpbnQgejsKKworCQlmcmVlID0gc3VtX3pvbmVfbm9kZV9wYWdlX3N0YXRl KHBnZGF0LT5ub2RlX2lkLCBOUl9GUkVFX1BBR0VTKTsKKwkJZmlsZSA9IG5vZGVfcGFnZV9zdGF0 ZShwZ2RhdCwgTlJfQUNUSVZFX0ZJTEUpICsKKwkJCSAgIG5vZGVfcGFnZV9zdGF0ZShwZ2RhdCwg TlJfSU5BQ1RJVkVfRklMRSk7CisKKwkJZm9yICh6ID0gMDsgeiA8IE1BWF9OUl9aT05FUzsgeisr KSB7CisJCQlzdHJ1Y3Qgem9uZSAqem9uZSA9ICZwZ2RhdC0+bm9kZV96b25lc1t6XTsKKworCQkJ aWYgKCFtYW5hZ2VkX3pvbmUoem9uZSkpCisJCQkJY29udGludWU7CisKKwkJCXRvdGFsX2hpZ2hf d21hcmsgKz0gaGlnaF93bWFya19wYWdlcyh6b25lKTsKKwkJfQorCisJCS8qCisJCSAqIENvbnNp ZGVyIGFub246IGlmIHRoYXQncyBsb3cgdG9vLCB0aGlzIGlzbid0IGEKKwkJICogcnVuYXdheSBm aWxlIHJlY2xhaW0gcHJvYmxlbSwgYnV0IHJhdGhlciBqdXN0CisJCSAqIGV4dHJlbWUgcHJlc3N1 cmUuIFJlY2xhaW0gYXMgcGVyIHVzdWFsIHRoZW4uCisJCSAqLworCQlhbm9uID0gbm9kZV9wYWdl X3N0YXRlKHBnZGF0LCBOUl9JTkFDVElWRV9BTk9OKTsKKworCQlzYy0+ZmlsZV9pc190aW55ID0K KwkJCWZpbGUgKyBmcmVlIDw9IHRvdGFsX2hpZ2hfd21hcmsgJiYKKwkJCSEoc2MtPm1heV9kZWFj dGl2YXRlICYgREVBQ1RJVkFURV9BTk9OKSAmJgorCQkJYW5vbiA+PiBzYy0+cHJpb3JpdHk7CisJ fQorfQorCiAvKgogICogRGV0ZXJtaW5lIGhvdyBhZ2dyZXNzaXZlbHkgdGhlIGFub24gYW5kIGZp bGUgTFJVIGxpc3RzIHNob3VsZCBiZQogICogc2Nhbm5lZC4gIFRoZSByZWxhdGl2ZSB2YWx1ZSBv ZiBlYWNoIHNldCBvZiBMUlUgbGlzdHMgaXMgZGV0ZXJtaW5lZApAQCAtMzExNCwxMDkgKzMyMTcs MTYgQEAgc3RhdGljIHZvaWQgc2hyaW5rX25vZGUocGdfZGF0YV90ICpwZ2RhdCwgc3RydWN0IHNj YW5fY29udHJvbCAqc2MpCiAJdW5zaWduZWQgbG9uZyBucl9yZWNsYWltZWQsIG5yX3NjYW5uZWQ7 CiAJc3RydWN0IGxydXZlYyAqdGFyZ2V0X2xydXZlYzsKIAlib29sIHJlY2xhaW1hYmxlID0gZmFs c2U7Ci0JdW5zaWduZWQgbG9uZyBmaWxlOwogCiAJdGFyZ2V0X2xydXZlYyA9IG1lbV9jZ3JvdXBf bHJ1dmVjKHNjLT50YXJnZXRfbWVtX2Nncm91cCwgcGdkYXQpOwogCiBhZ2FpbjoKLQkvKgotCSAq IEZsdXNoIHRoZSBtZW1vcnkgY2dyb3VwIHN0YXRzLCBzbyB0aGF0IHdlIHJlYWQgYWNjdXJhdGUg cGVyLW1lbWNnCi0JICogbHJ1dmVjIHN0YXRzIGZvciBoZXVyaXN0aWNzLgotCSAqLwotCW1lbV9j Z3JvdXBfZmx1c2hfc3RhdHMoKTsKLQogCW1lbXNldCgmc2MtPm5yLCAwLCBzaXplb2Yoc2MtPm5y KSk7CiAKIAlucl9yZWNsYWltZWQgPSBzYy0+bnJfcmVjbGFpbWVkOwogCW5yX3NjYW5uZWQgPSBz Yy0+bnJfc2Nhbm5lZDsKIAotCS8qCi0JICogRGV0ZXJtaW5lIHRoZSBzY2FuIGJhbGFuY2UgYmV0 d2VlbiBhbm9uIGFuZCBmaWxlIExSVXMuCi0JICovCi0Jc3Bpbl9sb2NrX2lycSgmdGFyZ2V0X2xy dXZlYy0+bHJ1X2xvY2spOwotCXNjLT5hbm9uX2Nvc3QgPSB0YXJnZXRfbHJ1dmVjLT5hbm9uX2Nv c3Q7Ci0Jc2MtPmZpbGVfY29zdCA9IHRhcmdldF9scnV2ZWMtPmZpbGVfY29zdDsKLQlzcGluX3Vu bG9ja19pcnEoJnRhcmdldF9scnV2ZWMtPmxydV9sb2NrKTsKLQotCS8qCi0JICogVGFyZ2V0IGRl c2lyYWJsZSBpbmFjdGl2ZTphY3RpdmUgbGlzdCByYXRpb3MgZm9yIHRoZSBhbm9uCi0JICogYW5k IGZpbGUgTFJVIGxpc3RzLgotCSAqLwotCWlmICghc2MtPmZvcmNlX2RlYWN0aXZhdGUpIHsKLQkJ dW5zaWduZWQgbG9uZyByZWZhdWx0czsKLQotCQlyZWZhdWx0cyA9IGxydXZlY19wYWdlX3N0YXRl KHRhcmdldF9scnV2ZWMsCi0JCQkJV09SS0lOR1NFVF9BQ1RJVkFURV9BTk9OKTsKLQkJaWYgKHJl ZmF1bHRzICE9IHRhcmdldF9scnV2ZWMtPnJlZmF1bHRzWzBdIHx8Ci0JCQlpbmFjdGl2ZV9pc19s b3codGFyZ2V0X2xydXZlYywgTFJVX0lOQUNUSVZFX0FOT04pKQotCQkJc2MtPm1heV9kZWFjdGl2 YXRlIHw9IERFQUNUSVZBVEVfQU5PTjsKLQkJZWxzZQotCQkJc2MtPm1heV9kZWFjdGl2YXRlICY9 IH5ERUFDVElWQVRFX0FOT047Ci0KLQkJLyoKLQkJICogV2hlbiByZWZhdWx0cyBhcmUgYmVpbmcg b2JzZXJ2ZWQsIGl0IG1lYW5zIGEgbmV3Ci0JCSAqIHdvcmtpbmdzZXQgaXMgYmVpbmcgZXN0YWJs aXNoZWQuIERlYWN0aXZhdGUgdG8gZ2V0Ci0JCSAqIHJpZCBvZiBhbnkgc3RhbGUgYWN0aXZlIHBh Z2VzIHF1aWNrbHkuCi0JCSAqLwotCQlyZWZhdWx0cyA9IGxydXZlY19wYWdlX3N0YXRlKHRhcmdl dF9scnV2ZWMsCi0JCQkJV09SS0lOR1NFVF9BQ1RJVkFURV9GSUxFKTsKLQkJaWYgKHJlZmF1bHRz ICE9IHRhcmdldF9scnV2ZWMtPnJlZmF1bHRzWzFdIHx8Ci0JCSAgICBpbmFjdGl2ZV9pc19sb3co dGFyZ2V0X2xydXZlYywgTFJVX0lOQUNUSVZFX0ZJTEUpKQotCQkJc2MtPm1heV9kZWFjdGl2YXRl IHw9IERFQUNUSVZBVEVfRklMRTsKLQkJZWxzZQotCQkJc2MtPm1heV9kZWFjdGl2YXRlICY9IH5E RUFDVElWQVRFX0ZJTEU7Ci0JfSBlbHNlCi0JCXNjLT5tYXlfZGVhY3RpdmF0ZSA9IERFQUNUSVZB VEVfQU5PTiB8IERFQUNUSVZBVEVfRklMRTsKLQotCS8qCi0JICogSWYgd2UgaGF2ZSBwbGVudHkg b2YgaW5hY3RpdmUgZmlsZSBwYWdlcyB0aGF0IGFyZW4ndAotCSAqIHRocmFzaGluZywgdHJ5IHRv IHJlY2xhaW0gdGhvc2UgZmlyc3QgYmVmb3JlIHRvdWNoaW5nCi0JICogYW5vbnltb3VzIHBhZ2Vz LgotCSAqLwotCWZpbGUgPSBscnV2ZWNfcGFnZV9zdGF0ZSh0YXJnZXRfbHJ1dmVjLCBOUl9JTkFD VElWRV9GSUxFKTsKLQlpZiAoZmlsZSA+PiBzYy0+cHJpb3JpdHkgJiYgIShzYy0+bWF5X2RlYWN0 aXZhdGUgJiBERUFDVElWQVRFX0ZJTEUpKQotCQlzYy0+Y2FjaGVfdHJpbV9tb2RlID0gMTsKLQll bHNlCi0JCXNjLT5jYWNoZV90cmltX21vZGUgPSAwOwotCi0JLyoKLQkgKiBQcmV2ZW50IHRoZSBy ZWNsYWltZXIgZnJvbSBmYWxsaW5nIGludG8gdGhlIGNhY2hlIHRyYXA6IGFzCi0JICogY2FjaGUg cGFnZXMgc3RhcnQgb3V0IGluYWN0aXZlLCBldmVyeSBjYWNoZSBmYXVsdCB3aWxsIHRpcAotCSAq IHRoZSBzY2FuIGJhbGFuY2UgdG93YXJkcyB0aGUgZmlsZSBMUlUuICBBbmQgYXMgdGhlIGZpbGUg TFJVCi0JICogc2hyaW5rcywgc28gZG9lcyB0aGUgd2luZG93IGZvciByb3RhdGlvbiBmcm9tIHJl ZmVyZW5jZXMuCi0JICogVGhpcyBtZWFucyB3ZSBoYXZlIGEgcnVuYXdheSBmZWVkYmFjayBsb29w IHdoZXJlIGEgdGlueQotCSAqIHRocmFzaGluZyBmaWxlIExSVSBiZWNvbWVzIGluZmluaXRlbHkg bW9yZSBhdHRyYWN0aXZlIHRoYW4KLQkgKiBhbm9uIHBhZ2VzLiAgVHJ5IHRvIGRldGVjdCB0aGlz IGJhc2VkIG9uIGZpbGUgTFJVIHNpemUuCi0JICovCi0JaWYgKCFjZ3JvdXBfcmVjbGFpbShzYykp IHsKLQkJdW5zaWduZWQgbG9uZyB0b3RhbF9oaWdoX3dtYXJrID0gMDsKLQkJdW5zaWduZWQgbG9u ZyBmcmVlLCBhbm9uOwotCQlpbnQgejsKLQotCQlmcmVlID0gc3VtX3pvbmVfbm9kZV9wYWdlX3N0 YXRlKHBnZGF0LT5ub2RlX2lkLCBOUl9GUkVFX1BBR0VTKTsKLQkJZmlsZSA9IG5vZGVfcGFnZV9z dGF0ZShwZ2RhdCwgTlJfQUNUSVZFX0ZJTEUpICsKLQkJCSAgIG5vZGVfcGFnZV9zdGF0ZShwZ2Rh dCwgTlJfSU5BQ1RJVkVfRklMRSk7Ci0KLQkJZm9yICh6ID0gMDsgeiA8IE1BWF9OUl9aT05FUzsg eisrKSB7Ci0JCQlzdHJ1Y3Qgem9uZSAqem9uZSA9ICZwZ2RhdC0+bm9kZV96b25lc1t6XTsKLQkJ CWlmICghbWFuYWdlZF96b25lKHpvbmUpKQotCQkJCWNvbnRpbnVlOwotCi0JCQl0b3RhbF9oaWdo X3dtYXJrICs9IGhpZ2hfd21hcmtfcGFnZXMoem9uZSk7Ci0JCX0KLQotCQkvKgotCQkgKiBDb25z aWRlciBhbm9uOiBpZiB0aGF0J3MgbG93IHRvbywgdGhpcyBpc24ndCBhCi0JCSAqIHJ1bmF3YXkg ZmlsZSByZWNsYWltIHByb2JsZW0sIGJ1dCByYXRoZXIganVzdAotCQkgKiBleHRyZW1lIHByZXNz dXJlLiBSZWNsYWltIGFzIHBlciB1c3VhbCB0aGVuLgotCQkgKi8KLQkJYW5vbiA9IG5vZGVfcGFn ZV9zdGF0ZShwZ2RhdCwgTlJfSU5BQ1RJVkVfQU5PTik7Ci0KLQkJc2MtPmZpbGVfaXNfdGlueSA9 Ci0JCQlmaWxlICsgZnJlZSA8PSB0b3RhbF9oaWdoX3dtYXJrICYmCi0JCQkhKHNjLT5tYXlfZGVh Y3RpdmF0ZSAmIERFQUNUSVZBVEVfQU5PTikgJiYKLQkJCWFub24gPj4gc2MtPnByaW9yaXR5Owot CX0KKwlwcmVwYXJlX3NjYW5fY291bnQocGdkYXQsIHNjKTsKIAogCXNocmlua19ub2RlX21lbWNn cyhwZ2RhdCwgc2MpOwogCi0tIAoyLjM2LjAuNTUwLmdiMDkwODUxNzA4LWdvb2cKCgpfX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fXwpsaW51eC1hcm0ta2VybmVs IG1haWxpbmcgbGlzdApsaW51eC1hcm0ta2VybmVsQGxpc3RzLmluZnJhZGVhZC5vcmcKaHR0cDov L2xpc3RzLmluZnJhZGVhZC5vcmcvbWFpbG1hbi9saXN0aW5mby9saW51eC1hcm0ta2VybmVsCg==