From patchwork Wed Feb 14 22:57:39 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sourav Panda X-Patchwork-Id: 13557159 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 kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by smtp.lore.kernel.org (Postfix) with ESMTP id BED71C48BC3 for ; Wed, 14 Feb 2024 22:57:46 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 324438D0019; Wed, 14 Feb 2024 17:57:46 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 2AD3C8D000E; Wed, 14 Feb 2024 17:57:46 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 100108D0019; Wed, 14 Feb 2024 17:57:46 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0012.hostedemail.com [216.40.44.12]) by kanga.kvack.org (Postfix) with ESMTP id EB34B8D000E for ; Wed, 14 Feb 2024 17:57:45 -0500 (EST) Received: from smtpin12.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay09.hostedemail.com (Postfix) with ESMTP id 9F59D807F3 for ; Wed, 14 Feb 2024 22:57:45 +0000 (UTC) X-FDA: 81791923290.12.7034501 Received: from mail-yw1-f202.google.com (mail-yw1-f202.google.com [209.85.128.202]) by imf30.hostedemail.com (Postfix) with ESMTP id DA2EB80006 for ; Wed, 14 Feb 2024 22:57:43 +0000 (UTC) Authentication-Results: imf30.hostedemail.com; dkim=pass header.d=google.com header.s=20230601 header.b="n/VIFiRo"; spf=pass (imf30.hostedemail.com: domain of 3ZkXNZQsKCFsLHNK3OI3G639HH9E7.5HFEBGNQ-FFDO35D.HK9@flex--souravpanda.bounces.google.com designates 209.85.128.202 as permitted sender) smtp.mailfrom=3ZkXNZQsKCFsLHNK3OI3G639HH9E7.5HFEBGNQ-FFDO35D.HK9@flex--souravpanda.bounces.google.com; dmarc=pass (policy=reject) header.from=google.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1707951463; h=from:from:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:mime-version: content-type:content-type:content-transfer-encoding:in-reply-to: references:dkim-signature; bh=ER/kDDF0VbhJ9fY0LYS6Jm2lqhCgvi5b8hhyOiCuUPM=; b=HR29rFYf3LyETOU1ee/gwK3+P9Tvut6Woad2e9vwulz9gfTFRd/sg/tVEe3KVq0R2ADTIo RQxp+7bj2kD4r4DywFr5g29AhpCr6+1S6yj5fcLZwt22qeZgpbPIPLShEaeA+X1H8T8jTP neiv6UBCSSfCQCTcfnXjMJ5Ek/Rv98I= ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1707951463; a=rsa-sha256; cv=none; b=cfuW2huWzKsxfYcOQeuzLHJZPmdU0QU76VweI5XrjcmqOPrsXnGLAkIgEgEjsYKfcaznr9 dDhBD+XHI6Y4SiI3pDsI24ibHPEMnvFGGXBxCKv8Gj6+CD+GcXCihkgjJ2RUL4SGkMXNGS W5bog/gFDEgMMZBqTSF0zsyOYBPwQnM= ARC-Authentication-Results: i=1; imf30.hostedemail.com; dkim=pass header.d=google.com header.s=20230601 header.b="n/VIFiRo"; spf=pass (imf30.hostedemail.com: domain of 3ZkXNZQsKCFsLHNK3OI3G639HH9E7.5HFEBGNQ-FFDO35D.HK9@flex--souravpanda.bounces.google.com designates 209.85.128.202 as permitted sender) smtp.mailfrom=3ZkXNZQsKCFsLHNK3OI3G639HH9E7.5HFEBGNQ-FFDO35D.HK9@flex--souravpanda.bounces.google.com; dmarc=pass (policy=reject) header.from=google.com Received: by mail-yw1-f202.google.com with SMTP id 00721157ae682-60665b5fabcso4020587b3.1 for ; Wed, 14 Feb 2024 14:57:43 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1707951463; x=1708556263; darn=kvack.org; h=to:from:subject:message-id:mime-version:date:from:to:cc:subject :date:message-id:reply-to; bh=ER/kDDF0VbhJ9fY0LYS6Jm2lqhCgvi5b8hhyOiCuUPM=; b=n/VIFiRo+1f488T6D9EvQE58X9BRpG7q1l7YwrXHZhit6/fUj05zP0pYSvfnoGZnSM kt3eIWMW2H6Lb3PbhVw1wsSqZ97tPbvteaibMevpGQWQ4MAN2zxYhzTSd+E+ma2yTjzV gM8B3mCXztqQOIKk9EiOr/LRbGV0+BrR1xG4fU7D/9XL0zTeGR5Q/gwrqYYuBEAChVhD rqFXIQieQmhPbXXliZ0ugAi+SqlwXXh+39F67vEBSlRKv8RB0mNpL1ovyIbgwQ14cEYN /YfoPE/TQvyMJujarKmKdNgGk3ATl7hVE3c7UmuO5slwsXy7c/NulHDBxK7i0RjPn7K3 n2FA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1707951463; x=1708556263; h=to:from:subject:message-id:mime-version:date:x-gm-message-state :from:to:cc:subject:date:message-id:reply-to; bh=ER/kDDF0VbhJ9fY0LYS6Jm2lqhCgvi5b8hhyOiCuUPM=; b=V84fzNeEvPfLgmfLnHSqI+dXCjhBB/bKd8GA5SoWEcUr/M7JIFQV5/u7uQAn0R700k kMAqGo6DhHZn9QjG6HgMNnglJiH5yuEKdnN9Tae3m6ir/1E2F2Rq+LmXK5AAftVceirl M6+JZHZLerlAC09ph0Ok6tcR3sxw9sq7ewAB1HRQqkExCtCATtaVEt8OQbBoLrxrpaQ3 7zNbxUCdkD9ZXt0IV97rgjlImC5D0Tj7c4nlaTVP7sFpy97ZGyq5W7GP2bvhoQt1XRVi i8FyNJfyYQwxGDT7vVsEyX/SJbAI/p23FqfmDqHIT5I7RfKulk84+4TcUMDk7MtAj1uL B22Q== X-Forwarded-Encrypted: i=1; AJvYcCWYNEY7n/dGeBjl8Pb5tcwF3/TToctz0a/lihgLGMbYtO8v53EL6LtPNElIdndWt91eflGNxZ5drvApyid+Dzkpi3s= X-Gm-Message-State: AOJu0YxgSKhNil5NVQqY7/Al88w0ZfYX1SwCcleFLkG53lhOBcBOrr5B Zht95itMoEHtJCCuchNN/Py8VsE1jT6p5laPDJ7XdyLfoXeJdyKX6ddmUpzmRTLCadt5lHbw/8V VRYLT8Rl8PWmMu9BWx4LQCw== X-Google-Smtp-Source: AGHT+IFTRjt4DJhFCr9j1PqFgRtUHJFi+z87oKy8C90T3jT3GR3k+j/v65obVYtWfG5q0k1nva8mC1JT1TFc5nVKFg== X-Received: from souravpanda.svl.corp.google.com ([2620:15c:2a3:200:b4ba:86fe:7d36:2fb0]) (user=souravpanda job=sendgmr) by 2002:a81:99d5:0:b0:607:75af:8006 with SMTP id q204-20020a8199d5000000b0060775af8006mr3707ywg.0.1707951462771; Wed, 14 Feb 2024 14:57:42 -0800 (PST) Date: Wed, 14 Feb 2024 14:57:39 -0800 Mime-Version: 1.0 X-Mailer: git-send-email 2.44.0.rc0.258.g7320e95886-goog Message-ID: <20240214225741.403783-1-souravpanda@google.com> Subject: [PATCH v8 0/1] mm: report per-page metadata information From: Sourav Panda To: corbet@lwn.net, gregkh@linuxfoundation.org, rafael@kernel.org, akpm@linux-foundation.org, mike.kravetz@oracle.com, muchun.song@linux.dev, rppt@kernel.org, david@redhat.com, rdunlap@infradead.org, chenlinxuan@uniontech.com, yang.yang29@zte.com.cn, souravpanda@google.com, tomas.mudrunka@gmail.com, bhelgaas@google.com, ivan@cloudflare.com, pasha.tatashin@soleen.com, yosryahmed@google.com, hannes@cmpxchg.org, shakeelb@google.com, kirill.shutemov@linux.intel.com, wangkefeng.wang@huawei.com, adobriyan@gmail.com, vbabka@suse.cz, Liam.Howlett@Oracle.com, surenb@google.com, linux-kernel@vger.kernel.org, linux-fsdevel@vger.kernel.org, linux-doc@vger.kernel.org, linux-mm@kvack.org, willy@infradead.org, weixugc@google.com X-Stat-Signature: 8pnc4hp9zj6wkfycoatcb4z8botjcc8q X-Rspamd-Server: rspam10 X-Rspamd-Queue-Id: DA2EB80006 X-Rspam-User: X-HE-Tag: 1707951463-602621 X-HE-Meta: U2FsdGVkX19UVUBZncazBkO90Jxq0Wbp1pteFuDrmVR0BKkPJizTI1+yuneKUOB0Yhh1KTonJ5RcbDD9lloE+YCEjZfb0N1dzW/kKgcjp4P0YrhLuBYLtCg4Ee1e7oRFZchZS1Iv8Fxo74qPScH/hFVWWgFqo1XTmaDbGgcwHPjwL5kmFi9FGmZ/5iYIOQdsj84A6nf3H6KqcNZrJoLavVqQaywsbfgav1kcVd9dcubRyVAL7Y9X5Pnj/JqDYeN652eOdstCrglT2WF/q2m+UvNJPBUTfkqdCOC4TwXs32MM9u3JeS1fTpUvnWdqASPcxkW1umhpvaKGeZm6XuVgiq1jW56p46Vs0zI1XqokUZT4l4tC2SoJjw+9A3VRKld0IxkmMOHj061UEnqkStjjKJxsrH8lLls1t9R51QESiGLES5MDgxxppUm4gKFbxoJIh1dltNa7h+0Qg/3zmpqiOwKSgK7k1G1TzqLS+jKU6izUU1wykWyaVtFmLA2lHsBPtFt0a7PpwMX5NvvfCDg9RVpKNAfxyWeE3hWuFrkM43g4zfSG2DDvPfAauXSiv+kkNMynAqxpLOrT5QsS/U6fhXtC2lHsKeSSWJiu5rSX0S9SNiK3sGUwt+rslAEUv9vG4ZXH8i333+TW93tcnERQa4dJtMM5aa9T0hgudNR+tcQ/OA3NMKFlYwBrPzTTFb+ZwUSbwZE6lFeIU850gy5E57Gw0RBLL+G8RFa3cixGmVj9wFdkD+J7d0bgfwbQRLj3ROOs9F2IU9OaXgZ1AVTjp1z2Z0d/iLlxTrW+uBXAM+/eknBPbEH4p83/eitQvZgpcj7EHKRIo7jmt2/ylKVSaMimW3lEANxhC8ATUtrofykn3mYRHoPyZrS4hYeWB5/lKX4FUufZKPECNIqRePWW7LHLMXmyo89TG8wzTtQD6RcJgusIEk200r/ytEX0oa0DY1EGu2GJzuGuReUteYe Pl3OvQKs BqYehpEfscDyi34FuUN3zXEpPYQelCsZLHOZ9+jnVmriHBlxmGvEjP1FgYfKSDEM4ElsYQRrv8yWDnZmOunN+3xdkxl0IPbURoPkRehxGAa9zT5RGnlPnOTdHeGpXyz+xF5yaBv0Uzc75t5m0mE7Z0EC1d5R8gLyXoB/Ijq38ya8D1DDQXQlEzH9LSuByR8Aj+590ndCPpyz+hAl81E6TzDRIQat4/xOPjhaqh0RFDTCuF8GsxS2D23mmmkLazG68yKuQDkyFUwJyS72vcoJM5L/M6Fv58y9G4/cIXNvJTtWry1eSTnIAsMtM14BegY9x6f9Gbkg5GZCPZKitUjX4bjlw9pDE0I74bXY6gxW8DeZ2jhUcrnoAOOR/y080Mbti9U1DfwLlGQLxw5q+5TcuDrJAH0BuKI11pbgOe3BIKB+7iiTEX/wIYuiuXvruULRvCZR4RI3tUj2AhdWXqOTIjLky1Bni94+6gDF65suFv8uHG3PZUu5CBcAlUr4ndwzw2aEJ2r3WPv1N5StTr1hqfPxTsPfAN1LumA59BMpTqPR95glB/IwsqOvUsru8OnDuSxZTf5r9V0aE8lZQTv3tcQAN45892wfFlDVchl5qAJZfBCXTcUIUzNDVIWIN/DI0uKIZUCByWNhCUWEIrmM8eeSmdV+93Pte5S2gQQZSVUlWrL+CwMpfR0F7Pa2lKnxP5/jAbFcDIPAEslGFSEm7Hx8+l+ukx0TIKKioFmLwpT2UStwEw1UzxqWVd1gkCCD1THfn5L63fwEajEO3sEWQQU1RTg== X-Bogosity: Ham, tests=bogofilter, spamicity=0.000000, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: List-Subscribe: List-Unsubscribe: Changelog: v8: - Addressed Powerpc (Power8 LE) boot failure. - In __populate_section_memmap instead of calling mod_node_page_state (unavaialable at boot for powerpc), we call mod_node_early_perpage_metadata. This was a helper function that was introduced for arm, to combat this exact problem. - Since __populate_section_memmap is tagged with __meminit, we also had to modify the tag of mod_node_early_perpage_metadata from __init to __meminit. - Naming Changes: - In /proc/meminfo PageMetadata --> Memmap - In /proc/vmstat nr_page_metadata --> nr_memmap - In /proc/vmstat nr_page_metadata_boot --> nr_memmap_boot - Addressed clarifications requested by Andrew Morton. - Updated the commit log to include utility or potential usage for userspace. - Declined changing placement of metrics after attempting: - No changes in /proc/meminfo since it cannot be moved to the end anyway. This is because we have also hugetlb_report_meminfo() and arch_report_meminfo(). - Rebased to version 6, patchlevel 8. v7: - Addressed comments from David Rientjes - For exporting PageMetadata to /proc/meminfo, utilize global_node_page_state_pages for item NR_PAGE_METADATA. This is instead of iterating over nodes and accumulating the output of node_page_state. v6: - Interface changes - Added per-node nr_page_metadata and nr_page_metadata_boot fields that are exported in /sys/devices/system/node/nodeN/vmstat - nr_page_metadata exclusively tracks buddy allocations while nr_page_metadata_boot exclusively tracks memblock allocations. - Modified PageMetadata in /proc/meminfo to only include buddy allocations so that it is comparable against MemTotal in /proc/meminfo - Removed the PageMetadata field added in /sys/devices/system/node/nodeN/meminfo - Addressed bugs reported by the kernel test bot. - All occurences of __mod_node_page_state have been replaced by mod_node_page_state. - Addressed comments from Muchun Song. - Removed page meta data accouting from mm/hugetlb.c. When CONFIG_SPARSEMEM_VMEMMAP is disabled struct pages should not be returned to buddy. - Modified the cover letter with the results and analysis - From when memory_hotplug.memmap_on_memory is alternated between 0 and 1. - To account for the new interface changes. v5: - Addressed comments from Muchun Song. - Fixed errors introduced in v4 when CONFIG_SPARSEMEM_VMEMMAP is disabled by testing against FLATMEM and SPARSEMEM memory models. - Handled the condition wherein the allocation of walk.reuse_page fails, by moving NR_PAGE_METADATA update into the clause if( walk.reuse_page ). - Removed the usage of DIV_ROUND_UP from alloc_vmemmap_page_list since "end - start" is always a multiple of PAGE_SIZE. - Modified alloc_vmemmap_page_list to update NR_PAGE_METADATA once instead of every loop. v4: - Addressed comment from Matthew Wilcox. - Used __node_stat_sub_folio and __node_stat_add_folio instead of __mod_node_page_state in mm/hugetlb.c. - Used page_pgdat wherever possible in the entire patch. - Used DIV_ROUND_UP() wherever possible in the entire patch. v3: - Addressed one comment from Matthew Wilcox. - In free_page_ext, page_pgdat() is now extracted prior to freeing the memory. v2: - Fixed the three bugs reported by kernel test robot. - Enhanced the commit message as recommended by David Hildenbrand. - Addressed comments from Matthew Wilcox: - Simplified alloc_vmemmap_page_list() and free_page_ext() as recommended. - Used the appropriate comment style in mm/vmstat.c. - Replaced writeout_early_perpage_metadata() with store_early_perpage_metadata() to reduce ambiguity with what swap does. - Addressed comments from Mike Rapoport: - Simplified the loop in alloc_vmemmap_page_list(). - Could NOT address a comment to move store_early_perpage_metadata() near where nodes and page allocator are initialized. - Included the vmalloc()ed page_ext in accounting within free_page_ext(). - Made early_perpage_metadata[MAX_NUMNODES] static. Previous approaches and discussions ----------------------------------- V7: https://lore.kernel.org/all/20240129224204.1812062-1-souravpanda@google.com V6: https://lore.kernel.org/all/20231205223118.3575485-1-souravpanda@google.com v5: https://lore.kernel.org/all/20231101230816.1459373-1-souravpanda@google.com v4: https://lore.kernel.org/all/20231031223846.827173-1-souravpanda@google.com v3: https://lore.kernel.org/all/20231031174459.459480-1-souravpanda@google.com v2: https://lore.kernel.org/all/20231018005548.3505662-1-souravpanda@google.com v1: https://lore.kernel.org/r/20230913173000.4016218-2-souravpanda@google.com Hi! This patch adds two new per-node fields, namely nr_memmap and nr_memmap_boot to /sys/devices/system/node/nodeN/vmstat and a global Memmap field to /proc/meminfo. This information can be used by users to see how much memory is being used by per-page metadata, which can vary depending on build configuration, machine architecture, and system use. Per-page metadata is the amount of memory that Linux needs in order to manage memory at the page granularity. The majority of such memory is used by "struct page" and "page_ext" data structures. Background ---------- Kernel overhead observability is missing some of the largest allocations during runtime, including vmemmap (struct pages) and page_ext. This patch aims to address this problem by exporting a new metric Memmap. On the contrary, the kernel does provide observibility for boot memory allocations. For example, the metric reserved_pages depicts the pages allocated by the bootmem allocator. This can be simply calculated as present_pages - managed_pages, which are both exported in /proc/zoneinfo. The metric reserved_pages is primarily composed of struct pages and page_ext. What about the struct pages (allocated by bootmem allocator) that are free'd during hugetlbfs allocations and then allocated by buddy-allocator once hugtlbfs pages are free'd? /proc/meminfo MemTotal changes: MemTotal does not include memblock allocations but includes buddy allocations. However, during runtime memblock allocations can be shifted into buddy allocations, and therefore become part of MemTotal. Once the struct pages get allocated by buddy allocator, we lose track of these struct page allocations overhead accounting. Therefore, we must export new metrics. nr_memmap and nr_memmap_boot exclusively track the struct page and page ext allocations made by the buddy allocator and memblock allocator, respectively for each node. Memmap in /proc/meminfo would report the struct page and page ext allocations made by the buddy allocator. Results and analysis -------------------- Memory model: Sparsemem-vmemmap $ echo 1 > /proc/sys/vm/hugetlb_optimize_vmemmap $ cat /proc/meminfo | grep MemTotal MemTotal: 32919124 kB $ cat /proc/meminfo | grep Memmap Memmap: 65536 kB $ cat /sys/devices/system/node/node0/vmstat | grep "nr_memmap" nr_memmap 8192 nr_memmap_boot 65536 $ cat /sys/devices/system/node/node1/vmstat | grep "nr_memmap" nr_memmap 8192 nr_memmap_boot 65536 AFTER HUGTLBFS RESERVATION $ echo 512 > /proc/sys/vm/nr_hugepages $ cat /proc/meminfo | grep MemTotal MemTotal: 32935508 kB $ cat /proc/meminfo | grep Memmap Memmap: 67584 kB $ cat /sys/devices/system/node/node0/vmstat | grep "nr_memmap" nr_memmap 8448 nr_memmap_boot 63488 $ cat /sys/devices/system/node/node0/vmstat | grep "nr_memmap" nr_memmap 8448 nr_memmap_boot 63488 AFTER FREEING HUGTLBFS RESERVATION $ echo 0 > /proc/sys/vm/nr_hugepages $ cat /proc/meminfo | grep MemTotal MemTotal: 32935508 kB $ cat /proc/meminfo | grep Memmap Memmap: 81920 kB $ cat /sys/devices/system/node/node0/vmstat | grep "nr_memmap" nr_memmap 10240 nr_memmap_boot 63488 $ cat /sys/devices/system/node/node0/vmstat | grep "nr_memmap" nr_memmap 10240 nr_memmap_boot 63488 ------------------------ Memory Hotplug with memory_hotplug.memmap_on_memory=1 BEFORE HOTADD $ cat /proc/meminfo | grep MemTotal MemTotal: 32919124 kB $ cat /proc/meminfo | grep Memmap Memmap: 65536 kB $ cat /sys/devices/system/node/node0/vmstat | grep "nr_memmap" nr_memmap 8192 nr_memmap_boot 65536 $ cat /sys/devices/system/node/node0/vmstat | grep "nr_memmap" nr_memmap 8192 nr_memmap_boot 65536 AFTER HOTADDING 1GB $ cat /proc/meminfo | grep MemTotal MemTotal: 33951316 kB $ cat /proc/meminfo | grep Memmap Memmap: 83968 kB $ cat /sys/devices/system/node/node0/vmstat | grep "nr_memmap" nr_memmap 12800 nr_memmap_boot 65536 $ cat /sys/devices/system/node/node0/vmstat | grep "nr_memmap" nr_memmap 8192 nr_memmap_boot 65536 -------------------------- Memory Hotplug with memory_hotplug.memmap_on_memory=0 BEFORE HOTADD $ cat /proc/meminfo | grep MemTotal MemTotal: 32919124 kB $ cat /proc/meminfo | grep Memmap Memmap: 65536 kB $ cat /sys/devices/system/node/node0/vmstat | grep "nr_memmap" nr_memmap 8192 nr_memmap_boot 65536 $ cat /sys/devices/system/node/node0/vmstat | grep "nr_memmap" nr_memmap 8192 nr_memmap_boot 65536 AFTER HOTADDING 1GB $ cat /proc/meminfo | grep MemTotal MemTotal: 33967700 kB $ cat /proc/meminfo | grep Memmap Memmap: 83968 kB $ cat /sys/devices/system/node/node0/vmstat | grep "nr_memmap" nr_memmap 12800 nr_memmap_boot 65536 $ cat /sys/devices/system/node/node0/vmstat | grep "nr_memmap" nr_memmap 8192 nr_memmap_boot 65536 Sourav Panda (1): mm: report per-page metadata information Documentation/filesystems/proc.rst | 3 +++ fs/proc/meminfo.c | 4 ++++ include/linux/mmzone.h | 4 ++++ include/linux/vmstat.h | 4 ++++ mm/hugetlb_vmemmap.c | 17 ++++++++++++---- mm/mm_init.c | 3 +++ mm/page_alloc.c | 1 + mm/page_ext.c | 32 +++++++++++++++++++++--------- mm/sparse-vmemmap.c | 8 ++++++++ mm/sparse.c | 7 ++++++- mm/vmstat.c | 26 +++++++++++++++++++++++- 11 files changed, 94 insertions(+), 15 deletions(-)