Message ID | 20240220214558.3377482-1-souravpanda@google.com |
---|---|
Headers |
Return-Path: <linux-kernel+bounces-73735-ouuuleilei=gmail.com@vger.kernel.org> Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:693c:2685:b0:108:e6aa:91d0 with SMTP id mn5csp682472dyc; Tue, 20 Feb 2024 13:46:57 -0800 (PST) X-Forwarded-Encrypted: i=3; AJvYcCVjlIr7ndL6gQ5/lRz0NITUsGO69lA9ZLBp9ua79vv2Ira1h2VUvks+VpmWyPEvzT/ZfSPbK3aAJbJvVUVXgxVA3K/LVg== X-Google-Smtp-Source: AGHT+IEXc2yXoOH3l/vPpqbrSjMED+zC09k5Wh6IBjsg3Rwa/nZH2c8WCmLMw3rJdTI3hx9V3WFq X-Received: by 2002:a17:90a:9bcb:b0:299:8dbc:f575 with SMTP id b11-20020a17090a9bcb00b002998dbcf575mr5693449pjw.21.1708465617521; Tue, 20 Feb 2024 13:46:57 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1708465617; cv=pass; d=google.com; s=arc-20160816; b=IRL//lCtQZQlRFVGLpmGsZaEY4debmzkBqJHreoC/0zwU36ubDOJKiJCyqaONszMzL k3zJ0Du0cEzdHUMajRHfK7hpAlLyQNQTEyKNyVxtbwnBFdmL3/QngWlK7Hex84KyGd9z 1gvgAAb0LChs8dpqnDSyP62OiCvFrpTZ3Ao/+UWKUmHxGVl1NTi2n9vNGqF8enrV5a0b MxIWSxYzLB5eZma0C8Lj10pxBRXtllhLh9msjHZIYYK2FWBOwDruaS4Fo/6Kg4MtZ72n mHLmrXzqK7cvaxOi4cWAYf80NBUx0J78fuYsv8hmQubk0lPj/HYP/U9JmsZXxqItYQmY aMWw== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=to:from:subject:message-id:mime-version:list-unsubscribe :list-subscribe:list-id:precedence:date:dkim-signature; bh=V01TnE5q7SHBZ8jNobegTNpx6Z7xiHdfszo2NROYfag=; fh=/YjOjeoHNdoppUI+RjHI/hvAaJul0aKqEdCzaoPVszM=; b=WOeGv2Ty+9VskfXTn5lM509D7ZLGml+emSllUR/6WeWGvapSBm2wdsDTQgMqygwH3K eAhaYg6pvYW22NbQipresL68g/Dqv2QOtZ9XlKmQO75INVZtv6/FjfIKXA4fR/xq9l4x AUE+W+52Z89oJ4MJLgCoiyXVxKIkpDpbFk4tTxQCOTnSqDk+RqG5bq7AbXNwWOUZ1RUA stjyPxX7+Dzv6tw9kKGFucbLjaLNJgXX0GQnpcFzRLdvEv7FoBLrBStlmFqO6rfxa6KI xwoh2dvRvtcyGdM2SDVMR4Sjt2h5U46ZrF8M5RfYi/ly7I+QI/4JsqFHxxW4VCQVAEii I4ow==; dara=google.com ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@google.com header.s=20230601 header.b=lWwxld4e; arc=pass (i=1 spf=pass spfdomain=flex--souravpanda.bounces.google.com dkim=pass dkdomain=google.com dmarc=pass fromdomain=google.com); spf=pass (google.com: domain of linux-kernel+bounces-73735-ouuuleilei=gmail.com@vger.kernel.org designates 147.75.48.161 as permitted sender) smtp.mailfrom="linux-kernel+bounces-73735-ouuuleilei=gmail.com@vger.kernel.org"; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=google.com Received: from sy.mirrors.kernel.org (sy.mirrors.kernel.org. [147.75.48.161]) by mx.google.com with ESMTPS id pw7-20020a17090b278700b00298fd9b5505si7038582pjb.114.2024.02.20.13.46.57 for <ouuuleilei@gmail.com> (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 20 Feb 2024 13:46:57 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel+bounces-73735-ouuuleilei=gmail.com@vger.kernel.org designates 147.75.48.161 as permitted sender) client-ip=147.75.48.161; Authentication-Results: mx.google.com; dkim=pass header.i=@google.com header.s=20230601 header.b=lWwxld4e; arc=pass (i=1 spf=pass spfdomain=flex--souravpanda.bounces.google.com dkim=pass dkdomain=google.com dmarc=pass fromdomain=google.com); spf=pass (google.com: domain of linux-kernel+bounces-73735-ouuuleilei=gmail.com@vger.kernel.org designates 147.75.48.161 as permitted sender) smtp.mailfrom="linux-kernel+bounces-73735-ouuuleilei=gmail.com@vger.kernel.org"; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=google.com Received: from smtp.subspace.kernel.org (wormhole.subspace.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by sy.mirrors.kernel.org (Postfix) with ESMTPS id 01451B22AB6 for <ouuuleilei@gmail.com>; Tue, 20 Feb 2024 21:46:37 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id CA3E81534E5; Tue, 20 Feb 2024 21:46:07 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b="lWwxld4e" Received: from mail-yb1-f201.google.com (mail-yb1-f201.google.com [209.85.219.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 00DDB151CEA for <linux-kernel@vger.kernel.org>; Tue, 20 Feb 2024 21:46:00 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.219.201 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1708465563; cv=none; b=niO76bRJwyBafJetwnY0dT+8Ig5vIgEFwVmxVO7DmFIYIr0a7MytRs+9mUwPSejxvVBROOPau0chjRBc3lfDZWSBbGjykSoSigiSVA1vfBb+1D7Sm+cfn9Y2hlK2KEu9E5ozoTLXxVgkJUj8du7g5DWb5gdgOx6uvNo8pN8+IUw= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1708465563; c=relaxed/simple; bh=eiMM/uI3YwCporpUQgYFZ1FqYmJ6e3TvgkTC4YyjgRY=; h=Date:Mime-Version:Message-ID:Subject:From:To:Content-Type; b=pYGKPBdvT/ynW3VG6aE4rIk8SjQq/tvgEoG0E9TWYpyPSXt+bD6/GwkSCQW3LxUA0qmzhUf6c1d4vaZjDjTHbAoEVUmn85Q++zZqMOof57MPFbiGn7uTHp+xAFWyraAx6MjGGdH1YsfmIu5O8C0gakVdeG7s2xxlBvzROCGg1Us= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com; spf=pass smtp.mailfrom=flex--souravpanda.bounces.google.com; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b=lWwxld4e; arc=none smtp.client-ip=209.85.219.201 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=flex--souravpanda.bounces.google.com Received: by mail-yb1-f201.google.com with SMTP id 3f1490d57ef6-dc64b659a9cso10456030276.3 for <linux-kernel@vger.kernel.org>; Tue, 20 Feb 2024 13:46:00 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1708465560; x=1709070360; darn=vger.kernel.org; h=to:from:subject:message-id:mime-version:date:from:to:cc:subject :date:message-id:reply-to; bh=V01TnE5q7SHBZ8jNobegTNpx6Z7xiHdfszo2NROYfag=; b=lWwxld4eq7H/ha/LYqrmPufcw9pbi7vU+W9acJeI4a22g+vkP8SSCDAXODOeHWtg2P 1xAJXsHqwQyt0tl3s+Sr7Iw0P0trsFIashOs16YwsqdHG92DvfFS7RbWcRQxKEfxK/s8 s+SU2RBKsPY8feNwi9K5cnkW+PiEJD8vkUndMcPXU/IV8V9bzFv8y8npw9reKk0mzTLd Utyv6Jay9PclnBqat+8XVjNUpbrYE+chYSFspg0jkdk8OU4RJc9+LlZYlHUybtPKXcmn cwADWGDOsS91YcnYBkG1+cMDv5SXX3hR7ZzbwTm4PgujRz2TDRyR+KoNTwdKoqc1jmhy n51A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1708465560; x=1709070360; h=to:from:subject:message-id:mime-version:date:x-gm-message-state :from:to:cc:subject:date:message-id:reply-to; bh=V01TnE5q7SHBZ8jNobegTNpx6Z7xiHdfszo2NROYfag=; b=CsVXcXI+DzB+57zaKlhTQUXSGdq7DwwIkBYF9tPfkWtkIviv/VQXW4AwOwa4jSw/8E WYMSgk53lRonLgRQoZAil7ea17OGPtbTHfc6p2TiBIERqnqdRGoL4R3dCrK+i8Ueqsru +bT31axw7ai3exUIerNcav4xLYObu//+Fz/kq/IyYilCZ1SQhQDm9cWfUXFr0r9+Ban9 8tqkRbEWwFxG8uYyxKJ3RUWSAeZG16AvmgS4P8jYF5B+JPm+EwHTDC9M55N8LtoJuUEu pUZORNAnNG9whFzrWO4BzoJSbX+PETNYyobVwEa41dxG7UWlayW7VlPerAVwAsyb2BNk mzag== X-Forwarded-Encrypted: i=1; AJvYcCUNhpYUHzU8E+RM+zG6wq9sRdh2RCHlAau59TUC/U3q70glZoYUAXtHtwghX11bWcUS+Cl70p5BUZGDQOXoxk7QZzkf0i7b2t/EUwRs X-Gm-Message-State: AOJu0YwDSb4n5bWxyx7k/uzHHXKZvqunyHh/zl1mgPfgqT3acX80MCPU /pTxDvnOvWB3/OdYH7IoV8G8WhNyEB8Aq/Fruq97SUIG/RZJBMKxL/RgSI8j8BYJ3pgr5a18y50 BHhWuxmBCfKRW3Xf3g4Yxsw== X-Received: from souravpanda.svl.corp.google.com ([2620:15c:2a3:200:908a:1ef7:e79e:3cf5]) (user=souravpanda job=sendgmr) by 2002:a25:dbc6:0:b0:dc6:e5d3:5f03 with SMTP id g189-20020a25dbc6000000b00dc6e5d35f03mr4066041ybf.4.1708465559994; Tue, 20 Feb 2024 13:45:59 -0800 (PST) Date: Tue, 20 Feb 2024 13:45:57 -0800 Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: <linux-kernel.vger.kernel.org> List-Subscribe: <mailto:linux-kernel+subscribe@vger.kernel.org> List-Unsubscribe: <mailto:linux-kernel+unsubscribe@vger.kernel.org> Mime-Version: 1.0 X-Mailer: git-send-email 2.44.0.rc0.258.g7320e95886-goog Message-ID: <20240220214558.3377482-1-souravpanda@google.com> Subject: [PATCH v9 0/1] mm: report per-page metadata information From: Sourav Panda <souravpanda@google.com> 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 Content-Type: text/plain; charset="UTF-8" X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1791456029001641532 X-GMAIL-MSGID: 1791456043476677384 |
Series |
mm: report per-page metadata information
|
|
Message
Sourav Panda
Feb. 20, 2024, 9:45 p.m. UTC
Changelog: v9: - Quick Fix: - In fs/proc/meminfo.c, replaced tabs with spaces for consistent userspace parsing. - Patch is ready to be taken in. 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 ----------------------------------- V8: https://lore.kernel.org/all/20240214225741.403783-1-souravpanda@google.com 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(-)