Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]
Groups > linux.kernel > #1200217 > unrolled thread
| Started by | Jörn Engel <joern@purestorage.com> |
|---|---|
| First post | 2015-08-04 20:30 +0200 |
| Last post | 2015-08-12 01:50 +0200 |
| Articles | 20 on this page of 27 — 4 participants |
Back to article view | Back to linux.kernel
This discussion starts older than the indexed window; earlier articles aren't shown. The article labeled Started by
below is the oldest one visible, not the original post.
Re: [PATCH] smaps: fill missing fields for vma(VM_HUGETLB) Jörn Engel <joern@purestorage.com> - 2015-08-04 20:30 +0200
Re: [PATCH] smaps: fill missing fields for vma(VM_HUGETLB) David Rientjes <rientjes@google.com> - 2015-08-06 04:20 +0200
Re: [PATCH] smaps: fill missing fields for vma(VM_HUGETLB) Naoya Horiguchi <n-horiguchi@ah.jp.nec.com> - 2015-08-06 09:50 +0200
[PATCH v2 0/2] hugetlb: display per-process/per-vma usage Naoya Horiguchi <n-horiguchi@ah.jp.nec.com> - 2015-08-07 09:30 +0200
[PATCH v2 2/2] mm: hugetlb: add VmHugetlbRSS: field in /proc/pid/status Naoya Horiguchi <n-horiguchi@ah.jp.nec.com> - 2015-08-07 09:30 +0200
Re: [PATCH v2 2/2] mm: hugetlb: add VmHugetlbRSS: field in /proc/pid/status Andrew Morton <akpm@linux-foundation.org> - 2015-08-08 01:00 +0200
[PATCH v3 3/3] Documentation/filesystems/proc.txt: document hugetlb RSS Naoya Horiguchi <n-horiguchi@ah.jp.nec.com> - 2015-08-10 02:50 +0200
Re: [PATCH v3 3/3] Documentation/filesystems/proc.txt: document hugetlb RSS David Rientjes <rientjes@google.com> - 2015-08-11 02:50 +0200
Re: [PATCH v3 3/3] Documentation/filesystems/proc.txt: document hugetlb RSS Naoya Horiguchi <n-horiguchi@ah.jp.nec.com> - 2015-08-12 02:10 +0200
[PATCH v4 2/2] mm: hugetlb: proc: add HugetlbPages field to /proc/PID/status Naoya Horiguchi <n-horiguchi@ah.jp.nec.com> - 2015-08-12 09:50 +0200
Re: [PATCH v4 2/2] mm: hugetlb: proc: add HugetlbPages field to /proc/PID/status David Rientjes <rientjes@google.com> - 2015-08-12 22:40 +0200
Re: [PATCH v4 2/2] mm: hugetlb: proc: add HugetlbPages field to /proc/PID/status Naoya Horiguchi <n-horiguchi@ah.jp.nec.com> - 2015-08-13 02:50 +0200
Re: [PATCH v4 2/2] mm: hugetlb: proc: add HugetlbPages field to /proc/PID/status Jörn Engel <joern@purestorage.com> - 2015-08-13 23:20 +0200
Re: [PATCH v4 2/2] mm: hugetlb: proc: add HugetlbPages field to /proc/PID/status Jörn Engel <joern@purestorage.com> - 2015-08-13 23:20 +0200
Re: [PATCH v4 2/2] mm: hugetlb: proc: add HugetlbPages field to /proc/PID/status David Rientjes <rientjes@google.com> - 2015-08-17 23:30 +0200
[PATCH v4 1/2] mm: hugetlb: proc: add HugetlbPages field to /proc/PID/smaps Naoya Horiguchi <n-horiguchi@ah.jp.nec.com> - 2015-08-12 09:50 +0200
Re: [PATCH v4 1/2] mm: hugetlb: proc: add HugetlbPages field to /proc/PID/smaps David Rientjes <rientjes@google.com> - 2015-08-12 22:30 +0200
Re: [PATCH v4 1/2] mm: hugetlb: proc: add HugetlbPages field to /proc/PID/smaps Jörn Engel <joern@purestorage.com> - 2015-08-13 23:20 +0200
[PATCH v3 2/3] mm: hugetlb: add VmHugetlbRSS: field in /proc/pid/status Naoya Horiguchi <n-horiguchi@ah.jp.nec.com> - 2015-08-10 02:50 +0200
Re: [PATCH v3 2/3] mm: hugetlb: add VmHugetlbRSS: field in /proc/pid/status Naoya Horiguchi <n-horiguchi@ah.jp.nec.com> - 2015-08-10 03:20 +0200
[PATCH v3 1/3] smaps: fill missing fields for vma(VM_HUGETLB) Naoya Horiguchi <n-horiguchi@ah.jp.nec.com> - 2015-08-10 02:50 +0200
Re: [PATCH v2 2/2] mm: hugetlb: add VmHugetlbRSS: field in /proc/pid/status Naoya Horiguchi <n-horiguchi@ah.jp.nec.com> - 2015-08-10 02:50 +0200
[PATCH v2 1/2] smaps: fill missing fields for vma(VM_HUGETLB) Naoya Horiguchi <n-horiguchi@ah.jp.nec.com> - 2015-08-07 09:30 +0200
Re: [PATCH v2 1/2] smaps: fill missing fields for vma(VM_HUGETLB) Andrew Morton <akpm@linux-foundation.org> - 2015-08-08 01:00 +0200
Re: [PATCH v2 1/2] smaps: fill missing fields for vma(VM_HUGETLB) David Rientjes <rientjes@google.com> - 2015-08-11 02:40 +0200
Re: [PATCH v2 1/2] smaps: fill missing fields for vma(VM_HUGETLB) Naoya Horiguchi <n-horiguchi@ah.jp.nec.com> - 2015-08-12 01:40 +0200
Re: [PATCH v2 1/2] smaps: fill missing fields for vma(VM_HUGETLB) David Rientjes <rientjes@google.com> - 2015-08-12 01:50 +0200
Page 1 of 2 [1] 2 Next page →
| From | Jörn Engel <joern@purestorage.com> |
|---|---|
| Date | 2015-08-04 20:30 +0200 |
| Subject | Re: [PATCH] smaps: fill missing fields for vma(VM_HUGETLB) |
| Message-ID | <pTP8l-1Gf-3@gated-at.bofh.it> |
On Tue, Aug 04, 2015 at 05:13:39AM +0000, Naoya Horiguchi wrote:
> On Tue, Aug 04, 2015 at 02:55:30AM +0000, Naoya Horiguchi wrote:
> >
> > One possible way to get hugetlb metric in per-task basis is to walk page
> > table via /proc/pid/pagemap, and counting page flags for each mapped page
> > (we can easily do this with tools/vm/page-types.c like "page-types -p <PID>
> > -b huge"). This is obviously slower than just storing the counter as
> > in-kernel data and just exporting it, but might be useful in some situation.
Maybe. The current situation is a mess and I don't know the best way
out of it yet.
> BTW, currently smaps doesn't report any meaningful info for vma(VM_HUGETLB).
> I wrote the following patch, which hopefully is helpful for your purpose.
>
> Thanks,
> Naoya Horiguchi
>
> ---
> From: Naoya Horiguchi <n-horiguchi@ah.jp.nec.com>
> Subject: [PATCH] smaps: fill missing fields for vma(VM_HUGETLB)
>
> Currently smaps reports many zero fields for vma(VM_HUGETLB), which is
> inconvenient when we want to know per-task or per-vma base hugetlb usage.
> This patch enables these fields by introducing smaps_hugetlb_range().
>
> before patch:
>
> Size: 20480 kB
> Rss: 0 kB
> Pss: 0 kB
> Shared_Clean: 0 kB
> Shared_Dirty: 0 kB
> Private_Clean: 0 kB
> Private_Dirty: 0 kB
> Referenced: 0 kB
> Anonymous: 0 kB
> AnonHugePages: 0 kB
> Swap: 0 kB
> KernelPageSize: 2048 kB
> MMUPageSize: 2048 kB
> Locked: 0 kB
> VmFlags: rd wr mr mw me de ht
>
> after patch:
>
> Size: 20480 kB
> Rss: 18432 kB
> Pss: 18432 kB
> Shared_Clean: 0 kB
> Shared_Dirty: 0 kB
> Private_Clean: 0 kB
> Private_Dirty: 18432 kB
> Referenced: 18432 kB
> Anonymous: 18432 kB
> AnonHugePages: 0 kB
> Swap: 0 kB
> KernelPageSize: 2048 kB
> MMUPageSize: 2048 kB
> Locked: 0 kB
> VmFlags: rd wr mr mw me de ht
Nice!
> Signed-off-by: Naoya Horiguchi <n-horiguchi@ah.jp.nec.com>
> ---
> fs/proc/task_mmu.c | 27 +++++++++++++++++++++++++++
> 1 file changed, 27 insertions(+)
>
> diff --git a/fs/proc/task_mmu.c b/fs/proc/task_mmu.c
> index ca1e091881d4..c7218603306d 100644
> --- a/fs/proc/task_mmu.c
> +++ b/fs/proc/task_mmu.c
> @@ -610,12 +610,39 @@ static void show_smap_vma_flags(struct seq_file *m, struct vm_area_struct *vma)
> seq_putc(m, '\n');
> }
>
> +#ifdef CONFIG_HUGETLB_PAGE
> +static int smaps_hugetlb_range(pte_t *pte, unsigned long hmask,
> + unsigned long addr, unsigned long end,
> + struct mm_walk *walk)
> +{
> + struct mem_size_stats *mss = walk->private;
> + struct vm_area_struct *vma = walk->vma;
> + struct page *page = NULL;
> +
> + if (pte_present(*pte)) {
> + page = vm_normal_page(vma, addr, *pte);
> + } else if (is_swap_pte(*pte)) {
> + swp_entry_t swpent = pte_to_swp_entry(*pte);
> +
> + if (is_migration_entry(swpent))
> + page = migration_entry_to_page(swpent);
> + }
> + if (page)
> + smaps_account(mss, page, huge_page_size(hstate_vma(vma)),
> + pte_young(*pte), pte_dirty(*pte));
> + return 0;
> +}
> +#endif /* HUGETLB_PAGE */
> +
> static int show_smap(struct seq_file *m, void *v, int is_pid)
> {
> struct vm_area_struct *vma = v;
> struct mem_size_stats mss;
> struct mm_walk smaps_walk = {
> .pmd_entry = smaps_pte_range,
> +#ifdef CONFIG_HUGETLB_PAGE
> + .hugetlb_entry = smaps_hugetlb_range,
> +#endif
Not too fond of the #ifdef. But I won't blame you, as there already is
an example of the same and - worse - a contradicting example that
unconditionally assigns and moved the #ifdef elsewhere.
Hugetlb is the unloved stepchild with 13 years of neglect and
half-measures. It shows.
Patch looks good to me.
Acked-by: Jörn Engel <joern@logfs.org>
Jörn
--
Functionality is an asset, but code is a liability.
--Ted Dziuba
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
[toc] | [next] | [standalone]
| From | David Rientjes <rientjes@google.com> |
|---|---|
| Date | 2015-08-06 04:20 +0200 |
| Message-ID | <pUiWK-3cM-5@gated-at.bofh.it> |
| In reply to | #1200217 |
[Multipart message — attachments visible in raw view] — view raw
On Tue, 4 Aug 2015, Jörn Engel wrote: > > From: Naoya Horiguchi <n-horiguchi@ah.jp.nec.com> > > Subject: [PATCH] smaps: fill missing fields for vma(VM_HUGETLB) > > > > Currently smaps reports many zero fields for vma(VM_HUGETLB), which is > > inconvenient when we want to know per-task or per-vma base hugetlb usage. > > This patch enables these fields by introducing smaps_hugetlb_range(). > > > > before patch: > > > > Size: 20480 kB > > Rss: 0 kB > > Pss: 0 kB > > Shared_Clean: 0 kB > > Shared_Dirty: 0 kB > > Private_Clean: 0 kB > > Private_Dirty: 0 kB > > Referenced: 0 kB > > Anonymous: 0 kB > > AnonHugePages: 0 kB > > Swap: 0 kB > > KernelPageSize: 2048 kB > > MMUPageSize: 2048 kB > > Locked: 0 kB > > VmFlags: rd wr mr mw me de ht > > > > after patch: > > > > Size: 20480 kB > > Rss: 18432 kB > > Pss: 18432 kB > > Shared_Clean: 0 kB > > Shared_Dirty: 0 kB > > Private_Clean: 0 kB > > Private_Dirty: 18432 kB > > Referenced: 18432 kB > > Anonymous: 18432 kB > > AnonHugePages: 0 kB > > Swap: 0 kB > > KernelPageSize: 2048 kB > > MMUPageSize: 2048 kB > > Locked: 0 kB > > VmFlags: rd wr mr mw me de ht > > Nice! > Hmm, wouldn't this be confusing since VmRSS in /proc/pid/status doesn't match the rss shown in smaps, since hugetlb mappings aren't accounted in get_mm_rss()? Not sure this is a good idea, I think consistency amongst rss values would be more important.
[toc] | [prev] | [next] | [standalone]
| From | Naoya Horiguchi <n-horiguchi@ah.jp.nec.com> |
|---|---|
| Date | 2015-08-06 09:50 +0200 |
| Message-ID | <pUo65-2mn-1@gated-at.bofh.it> |
| In reply to | #1201390 |
T24gV2VkLCBBdWcgMDUsIDIwMTUgYXQgMDc6MTg6NDRQTSAtMDcwMCwgRGF2aWQgUmllbnRqZXMg d3JvdGU6DQouLi4NCj4gSG1tLCB3b3VsZG4ndCB0aGlzIGJlIGNvbmZ1c2luZyBzaW5jZSBWbVJT UyBpbiAvcHJvYy9waWQvc3RhdHVzIGRvZXNuJ3QgDQo+IG1hdGNoIHRoZSByc3Mgc2hvd24gaW4g c21hcHMsIHNpbmNlIGh1Z2V0bGIgbWFwcGluZ3MgYXJlbid0IGFjY291bnRlZCBpbiANCj4gZ2V0 X21tX3JzcygpPw0KPiANCj4gTm90IHN1cmUgdGhpcyBpcyBhIGdvb2QgaWRlYSwgSSB0aGluayBj b25zaXN0ZW5jeSBhbW9uZ3N0IHJzcyB2YWx1ZXMgd291bGQgDQo+IGJlIG1vcmUgaW1wb3J0YW50 Lg0KDQpSaWdodCwgc28gb25lIG9wdGlvbiBpcyBtYWtpbmcgZ2V0X21tX3JzcygpIGNvdW50IGh1 Z2V0bGIsIGJ1dCB0aGF0IGNvdWxkDQptYWtlIG9vbS9tZW1jZyBsZXNzIGVmZmljaWVudCBvciBi cm9rZW4gYXMgeW91IHN0YXRlZCBpbiBhIHByZXZpb3VzIGVtYWlsLg0KU28gYW5vdGhlciBvbmUg aXMgdG8gYWRkICJWbUh1Z2V0bGJSU1M6IiBmaWVsZCBpbiAvcHJvYy9waWQvc3RhdHVzPw0KDQpU aGFua3MsDQpOYW95YSBIb3JpZ3VjaGk= -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
[toc] | [prev] | [next] | [standalone]
| From | Naoya Horiguchi <n-horiguchi@ah.jp.nec.com> |
|---|---|
| Date | 2015-08-07 09:30 +0200 |
| Subject | [PATCH v2 0/2] hugetlb: display per-process/per-vma usage |
| Message-ID | <pUKgi-10c-17@gated-at.bofh.it> |
| In reply to | #1201524 |
SSB3cm90ZSBwYXRjaGVzIHRvIGV4cG9ydCBodWdldGxiIHVzYWdlIGluZm8gdmlhIC9wcm9jL3Bp ZC97c21hcHMsc3RhdHVzfS4NCkluIHRoaXMgdmVyc2lvbiwgSSBhZGRlZCBwYXRjaCAyIGZvciAv cHJvYy9waWQvc3RhdHVzIHRvIGRlYWwgd2l0aCB0aGUNCmluY29uc2lzdGVuY3kgY29uY2VybiBm cm9tIERhdmlkICh0aGFua3MgZm9yIHRoZSBjb21tZW50KS4NCg0KVGhhbmtzLA0KTmFveWEgSG9y aWd1Y2hpDQotLS0NClN1bW1hcnk6DQoNCk5hb3lhIEhvcmlndWNoaSAoMik6DQogICAgICBzbWFw czogZmlsbCBtaXNzaW5nIGZpZWxkcyBmb3Igdm1hKFZNX0hVR0VUTEIpDQogICAgICBtbTogaHVn ZXRsYjogYWRkIFZtSHVnZXRsYlJTUzogZmllbGQgaW4gL3Byb2MvcGlkL3N0YXR1cw0KDQogZnMv cHJvYy90YXNrX21tdS5jICAgICAgIHwgMzIgKysrKysrKysrKysrKysrKysrKysrKysrKysrKysr Ky0NCiBpbmNsdWRlL2xpbnV4L2h1Z2V0bGIuaCAgfCAxOCArKysrKysrKysrKysrKysrKysNCiBp bmNsdWRlL2xpbnV4L21tLmggICAgICAgfCAgMyArKysNCiBpbmNsdWRlL2xpbnV4L21tX3R5cGVz LmggfCAgMyArKysNCiBtbS9odWdldGxiLmMgICAgICAgICAgICAgfCAgOSArKysrKysrKysNCiBt bS9tZW1vcnkuYyAgICAgICAgICAgICAgfCAgNCArKy0tDQogbW0vcm1hcC5jICAgICAgICAgICAg ICAgIHwgIDQgKysrLQ0KIDcgZmlsZXMgY2hhbmdlZCwgNjkgaW5zZXJ0aW9ucygrKSwgNCBkZWxl dGlvbnMoLSk= -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
[toc] | [prev] | [next] | [standalone]
| From | Naoya Horiguchi <n-horiguchi@ah.jp.nec.com> |
|---|---|
| Date | 2015-08-07 09:30 +0200 |
| Subject | [PATCH v2 2/2] mm: hugetlb: add VmHugetlbRSS: field in /proc/pid/status |
| Message-ID | <pUKgi-10c-31@gated-at.bofh.it> |
| In reply to | #1202357 |
Q3VycmVudGx5IHRoZXJlJ3Mgbm8gZWFzeSB3YXkgdG8gZ2V0IHBlci1wcm9jZXNzIHVzYWdlIG9m IGh1Z2V0bGIgcGFnZXMsIHdoaWNoDQppcyBpbmNvbnZlbmllbnQgYmVjYXVzZSBhcHBsaWNhdGlv bnMgd2hpY2ggdXNlIGh1Z2V0bGIgdHlwaWNhbGx5IHdhbnQgdG8gY29udHJvbA0KdGhlaXIgcHJv Y2Vzc2VzIG9uIHRoZSBiYXNpcyBvZiBob3cgbXVjaCBtZW1vcnkgKGluY2x1ZGluZyBodWdldGxi KSB0aGV5IHVzZS4NClNvIHRoaXMgcGF0Y2ggc2ltcGx5IHByb3ZpZGVzIGVhc3kgYWNjZXNzIHRv IHRoZSBpbmZvIHZpYSAvcHJvYy9waWQvc3RhdHVzLg0KDQpUaGlzIHBhdGNoIHNob3VsZG4ndCBj aGFuZ2UgdGhlIE9PTSBiZWhhdmlvciAoc28gaHVnZXRsYiB1c2FnZSBpcyBpZ25vcmVkIGFzDQpp cyBub3csKSB3aGljaCBJIGd1ZXNzIGlzIGZpbmUgdW50aWwgd2UgaGF2ZSBzb21lIHN0cm9uZyBy ZWFzb24gdG8gZG8gaXQuDQoNClNpZ25lZC1vZmYtYnk6IE5hb3lhIEhvcmlndWNoaSA8bi1ob3Jp Z3VjaGlAYWguanAubmVjLmNvbT4NCi0tLQ0KIGZzL3Byb2MvdGFza19tbXUuYyAgICAgICB8ICA1 ICsrKystDQogaW5jbHVkZS9saW51eC9odWdldGxiLmggIHwgMTggKysrKysrKysrKysrKysrKysr DQogaW5jbHVkZS9saW51eC9tbS5oICAgICAgIHwgIDMgKysrDQogaW5jbHVkZS9saW51eC9tbV90 eXBlcy5oIHwgIDMgKysrDQogbW0vaHVnZXRsYi5jICAgICAgICAgICAgIHwgIDkgKysrKysrKysr DQogbW0vbWVtb3J5LmMgICAgICAgICAgICAgIHwgIDQgKystLQ0KIG1tL3JtYXAuYyAgICAgICAg ICAgICAgICB8ICA0ICsrKy0NCiA3IGZpbGVzIGNoYW5nZWQsIDQyIGluc2VydGlvbnMoKyksIDQg ZGVsZXRpb25zKC0pDQoNCmRpZmYgLS1naXQgdjQuMi1yYzQub3JpZy9mcy9wcm9jL3Rhc2tfbW11 LmMgdjQuMi1yYzQvZnMvcHJvYy90YXNrX21tdS5jDQppbmRleCBjNzIxODYwMzMwNmQuLmYxODFm NTZmY2NlMiAxMDA2NDQNCi0tLSB2NC4yLXJjNC5vcmlnL2ZzL3Byb2MvdGFza19tbXUuYw0KKysr IHY0LjItcmM0L2ZzL3Byb2MvdGFza19tbXUuYw0KQEAgLTIyLDcgKzIyLDcgQEANCiB2b2lkIHRh c2tfbWVtKHN0cnVjdCBzZXFfZmlsZSAqbSwgc3RydWN0IG1tX3N0cnVjdCAqbW0pDQogew0KIAl1 bnNpZ25lZCBsb25nIGRhdGEsIHRleHQsIGxpYiwgc3dhcCwgcHRlcywgcG1kczsNCi0JdW5zaWdu ZWQgbG9uZyBoaXdhdGVyX3ZtLCB0b3RhbF92bSwgaGl3YXRlcl9yc3MsIHRvdGFsX3JzczsNCisJ dW5zaWduZWQgbG9uZyBoaXdhdGVyX3ZtLCB0b3RhbF92bSwgaGl3YXRlcl9yc3MsIHRvdGFsX3Jz cywgaHVnZXRsYl9yc3M7DQogDQogCS8qDQogCSAqIE5vdGU6IHRvIG1pbmltaXplIHRoZWlyIG92 ZXJoZWFkLCBtbSBtYWludGFpbnMgaGl3YXRlcl92bSBhbmQNCkBAIC0zNyw2ICszNyw3IEBAIHZv aWQgdGFza19tZW0oc3RydWN0IHNlcV9maWxlICptLCBzdHJ1Y3QgbW1fc3RydWN0ICptbSkNCiAJ aGl3YXRlcl9yc3MgPSB0b3RhbF9yc3MgPSBnZXRfbW1fcnNzKG1tKTsNCiAJaWYgKGhpd2F0ZXJf cnNzIDwgbW0tPmhpd2F0ZXJfcnNzKQ0KIAkJaGl3YXRlcl9yc3MgPSBtbS0+aGl3YXRlcl9yc3M7 DQorCWh1Z2V0bGJfcnNzID0gZ2V0X2h1Z2V0bGJfcnNzKG1tKTsNCiANCiAJZGF0YSA9IG1tLT50 b3RhbF92bSAtIG1tLT5zaGFyZWRfdm0gLSBtbS0+c3RhY2tfdm07DQogCXRleHQgPSAoUEFHRV9B TElHTihtbS0+ZW5kX2NvZGUpIC0gKG1tLT5zdGFydF9jb2RlICYgUEFHRV9NQVNLKSkgPj4gMTA7 DQpAQCAtNTEsNiArNTIsNyBAQCB2b2lkIHRhc2tfbWVtKHN0cnVjdCBzZXFfZmlsZSAqbSwgc3Ry dWN0IG1tX3N0cnVjdCAqbW0pDQogCQkiVm1QaW46XHQlOGx1IGtCXG4iDQogCQkiVm1IV006XHQl OGx1IGtCXG4iDQogCQkiVm1SU1M6XHQlOGx1IGtCXG4iDQorCQkiVm1IdWdldGxiUlNTOlx0JThs dSBrQlxuIg0KIAkJIlZtRGF0YTpcdCU4bHUga0JcbiINCiAJCSJWbVN0azpcdCU4bHUga0JcbiIN CiAJCSJWbUV4ZTpcdCU4bHUga0JcbiINCkBAIC02NCw2ICs2Niw3IEBAIHZvaWQgdGFza19tZW0o c3RydWN0IHNlcV9maWxlICptLCBzdHJ1Y3QgbW1fc3RydWN0ICptbSkNCiAJCW1tLT5waW5uZWRf dm0gPDwgKFBBR0VfU0hJRlQtMTApLA0KIAkJaGl3YXRlcl9yc3MgPDwgKFBBR0VfU0hJRlQtMTAp LA0KIAkJdG90YWxfcnNzIDw8IChQQUdFX1NISUZULTEwKSwNCisJCWh1Z2V0bGJfcnNzIDw8IChQ QUdFX1NISUZULTEwKSwNCiAJCWRhdGEgPDwgKFBBR0VfU0hJRlQtMTApLA0KIAkJbW0tPnN0YWNr X3ZtIDw8IChQQUdFX1NISUZULTEwKSwgdGV4dCwgbGliLA0KIAkJcHRlcyA+PiAxMCwNCmRpZmYg LS1naXQgdjQuMi1yYzQub3JpZy9pbmNsdWRlL2xpbnV4L2h1Z2V0bGIuaCB2NC4yLXJjNC9pbmNs dWRlL2xpbnV4L2h1Z2V0bGIuaA0KaW5kZXggZDg5MWY5NDk0NjZhLi42MzE5ZGYxMjRlNjggMTAw NjQ0DQotLS0gdjQuMi1yYzQub3JpZy9pbmNsdWRlL2xpbnV4L2h1Z2V0bGIuaA0KKysrIHY0LjIt cmM0L2luY2x1ZGUvbGludXgvaHVnZXRsYi5oDQpAQCAtNDY5LDYgKzQ2OSwyMSBAQCBzdGF0aWMg aW5saW5lIHNwaW5sb2NrX3QgKmh1Z2VfcHRlX2xvY2twdHIoc3RydWN0IGhzdGF0ZSAqaCwNCiAj ZGVmaW5lIGh1Z2VwYWdlc19zdXBwb3J0ZWQoKSAoSFBBR0VfU0hJRlQgIT0gMCkNCiAjZW5kaWYN CiANCisvKg0KKyAqIFRoaXMgc2ltcGxlIHdyYXBwZXJzIGFyZSB0byBoaWRlIE1NX0hVR0VUTEJQ QUdFUyBmcm9tIG91dHNpZGUgaHVnZXRsYmZzDQorICogc3Vic3lzdGVtLiBUaGUgY291bnRlciBN TV9IVUdFVExCUEFHRVMgaXMgbWFpbnRhaW5lZCBpbiBwYWdlIHVuaXQgYmFzaXMsDQorICogc28g aXQgY2hhbmdlcyBieSA1MTIgZm9yIGV4YW1wbGUgaWYgYSAyTUIgaHVnZXBhZ2UgaXMgbWFwcGVk IG9yIHVubWFwcGVkLg0KKyAqLw0KK3N0YXRpYyBpbmxpbmUgaW50IGdldF9odWdldGxiX3Jzcyhz dHJ1Y3QgbW1fc3RydWN0ICptbSkNCit7DQorCXJldHVybiBnZXRfbW1fY291bnRlcihtbSwgTU1f SFVHRVRMQlBBR0VTKTsNCit9DQorDQorc3RhdGljIGlubGluZSB2b2lkIG1vZF9odWdldGxiX3Jz cyhzdHJ1Y3QgbW1fc3RydWN0ICptbSwgbG9uZyB2YWx1ZSkNCit7DQorCWFkZF9tbV9jb3VudGVy KG1tLCBNTV9IVUdFVExCUEFHRVMsIHZhbHVlKTsNCit9DQorDQogI2Vsc2UJLyogQ09ORklHX0hV R0VUTEJfUEFHRSAqLw0KIHN0cnVjdCBoc3RhdGUge307DQogI2RlZmluZSBhbGxvY19odWdlX3Bh Z2Vfbm9kZShoLCBuaWQpIE5VTEwNCkBAIC01MDQsNiArNTE5LDkgQEAgc3RhdGljIGlubGluZSBz cGlubG9ja190ICpodWdlX3B0ZV9sb2NrcHRyKHN0cnVjdCBoc3RhdGUgKmgsDQogew0KIAlyZXR1 cm4gJm1tLT5wYWdlX3RhYmxlX2xvY2s7DQogfQ0KKw0KKyNkZWZpbmUgZ2V0X2h1Z2V0bGJfcnNz KG1tKQkwDQorI2RlZmluZSBtb2RfaHVnZXRsYl9yc3MobW0sIHZhbHVlKQlkbyB7fSB3aGlsZSAo MCkNCiAjZW5kaWYJLyogQ09ORklHX0hVR0VUTEJfUEFHRSAqLw0KIA0KIHN0YXRpYyBpbmxpbmUg c3BpbmxvY2tfdCAqaHVnZV9wdGVfbG9jayhzdHJ1Y3QgaHN0YXRlICpoLA0KZGlmZiAtLWdpdCB2 NC4yLXJjNC5vcmlnL2luY2x1ZGUvbGludXgvbW0uaCB2NC4yLXJjNC9pbmNsdWRlL2xpbnV4L21t LmgNCmluZGV4IDJlODcyZjkyZGJhYy4uOTIxOGE4ODU2NDgzIDEwMDY0NA0KLS0tIHY0LjItcmM0 Lm9yaWcvaW5jbHVkZS9saW51eC9tbS5oDQorKysgdjQuMi1yYzQvaW5jbHVkZS9saW51eC9tbS5o DQpAQCAtMTM1NSw2ICsxMzU1LDkgQEAgc3RhdGljIGlubGluZSB2b2lkIHN5bmNfbW1fcnNzKHN0 cnVjdCBtbV9zdHJ1Y3QgKm1tKQ0KIH0NCiAjZW5kaWYNCiANCitleHRlcm4gaW5saW5lIHZvaWQg aW5pdF9yc3NfdmVjKGludCAqcnNzKTsNCitleHRlcm4gaW5saW5lIHZvaWQgYWRkX21tX3Jzc192 ZWMoc3RydWN0IG1tX3N0cnVjdCAqbW0sIGludCAqcnNzKTsNCisNCiBpbnQgdm1hX3dhbnRzX3dy aXRlbm90aWZ5KHN0cnVjdCB2bV9hcmVhX3N0cnVjdCAqdm1hKTsNCiANCiBleHRlcm4gcHRlX3Qg Kl9fZ2V0X2xvY2tlZF9wdGUoc3RydWN0IG1tX3N0cnVjdCAqbW0sIHVuc2lnbmVkIGxvbmcgYWRk ciwNCmRpZmYgLS1naXQgdjQuMi1yYzQub3JpZy9pbmNsdWRlL2xpbnV4L21tX3R5cGVzLmggdjQu Mi1yYzQvaW5jbHVkZS9saW51eC9tbV90eXBlcy5oDQppbmRleCAwMDM4YWM3NDY2ZmQuLjg4N2I0 M2JhNWExOCAxMDA2NDQNCi0tLSB2NC4yLXJjNC5vcmlnL2luY2x1ZGUvbGludXgvbW1fdHlwZXMu aA0KKysrIHY0LjItcmM0L2luY2x1ZGUvbGludXgvbW1fdHlwZXMuaA0KQEAgLTM0OCw2ICszNDgs OSBAQCBlbnVtIHsNCiAJTU1fRklMRVBBR0VTLA0KIAlNTV9BTk9OUEFHRVMsDQogCU1NX1NXQVBF TlRTLA0KKyNpZmRlZiBDT05GSUdfSFVHRVRMQl9QQUdFDQorCU1NX0hVR0VUTEJQQUdFUywNCisj ZW5kaWYNCiAJTlJfTU1fQ09VTlRFUlMNCiB9Ow0KIA0KZGlmZiAtLWdpdCB2NC4yLXJjNC5vcmln L21tL2h1Z2V0bGIuYyB2NC4yLXJjNC9tbS9odWdldGxiLmMNCmluZGV4IGE4YzMwODcwODlkOC4u MTJlNWU3ZDNiNjBmIDEwMDY0NA0KLS0tIHY0LjItcmM0Lm9yaWcvbW0vaHVnZXRsYi5jDQorKysg djQuMi1yYzQvbW0vaHVnZXRsYi5jDQpAQCAtMjc0Myw5ICsyNzQzLDExIEBAIGludCBjb3B5X2h1 Z2V0bGJfcGFnZV9yYW5nZShzdHJ1Y3QgbW1fc3RydWN0ICpkc3QsIHN0cnVjdCBtbV9zdHJ1Y3Qg KnNyYywNCiAJdW5zaWduZWQgbG9uZyBtbXVuX3N0YXJ0OwkvKiBGb3IgbW11X25vdGlmaWVycyAq Lw0KIAl1bnNpZ25lZCBsb25nIG1tdW5fZW5kOwkJLyogRm9yIG1tdV9ub3RpZmllcnMgKi8NCiAJ aW50IHJldCA9IDA7DQorCWludCByc3NbTlJfTU1fQ09VTlRFUlNdOw0KIA0KIAljb3cgPSAodm1h LT52bV9mbGFncyAmIChWTV9TSEFSRUQgfCBWTV9NQVlXUklURSkpID09IFZNX01BWVdSSVRFOw0K IA0KKwlpbml0X3Jzc192ZWMocnNzKTsNCiAJbW11bl9zdGFydCA9IHZtYS0+dm1fc3RhcnQ7DQog CW1tdW5fZW5kID0gdm1hLT52bV9lbmQ7DQogCWlmIChjb3cpDQpAQCAtMjc5Nyw2ICsyNzk5LDcg QEAgaW50IGNvcHlfaHVnZXRsYl9wYWdlX3JhbmdlKHN0cnVjdCBtbV9zdHJ1Y3QgKmRzdCwgc3Ry dWN0IG1tX3N0cnVjdCAqc3JjLA0KIAkJCWdldF9wYWdlKHB0ZXBhZ2UpOw0KIAkJCXBhZ2VfZHVw X3JtYXAocHRlcGFnZSk7DQogCQkJc2V0X2h1Z2VfcHRlX2F0KGRzdCwgYWRkciwgZHN0X3B0ZSwg ZW50cnkpOw0KKwkJCXJzc1tNTV9IVUdFVExCUEFHRVNdICs9IHBhZ2VzX3Blcl9odWdlX3BhZ2Uo aCk7DQogCQl9DQogCQlzcGluX3VubG9jayhzcmNfcHRsKTsNCiAJCXNwaW5fdW5sb2NrKGRzdF9w dGwpOw0KQEAgLTI4MDUsNiArMjgwOCw3IEBAIGludCBjb3B5X2h1Z2V0bGJfcGFnZV9yYW5nZShz dHJ1Y3QgbW1fc3RydWN0ICpkc3QsIHN0cnVjdCBtbV9zdHJ1Y3QgKnNyYywNCiAJaWYgKGNvdykN CiAJCW1tdV9ub3RpZmllcl9pbnZhbGlkYXRlX3JhbmdlX2VuZChzcmMsIG1tdW5fc3RhcnQsIG1t dW5fZW5kKTsNCiANCisJYWRkX21tX3Jzc192ZWMoZHN0LCByc3MpOw0KIAlyZXR1cm4gcmV0Ow0K IH0NCiANCkBAIC0yODIzLDYgKzI4MjcsNyBAQCB2b2lkIF9fdW5tYXBfaHVnZXBhZ2VfcmFuZ2Uo c3RydWN0IG1tdV9nYXRoZXIgKnRsYiwgc3RydWN0IHZtX2FyZWFfc3RydWN0ICp2bWEsDQogCXVu c2lnbmVkIGxvbmcgc3ogPSBodWdlX3BhZ2Vfc2l6ZShoKTsNCiAJY29uc3QgdW5zaWduZWQgbG9u ZyBtbXVuX3N0YXJ0ID0gc3RhcnQ7CS8qIEZvciBtbXVfbm90aWZpZXJzICovDQogCWNvbnN0IHVu c2lnbmVkIGxvbmcgbW11bl9lbmQgICA9IGVuZDsJLyogRm9yIG1tdV9ub3RpZmllcnMgKi8NCisJ aW50IHJzc1tOUl9NTV9DT1VOVEVSU107DQogDQogCVdBUk5fT04oIWlzX3ZtX2h1Z2V0bGJfcGFn ZSh2bWEpKTsNCiAJQlVHX09OKHN0YXJ0ICYgfmh1Z2VfcGFnZV9tYXNrKGgpKTsNCkBAIC0yODMy LDYgKzI4MzcsNyBAQCB2b2lkIF9fdW5tYXBfaHVnZXBhZ2VfcmFuZ2Uoc3RydWN0IG1tdV9nYXRo ZXIgKnRsYiwgc3RydWN0IHZtX2FyZWFfc3RydWN0ICp2bWEsDQogCW1tdV9ub3RpZmllcl9pbnZh bGlkYXRlX3JhbmdlX3N0YXJ0KG1tLCBtbXVuX3N0YXJ0LCBtbXVuX2VuZCk7DQogCWFkZHJlc3Mg PSBzdGFydDsNCiBhZ2FpbjoNCisJaW5pdF9yc3NfdmVjKHJzcyk7DQogCWZvciAoOyBhZGRyZXNz IDwgZW5kOyBhZGRyZXNzICs9IHN6KSB7DQogCQlwdGVwID0gaHVnZV9wdGVfb2Zmc2V0KG1tLCBh ZGRyZXNzKTsNCiAJCWlmICghcHRlcCkNCkBAIC0yODc3LDYgKzI4ODMsNyBAQCB2b2lkIF9fdW5t YXBfaHVnZXBhZ2VfcmFuZ2Uoc3RydWN0IG1tdV9nYXRoZXIgKnRsYiwgc3RydWN0IHZtX2FyZWFf c3RydWN0ICp2bWEsDQogCQlpZiAoaHVnZV9wdGVfZGlydHkocHRlKSkNCiAJCQlzZXRfcGFnZV9k aXJ0eShwYWdlKTsNCiANCisJCXJzc1tNTV9IVUdFVExCUEFHRVNdIC09IHBhZ2VzX3Blcl9odWdl X3BhZ2UoaCk7DQogCQlwYWdlX3JlbW92ZV9ybWFwKHBhZ2UpOw0KIAkJZm9yY2VfZmx1c2ggPSAh X190bGJfcmVtb3ZlX3BhZ2UodGxiLCBwYWdlKTsNCiAJCWlmIChmb3JjZV9mbHVzaCkgew0KQEAg LTI4OTIsNiArMjg5OSw3IEBAIHZvaWQgX191bm1hcF9odWdlcGFnZV9yYW5nZShzdHJ1Y3QgbW11 X2dhdGhlciAqdGxiLCBzdHJ1Y3Qgdm1fYXJlYV9zdHJ1Y3QgKnZtYSwNCiB1bmxvY2s6DQogCQlz cGluX3VubG9jayhwdGwpOw0KIAl9DQorCWFkZF9tbV9yc3NfdmVjKG1tLCByc3MpOw0KIAkvKg0K IAkgKiBtbXVfZ2F0aGVyIHJhbiBvdXQgb2Ygcm9vbSB0byBiYXRjaCBwYWdlcywgd2UgYnJlYWsg b3V0IG9mDQogCSAqIHRoZSBQVEUgbG9jayB0byBhdm9pZCBkb2luZyB0aGUgcG90ZW50aWFsIGV4 cGVuc2l2ZSBUTEIgaW52YWxpZGF0ZQ0KQEAgLTMyNjEsNiArMzI2OSw3IEBAIHN0YXRpYyBpbnQg aHVnZXRsYl9ub19wYWdlKHN0cnVjdCBtbV9zdHJ1Y3QgKm1tLCBzdHJ1Y3Qgdm1fYXJlYV9zdHJ1 Y3QgKnZtYSwNCiAJCQkJJiYgKHZtYS0+dm1fZmxhZ3MgJiBWTV9TSEFSRUQpKSk7DQogCXNldF9o dWdlX3B0ZV9hdChtbSwgYWRkcmVzcywgcHRlcCwgbmV3X3B0ZSk7DQogDQorCW1vZF9odWdldGxi X3JzcyhtbSwgcGFnZXNfcGVyX2h1Z2VfcGFnZShoKSk7DQogCWlmICgoZmxhZ3MgJiBGQVVMVF9G TEFHX1dSSVRFKSAmJiAhKHZtYS0+dm1fZmxhZ3MgJiBWTV9TSEFSRUQpKSB7DQogCQkvKiBPcHRp bWl6YXRpb24sIGRvIHRoZSBDT1cgd2l0aG91dCBhIHNlY29uZCBmYXVsdCAqLw0KIAkJcmV0ID0g aHVnZXRsYl9jb3cobW0sIHZtYSwgYWRkcmVzcywgcHRlcCwgbmV3X3B0ZSwgcGFnZSwgcHRsKTsN CmRpZmYgLS1naXQgdjQuMi1yYzQub3JpZy9tbS9tZW1vcnkuYyB2NC4yLXJjNC9tbS9tZW1vcnku Yw0KaW5kZXggMzg4ZGNmOWFhMjgzLi5lMDliNTNkYTI3MzMgMTAwNjQ0DQotLS0gdjQuMi1yYzQu b3JpZy9tbS9tZW1vcnkuYw0KKysrIHY0LjItcmM0L21tL21lbW9yeS5jDQpAQCAtNjIwLDEyICs2 MjAsMTIgQEAgaW50IF9fcHRlX2FsbG9jX2tlcm5lbChwbWRfdCAqcG1kLCB1bnNpZ25lZCBsb25n IGFkZHJlc3MpDQogCXJldHVybiAwOw0KIH0NCiANCi1zdGF0aWMgaW5saW5lIHZvaWQgaW5pdF9y c3NfdmVjKGludCAqcnNzKQ0KK2lubGluZSB2b2lkIGluaXRfcnNzX3ZlYyhpbnQgKnJzcykNCiB7 DQogCW1lbXNldChyc3MsIDAsIHNpemVvZihpbnQpICogTlJfTU1fQ09VTlRFUlMpOw0KIH0NCiAN Ci1zdGF0aWMgaW5saW5lIHZvaWQgYWRkX21tX3Jzc192ZWMoc3RydWN0IG1tX3N0cnVjdCAqbW0s IGludCAqcnNzKQ0KK2lubGluZSB2b2lkIGFkZF9tbV9yc3NfdmVjKHN0cnVjdCBtbV9zdHJ1Y3Qg Km1tLCBpbnQgKnJzcykNCiB7DQogCWludCBpOw0KIA0KZGlmZiAtLWdpdCB2NC4yLXJjNC5vcmln L21tL3JtYXAuYyB2NC4yLXJjNC9tbS9ybWFwLmMNCmluZGV4IDE3MWI2ODc2OGRmMS4uNzhlNzdi MGVhM2MzIDEwMDY0NA0KLS0tIHY0LjItcmM0Lm9yaWcvbW0vcm1hcC5jDQorKysgdjQuMi1yYzQv bW0vcm1hcC5jDQpAQCAtMTIzMCw3ICsxMjMwLDkgQEAgc3RhdGljIGludCB0cnlfdG9fdW5tYXBf b25lKHN0cnVjdCBwYWdlICpwYWdlLCBzdHJ1Y3Qgdm1fYXJlYV9zdHJ1Y3QgKnZtYSwNCiAJdXBk YXRlX2hpd2F0ZXJfcnNzKG1tKTsNCiANCiAJaWYgKFBhZ2VIV1BvaXNvbihwYWdlKSAmJiAhKGZs YWdzICYgVFRVX0lHTk9SRV9IV1BPSVNPTikpIHsNCi0JCWlmICghUGFnZUh1Z2UocGFnZSkpIHsN CisJCWlmIChQYWdlSHVnZShwYWdlKSkgew0KKwkJCW1vZF9odWdldGxiX3JzcyhtbSwgLSgxIDw8 IGNvbXBvdW5kX29yZGVyKHBhZ2UpKSk7DQorCQl9IGVsc2Ugew0KIAkJCWlmIChQYWdlQW5vbihw YWdlKSkNCiAJCQkJZGVjX21tX2NvdW50ZXIobW0sIE1NX0FOT05QQUdFUyk7DQogCQkJZWxzZQ0K LS0gDQoyLjQuMw0K -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
[toc] | [prev] | [next] | [standalone]
| From | Andrew Morton <akpm@linux-foundation.org> |
|---|---|
| Date | 2015-08-08 01:00 +0200 |
| Subject | Re: [PATCH v2 2/2] mm: hugetlb: add VmHugetlbRSS: field in /proc/pid/status |
| Message-ID | <pUYMi-5gn-5@gated-at.bofh.it> |
| In reply to | #1202366 |
On Fri, 7 Aug 2015 07:24:50 +0000 Naoya Horiguchi <n-horiguchi@ah.jp.nec.com> wrote:
> Currently there's no easy way to get per-process usage of hugetlb pages, which
> is inconvenient because applications which use hugetlb typically want to control
> their processes on the basis of how much memory (including hugetlb) they use.
> So this patch simply provides easy access to the info via /proc/pid/status.
>
> This patch shouldn't change the OOM behavior (so hugetlb usage is ignored as
> is now,) which I guess is fine until we have some strong reason to do it.
>
A procfs change triggers a documentation change. Always, please.
Documentation/filesystems/proc.txt is the place.
>
> ...
>
> @@ -504,6 +519,9 @@ static inline spinlock_t *huge_pte_lockptr(struct hstate *h,
> {
> return &mm->page_table_lock;
> }
> +
> +#define get_hugetlb_rss(mm) 0
> +#define mod_hugetlb_rss(mm, value) do {} while (0)
I don't think these have to be macros? inline functions are nicer in
several ways: more readable, more likely to be documented, can prevent
unused variable warnings.
> #endif /* CONFIG_HUGETLB_PAGE */
>
> static inline spinlock_t *huge_pte_lock(struct hstate *h,
>
> ...
>
> --- v4.2-rc4.orig/mm/memory.c
> +++ v4.2-rc4/mm/memory.c
> @@ -620,12 +620,12 @@ int __pte_alloc_kernel(pmd_t *pmd, unsigned long address)
> return 0;
> }
>
> -static inline void init_rss_vec(int *rss)
> +inline void init_rss_vec(int *rss)
> {
> memset(rss, 0, sizeof(int) * NR_MM_COUNTERS);
> }
>
> -static inline void add_mm_rss_vec(struct mm_struct *mm, int *rss)
> +inline void add_mm_rss_vec(struct mm_struct *mm, int *rss)
> {
> int i;
The inlines are a bit odd, but this does save ~10 bytes in memory.o for
some reason.
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
[toc] | [prev] | [next] | [standalone]
| From | Naoya Horiguchi <n-horiguchi@ah.jp.nec.com> |
|---|---|
| Date | 2015-08-10 02:50 +0200 |
| Subject | [PATCH v3 3/3] Documentation/filesystems/proc.txt: document hugetlb RSS |
| Message-ID | <pVJrQ-5JM-1@gated-at.bofh.it> |
| In reply to | #1203069 |
L3Byb2MvUElEL3tzdGF0dXMsc21hcHN9IGlzIGF3YXJlIG9mIGh1Z2V0bGIgUlNTIG5vdywgc28g bGV0J3MgZG9jdW1lbnQgaXQuDQoNClNpZ25lZC1vZmYtYnk6IE5hb3lhIEhvcmlndWNoaSA8bi1o b3JpZ3VjaGlAYWguanAubmVjLmNvbT4NCi0tLQ0KIERvY3VtZW50YXRpb24vZmlsZXN5c3RlbXMv cHJvYy50eHQgfCAxMCArKysrKysrKy0tDQogMSBmaWxlIGNoYW5nZWQsIDggaW5zZXJ0aW9ucygr KSwgMiBkZWxldGlvbnMoLSkNCg0KZGlmZiAtLWdpdCB2NC4yLXJjNC5vcmlnL0RvY3VtZW50YXRp b24vZmlsZXN5c3RlbXMvcHJvYy50eHQgdjQuMi1yYzQvRG9jdW1lbnRhdGlvbi9maWxlc3lzdGVt cy9wcm9jLnR4dA0KaW5kZXggNmY3ZmFmZGUwODg0Li5jYjg1NjVlMTUwZWQgMTAwNjQ0DQotLS0g djQuMi1yYzQub3JpZy9Eb2N1bWVudGF0aW9uL2ZpbGVzeXN0ZW1zL3Byb2MudHh0DQorKysgdjQu Mi1yYzQvRG9jdW1lbnRhdGlvbi9maWxlc3lzdGVtcy9wcm9jLnR4dA0KQEAgLTE2OCw2ICsxNjgs NyBAQCBGb3IgZXhhbXBsZSwgdG8gZ2V0IHRoZSBzdGF0dXMgaW5mb3JtYXRpb24gb2YgYSBwcm9j ZXNzLCBhbGwgeW91IGhhdmUgdG8gZG8gaXMNCiAgIFZtTGNrOiAgICAgICAgIDAga0INCiAgIFZt SFdNOiAgICAgICA0NzYga0INCiAgIFZtUlNTOiAgICAgICA0NzYga0INCisgIFZtSHVnZXRsYlJT UzogIDAga0INCiAgIFZtRGF0YTogICAgICAxNTYga0INCiAgIFZtU3RrOiAgICAgICAgODgga0IN CiAgIFZtRXhlOiAgICAgICAgNjgga0INCkBAIC0yMzAsNiArMjMxLDcgQEAgVGFibGUgMS0yOiBD b250ZW50cyBvZiB0aGUgc3RhdHVzIGZpbGVzIChhcyBvZiA0LjEpDQogIFZtTGNrICAgICAgICAg ICAgICAgICAgICAgICBsb2NrZWQgbWVtb3J5IHNpemUNCiAgVm1IV00gICAgICAgICAgICAgICAg ICAgICAgIHBlYWsgcmVzaWRlbnQgc2V0IHNpemUgKCJoaWdoIHdhdGVyIG1hcmsiKQ0KICBWbVJT UyAgICAgICAgICAgICAgICAgICAgICAgc2l6ZSBvZiBtZW1vcnkgcG9ydGlvbnMNCisgVm1IdWdl dGxiUlNTICAgICAgICAgICAgICAgIHNpemUgb2YgaHVnZXRsYiBtZW1vcnkgcG9ydGlvbnMNCiAg Vm1EYXRhICAgICAgICAgICAgICAgICAgICAgIHNpemUgb2YgZGF0YSwgc3RhY2ssIGFuZCB0ZXh0 IHNlZ21lbnRzDQogIFZtU3RrICAgICAgICAgICAgICAgICAgICAgICBzaXplIG9mIGRhdGEsIHN0 YWNrLCBhbmQgdGV4dCBzZWdtZW50cw0KICBWbUV4ZSAgICAgICAgICAgICAgICAgICAgICAgc2l6 ZSBvZiB0ZXh0IHNlZ21lbnQNCkBAIC00NDAsOCArNDQyLDEyIEBAIGluZGljYXRlcyB0aGUgYW1v dW50IG9mIG1lbW9yeSBjdXJyZW50bHkgbWFya2VkIGFzIHJlZmVyZW5jZWQgb3IgYWNjZXNzZWQu DQogIkFub255bW91cyIgc2hvd3MgdGhlIGFtb3VudCBvZiBtZW1vcnkgdGhhdCBkb2VzIG5vdCBi ZWxvbmcgdG8gYW55IGZpbGUuICBFdmVuDQogYSBtYXBwaW5nIGFzc29jaWF0ZWQgd2l0aCBhIGZp bGUgbWF5IGNvbnRhaW4gYW5vbnltb3VzIHBhZ2VzOiB3aGVuIE1BUF9QUklWQVRFDQogYW5kIGEg cGFnZSBpcyBtb2RpZmllZCwgdGhlIGZpbGUgcGFnZSBpcyByZXBsYWNlZCBieSBhIHByaXZhdGUg YW5vbnltb3VzIGNvcHkuDQotIlN3YXAiIHNob3dzIGhvdyBtdWNoIHdvdWxkLWJlLWFub255bW91 cyBtZW1vcnkgaXMgYWxzbyB1c2VkLCBidXQgb3V0IG9uDQotc3dhcC4NCisiU3dhcCIgc2hvd3Mg aG93IG11Y2ggd291bGQtYmUtYW5vbnltb3VzIG1lbW9yeSBpcyBhbHNvIHVzZWQsIGJ1dCBvdXQg b24gc3dhcC4NCitTaW5jZSA0LjMsICJSU1MiIGNvbnRhaW5zIHRoZSBhbW91bnQgb2YgbWFwcGlu Z3MgZm9yIGh1Z2V0bGIgcGFnZXMuIEFsdGhvdWdoDQorUlNTIG9mIGh1Z2V0bGIgbWFwcGluZ3Mg aXMgbWFpbnRhaW5lZCBzZXBhcmF0ZWx5IGZyb20gbm9ybWFsIG1hcHBpbmdzDQorKGRpc3BsYXll ZCBpbiAiVm1IdWdldGxiUlNTIiBmaWVsZCBvZiAvcHJvYy9QSUQvc3RhdHVzLCkgL3Byb2MvUElE L3NtYXBzIHNob3dzDQorYm90aCBtYXBwaW5ncyBpbiAiUlNTIiBmaWVsZC4gVXNlcnNwYWNlIGFw cGxpY2F0aW9ucyBjbGVhcmx5IGRpc3Rpbmd1aXNoIHRoZQ0KK3R5cGUgb2YgbWFwcGluZyB3aXRo ICdodCcgZmxhZyBpbiAiVm1GbGFncyIgZmllbGQuDQogDQogIlZtRmxhZ3MiIGZpZWxkIGRlc2Vy dmVzIGEgc2VwYXJhdGUgZGVzY3JpcHRpb24uIFRoaXMgbWVtYmVyIHJlcHJlc2VudHMgdGhlIGtl cm5lbA0KIGZsYWdzIGFzc29jaWF0ZWQgd2l0aCB0aGUgcGFydGljdWxhciB2aXJ0dWFsIG1lbW9y eSBhcmVhIGluIHR3byBsZXR0ZXIgZW5jb2RlZA0KLS0gDQoyLjQuMw0K -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
[toc] | [prev] | [next] | [standalone]
| From | David Rientjes <rientjes@google.com> |
|---|---|
| Date | 2015-08-11 02:50 +0200 |
| Subject | Re: [PATCH v3 3/3] Documentation/filesystems/proc.txt: document hugetlb RSS |
| Message-ID | <pW5Vn-5Vd-5@gated-at.bofh.it> |
| In reply to | #1203720 |
On Mon, 10 Aug 2015, Naoya Horiguchi wrote:
> diff --git v4.2-rc4.orig/Documentation/filesystems/proc.txt v4.2-rc4/Documentation/filesystems/proc.txt
> index 6f7fafde0884..cb8565e150ed 100644
> --- v4.2-rc4.orig/Documentation/filesystems/proc.txt
> +++ v4.2-rc4/Documentation/filesystems/proc.txt
> @@ -168,6 +168,7 @@ For example, to get the status information of a process, all you have to do is
> VmLck: 0 kB
> VmHWM: 476 kB
> VmRSS: 476 kB
> + VmHugetlbRSS: 0 kB
> VmData: 156 kB
> VmStk: 88 kB
> VmExe: 68 kB
> @@ -230,6 +231,7 @@ Table 1-2: Contents of the status files (as of 4.1)
> VmLck locked memory size
> VmHWM peak resident set size ("high water mark")
> VmRSS size of memory portions
> + VmHugetlbRSS size of hugetlb memory portions
> VmData size of data, stack, and text segments
> VmStk size of data, stack, and text segments
> VmExe size of text segment
> @@ -440,8 +442,12 @@ indicates the amount of memory currently marked as referenced or accessed.
> "Anonymous" shows the amount of memory that does not belong to any file. Even
> a mapping associated with a file may contain anonymous pages: when MAP_PRIVATE
> and a page is modified, the file page is replaced by a private anonymous copy.
> -"Swap" shows how much would-be-anonymous memory is also used, but out on
> -swap.
> +"Swap" shows how much would-be-anonymous memory is also used, but out on swap.
> +Since 4.3, "RSS" contains the amount of mappings for hugetlb pages. Although
> +RSS of hugetlb mappings is maintained separately from normal mappings
> +(displayed in "VmHugetlbRSS" field of /proc/PID/status,) /proc/PID/smaps shows
> +both mappings in "RSS" field. Userspace applications clearly distinguish the
> +type of mapping with 'ht' flag in "VmFlags" field.
>
> "VmFlags" field deserves a separate description. This member represents the kernel
> flags associated with the particular virtual memory area in two letter encoded
My objection to adding hugetlb memory to the RSS field of /proc/pid/smaps
still stands and can be addressed in the thread of the first patch. Since
this includes wording that describes that change, then the objection would
also cover that.
With regard to adding VmHugetlbRSS, I think the change is fine, and I
appreciate that you call it VmHugetlbRSS and not VmHugeRSS since that
would be confused with thp.
My only concern regarding VmHugetlbRSS would be extendability and whether
we will eventually, or even today, want to differentiate between various
hugetlb page sizes. For example, if 1GB hugetlb pages on x86 are a
precious resource, then how do I determine which process has mapped it
rather than 512 2MB hugetlb pages?
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
[toc] | [prev] | [next] | [standalone]
| From | Naoya Horiguchi <n-horiguchi@ah.jp.nec.com> |
|---|---|
| Date | 2015-08-12 02:10 +0200 |
| Subject | Re: [PATCH v3 3/3] Documentation/filesystems/proc.txt: document hugetlb RSS |
| Message-ID | <pWrMe-45O-9@gated-at.bofh.it> |
| In reply to | #1204652 |
T24gTW9uLCBBdWcgMTAsIDIwMTUgYXQgMDU6NDQ6NTRQTSAtMDcwMCwgRGF2aWQgUmllbnRqZXMg d3JvdGU6DQo+IE9uIE1vbiwgMTAgQXVnIDIwMTUsIE5hb3lhIEhvcmlndWNoaSB3cm90ZToNCj4g DQo+ID4gZGlmZiAtLWdpdCB2NC4yLXJjNC5vcmlnL0RvY3VtZW50YXRpb24vZmlsZXN5c3RlbXMv cHJvYy50eHQgdjQuMi1yYzQvRG9jdW1lbnRhdGlvbi9maWxlc3lzdGVtcy9wcm9jLnR4dA0KPiA+ IGluZGV4IDZmN2ZhZmRlMDg4NC4uY2I4NTY1ZTE1MGVkIDEwMDY0NA0KPiA+IC0tLSB2NC4yLXJj NC5vcmlnL0RvY3VtZW50YXRpb24vZmlsZXN5c3RlbXMvcHJvYy50eHQNCj4gPiArKysgdjQuMi1y YzQvRG9jdW1lbnRhdGlvbi9maWxlc3lzdGVtcy9wcm9jLnR4dA0KPiA+IEBAIC0xNjgsNiArMTY4 LDcgQEAgRm9yIGV4YW1wbGUsIHRvIGdldCB0aGUgc3RhdHVzIGluZm9ybWF0aW9uIG9mIGEgcHJv Y2VzcywgYWxsIHlvdSBoYXZlIHRvIGRvIGlzDQo+ID4gICAgVm1MY2s6ICAgICAgICAgMCBrQg0K PiA+ICAgIFZtSFdNOiAgICAgICA0NzYga0INCj4gPiAgICBWbVJTUzogICAgICAgNDc2IGtCDQo+ ID4gKyAgVm1IdWdldGxiUlNTOiAgMCBrQg0KPiA+ICAgIFZtRGF0YTogICAgICAxNTYga0INCj4g PiAgICBWbVN0azogICAgICAgIDg4IGtCDQo+ID4gICAgVm1FeGU6ICAgICAgICA2OCBrQg0KPiA+ IEBAIC0yMzAsNiArMjMxLDcgQEAgVGFibGUgMS0yOiBDb250ZW50cyBvZiB0aGUgc3RhdHVzIGZp bGVzIChhcyBvZiA0LjEpDQo+ID4gICBWbUxjayAgICAgICAgICAgICAgICAgICAgICAgbG9ja2Vk IG1lbW9yeSBzaXplDQo+ID4gICBWbUhXTSAgICAgICAgICAgICAgICAgICAgICAgcGVhayByZXNp ZGVudCBzZXQgc2l6ZSAoImhpZ2ggd2F0ZXIgbWFyayIpDQo+ID4gICBWbVJTUyAgICAgICAgICAg ICAgICAgICAgICAgc2l6ZSBvZiBtZW1vcnkgcG9ydGlvbnMNCj4gPiArIFZtSHVnZXRsYlJTUyAg ICAgICAgICAgICAgICBzaXplIG9mIGh1Z2V0bGIgbWVtb3J5IHBvcnRpb25zDQo+ID4gICBWbURh dGEgICAgICAgICAgICAgICAgICAgICAgc2l6ZSBvZiBkYXRhLCBzdGFjaywgYW5kIHRleHQgc2Vn bWVudHMNCj4gPiAgIFZtU3RrICAgICAgICAgICAgICAgICAgICAgICBzaXplIG9mIGRhdGEsIHN0 YWNrLCBhbmQgdGV4dCBzZWdtZW50cw0KPiA+ICAgVm1FeGUgICAgICAgICAgICAgICAgICAgICAg IHNpemUgb2YgdGV4dCBzZWdtZW50DQo+ID4gQEAgLTQ0MCw4ICs0NDIsMTIgQEAgaW5kaWNhdGVz IHRoZSBhbW91bnQgb2YgbWVtb3J5IGN1cnJlbnRseSBtYXJrZWQgYXMgcmVmZXJlbmNlZCBvciBh Y2Nlc3NlZC4NCj4gPiAgIkFub255bW91cyIgc2hvd3MgdGhlIGFtb3VudCBvZiBtZW1vcnkgdGhh dCBkb2VzIG5vdCBiZWxvbmcgdG8gYW55IGZpbGUuICBFdmVuDQo+ID4gIGEgbWFwcGluZyBhc3Nv Y2lhdGVkIHdpdGggYSBmaWxlIG1heSBjb250YWluIGFub255bW91cyBwYWdlczogd2hlbiBNQVBf UFJJVkFURQ0KPiA+ICBhbmQgYSBwYWdlIGlzIG1vZGlmaWVkLCB0aGUgZmlsZSBwYWdlIGlzIHJl cGxhY2VkIGJ5IGEgcHJpdmF0ZSBhbm9ueW1vdXMgY29weS4NCj4gPiAtIlN3YXAiIHNob3dzIGhv dyBtdWNoIHdvdWxkLWJlLWFub255bW91cyBtZW1vcnkgaXMgYWxzbyB1c2VkLCBidXQgb3V0IG9u DQo+ID4gLXN3YXAuDQo+ID4gKyJTd2FwIiBzaG93cyBob3cgbXVjaCB3b3VsZC1iZS1hbm9ueW1v dXMgbWVtb3J5IGlzIGFsc28gdXNlZCwgYnV0IG91dCBvbiBzd2FwLg0KPiA+ICtTaW5jZSA0LjMs ICJSU1MiIGNvbnRhaW5zIHRoZSBhbW91bnQgb2YgbWFwcGluZ3MgZm9yIGh1Z2V0bGIgcGFnZXMu IEFsdGhvdWdoDQo+ID4gK1JTUyBvZiBodWdldGxiIG1hcHBpbmdzIGlzIG1haW50YWluZWQgc2Vw YXJhdGVseSBmcm9tIG5vcm1hbCBtYXBwaW5ncw0KPiA+ICsoZGlzcGxheWVkIGluICJWbUh1Z2V0 bGJSU1MiIGZpZWxkIG9mIC9wcm9jL1BJRC9zdGF0dXMsKSAvcHJvYy9QSUQvc21hcHMgc2hvd3MN Cj4gPiArYm90aCBtYXBwaW5ncyBpbiAiUlNTIiBmaWVsZC4gVXNlcnNwYWNlIGFwcGxpY2F0aW9u cyBjbGVhcmx5IGRpc3Rpbmd1aXNoIHRoZQ0KPiA+ICt0eXBlIG9mIG1hcHBpbmcgd2l0aCAnaHQn IGZsYWcgaW4gIlZtRmxhZ3MiIGZpZWxkLg0KPiA+ICANCj4gPiAgIlZtRmxhZ3MiIGZpZWxkIGRl c2VydmVzIGEgc2VwYXJhdGUgZGVzY3JpcHRpb24uIFRoaXMgbWVtYmVyIHJlcHJlc2VudHMgdGhl IGtlcm5lbA0KPiA+ICBmbGFncyBhc3NvY2lhdGVkIHdpdGggdGhlIHBhcnRpY3VsYXIgdmlydHVh bCBtZW1vcnkgYXJlYSBpbiB0d28gbGV0dGVyIGVuY29kZWQNCj4gDQo+IE15IG9iamVjdGlvbiB0 byBhZGRpbmcgaHVnZXRsYiBtZW1vcnkgdG8gdGhlIFJTUyBmaWVsZCBvZiAvcHJvYy9waWQvc21h cHMgDQo+IHN0aWxsIHN0YW5kcyBhbmQgY2FuIGJlIGFkZHJlc3NlZCBpbiB0aGUgdGhyZWFkIG9m IHRoZSBmaXJzdCBwYXRjaC4gIFNpbmNlIA0KPiB0aGlzIGluY2x1ZGVzIHdvcmRpbmcgdGhhdCBk ZXNjcmliZXMgdGhhdCBjaGFuZ2UsIHRoZW4gdGhlIG9iamVjdGlvbiB3b3VsZCANCj4gYWxzbyBj b3ZlciB0aGF0Lg0KDQpPSywgSSdsbCB1cGRhdGUgdGhpcyBpbiBhY2NvcmRhbmNlIHdpdGggdGhl IGNoYW5nZSBvbiB0aGUgZmlyc3QgcGF0Y2guDQoNCj4gV2l0aCByZWdhcmQgdG8gYWRkaW5nIFZt SHVnZXRsYlJTUywgSSB0aGluayB0aGUgY2hhbmdlIGlzIGZpbmUsIGFuZCBJIA0KPiBhcHByZWNp YXRlIHRoYXQgeW91IGNhbGwgaXQgVm1IdWdldGxiUlNTIGFuZCBub3QgVm1IdWdlUlNTIHNpbmNl IHRoYXQgDQo+IHdvdWxkIGJlIGNvbmZ1c2VkIHdpdGggdGhwLg0KDQpJIHBsYW4gdG8gcmVuYW1l IHRoZSBmaWVsZCwgdGhlbiB0aGUgbmV3IG5hbWUgd2lsbC9zaG91bGQgYmUgdW5jb25mdXNpbmcN CmJldHdlZW4gdGhwIGFuZCBodWdldGxiLg0KDQo+IE15IG9ubHkgY29uY2VybiByZWdhcmRpbmcg Vm1IdWdldGxiUlNTIHdvdWxkIGJlIGV4dGVuZGFiaWxpdHkgYW5kIHdoZXRoZXIgDQo+IHdlIHdp bGwgZXZlbnR1YWxseSwgb3IgZXZlbiB0b2RheSwgd2FudCB0byBkaWZmZXJlbnRpYXRlIGJldHdl ZW4gdmFyaW91cyANCj4gaHVnZXRsYiBwYWdlIHNpemVzLiAgRm9yIGV4YW1wbGUsIGlmIDFHQiBo dWdldGxiIHBhZ2VzIG9uIHg4NiBhcmUgYSANCj4gcHJlY2lvdXMgcmVzb3VyY2UsIHRoZW4gaG93 IGRvIEkgZGV0ZXJtaW5lIHdoaWNoIHByb2Nlc3MgaGFzIG1hcHBlZCBpdCANCj4gcmF0aGVyIHRo YW4gNTEyIDJNQiBodWdldGxiIHBhZ2VzPw0KDQoiS2VybmVsUGFnZVNpemUiIGZpZWxkIGluIC9w cm9jL1BJRC9zbWFwcyBpcyBhd2FyZSBvZiBodWdldGxiIHBhZ2Ugc2l6ZXMsDQpzbyBJIGV4cGVj dGVkIHVzZXJzcGFjZSB0byBkZXRlY3QgdGhlIHNpemUgaXRzZWxmLiBCdXQgL3Byb2MvUElEL3N0 YXR1cyBzaG93cw0Kb25seSBwcm9jY2Vzcy13aWRlIGluZm8sIHNvIHVzZXJzcGFjZSBhcHBsaWNh dGlvbnMgbXVzdCByZWFkIGJvdGggb2YgdGhlc2UNCmZpbGVzIHRvIGtub3cgdGhlIHVzYWdlIHBl ciBodWdlcGFnZSBzaXplLCB3aGljaCBtaWdodCBiZSBpbmNvbnZlbmllbnQuDQoNCk9uZSBpZGVh IGlzIHRvIHNob3cgdGhlIG5ldyBmaWVsZCBsaWtlICJWbUh1Z2V0bGJSU1M6IDJ4NTEya0IgMXgx R0IiIGZvcg0KYm90aCBvZiAvcHJvYy9QSUQve3N0YXR1cyxzbWFwc30sIHdoaWNoIHBhc3NlcyB0 aGUgZnVsbCBodWdldGxiIGluZm8gaW4gYQ0Kc2luZ2xlIGxpbmUgc28gZWFzaWVyIHRvIHBhcnNl IGFuZCBwcm9jZXNzLiBPciBzb21lIG90aGVyIGZpZWxkcyBzaG93cyBpbg0KImtCIiwgc28gIlZt SHVnZXRsYlJTUzogMTA1MjY3MiBrQiAoMng1MTJrQiAxeDFHQikiIGlzIHBvc3NpYmxlIGZvciBo dW1hbg0KcmVhZGFiaWxpdHkuDQoNClRoYW5rIHlvdSB2ZXJ5IG11Y2ggZm9yIHRoZSBmZWVkYmFj aywgSSdsbCByZXBvc3Qgc29vbiwgYnV0IGFueSBhZGRpdGlvbmFsDQpjb21tZW50IGlzIGFwcHJl Y2lhdGVkLg0KDQpOYW95YQ== -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
[toc] | [prev] | [next] | [standalone]
| From | Naoya Horiguchi <n-horiguchi@ah.jp.nec.com> |
|---|---|
| Date | 2015-08-12 09:50 +0200 |
| Subject | [PATCH v4 2/2] mm: hugetlb: proc: add HugetlbPages field to /proc/PID/status |
| Message-ID | <pWyXo-6k2-7@gated-at.bofh.it> |
| In reply to | #1205514 |
Q3VycmVudGx5IHRoZXJlJ3Mgbm8gZWFzeSB3YXkgdG8gZ2V0IHBlci1wcm9jZXNzIHVzYWdlIG9m IGh1Z2V0bGIgcGFnZXMsIHdoaWNoDQppcyBpbmNvbnZlbmllbnQgYmVjYXVzZSB1c2Vyc3BhY2Ug YXBwbGljYXRpb25zIHdoaWNoIHVzZSBodWdldGxiIHR5cGljYWxseSB3YW50DQp0byBjb250cm9s IHRoZWlyIHByb2Nlc3NlcyBvbiB0aGUgYmFzaXMgb2YgaG93IG11Y2ggbWVtb3J5IChpbmNsdWRp bmcgaHVnZXRsYikNCnRoZXkgdXNlLiBTbyB0aGlzIHBhdGNoIHNpbXBseSBwcm92aWRlcyBlYXN5 IGFjY2VzcyB0byB0aGUgaW5mbyB2aWENCi9wcm9jL1BJRC9zdGF0dXMuDQoNCldpdGggdGhpcyBw YXRjaCwgZm9yIGV4YW1wbGUsIC9wcm9jL1BJRC9zdGF0dXMgc2hvd3MgYSBsaW5lIGxpa2UgdGhp czoNCg0KICBIdWdldGxiUGFnZXM6ICAgICAgMjA0ODAga0IgKDEweDIwNDhrQikNCg0KSWYgeW91 ciBzeXN0ZW0gc3VwcG9ydHMgYW5kIGVuYWJsZXMgbXVsdGlwbGUgaHVnZXBhZ2Ugc2l6ZXMsIHRo ZSBsaW5lIGxvb2tzDQpsaWtlIHRoaXM6DQoNCiAgSHVnZXRsYlBhZ2VzOiAgICAxMDY5MDU2IGtC ICgxeDEwNDg1NzZrQiAxMHgyMDQ4a0IpDQoNCiwgc28geW91IGNhbiBlYXNpbHkga25vdyBob3cg bWFueSBodWdlcGFnZXMgaW4gd2hpY2ggcGFnZXNpemUgYXJlIHVzZWQgYnkgYQ0KcHJvY2Vzcy4N Cg0KU2lnbmVkLW9mZi1ieTogTmFveWEgSG9yaWd1Y2hpIDxuLWhvcmlndWNoaUBhaC5qcC5uZWMu Y29tPg0KLS0tDQp2MyAtPiB2NDoNCi0gcmVuYW1lIGZpZWxkIChWbUh1Z2V0bGJSU1MgaXMgbm90 IHRoZSBiZXN0IG5hbWUpDQotIGludHJvZHVjZSBzdHJ1Y3QgaHVnZXRsYl91c2FnZSBpbiBzdHJ1 Y3QgbW1fc3RydWN0IChubyBpbnZhc2lvbiB0byBzdHJ1Y3QNCiAgbW1fcnNzX3N0YXQpDQotIGlu dHJvZHVjZSBodWdldGxiX3JlcG9ydF91c2FnZSgpDQotIG1lcmdlZCBkb2N1bWVudGF0aW9uIHVw ZGF0ZQ0KDQp2MiAtPiB2MzoNCi0gdXNlIGlubGluZSBmdW5jdGlvbnMgaW5zdGVhZCBvZiBtYWNy b3MgZm9yICFDT05GSUdfSFVHRVRMQl9QQUdFDQotLS0NCiBEb2N1bWVudGF0aW9uL2ZpbGVzeXN0 ZW1zL3Byb2MudHh0IHwgIDMgKysrDQogZnMvcHJvYy90YXNrX21tdS5jICAgICAgICAgICAgICAg ICB8ICAxICsNCiBpbmNsdWRlL2xpbnV4L2h1Z2V0bGIuaCAgICAgICAgICAgIHwgMjAgKysrKysr KysrKysrKysrKysrKysNCiBpbmNsdWRlL2xpbnV4L21tX3R5cGVzLmggICAgICAgICAgIHwgMTAg KysrKysrKysrKw0KIG1tL2h1Z2V0bGIuYyAgICAgICAgICAgICAgICAgICAgICAgfCAyNyArKysr KysrKysrKysrKysrKysrKysrKysrKysNCiBtbS9ybWFwLmMgICAgICAgICAgICAgICAgICAgICAg ICAgIHwgIDQgKysrLQ0KIDYgZmlsZXMgY2hhbmdlZCwgNjQgaW5zZXJ0aW9ucygrKSwgMSBkZWxl dGlvbigtKQ0KDQpkaWZmIC0tZ2l0IHY0LjItcmM0Lm9yaWcvRG9jdW1lbnRhdGlvbi9maWxlc3lz dGVtcy9wcm9jLnR4dCB2NC4yLXJjNC9Eb2N1bWVudGF0aW9uL2ZpbGVzeXN0ZW1zL3Byb2MudHh0 DQppbmRleCAyMmU0MDIxMWVmNjQuLmU5MmE0YTkxZmM5OSAxMDA2NDQNCi0tLSB2NC4yLXJjNC5v cmlnL0RvY3VtZW50YXRpb24vZmlsZXN5c3RlbXMvcHJvYy50eHQNCisrKyB2NC4yLXJjNC9Eb2N1 bWVudGF0aW9uL2ZpbGVzeXN0ZW1zL3Byb2MudHh0DQpAQCAtMTc0LDYgKzE3NCw3IEBAIEZvciBl eGFtcGxlLCB0byBnZXQgdGhlIHN0YXR1cyBpbmZvcm1hdGlvbiBvZiBhIHByb2Nlc3MsIGFsbCB5 b3UgaGF2ZSB0byBkbyBpcw0KICAgVm1MaWI6ICAgICAgMTQxMiBrQg0KICAgVm1QVEU6ICAgICAg ICAyMCBrYg0KICAgVm1Td2FwOiAgICAgICAgMCBrQg0KKyAgSHVnZXRsYlBhZ2VzOiAgICAgICAg ICAwIGtCICgweDIwNDhrQikNCiAgIFRocmVhZHM6ICAgICAgICAxDQogICBTaWdROiAgIDAvMjg1 NzgNCiAgIFNpZ1BuZDogMDAwMDAwMDAwMDAwMDAwMA0KQEAgLTIzNyw2ICsyMzgsOCBAQCBUYWJs ZSAxLTI6IENvbnRlbnRzIG9mIHRoZSBzdGF0dXMgZmlsZXMgKGFzIG9mIDQuMSkNCiAgVm1QVEUg ICAgICAgICAgICAgICAgICAgICAgIHNpemUgb2YgcGFnZSB0YWJsZSBlbnRyaWVzDQogIFZtUE1E ICAgICAgICAgICAgICAgICAgICAgICBzaXplIG9mIHNlY29uZCBsZXZlbCBwYWdlIHRhYmxlcw0K ICBWbVN3YXAgICAgICAgICAgICAgICAgICAgICAgc2l6ZSBvZiBzd2FwIHVzYWdlICh0aGUgbnVt YmVyIG9mIHJlZmVycmVkIHN3YXBlbnRzKQ0KKyBIdWdldGxiUGFnZXMgICAgICAgICAgICAgICAg c2l6ZSBvZiBodWdldGxiIG1lbW9yeSBwb3J0aW9ucyAod2l0aCBhZGRpdGlvbmFsIGluZm8NCisg ICAgICAgICAgICAgICAgICAgICAgICAgICAgIGFib3V0IG51bWJlciBvZiBtYXBwZWQgaHVnZXBh Z2VzIGZvciBlYWNoIHBhZ2Ugc2l6ZSkNCiAgVGhyZWFkcyAgICAgICAgICAgICAgICAgICAgIG51 bWJlciBvZiB0aHJlYWRzDQogIFNpZ1EgICAgICAgICAgICAgICAgICAgICAgICBudW1iZXIgb2Yg c2lnbmFscyBxdWV1ZWQvbWF4LiBudW1iZXIgZm9yIHF1ZXVlDQogIFNpZ1BuZCAgICAgICAgICAg ICAgICAgICAgICBiaXRtYXAgb2YgcGVuZGluZyBzaWduYWxzIGZvciB0aGUgdGhyZWFkDQpkaWZm IC0tZ2l0IHY0LjItcmM0Lm9yaWcvZnMvcHJvYy90YXNrX21tdS5jIHY0LjItcmM0L2ZzL3Byb2Mv dGFza19tbXUuYw0KaW5kZXggMmMzNzkzOGI4MmVlLi5iM2NmN2ZhOWVmNmMgMTAwNjQ0DQotLS0g djQuMi1yYzQub3JpZy9mcy9wcm9jL3Rhc2tfbW11LmMNCisrKyB2NC4yLXJjNC9mcy9wcm9jL3Rh c2tfbW11LmMNCkBAIC02OSw2ICs2OSw3IEBAIHZvaWQgdGFza19tZW0oc3RydWN0IHNlcV9maWxl ICptLCBzdHJ1Y3QgbW1fc3RydWN0ICptbSkNCiAJCXB0ZXMgPj4gMTAsDQogCQlwbWRzID4+IDEw LA0KIAkJc3dhcCA8PCAoUEFHRV9TSElGVC0xMCkpOw0KKwlodWdldGxiX3JlcG9ydF91c2FnZSht LCBtbSk7DQogfQ0KIA0KIHVuc2lnbmVkIGxvbmcgdGFza192c2l6ZShzdHJ1Y3QgbW1fc3RydWN0 ICptbSkNCmRpZmYgLS1naXQgdjQuMi1yYzQub3JpZy9pbmNsdWRlL2xpbnV4L2h1Z2V0bGIuaCB2 NC4yLXJjNC9pbmNsdWRlL2xpbnV4L2h1Z2V0bGIuaA0KaW5kZXggZDg5MWY5NDk0NjZhLi42NGFh NGRiMDFmNDggMTAwNjQ0DQotLS0gdjQuMi1yYzQub3JpZy9pbmNsdWRlL2xpbnV4L2h1Z2V0bGIu aA0KKysrIHY0LjItcmM0L2luY2x1ZGUvbGludXgvaHVnZXRsYi5oDQpAQCAtNDY5LDYgKzQ2OSwx OCBAQCBzdGF0aWMgaW5saW5lIHNwaW5sb2NrX3QgKmh1Z2VfcHRlX2xvY2twdHIoc3RydWN0IGhz dGF0ZSAqaCwNCiAjZGVmaW5lIGh1Z2VwYWdlc19zdXBwb3J0ZWQoKSAoSFBBR0VfU0hJRlQgIT0g MCkNCiAjZW5kaWYNCiANCit2b2lkIGh1Z2V0bGJfcmVwb3J0X3VzYWdlKHN0cnVjdCBzZXFfZmls ZSAqbSwgc3RydWN0IG1tX3N0cnVjdCAqbW0pOw0KKw0KK3N0YXRpYyBpbmxpbmUgdm9pZCBpbmNf aHVnZXRsYl9jb3VudChzdHJ1Y3QgbW1fc3RydWN0ICptbSwgc3RydWN0IGhzdGF0ZSAqaCkNCit7 DQorCWF0b21pY19sb25nX2luYygmbW0tPmh1Z2V0bGJfdXNhZ2UuY291bnRbaHN0YXRlX2luZGV4 KGgpXSk7DQorfQ0KKw0KK3N0YXRpYyBpbmxpbmUgdm9pZCBkZWNfaHVnZXRsYl9jb3VudChzdHJ1 Y3QgbW1fc3RydWN0ICptbSwgc3RydWN0IGhzdGF0ZSAqaCkNCit7DQorCWF0b21pY19sb25nX2Rl YygmbW0tPmh1Z2V0bGJfdXNhZ2UuY291bnRbaHN0YXRlX2luZGV4KGgpXSk7DQorfQ0KKw0KICNl bHNlCS8qIENPTkZJR19IVUdFVExCX1BBR0UgKi8NCiBzdHJ1Y3QgaHN0YXRlIHt9Ow0KICNkZWZp bmUgYWxsb2NfaHVnZV9wYWdlX25vZGUoaCwgbmlkKSBOVUxMDQpAQCAtNTA0LDYgKzUxNiwxNCBA QCBzdGF0aWMgaW5saW5lIHNwaW5sb2NrX3QgKmh1Z2VfcHRlX2xvY2twdHIoc3RydWN0IGhzdGF0 ZSAqaCwNCiB7DQogCXJldHVybiAmbW0tPnBhZ2VfdGFibGVfbG9jazsNCiB9DQorDQorc3RhdGlj IGlubGluZSB2b2lkIGh1Z2V0bGJfcmVwb3J0X3VzYWdlKHN0cnVjdCBzZXFfZmlsZSAqZiwgc3Ry dWN0IG1tX3N0cnVjdCAqbSkNCit7DQorfQ0KKw0KK3N0YXRpYyBpbmxpbmUgdm9pZCBkZWNfaHVn ZXRsYl9jb3VudChzdHJ1Y3QgbW1fc3RydWN0ICptbSwgc3RydWN0IGhzdGF0ZSAqaCkNCit7DQor fQ0KICNlbmRpZgkvKiBDT05GSUdfSFVHRVRMQl9QQUdFICovDQogDQogc3RhdGljIGlubGluZSBz cGlubG9ja190ICpodWdlX3B0ZV9sb2NrKHN0cnVjdCBoc3RhdGUgKmgsDQpkaWZmIC0tZ2l0IHY0 LjItcmM0Lm9yaWcvaW5jbHVkZS9saW51eC9tbV90eXBlcy5oIHY0LjItcmM0L2luY2x1ZGUvbGlu dXgvbW1fdHlwZXMuaA0KaW5kZXggMDAzOGFjNzQ2NmZkLi5lOTVjNWZlMWViN2QgMTAwNjQ0DQot LS0gdjQuMi1yYzQub3JpZy9pbmNsdWRlL2xpbnV4L21tX3R5cGVzLmgNCisrKyB2NC4yLXJjNC9p bmNsdWRlL2xpbnV4L21tX3R5cGVzLmgNCkBAIC0zNjQsNiArMzY0LDEyIEBAIHN0cnVjdCBtbV9y c3Nfc3RhdCB7DQogCWF0b21pY19sb25nX3QgY291bnRbTlJfTU1fQ09VTlRFUlNdOw0KIH07DQog DQorI2lmZGVmIENPTkZJR19IVUdFVExCX1BBR0UNCitzdHJ1Y3QgaHVnZXRsYl91c2FnZSB7DQor CWF0b21pY19sb25nX3QgY291bnRbSFVHRV9NQVhfSFNUQVRFXTsNCit9Ow0KKyNlbmRpZg0KKw0K IHN0cnVjdCBraW9jdHhfdGFibGU7DQogc3RydWN0IG1tX3N0cnVjdCB7DQogCXN0cnVjdCB2bV9h cmVhX3N0cnVjdCAqbW1hcDsJCS8qIGxpc3Qgb2YgVk1BcyAqLw0KQEAgLTQ4NCw2ICs0OTAsMTAg QEAgc3RydWN0IG1tX3N0cnVjdCB7DQogCS8qIGFkZHJlc3Mgb2YgdGhlIGJvdW5kcyBkaXJlY3Rv cnkgKi8NCiAJdm9pZCBfX3VzZXIgKmJkX2FkZHI7DQogI2VuZGlmDQorDQorI2lmZGVmIENPTkZJ R19IVUdFVExCX1BBR0UNCisJc3RydWN0IGh1Z2V0bGJfdXNhZ2UgaHVnZXRsYl91c2FnZTsNCisj ZW5kaWYNCiB9Ow0KIA0KIHN0YXRpYyBpbmxpbmUgdm9pZCBtbV9pbml0X2NwdW1hc2soc3RydWN0 IG1tX3N0cnVjdCAqbW0pDQpkaWZmIC0tZ2l0IHY0LjItcmM0Lm9yaWcvbW0vaHVnZXRsYi5jIHY0 LjItcmM0L21tL2h1Z2V0bGIuYw0KaW5kZXggYThjMzA4NzA4OWQ4Li5iODkwNDMxZDA3NjMgMTAw NjQ0DQotLS0gdjQuMi1yYzQub3JpZy9tbS9odWdldGxiLmMNCisrKyB2NC4yLXJjNC9tbS9odWdl dGxiLmMNCkBAIC0yNTYyLDYgKzI1NjIsMzAgQEAgdm9pZCBodWdldGxiX3Nob3dfbWVtaW5mbyh2 b2lkKQ0KIAkJCQkxVUwgPDwgKGh1Z2VfcGFnZV9vcmRlcihoKSArIFBBR0VfU0hJRlQgLSAxMCkp Ow0KIH0NCiANCit2b2lkIGh1Z2V0bGJfcmVwb3J0X3VzYWdlKHN0cnVjdCBzZXFfZmlsZSAqbSwg c3RydWN0IG1tX3N0cnVjdCAqbW0pDQorew0KKwlpbnQgaTsNCisJdW5zaWduZWQgbG9uZyB0b3Rh bF91c2FnZSA9IDA7DQorDQorCWZvciAoaSA9IDA7IGkgPCBIVUdFX01BWF9IU1RBVEU7IGkrKykg ew0KKwkJdG90YWxfdXNhZ2UgKz0gYXRvbWljX2xvbmdfcmVhZCgmbW0tPmh1Z2V0bGJfdXNhZ2Uu Y291bnRbaV0pICoNCisJCQkoaHVnZV9wYWdlX3NpemUoJmhzdGF0ZXNbaV0pID4+IDEwKTsNCisJ fQ0KKw0KKwlzZXFfcHJpbnRmKG0sICJIdWdldGxiUGFnZXM6XHQlOGx1IGtCICgiLCB0b3RhbF91 c2FnZSk7DQorCWZvciAoaSA9IDA7IGkgPCBIVUdFX01BWF9IU1RBVEU7IGkrKykgew0KKwkJaWYg KGh1Z2VfcGFnZV9vcmRlcigmaHN0YXRlc1tpXSkgPT0gMCkNCisJCQlicmVhazsNCisJCWlmIChp ID4gMCkNCisJCQlzZXFfcHV0cyhtLCAiICIpOw0KKw0KKwkJc2VxX3ByaW50ZihtLCAiJWxkeCVk a0IiLA0KKwkJCWF0b21pY19sb25nX3JlYWQoJm1tLT5odWdldGxiX3VzYWdlLmNvdW50W2ldKSwN CisJCQlodWdlX3BhZ2Vfc2l6ZSgmaHN0YXRlc1tpXSkgPj4gMTApOw0KKwl9DQorCXNlcV9wdXRz KG0sICIpXG4iKTsNCit9DQorDQogLyogUmV0dXJuIHRoZSBudW1iZXIgcGFnZXMgb2YgbWVtb3J5 IHdlIHBoeXNpY2FsbHkgaGF2ZSwgaW4gUEFHRV9TSVpFIHVuaXRzLiAqLw0KIHVuc2lnbmVkIGxv bmcgaHVnZXRsYl90b3RhbF9wYWdlcyh2b2lkKQ0KIHsNCkBAIC0yNzk3LDYgKzI4MjEsNyBAQCBp bnQgY29weV9odWdldGxiX3BhZ2VfcmFuZ2Uoc3RydWN0IG1tX3N0cnVjdCAqZHN0LCBzdHJ1Y3Qg bW1fc3RydWN0ICpzcmMsDQogCQkJZ2V0X3BhZ2UocHRlcGFnZSk7DQogCQkJcGFnZV9kdXBfcm1h cChwdGVwYWdlKTsNCiAJCQlzZXRfaHVnZV9wdGVfYXQoZHN0LCBhZGRyLCBkc3RfcHRlLCBlbnRy eSk7DQorCQkJaW5jX2h1Z2V0bGJfY291bnQoZHN0LCBoKTsNCiAJCX0NCiAJCXNwaW5fdW5sb2Nr KHNyY19wdGwpOw0KIAkJc3Bpbl91bmxvY2soZHN0X3B0bCk7DQpAQCAtMjg3Nyw2ICsyOTAyLDcg QEAgdm9pZCBfX3VubWFwX2h1Z2VwYWdlX3JhbmdlKHN0cnVjdCBtbXVfZ2F0aGVyICp0bGIsIHN0 cnVjdCB2bV9hcmVhX3N0cnVjdCAqdm1hLA0KIAkJaWYgKGh1Z2VfcHRlX2RpcnR5KHB0ZSkpDQog CQkJc2V0X3BhZ2VfZGlydHkocGFnZSk7DQogDQorCQlkZWNfaHVnZXRsYl9jb3VudChtbSwgaCk7 DQogCQlwYWdlX3JlbW92ZV9ybWFwKHBhZ2UpOw0KIAkJZm9yY2VfZmx1c2ggPSAhX190bGJfcmVt b3ZlX3BhZ2UodGxiLCBwYWdlKTsNCiAJCWlmIChmb3JjZV9mbHVzaCkgew0KQEAgLTMyNjEsNiAr MzI4Nyw3IEBAIHN0YXRpYyBpbnQgaHVnZXRsYl9ub19wYWdlKHN0cnVjdCBtbV9zdHJ1Y3QgKm1t LCBzdHJ1Y3Qgdm1fYXJlYV9zdHJ1Y3QgKnZtYSwNCiAJCQkJJiYgKHZtYS0+dm1fZmxhZ3MgJiBW TV9TSEFSRUQpKSk7DQogCXNldF9odWdlX3B0ZV9hdChtbSwgYWRkcmVzcywgcHRlcCwgbmV3X3B0 ZSk7DQogDQorCWluY19odWdldGxiX2NvdW50KG1tLCBoKTsNCiAJaWYgKChmbGFncyAmIEZBVUxU X0ZMQUdfV1JJVEUpICYmICEodm1hLT52bV9mbGFncyAmIFZNX1NIQVJFRCkpIHsNCiAJCS8qIE9w dGltaXphdGlvbiwgZG8gdGhlIENPVyB3aXRob3V0IGEgc2Vjb25kIGZhdWx0ICovDQogCQlyZXQg PSBodWdldGxiX2NvdyhtbSwgdm1hLCBhZGRyZXNzLCBwdGVwLCBuZXdfcHRlLCBwYWdlLCBwdGwp Ow0KZGlmZiAtLWdpdCB2NC4yLXJjNC5vcmlnL21tL3JtYXAuYyB2NC4yLXJjNC9tbS9ybWFwLmMN CmluZGV4IDE3MWI2ODc2OGRmMS4uYjMzMjc4YmM0ZGRiIDEwMDY0NA0KLS0tIHY0LjItcmM0Lm9y aWcvbW0vcm1hcC5jDQorKysgdjQuMi1yYzQvbW0vcm1hcC5jDQpAQCAtMTIzMCw3ICsxMjMwLDkg QEAgc3RhdGljIGludCB0cnlfdG9fdW5tYXBfb25lKHN0cnVjdCBwYWdlICpwYWdlLCBzdHJ1Y3Qg dm1fYXJlYV9zdHJ1Y3QgKnZtYSwNCiAJdXBkYXRlX2hpd2F0ZXJfcnNzKG1tKTsNCiANCiAJaWYg KFBhZ2VIV1BvaXNvbihwYWdlKSAmJiAhKGZsYWdzICYgVFRVX0lHTk9SRV9IV1BPSVNPTikpIHsN Ci0JCWlmICghUGFnZUh1Z2UocGFnZSkpIHsNCisJCWlmIChQYWdlSHVnZShwYWdlKSkgew0KKwkJ CWRlY19odWdldGxiX2NvdW50KG1tLCBwYWdlX2hzdGF0ZShwYWdlKSk7DQorCQl9IGVsc2Ugew0K IAkJCWlmIChQYWdlQW5vbihwYWdlKSkNCiAJCQkJZGVjX21tX2NvdW50ZXIobW0sIE1NX0FOT05Q QUdFUyk7DQogCQkJZWxzZQ0KLS0gDQoyLjQuMw0K -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
[toc] | [prev] | [next] | [standalone]
| From | David Rientjes <rientjes@google.com> |
|---|---|
| Date | 2015-08-12 22:40 +0200 |
| Subject | Re: [PATCH v4 2/2] mm: hugetlb: proc: add HugetlbPages field to /proc/PID/status |
| Message-ID | <pWKYy-6Q7-19@gated-at.bofh.it> |
| In reply to | #1205673 |
On Wed, 12 Aug 2015, Naoya Horiguchi wrote: > Currently there's no easy way to get per-process usage of hugetlb pages, which > is inconvenient because userspace applications which use hugetlb typically want > to control their processes on the basis of how much memory (including hugetlb) > they use. So this patch simply provides easy access to the info via > /proc/PID/status. > > With this patch, for example, /proc/PID/status shows a line like this: > > HugetlbPages: 20480 kB (10x2048kB) > > If your system supports and enables multiple hugepage sizes, the line looks > like this: > > HugetlbPages: 1069056 kB (1x1048576kB 10x2048kB) > > , so you can easily know how many hugepages in which pagesize are used by a > process. > > Signed-off-by: Naoya Horiguchi <n-horiguchi@ah.jp.nec.com> I'm happy with this and thanks very much for going the extra mile and breaking the usage down by hstate size. I'd be interested in the comments of others, though, to see if there is any reservation about the hstate size breakdown. It may actually find no current customer who is interested in parsing it. (If we keep it, I would suggest the 'x' change to '*' similar to per-order breakdowns in show_mem()). It may also be possible to add it later if a definitive usecase is presented. But overall I'm very happy with the new addition and think it's a good solution to the problem. -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
[toc] | [prev] | [next] | [standalone]
| From | Naoya Horiguchi <n-horiguchi@ah.jp.nec.com> |
|---|---|
| Date | 2015-08-13 02:50 +0200 |
| Subject | Re: [PATCH v4 2/2] mm: hugetlb: proc: add HugetlbPages field to /proc/PID/status |
| Message-ID | <pWOSu-43r-9@gated-at.bofh.it> |
| In reply to | #1206366 |
T24gV2VkLCBBdWcgMTIsIDIwMTUgYXQgMDE6MzA6MjdQTSAtMDcwMCwgRGF2aWQgUmllbnRqZXMg d3JvdGU6DQo+IE9uIFdlZCwgMTIgQXVnIDIwMTUsIE5hb3lhIEhvcmlndWNoaSB3cm90ZToNCj4g DQo+ID4gQ3VycmVudGx5IHRoZXJlJ3Mgbm8gZWFzeSB3YXkgdG8gZ2V0IHBlci1wcm9jZXNzIHVz YWdlIG9mIGh1Z2V0bGIgcGFnZXMsIHdoaWNoDQo+ID4gaXMgaW5jb252ZW5pZW50IGJlY2F1c2Ug dXNlcnNwYWNlIGFwcGxpY2F0aW9ucyB3aGljaCB1c2UgaHVnZXRsYiB0eXBpY2FsbHkgd2FudA0K PiA+IHRvIGNvbnRyb2wgdGhlaXIgcHJvY2Vzc2VzIG9uIHRoZSBiYXNpcyBvZiBob3cgbXVjaCBt ZW1vcnkgKGluY2x1ZGluZyBodWdldGxiKQ0KPiA+IHRoZXkgdXNlLiBTbyB0aGlzIHBhdGNoIHNp bXBseSBwcm92aWRlcyBlYXN5IGFjY2VzcyB0byB0aGUgaW5mbyB2aWENCj4gPiAvcHJvYy9QSUQv c3RhdHVzLg0KPiA+IA0KPiA+IFdpdGggdGhpcyBwYXRjaCwgZm9yIGV4YW1wbGUsIC9wcm9jL1BJ RC9zdGF0dXMgc2hvd3MgYSBsaW5lIGxpa2UgdGhpczoNCj4gPiANCj4gPiAgIEh1Z2V0bGJQYWdl czogICAgICAyMDQ4MCBrQiAoMTB4MjA0OGtCKQ0KPiA+IA0KPiA+IElmIHlvdXIgc3lzdGVtIHN1 cHBvcnRzIGFuZCBlbmFibGVzIG11bHRpcGxlIGh1Z2VwYWdlIHNpemVzLCB0aGUgbGluZSBsb29r cw0KPiA+IGxpa2UgdGhpczoNCj4gPiANCj4gPiAgIEh1Z2V0bGJQYWdlczogICAgMTA2OTA1NiBr QiAoMXgxMDQ4NTc2a0IgMTB4MjA0OGtCKQ0KPiA+IA0KPiA+ICwgc28geW91IGNhbiBlYXNpbHkg a25vdyBob3cgbWFueSBodWdlcGFnZXMgaW4gd2hpY2ggcGFnZXNpemUgYXJlIHVzZWQgYnkgYQ0K PiA+IHByb2Nlc3MuDQo+ID4gDQo+ID4gU2lnbmVkLW9mZi1ieTogTmFveWEgSG9yaWd1Y2hpIDxu LWhvcmlndWNoaUBhaC5qcC5uZWMuY29tPg0KPiANCj4gSSdtIGhhcHB5IHdpdGggdGhpcyBhbmQg dGhhbmtzIHZlcnkgbXVjaCBmb3IgZ29pbmcgdGhlIGV4dHJhIG1pbGUgYW5kIA0KPiBicmVha2lu ZyB0aGUgdXNhZ2UgZG93biBieSBoc3RhdGUgc2l6ZS4NCg0KR3JlYXQgdG8gaGVhciB0aGF0Lg0K DQo+IEknZCBiZSBpbnRlcmVzdGVkIGluIHRoZSBjb21tZW50cyBvZiBvdGhlcnMsIHRob3VnaCwg dG8gc2VlIGlmIHRoZXJlIGlzIA0KPiBhbnkgcmVzZXJ2YXRpb24gYWJvdXQgdGhlIGhzdGF0ZSBz aXplIGJyZWFrZG93bi4gIEl0IG1heSBhY3R1YWxseSBmaW5kIG5vIA0KPiBjdXJyZW50IGN1c3Rv bWVyIHdobyBpcyBpbnRlcmVzdGVkIGluIHBhcnNpbmcgaXQuICAoSWYgd2Uga2VlcCBpdCwgSSB3 b3VsZCANCj4gc3VnZ2VzdCB0aGUgJ3gnIGNoYW5nZSB0byAnKicgc2ltaWxhciB0byBwZXItb3Jk ZXIgYnJlYWtkb3ducyBpbiANCj4gc2hvd19tZW0oKSkuICBJdCBtYXkgYWxzbyBiZSBwb3NzaWJs ZSB0byBhZGQgaXQgbGF0ZXIgaWYgYSBkZWZpbml0aXZlIA0KPiB1c2VjYXNlIGlzIHByZXNlbnRl ZC4NCg0KSSdtIGZpbmUgdG8gY2hhbmdlIHRvICcqJy4NCg0KVGhhbmtzLA0KTmFveWEgSG9yaWd1 Y2hpDQotLS0NCkZyb206IE5hb3lhIEhvcmlndWNoaSA8bi1ob3JpZ3VjaGlAYWguanAubmVjLmNv bT4NClN1YmplY3Q6IFtQQVRDSF0gbW06IGh1Z2V0bGI6IHByb2M6IGFkZCBIdWdldGxiUGFnZXMg ZmllbGQgdG8gL3Byb2MvUElEL3N0YXR1cw0KDQpDdXJyZW50bHkgdGhlcmUncyBubyBlYXN5IHdh eSB0byBnZXQgcGVyLXByb2Nlc3MgdXNhZ2Ugb2YgaHVnZXRsYiBwYWdlcywgd2hpY2gNCmlzIGlu Y29udmVuaWVudCBiZWNhdXNlIHVzZXJzcGFjZSBhcHBsaWNhdGlvbnMgd2hpY2ggdXNlIGh1Z2V0 bGIgdHlwaWNhbGx5IHdhbnQNCnRvIGNvbnRyb2wgdGhlaXIgcHJvY2Vzc2VzIG9uIHRoZSBiYXNp cyBvZiBob3cgbXVjaCBtZW1vcnkgKGluY2x1ZGluZyBodWdldGxiKQ0KdGhleSB1c2UuIFNvIHRo aXMgcGF0Y2ggc2ltcGx5IHByb3ZpZGVzIGVhc3kgYWNjZXNzIHRvIHRoZSBpbmZvIHZpYQ0KL3By b2MvUElEL3N0YXR1cy4NCg0KV2l0aCB0aGlzIHBhdGNoLCBmb3IgZXhhbXBsZSwgL3Byb2MvUElE L3N0YXR1cyBzaG93cyBhIGxpbmUgbGlrZSB0aGlzOg0KDQogIEh1Z2V0bGJQYWdlczogICAgICAy MDQ4MCBrQiAoMTAqMjA0OGtCKQ0KDQpJZiB5b3VyIHN5c3RlbSBzdXBwb3J0cyBhbmQgZW5hYmxl cyBtdWx0aXBsZSBodWdlcGFnZSBzaXplcywgdGhlIGxpbmUgbG9va3MNCmxpa2UgdGhpczoNCg0K ICBIdWdldGxiUGFnZXM6ICAgIDEwNjkwNTYga0IgKDEqMTA0ODU3NmtCIDEwKjIwNDhrQikNCg0K LCBzbyB5b3UgY2FuIGVhc2lseSBrbm93IGhvdyBtYW55IGh1Z2VwYWdlcyBpbiB3aGljaCBwYWdl c2l6ZSBhcmUgdXNlZCBieSBhDQpwcm9jZXNzLg0KDQpTaWduZWQtb2ZmLWJ5OiBOYW95YSBIb3Jp Z3VjaGkgPG4taG9yaWd1Y2hpQGFoLmpwLm5lYy5jb20+DQotLS0NCiBEb2N1bWVudGF0aW9uL2Zp bGVzeXN0ZW1zL3Byb2MudHh0IHwgIDMgKysrDQogZnMvcHJvYy90YXNrX21tdS5jICAgICAgICAg ICAgICAgICB8ICAxICsNCiBpbmNsdWRlL2xpbnV4L2h1Z2V0bGIuaCAgICAgICAgICAgIHwgMjAg KysrKysrKysrKysrKysrKysrKysNCiBpbmNsdWRlL2xpbnV4L21tX3R5cGVzLmggICAgICAgICAg IHwgMTAgKysrKysrKysrKw0KIG1tL2h1Z2V0bGIuYyAgICAgICAgICAgICAgICAgICAgICAgfCAy NyArKysrKysrKysrKysrKysrKysrKysrKysrKysNCiBtbS9ybWFwLmMgICAgICAgICAgICAgICAg ICAgICAgICAgIHwgIDQgKysrLQ0KIDYgZmlsZXMgY2hhbmdlZCwgNjQgaW5zZXJ0aW9ucygrKSwg MSBkZWxldGlvbigtKQ0KDQpkaWZmIC0tZ2l0IGEvRG9jdW1lbnRhdGlvbi9maWxlc3lzdGVtcy9w cm9jLnR4dCBiL0RvY3VtZW50YXRpb24vZmlsZXN5c3RlbXMvcHJvYy50eHQNCmluZGV4IDIyZTQw MjExZWY2NC4uZjU2MWZjNDZlNDFiIDEwMDY0NA0KLS0tIGEvRG9jdW1lbnRhdGlvbi9maWxlc3lz dGVtcy9wcm9jLnR4dA0KKysrIGIvRG9jdW1lbnRhdGlvbi9maWxlc3lzdGVtcy9wcm9jLnR4dA0K QEAgLTE3NCw2ICsxNzQsNyBAQCBGb3IgZXhhbXBsZSwgdG8gZ2V0IHRoZSBzdGF0dXMgaW5mb3Jt YXRpb24gb2YgYSBwcm9jZXNzLCBhbGwgeW91IGhhdmUgdG8gZG8gaXMNCiAgIFZtTGliOiAgICAg IDE0MTIga0INCiAgIFZtUFRFOiAgICAgICAgMjAga2INCiAgIFZtU3dhcDogICAgICAgIDAga0IN CisgIEh1Z2V0bGJQYWdlczogICAgICAgICAgMCBrQiAoMCoyMDQ4a0IpDQogICBUaHJlYWRzOiAg ICAgICAgMQ0KICAgU2lnUTogICAwLzI4NTc4DQogICBTaWdQbmQ6IDAwMDAwMDAwMDAwMDAwMDAN CkBAIC0yMzcsNiArMjM4LDggQEAgVGFibGUgMS0yOiBDb250ZW50cyBvZiB0aGUgc3RhdHVzIGZp bGVzIChhcyBvZiA0LjEpDQogIFZtUFRFICAgICAgICAgICAgICAgICAgICAgICBzaXplIG9mIHBh Z2UgdGFibGUgZW50cmllcw0KICBWbVBNRCAgICAgICAgICAgICAgICAgICAgICAgc2l6ZSBvZiBz ZWNvbmQgbGV2ZWwgcGFnZSB0YWJsZXMNCiAgVm1Td2FwICAgICAgICAgICAgICAgICAgICAgIHNp emUgb2Ygc3dhcCB1c2FnZSAodGhlIG51bWJlciBvZiByZWZlcnJlZCBzd2FwZW50cykNCisgSHVn ZXRsYlBhZ2VzICAgICAgICAgICAgICAgIHNpemUgb2YgaHVnZXRsYiBtZW1vcnkgcG9ydGlvbnMg KHdpdGggYWRkaXRpb25hbCBpbmZvDQorICAgICAgICAgICAgICAgICAgICAgICAgICAgICBhYm91 dCBudW1iZXIgb2YgbWFwcGVkIGh1Z2VwYWdlcyBmb3IgZWFjaCBwYWdlIHNpemUpDQogIFRocmVh ZHMgICAgICAgICAgICAgICAgICAgICBudW1iZXIgb2YgdGhyZWFkcw0KICBTaWdRICAgICAgICAg ICAgICAgICAgICAgICAgbnVtYmVyIG9mIHNpZ25hbHMgcXVldWVkL21heC4gbnVtYmVyIGZvciBx dWV1ZQ0KICBTaWdQbmQgICAgICAgICAgICAgICAgICAgICAgYml0bWFwIG9mIHBlbmRpbmcgc2ln bmFscyBmb3IgdGhlIHRocmVhZA0KZGlmZiAtLWdpdCBhL2ZzL3Byb2MvdGFza19tbXUuYyBiL2Zz L3Byb2MvdGFza19tbXUuYw0KaW5kZXggMmMzNzkzOGI4MmVlLi5iM2NmN2ZhOWVmNmMgMTAwNjQ0 DQotLS0gYS9mcy9wcm9jL3Rhc2tfbW11LmMNCisrKyBiL2ZzL3Byb2MvdGFza19tbXUuYw0KQEAg LTY5LDYgKzY5LDcgQEAgdm9pZCB0YXNrX21lbShzdHJ1Y3Qgc2VxX2ZpbGUgKm0sIHN0cnVjdCBt bV9zdHJ1Y3QgKm1tKQ0KIAkJcHRlcyA+PiAxMCwNCiAJCXBtZHMgPj4gMTAsDQogCQlzd2FwIDw8 IChQQUdFX1NISUZULTEwKSk7DQorCWh1Z2V0bGJfcmVwb3J0X3VzYWdlKG0sIG1tKTsNCiB9DQog DQogdW5zaWduZWQgbG9uZyB0YXNrX3ZzaXplKHN0cnVjdCBtbV9zdHJ1Y3QgKm1tKQ0KZGlmZiAt LWdpdCBhL2luY2x1ZGUvbGludXgvaHVnZXRsYi5oIGIvaW5jbHVkZS9saW51eC9odWdldGxiLmgN CmluZGV4IGQ4OTFmOTQ5NDY2YS4uNjRhYTRkYjAxZjQ4IDEwMDY0NA0KLS0tIGEvaW5jbHVkZS9s aW51eC9odWdldGxiLmgNCisrKyBiL2luY2x1ZGUvbGludXgvaHVnZXRsYi5oDQpAQCAtNDY5LDYg KzQ2OSwxOCBAQCBzdGF0aWMgaW5saW5lIHNwaW5sb2NrX3QgKmh1Z2VfcHRlX2xvY2twdHIoc3Ry dWN0IGhzdGF0ZSAqaCwNCiAjZGVmaW5lIGh1Z2VwYWdlc19zdXBwb3J0ZWQoKSAoSFBBR0VfU0hJ RlQgIT0gMCkNCiAjZW5kaWYNCiANCit2b2lkIGh1Z2V0bGJfcmVwb3J0X3VzYWdlKHN0cnVjdCBz ZXFfZmlsZSAqbSwgc3RydWN0IG1tX3N0cnVjdCAqbW0pOw0KKw0KK3N0YXRpYyBpbmxpbmUgdm9p ZCBpbmNfaHVnZXRsYl9jb3VudChzdHJ1Y3QgbW1fc3RydWN0ICptbSwgc3RydWN0IGhzdGF0ZSAq aCkNCit7DQorCWF0b21pY19sb25nX2luYygmbW0tPmh1Z2V0bGJfdXNhZ2UuY291bnRbaHN0YXRl X2luZGV4KGgpXSk7DQorfQ0KKw0KK3N0YXRpYyBpbmxpbmUgdm9pZCBkZWNfaHVnZXRsYl9jb3Vu dChzdHJ1Y3QgbW1fc3RydWN0ICptbSwgc3RydWN0IGhzdGF0ZSAqaCkNCit7DQorCWF0b21pY19s b25nX2RlYygmbW0tPmh1Z2V0bGJfdXNhZ2UuY291bnRbaHN0YXRlX2luZGV4KGgpXSk7DQorfQ0K Kw0KICNlbHNlCS8qIENPTkZJR19IVUdFVExCX1BBR0UgKi8NCiBzdHJ1Y3QgaHN0YXRlIHt9Ow0K ICNkZWZpbmUgYWxsb2NfaHVnZV9wYWdlX25vZGUoaCwgbmlkKSBOVUxMDQpAQCAtNTA0LDYgKzUx NiwxNCBAQCBzdGF0aWMgaW5saW5lIHNwaW5sb2NrX3QgKmh1Z2VfcHRlX2xvY2twdHIoc3RydWN0 IGhzdGF0ZSAqaCwNCiB7DQogCXJldHVybiAmbW0tPnBhZ2VfdGFibGVfbG9jazsNCiB9DQorDQor c3RhdGljIGlubGluZSB2b2lkIGh1Z2V0bGJfcmVwb3J0X3VzYWdlKHN0cnVjdCBzZXFfZmlsZSAq Ziwgc3RydWN0IG1tX3N0cnVjdCAqbSkNCit7DQorfQ0KKw0KK3N0YXRpYyBpbmxpbmUgdm9pZCBk ZWNfaHVnZXRsYl9jb3VudChzdHJ1Y3QgbW1fc3RydWN0ICptbSwgc3RydWN0IGhzdGF0ZSAqaCkN Cit7DQorfQ0KICNlbmRpZgkvKiBDT05GSUdfSFVHRVRMQl9QQUdFICovDQogDQogc3RhdGljIGlu bGluZSBzcGlubG9ja190ICpodWdlX3B0ZV9sb2NrKHN0cnVjdCBoc3RhdGUgKmgsDQpkaWZmIC0t Z2l0IGEvaW5jbHVkZS9saW51eC9tbV90eXBlcy5oIGIvaW5jbHVkZS9saW51eC9tbV90eXBlcy5o DQppbmRleCAwMDM4YWM3NDY2ZmQuLmU5NWM1ZmUxZWI3ZCAxMDA2NDQNCi0tLSBhL2luY2x1ZGUv bGludXgvbW1fdHlwZXMuaA0KKysrIGIvaW5jbHVkZS9saW51eC9tbV90eXBlcy5oDQpAQCAtMzY0 LDYgKzM2NCwxMiBAQCBzdHJ1Y3QgbW1fcnNzX3N0YXQgew0KIAlhdG9taWNfbG9uZ190IGNvdW50 W05SX01NX0NPVU5URVJTXTsNCiB9Ow0KIA0KKyNpZmRlZiBDT05GSUdfSFVHRVRMQl9QQUdFDQor c3RydWN0IGh1Z2V0bGJfdXNhZ2Ugew0KKwlhdG9taWNfbG9uZ190IGNvdW50W0hVR0VfTUFYX0hT VEFURV07DQorfTsNCisjZW5kaWYNCisNCiBzdHJ1Y3Qga2lvY3R4X3RhYmxlOw0KIHN0cnVjdCBt bV9zdHJ1Y3Qgew0KIAlzdHJ1Y3Qgdm1fYXJlYV9zdHJ1Y3QgKm1tYXA7CQkvKiBsaXN0IG9mIFZN QXMgKi8NCkBAIC00ODQsNiArNDkwLDEwIEBAIHN0cnVjdCBtbV9zdHJ1Y3Qgew0KIAkvKiBhZGRy ZXNzIG9mIHRoZSBib3VuZHMgZGlyZWN0b3J5ICovDQogCXZvaWQgX191c2VyICpiZF9hZGRyOw0K ICNlbmRpZg0KKw0KKyNpZmRlZiBDT05GSUdfSFVHRVRMQl9QQUdFDQorCXN0cnVjdCBodWdldGxi X3VzYWdlIGh1Z2V0bGJfdXNhZ2U7DQorI2VuZGlmDQogfTsNCiANCiBzdGF0aWMgaW5saW5lIHZv aWQgbW1faW5pdF9jcHVtYXNrKHN0cnVjdCBtbV9zdHJ1Y3QgKm1tKQ0KZGlmZiAtLWdpdCBhL21t L2h1Z2V0bGIuYyBiL21tL2h1Z2V0bGIuYw0KaW5kZXggYThjMzA4NzA4OWQ4Li4yMzM4Yzk3MTNi N2EgMTAwNjQ0DQotLS0gYS9tbS9odWdldGxiLmMNCisrKyBiL21tL2h1Z2V0bGIuYw0KQEAgLTI1 NjIsNiArMjU2MiwzMCBAQCB2b2lkIGh1Z2V0bGJfc2hvd19tZW1pbmZvKHZvaWQpDQogCQkJCTFV TCA8PCAoaHVnZV9wYWdlX29yZGVyKGgpICsgUEFHRV9TSElGVCAtIDEwKSk7DQogfQ0KIA0KK3Zv aWQgaHVnZXRsYl9yZXBvcnRfdXNhZ2Uoc3RydWN0IHNlcV9maWxlICptLCBzdHJ1Y3QgbW1fc3Ry dWN0ICptbSkNCit7DQorCWludCBpOw0KKwl1bnNpZ25lZCBsb25nIHRvdGFsX3VzYWdlID0gMDsN CisNCisJZm9yIChpID0gMDsgaSA8IEhVR0VfTUFYX0hTVEFURTsgaSsrKSB7DQorCQl0b3RhbF91 c2FnZSArPSBhdG9taWNfbG9uZ19yZWFkKCZtbS0+aHVnZXRsYl91c2FnZS5jb3VudFtpXSkgKg0K KwkJCShodWdlX3BhZ2Vfc2l6ZSgmaHN0YXRlc1tpXSkgPj4gMTApOw0KKwl9DQorDQorCXNlcV9w cmludGYobSwgIkh1Z2V0bGJQYWdlczpcdCU4bHUga0IgKCIsIHRvdGFsX3VzYWdlKTsNCisJZm9y IChpID0gMDsgaSA8IEhVR0VfTUFYX0hTVEFURTsgaSsrKSB7DQorCQlpZiAoaHVnZV9wYWdlX29y ZGVyKCZoc3RhdGVzW2ldKSA9PSAwKQ0KKwkJCWJyZWFrOw0KKwkJaWYgKGkgPiAwKQ0KKwkJCXNl cV9wdXRzKG0sICIgIik7DQorDQorCQlzZXFfcHJpbnRmKG0sICIlbGQqJWRrQiIsDQorCQkJYXRv bWljX2xvbmdfcmVhZCgmbW0tPmh1Z2V0bGJfdXNhZ2UuY291bnRbaV0pLA0KKwkJCWh1Z2VfcGFn ZV9zaXplKCZoc3RhdGVzW2ldKSA+PiAxMCk7DQorCX0NCisJc2VxX3B1dHMobSwgIilcbiIpOw0K K30NCisNCiAvKiBSZXR1cm4gdGhlIG51bWJlciBwYWdlcyBvZiBtZW1vcnkgd2UgcGh5c2ljYWxs eSBoYXZlLCBpbiBQQUdFX1NJWkUgdW5pdHMuICovDQogdW5zaWduZWQgbG9uZyBodWdldGxiX3Rv dGFsX3BhZ2VzKHZvaWQpDQogew0KQEAgLTI3OTcsNiArMjgyMSw3IEBAIGludCBjb3B5X2h1Z2V0 bGJfcGFnZV9yYW5nZShzdHJ1Y3QgbW1fc3RydWN0ICpkc3QsIHN0cnVjdCBtbV9zdHJ1Y3QgKnNy YywNCiAJCQlnZXRfcGFnZShwdGVwYWdlKTsNCiAJCQlwYWdlX2R1cF9ybWFwKHB0ZXBhZ2UpOw0K IAkJCXNldF9odWdlX3B0ZV9hdChkc3QsIGFkZHIsIGRzdF9wdGUsIGVudHJ5KTsNCisJCQlpbmNf aHVnZXRsYl9jb3VudChkc3QsIGgpOw0KIAkJfQ0KIAkJc3Bpbl91bmxvY2soc3JjX3B0bCk7DQog CQlzcGluX3VubG9jayhkc3RfcHRsKTsNCkBAIC0yODc3LDYgKzI5MDIsNyBAQCB2b2lkIF9fdW5t YXBfaHVnZXBhZ2VfcmFuZ2Uoc3RydWN0IG1tdV9nYXRoZXIgKnRsYiwgc3RydWN0IHZtX2FyZWFf c3RydWN0ICp2bWEsDQogCQlpZiAoaHVnZV9wdGVfZGlydHkocHRlKSkNCiAJCQlzZXRfcGFnZV9k aXJ0eShwYWdlKTsNCiANCisJCWRlY19odWdldGxiX2NvdW50KG1tLCBoKTsNCiAJCXBhZ2VfcmVt b3ZlX3JtYXAocGFnZSk7DQogCQlmb3JjZV9mbHVzaCA9ICFfX3RsYl9yZW1vdmVfcGFnZSh0bGIs IHBhZ2UpOw0KIAkJaWYgKGZvcmNlX2ZsdXNoKSB7DQpAQCAtMzI2MSw2ICszMjg3LDcgQEAgc3Rh dGljIGludCBodWdldGxiX25vX3BhZ2Uoc3RydWN0IG1tX3N0cnVjdCAqbW0sIHN0cnVjdCB2bV9h cmVhX3N0cnVjdCAqdm1hLA0KIAkJCQkmJiAodm1hLT52bV9mbGFncyAmIFZNX1NIQVJFRCkpKTsN CiAJc2V0X2h1Z2VfcHRlX2F0KG1tLCBhZGRyZXNzLCBwdGVwLCBuZXdfcHRlKTsNCiANCisJaW5j X2h1Z2V0bGJfY291bnQobW0sIGgpOw0KIAlpZiAoKGZsYWdzICYgRkFVTFRfRkxBR19XUklURSkg JiYgISh2bWEtPnZtX2ZsYWdzICYgVk1fU0hBUkVEKSkgew0KIAkJLyogT3B0aW1pemF0aW9uLCBk byB0aGUgQ09XIHdpdGhvdXQgYSBzZWNvbmQgZmF1bHQgKi8NCiAJCXJldCA9IGh1Z2V0bGJfY293 KG1tLCB2bWEsIGFkZHJlc3MsIHB0ZXAsIG5ld19wdGUsIHBhZ2UsIHB0bCk7DQpkaWZmIC0tZ2l0 IGEvbW0vcm1hcC5jIGIvbW0vcm1hcC5jDQppbmRleCAxNzFiNjg3NjhkZjEuLmIzMzI3OGJjNGRk YiAxMDA2NDQNCi0tLSBhL21tL3JtYXAuYw0KKysrIGIvbW0vcm1hcC5jDQpAQCAtMTIzMCw3ICsx MjMwLDkgQEAgc3RhdGljIGludCB0cnlfdG9fdW5tYXBfb25lKHN0cnVjdCBwYWdlICpwYWdlLCBz dHJ1Y3Qgdm1fYXJlYV9zdHJ1Y3QgKnZtYSwNCiAJdXBkYXRlX2hpd2F0ZXJfcnNzKG1tKTsNCiAN CiAJaWYgKFBhZ2VIV1BvaXNvbihwYWdlKSAmJiAhKGZsYWdzICYgVFRVX0lHTk9SRV9IV1BPSVNP TikpIHsNCi0JCWlmICghUGFnZUh1Z2UocGFnZSkpIHsNCisJCWlmIChQYWdlSHVnZShwYWdlKSkg ew0KKwkJCWRlY19odWdldGxiX2NvdW50KG1tLCBwYWdlX2hzdGF0ZShwYWdlKSk7DQorCQl9IGVs c2Ugew0KIAkJCWlmIChQYWdlQW5vbihwYWdlKSkNCiAJCQkJZGVjX21tX2NvdW50ZXIobW0sIE1N X0FOT05QQUdFUyk7DQogCQkJZWxzZQ0KLS0gDQoyLjQuMw0K -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
[toc] | [prev] | [next] | [standalone]
| From | Jörn Engel <joern@purestorage.com> |
|---|---|
| Date | 2015-08-13 23:20 +0200 |
| Subject | Re: [PATCH v4 2/2] mm: hugetlb: proc: add HugetlbPages field to /proc/PID/status |
| Message-ID | <pX84O-6PO-21@gated-at.bofh.it> |
| In reply to | #1206443 |
On Thu, Aug 13, 2015 at 12:45:33AM +0000, Naoya Horiguchi wrote: > From: Naoya Horiguchi <n-horiguchi@ah.jp.nec.com> > Subject: [PATCH] mm: hugetlb: proc: add HugetlbPages field to /proc/PID/status > > Currently there's no easy way to get per-process usage of hugetlb pages, which > is inconvenient because userspace applications which use hugetlb typically want > to control their processes on the basis of how much memory (including hugetlb) > they use. So this patch simply provides easy access to the info via > /proc/PID/status. > > With this patch, for example, /proc/PID/status shows a line like this: > > HugetlbPages: 20480 kB (10*2048kB) > > If your system supports and enables multiple hugepage sizes, the line looks > like this: > > HugetlbPages: 1069056 kB (1*1048576kB 10*2048kB) > > , so you can easily know how many hugepages in which pagesize are used by a > process. > > Signed-off-by: Naoya Horiguchi <n-horiguchi@ah.jp.nec.com> Acked-by: Joern Engel <joern@logfs.org> Jörn -- Computer system analysis is like child-rearing; you can do grievous damage, but you cannot ensure success." -- Tom DeMarco -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
[toc] | [prev] | [next] | [standalone]
| From | Jörn Engel <joern@purestorage.com> |
|---|---|
| Date | 2015-08-13 23:20 +0200 |
| Subject | Re: [PATCH v4 2/2] mm: hugetlb: proc: add HugetlbPages field to /proc/PID/status |
| Message-ID | <pX84O-6PO-15@gated-at.bofh.it> |
| In reply to | #1206366 |
On Wed, Aug 12, 2015 at 01:30:27PM -0700, David Rientjes wrote: > > I'd be interested in the comments of others, though, to see if there is > any reservation about the hstate size breakdown. It may actually find no > current customer who is interested in parsing it. (If we keep it, I would > suggest the 'x' change to '*' similar to per-order breakdowns in > show_mem()). It may also be possible to add it later if a definitive > usecase is presented. I have no interest in parsing the size breakdown today. I might change my mind tomorrow and having the extra information hurts very little, so I won't argue against it either. > But overall I'm very happy with the new addition and think it's a good > solution to the problem. Agreed. Thank you! Jörn -- One of the painful things about our time is that those who feel certainty are stupid, and those with any imagination and understanding are filled with doubt and indecision. -- Bertrand Russell -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
[toc] | [prev] | [next] | [standalone]
| From | David Rientjes <rientjes@google.com> |
|---|---|
| Date | 2015-08-17 23:30 +0200 |
| Subject | Re: [PATCH v4 2/2] mm: hugetlb: proc: add HugetlbPages field to /proc/PID/status |
| Message-ID | <pYA8F-2u0-1@gated-at.bofh.it> |
| In reply to | #1206366 |
On Wed, 12 Aug 2015, David Rientjes wrote: > I'm happy with this and thanks very much for going the extra mile and > breaking the usage down by hstate size. > > I'd be interested in the comments of others, though, to see if there is > any reservation about the hstate size breakdown. It may actually find no > current customer who is interested in parsing it. (If we keep it, I would > suggest the 'x' change to '*' similar to per-order breakdowns in > show_mem()). It may also be possible to add it later if a definitive > usecase is presented. > > But overall I'm very happy with the new addition and think it's a good > solution to the problem. > No objections from anybody else, so Acked-by: David Rientjes <rientjes@google.com> Thanks Naoya! -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
[toc] | [prev] | [next] | [standalone]
| From | Naoya Horiguchi <n-horiguchi@ah.jp.nec.com> |
|---|---|
| Date | 2015-08-12 09:50 +0200 |
| Subject | [PATCH v4 1/2] mm: hugetlb: proc: add HugetlbPages field to /proc/PID/smaps |
| Message-ID | <pWyXo-6k2-9@gated-at.bofh.it> |
| In reply to | #1205514 |
Q3VycmVudGx5IC9wcm9jL1BJRC9zbWFwcyBwcm92aWRlcyBubyB1c2FnZSBpbmZvIGZvciB2bWEo Vk1fSFVHRVRMQiksIHdoaWNoDQppcyBpbmNvbnZlbmllbnQgd2hlbiB3ZSB3YW50IHRvIGtub3cg cGVyLXRhc2sgb3IgcGVyLXZtYSBiYXNlIGh1Z2V0bGIgdXNhZ2UuDQpUbyBzb2x2ZSB0aGlzLCB0 aGlzIHBhdGNoIGFkZHMgYSBuZXcgbGluZSBmb3IgaHVnZXRsYiB1c2FnZSBsaWtlIGJlbG93Og0K DQogIFNpemU6ICAgICAgICAgICAgICAyMDQ4MCBrQg0KICBSc3M6ICAgICAgICAgICAgICAgICAg IDAga0INCiAgUHNzOiAgICAgICAgICAgICAgICAgICAwIGtCDQogIFNoYXJlZF9DbGVhbjogICAg ICAgICAgMCBrQg0KICBTaGFyZWRfRGlydHk6ICAgICAgICAgIDAga0INCiAgUHJpdmF0ZV9DbGVh bjogICAgICAgICAwIGtCDQogIFByaXZhdGVfRGlydHk6ICAgICAgICAgMCBrQg0KICBSZWZlcmVu Y2VkOiAgICAgICAgICAgIDAga0INCiAgQW5vbnltb3VzOiAgICAgICAgICAgICAwIGtCDQogIEFu b25IdWdlUGFnZXM6ICAgICAgICAgMCBrQg0KICBIdWdldGxiUGFnZXM6ICAgICAgMTg0MzIga0IN CiAgU3dhcDogICAgICAgICAgICAgICAgICAwIGtCDQogIEtlcm5lbFBhZ2VTaXplOiAgICAgMjA0 OCBrQg0KICBNTVVQYWdlU2l6ZTogICAgICAgIDIwNDgga0INCiAgTG9ja2VkOiAgICAgICAgICAg ICAgICAwIGtCDQogIFZtRmxhZ3M6IHJkIHdyIG1yIG13IG1lIGRlIGh0DQoNClNpZ25lZC1vZmYt Ynk6IE5hb3lhIEhvcmlndWNoaSA8bi1ob3JpZ3VjaGlAYWguanAubmVjLmNvbT4NCi0tLQ0KdjMg LT4gdjQ6DQotIHN1c3BlbmQgQWNrZWQtYnkgdGFnIGJlY2F1c2UgdjMtPnY0IGNoYW5nZSBpcyBu b3QgdHJpdmlhbA0KLSBJIHN0YXRlZCBpbiBwcmV2aW91cyBkaXNjdXNzaW9uIHRoYXQgSHVnZXRs YlBhZ2VzIGxpbmUgY2FuIGNvbnRhaW4gcGFnZQ0KICBzaXplIGluZm8sIGJ1dCB0aGF0J3Mgbm90 IG5lY2Vzc2FyeSBiZWNhdXNlIHdlIGFscmVhZHkgaGF2ZSBLZXJuZWxQYWdlU2l6ZQ0KICBpbmZv Lg0KLSBtZXJnZWQgZG9jdW1lbnRhdGlvbiB1cGRhdGUsIHdoZXJlIHRoZSBjdXJyZW50IGRvY3Vt ZW50YXRpb24gZG9lc24ndCBtZW50aW9uDQogIEFub25IdWdlUGFnZXMsIHNvIGl0J3MgYWxzbyBh ZGRlZC4NCi0tLQ0KIERvY3VtZW50YXRpb24vZmlsZXN5c3RlbXMvcHJvYy50eHQgfCAgNyArKysr Ky0tDQogZnMvcHJvYy90YXNrX21tdS5jICAgICAgICAgICAgICAgICB8IDI5ICsrKysrKysrKysr KysrKysrKysrKysrKysrKysrDQogMiBmaWxlcyBjaGFuZ2VkLCAzNCBpbnNlcnRpb25zKCspLCAy IGRlbGV0aW9ucygtKQ0KDQpkaWZmIC0tZ2l0IHY0LjItcmM0Lm9yaWcvRG9jdW1lbnRhdGlvbi9m aWxlc3lzdGVtcy9wcm9jLnR4dCB2NC4yLXJjNC9Eb2N1bWVudGF0aW9uL2ZpbGVzeXN0ZW1zL3By b2MudHh0DQppbmRleCA2ZjdmYWZkZTA4ODQuLjIyZTQwMjExZWY2NCAxMDA2NDQNCi0tLSB2NC4y LXJjNC5vcmlnL0RvY3VtZW50YXRpb24vZmlsZXN5c3RlbXMvcHJvYy50eHQNCisrKyB2NC4yLXJj NC9Eb2N1bWVudGF0aW9uL2ZpbGVzeXN0ZW1zL3Byb2MudHh0DQpAQCAtNDIzLDYgKzQyMyw4IEBA IFByaXZhdGVfQ2xlYW46ICAgICAgICAgMCBrQg0KIFByaXZhdGVfRGlydHk6ICAgICAgICAgMCBr Qg0KIFJlZmVyZW5jZWQ6ICAgICAgICAgIDg5MiBrQg0KIEFub255bW91czogICAgICAgICAgICAg MCBrQg0KK0Fub25IdWdlUGFnZXM6ICAgICAgICAgMCBrQg0KK0h1Z2V0bGJQYWdlczogICAgICAg ICAgMCBrQg0KIFN3YXA6ICAgICAgICAgICAgICAgICAgMCBrQg0KIEtlcm5lbFBhZ2VTaXplOiAg ICAgICAgNCBrQg0KIE1NVVBhZ2VTaXplOiAgICAgICAgICAgNCBrQg0KQEAgLTQ0MCw4ICs0NDIs OSBAQCBpbmRpY2F0ZXMgdGhlIGFtb3VudCBvZiBtZW1vcnkgY3VycmVudGx5IG1hcmtlZCBhcyBy ZWZlcmVuY2VkIG9yIGFjY2Vzc2VkLg0KICJBbm9ueW1vdXMiIHNob3dzIHRoZSBhbW91bnQgb2Yg bWVtb3J5IHRoYXQgZG9lcyBub3QgYmVsb25nIHRvIGFueSBmaWxlLiAgRXZlbg0KIGEgbWFwcGlu ZyBhc3NvY2lhdGVkIHdpdGggYSBmaWxlIG1heSBjb250YWluIGFub255bW91cyBwYWdlczogd2hl biBNQVBfUFJJVkFURQ0KIGFuZCBhIHBhZ2UgaXMgbW9kaWZpZWQsIHRoZSBmaWxlIHBhZ2UgaXMg cmVwbGFjZWQgYnkgYSBwcml2YXRlIGFub255bW91cyBjb3B5Lg0KLSJTd2FwIiBzaG93cyBob3cg bXVjaCB3b3VsZC1iZS1hbm9ueW1vdXMgbWVtb3J5IGlzIGFsc28gdXNlZCwgYnV0IG91dCBvbg0K LXN3YXAuDQorIkFub25IdWdlUGFnZXMiIHNob3dzIHRoZSBhbW1vdW50IG9mIG1lbW9yeSBiYWNr ZWQgYnkgdHJhbnNwYXJlbnQgaHVnZXBhZ2UuDQorIkh1Z2V0bGJQYWdlcyIgc2hvd3MgdGhlIGFt bW91bnQgb2YgbWVtb3J5IGJhY2tlZCBieSBodWdldGxiZnMgcGFnZS4NCisiU3dhcCIgc2hvd3Mg aG93IG11Y2ggd291bGQtYmUtYW5vbnltb3VzIG1lbW9yeSBpcyBhbHNvIHVzZWQsIGJ1dCBvdXQg b24gc3dhcC4NCiANCiAiVm1GbGFncyIgZmllbGQgZGVzZXJ2ZXMgYSBzZXBhcmF0ZSBkZXNjcmlw dGlvbi4gVGhpcyBtZW1iZXIgcmVwcmVzZW50cyB0aGUga2VybmVsDQogZmxhZ3MgYXNzb2NpYXRl ZCB3aXRoIHRoZSBwYXJ0aWN1bGFyIHZpcnR1YWwgbWVtb3J5IGFyZWEgaW4gdHdvIGxldHRlciBl bmNvZGVkDQpkaWZmIC0tZ2l0IHY0LjItcmM0Lm9yaWcvZnMvcHJvYy90YXNrX21tdS5jIHY0LjIt cmM0L2ZzL3Byb2MvdGFza19tbXUuYw0KaW5kZXggY2ExZTA5MTg4MWQ0Li4yYzM3OTM4YjgyZWUg MTAwNjQ0DQotLS0gdjQuMi1yYzQub3JpZy9mcy9wcm9jL3Rhc2tfbW11LmMNCisrKyB2NC4yLXJj NC9mcy9wcm9jL3Rhc2tfbW11LmMNCkBAIC00NDUsNiArNDQ1LDcgQEAgc3RydWN0IG1lbV9zaXpl X3N0YXRzIHsNCiAJdW5zaWduZWQgbG9uZyBhbm9ueW1vdXM7DQogCXVuc2lnbmVkIGxvbmcgYW5v bnltb3VzX3RocDsNCiAJdW5zaWduZWQgbG9uZyBzd2FwOw0KKwl1bnNpZ25lZCBsb25nIGh1Z2V0 bGI7DQogCXU2NCBwc3M7DQogfTsNCiANCkBAIC02MTAsMTIgKzYxMSwzOCBAQCBzdGF0aWMgdm9p ZCBzaG93X3NtYXBfdm1hX2ZsYWdzKHN0cnVjdCBzZXFfZmlsZSAqbSwgc3RydWN0IHZtX2FyZWFf c3RydWN0ICp2bWEpDQogCXNlcV9wdXRjKG0sICdcbicpOw0KIH0NCiANCisjaWZkZWYgQ09ORklH X0hVR0VUTEJfUEFHRQ0KK3N0YXRpYyBpbnQgc21hcHNfaHVnZXRsYl9yYW5nZShwdGVfdCAqcHRl LCB1bnNpZ25lZCBsb25nIGhtYXNrLA0KKwkJCQkgdW5zaWduZWQgbG9uZyBhZGRyLCB1bnNpZ25l ZCBsb25nIGVuZCwNCisJCQkJIHN0cnVjdCBtbV93YWxrICp3YWxrKQ0KK3sNCisJc3RydWN0IG1l bV9zaXplX3N0YXRzICptc3MgPSB3YWxrLT5wcml2YXRlOw0KKwlzdHJ1Y3Qgdm1fYXJlYV9zdHJ1 Y3QgKnZtYSA9IHdhbGstPnZtYTsNCisJc3RydWN0IHBhZ2UgKnBhZ2UgPSBOVUxMOw0KKw0KKwlp ZiAocHRlX3ByZXNlbnQoKnB0ZSkpIHsNCisJCXBhZ2UgPSB2bV9ub3JtYWxfcGFnZSh2bWEsIGFk ZHIsICpwdGUpOw0KKwl9IGVsc2UgaWYgKGlzX3N3YXBfcHRlKCpwdGUpKSB7DQorCQlzd3BfZW50 cnlfdCBzd3BlbnQgPSBwdGVfdG9fc3dwX2VudHJ5KCpwdGUpOw0KKw0KKwkJaWYgKGlzX21pZ3Jh dGlvbl9lbnRyeShzd3BlbnQpKQ0KKwkJCXBhZ2UgPSBtaWdyYXRpb25fZW50cnlfdG9fcGFnZShz d3BlbnQpOw0KKwl9DQorCWlmIChwYWdlKQ0KKwkJbXNzLT5odWdldGxiICs9IGh1Z2VfcGFnZV9z aXplKGhzdGF0ZV92bWEodm1hKSk7DQorCXJldHVybiAwOw0KK30NCisjZW5kaWYgLyogSFVHRVRM Ql9QQUdFICovDQorDQogc3RhdGljIGludCBzaG93X3NtYXAoc3RydWN0IHNlcV9maWxlICptLCB2 b2lkICp2LCBpbnQgaXNfcGlkKQ0KIHsNCiAJc3RydWN0IHZtX2FyZWFfc3RydWN0ICp2bWEgPSB2 Ow0KIAlzdHJ1Y3QgbWVtX3NpemVfc3RhdHMgbXNzOw0KIAlzdHJ1Y3QgbW1fd2FsayBzbWFwc193 YWxrID0gew0KIAkJLnBtZF9lbnRyeSA9IHNtYXBzX3B0ZV9yYW5nZSwNCisjaWZkZWYgQ09ORklH X0hVR0VUTEJfUEFHRQ0KKwkJLmh1Z2V0bGJfZW50cnkgPSBzbWFwc19odWdldGxiX3JhbmdlLA0K KyNlbmRpZg0KIAkJLm1tID0gdm1hLT52bV9tbSwNCiAJCS5wcml2YXRlID0gJm1zcywNCiAJfTsN CkBAIC02MzcsNiArNjY0LDcgQEAgc3RhdGljIGludCBzaG93X3NtYXAoc3RydWN0IHNlcV9maWxl ICptLCB2b2lkICp2LCBpbnQgaXNfcGlkKQ0KIAkJICAgIlJlZmVyZW5jZWQ6ICAgICAlOGx1IGtC XG4iDQogCQkgICAiQW5vbnltb3VzOiAgICAgICU4bHUga0JcbiINCiAJCSAgICJBbm9uSHVnZVBh Z2VzOiAgJThsdSBrQlxuIg0KKwkJICAgIkh1Z2V0bGJQYWdlczogICAlOGx1IGtCXG4iDQogCQkg ICAiU3dhcDogICAgICAgICAgICU4bHUga0JcbiINCiAJCSAgICJLZXJuZWxQYWdlU2l6ZTogJThs dSBrQlxuIg0KIAkJICAgIk1NVVBhZ2VTaXplOiAgICAlOGx1IGtCXG4iDQpAQCAtNjUxLDYgKzY3 OSw3IEBAIHN0YXRpYyBpbnQgc2hvd19zbWFwKHN0cnVjdCBzZXFfZmlsZSAqbSwgdm9pZCAqdiwg aW50IGlzX3BpZCkNCiAJCSAgIG1zcy5yZWZlcmVuY2VkID4+IDEwLA0KIAkJICAgbXNzLmFub255 bW91cyA+PiAxMCwNCiAJCSAgIG1zcy5hbm9ueW1vdXNfdGhwID4+IDEwLA0KKwkJICAgbXNzLmh1 Z2V0bGIgPj4gMTAsDQogCQkgICBtc3Muc3dhcCA+PiAxMCwNCiAJCSAgIHZtYV9rZXJuZWxfcGFn ZXNpemUodm1hKSA+PiAxMCwNCiAJCSAgIHZtYV9tbXVfcGFnZXNpemUodm1hKSA+PiAxMCwNCi0t IA0KMi40LjMNCg== -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
[toc] | [prev] | [next] | [standalone]
| From | David Rientjes <rientjes@google.com> |
|---|---|
| Date | 2015-08-12 22:30 +0200 |
| Subject | Re: [PATCH v4 1/2] mm: hugetlb: proc: add HugetlbPages field to /proc/PID/smaps |
| Message-ID | <pWKOS-6EY-17@gated-at.bofh.it> |
| In reply to | #1205674 |
On Wed, 12 Aug 2015, Naoya Horiguchi wrote: > Currently /proc/PID/smaps provides no usage info for vma(VM_HUGETLB), which > is inconvenient when we want to know per-task or per-vma base hugetlb usage. > To solve this, this patch adds a new line for hugetlb usage like below: > > Size: 20480 kB > Rss: 0 kB > Pss: 0 kB > Shared_Clean: 0 kB > Shared_Dirty: 0 kB > Private_Clean: 0 kB > Private_Dirty: 0 kB > Referenced: 0 kB > Anonymous: 0 kB > AnonHugePages: 0 kB > HugetlbPages: 18432 kB > Swap: 0 kB > KernelPageSize: 2048 kB > MMUPageSize: 2048 kB > Locked: 0 kB > VmFlags: rd wr mr mw me de ht > > Signed-off-by: Naoya Horiguchi <n-horiguchi@ah.jp.nec.com> Acked-by: David Rientjes <rientjes@google.com> -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
[toc] | [prev] | [next] | [standalone]
| From | Jörn Engel <joern@purestorage.com> |
|---|---|
| Date | 2015-08-13 23:20 +0200 |
| Subject | Re: [PATCH v4 1/2] mm: hugetlb: proc: add HugetlbPages field to /proc/PID/smaps |
| Message-ID | <pX84N-6PO-5@gated-at.bofh.it> |
| In reply to | #1206363 |
On Wed, Aug 12, 2015 at 01:25:59PM -0700, David Rientjes wrote: > On Wed, 12 Aug 2015, Naoya Horiguchi wrote: > > > Currently /proc/PID/smaps provides no usage info for vma(VM_HUGETLB), which > > is inconvenient when we want to know per-task or per-vma base hugetlb usage. > > To solve this, this patch adds a new line for hugetlb usage like below: > > > > Size: 20480 kB > > Rss: 0 kB > > Pss: 0 kB > > Shared_Clean: 0 kB > > Shared_Dirty: 0 kB > > Private_Clean: 0 kB > > Private_Dirty: 0 kB > > Referenced: 0 kB > > Anonymous: 0 kB > > AnonHugePages: 0 kB > > HugetlbPages: 18432 kB > > Swap: 0 kB > > KernelPageSize: 2048 kB > > MMUPageSize: 2048 kB > > Locked: 0 kB > > VmFlags: rd wr mr mw me de ht > > > > Signed-off-by: Naoya Horiguchi <n-horiguchi@ah.jp.nec.com> > > Acked-by: David Rientjes <rientjes@google.com> Acked-by: Joern Engel <joern@logfs.org> Jörn -- One of my most productive days was throwing away 1000 lines of code. -- Ken Thompson. -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
[toc] | [prev] | [next] | [standalone]
| From | Naoya Horiguchi <n-horiguchi@ah.jp.nec.com> |
|---|---|
| Date | 2015-08-10 02:50 +0200 |
| Subject | [PATCH v3 2/3] mm: hugetlb: add VmHugetlbRSS: field in /proc/pid/status |
| Message-ID | <pVJrQ-5JM-5@gated-at.bofh.it> |
| In reply to | #1203069 |
Q3VycmVudGx5IHRoZXJlJ3Mgbm8gZWFzeSB3YXkgdG8gZ2V0IHBlci1wcm9jZXNzIHVzYWdlIG9m IGh1Z2V0bGIgcGFnZXMsIHdoaWNoDQppcyBpbmNvbnZlbmllbnQgYmVjYXVzZSBhcHBsaWNhdGlv bnMgd2hpY2ggdXNlIGh1Z2V0bGIgdHlwaWNhbGx5IHdhbnQgdG8gY29udHJvbA0KdGhlaXIgcHJv Y2Vzc2VzIG9uIHRoZSBiYXNpcyBvZiBob3cgbXVjaCBtZW1vcnkgKGluY2x1ZGluZyBodWdldGxi KSB0aGV5IHVzZS4NClNvIHRoaXMgcGF0Y2ggc2ltcGx5IHByb3ZpZGVzIGVhc3kgYWNjZXNzIHRv IHRoZSBpbmZvIHZpYSAvcHJvYy9waWQvc3RhdHVzLg0KDQpUaGlzIHBhdGNoIHNob3VsZG4ndCBj aGFuZ2UgdGhlIE9PTSBiZWhhdmlvciAoc28gaHVnZXRsYiB1c2FnZSBpcyBpZ25vcmVkIGFzDQpp cyBub3csKSB3aGljaCBJIGd1ZXNzIGlzIGZpbmUgdW50aWwgd2UgaGF2ZSBzb21lIHN0cm9uZyBy ZWFzb24gdG8gZG8gaXQuDQoNClNpZ25lZC1vZmYtYnk6IE5hb3lhIEhvcmlndWNoaSA8bi1ob3Jp Z3VjaGlAYWguanAubmVjLmNvbT4NCi0tLQ0KdjIgLT4gdjM6DQotIHVzZSBpbmxpbmUgZnVuY3Rp b25zIGluc3RlYWQgb2YgbWFjcm9zIGZvciAhQ09ORklHX0hVR0VUTEJfUEFHRQ0KLS0tDQogZnMv cHJvYy90YXNrX21tdS5jICAgICAgIHwgIDUgKysrKy0NCiBpbmNsdWRlL2xpbnV4L2h1Z2V0bGIu aCAgfCAyNCArKysrKysrKysrKysrKysrKysrKysrKysNCiBpbmNsdWRlL2xpbnV4L21tLmggICAg ICAgfCAgMyArKysNCiBpbmNsdWRlL2xpbnV4L21tX3R5cGVzLmggfCAgMyArKysNCiBtbS9odWdl dGxiLmMgICAgICAgICAgICAgfCAgOSArKysrKysrKysNCiBtbS9tZW1vcnkuYyAgICAgICAgICAg ICAgfCAgNCArKy0tDQogbW0vcm1hcC5jICAgICAgICAgICAgICAgIHwgIDQgKysrLQ0KIDcgZmls ZXMgY2hhbmdlZCwgNDggaW5zZXJ0aW9ucygrKSwgNCBkZWxldGlvbnMoLSkNCg0KZGlmZiAtLWdp dCB2NC4yLXJjNC5vcmlnL2ZzL3Byb2MvdGFza19tbXUuYyB2NC4yLXJjNC9mcy9wcm9jL3Rhc2tf bW11LmMNCmluZGV4IGM3MjE4NjAzMzA2ZC4uZjE4MWY1NmZjY2UyIDEwMDY0NA0KLS0tIHY0LjIt cmM0Lm9yaWcvZnMvcHJvYy90YXNrX21tdS5jDQorKysgdjQuMi1yYzQvZnMvcHJvYy90YXNrX21t dS5jDQpAQCAtMjIsNyArMjIsNyBAQA0KIHZvaWQgdGFza19tZW0oc3RydWN0IHNlcV9maWxlICpt LCBzdHJ1Y3QgbW1fc3RydWN0ICptbSkNCiB7DQogCXVuc2lnbmVkIGxvbmcgZGF0YSwgdGV4dCwg bGliLCBzd2FwLCBwdGVzLCBwbWRzOw0KLQl1bnNpZ25lZCBsb25nIGhpd2F0ZXJfdm0sIHRvdGFs X3ZtLCBoaXdhdGVyX3JzcywgdG90YWxfcnNzOw0KKwl1bnNpZ25lZCBsb25nIGhpd2F0ZXJfdm0s IHRvdGFsX3ZtLCBoaXdhdGVyX3JzcywgdG90YWxfcnNzLCBodWdldGxiX3JzczsNCiANCiAJLyoN CiAJICogTm90ZTogdG8gbWluaW1pemUgdGhlaXIgb3ZlcmhlYWQsIG1tIG1haW50YWlucyBoaXdh dGVyX3ZtIGFuZA0KQEAgLTM3LDYgKzM3LDcgQEAgdm9pZCB0YXNrX21lbShzdHJ1Y3Qgc2VxX2Zp bGUgKm0sIHN0cnVjdCBtbV9zdHJ1Y3QgKm1tKQ0KIAloaXdhdGVyX3JzcyA9IHRvdGFsX3JzcyA9 IGdldF9tbV9yc3MobW0pOw0KIAlpZiAoaGl3YXRlcl9yc3MgPCBtbS0+aGl3YXRlcl9yc3MpDQog CQloaXdhdGVyX3JzcyA9IG1tLT5oaXdhdGVyX3JzczsNCisJaHVnZXRsYl9yc3MgPSBnZXRfaHVn ZXRsYl9yc3MobW0pOw0KIA0KIAlkYXRhID0gbW0tPnRvdGFsX3ZtIC0gbW0tPnNoYXJlZF92bSAt IG1tLT5zdGFja192bTsNCiAJdGV4dCA9IChQQUdFX0FMSUdOKG1tLT5lbmRfY29kZSkgLSAobW0t PnN0YXJ0X2NvZGUgJiBQQUdFX01BU0spKSA+PiAxMDsNCkBAIC01MSw2ICs1Miw3IEBAIHZvaWQg dGFza19tZW0oc3RydWN0IHNlcV9maWxlICptLCBzdHJ1Y3QgbW1fc3RydWN0ICptbSkNCiAJCSJW bVBpbjpcdCU4bHUga0JcbiINCiAJCSJWbUhXTTpcdCU4bHUga0JcbiINCiAJCSJWbVJTUzpcdCU4 bHUga0JcbiINCisJCSJWbUh1Z2V0bGJSU1M6XHQlOGx1IGtCXG4iDQogCQkiVm1EYXRhOlx0JThs dSBrQlxuIg0KIAkJIlZtU3RrOlx0JThsdSBrQlxuIg0KIAkJIlZtRXhlOlx0JThsdSBrQlxuIg0K QEAgLTY0LDYgKzY2LDcgQEAgdm9pZCB0YXNrX21lbShzdHJ1Y3Qgc2VxX2ZpbGUgKm0sIHN0cnVj dCBtbV9zdHJ1Y3QgKm1tKQ0KIAkJbW0tPnBpbm5lZF92bSA8PCAoUEFHRV9TSElGVC0xMCksDQog CQloaXdhdGVyX3JzcyA8PCAoUEFHRV9TSElGVC0xMCksDQogCQl0b3RhbF9yc3MgPDwgKFBBR0Vf U0hJRlQtMTApLA0KKwkJaHVnZXRsYl9yc3MgPDwgKFBBR0VfU0hJRlQtMTApLA0KIAkJZGF0YSA8 PCAoUEFHRV9TSElGVC0xMCksDQogCQltbS0+c3RhY2tfdm0gPDwgKFBBR0VfU0hJRlQtMTApLCB0 ZXh0LCBsaWIsDQogCQlwdGVzID4+IDEwLA0KZGlmZiAtLWdpdCB2NC4yLXJjNC5vcmlnL2luY2x1 ZGUvbGludXgvaHVnZXRsYi5oIHY0LjItcmM0L2luY2x1ZGUvbGludXgvaHVnZXRsYi5oDQppbmRl eCBkODkxZjk0OTQ2NmEuLmZhOTU2ZDk0Y2FjYiAxMDA2NDQNCi0tLSB2NC4yLXJjNC5vcmlnL2lu Y2x1ZGUvbGludXgvaHVnZXRsYi5oDQorKysgdjQuMi1yYzQvaW5jbHVkZS9saW51eC9odWdldGxi LmgNCkBAIC00NjksNiArNDY5LDIxIEBAIHN0YXRpYyBpbmxpbmUgc3BpbmxvY2tfdCAqaHVnZV9w dGVfbG9ja3B0cihzdHJ1Y3QgaHN0YXRlICpoLA0KICNkZWZpbmUgaHVnZXBhZ2VzX3N1cHBvcnRl ZCgpIChIUEFHRV9TSElGVCAhPSAwKQ0KICNlbmRpZg0KIA0KKy8qDQorICogVGhpcyBzaW1wbGUg d3JhcHBlcnMgYXJlIHRvIGhpZGUgTU1fSFVHRVRMQlBBR0VTIGZyb20gb3V0c2lkZSBodWdldGxi ZnMNCisgKiBzdWJzeXN0ZW0uIFRoZSBjb3VudGVyIE1NX0hVR0VUTEJQQUdFUyBpcyBtYWludGFp bmVkIGluIHBhZ2UgdW5pdCBiYXNpcywNCisgKiBzbyBpdCBjaGFuZ2VzIGJ5IDUxMiBmb3IgZXhh bXBsZSBpZiBhIDJNQiBodWdlcGFnZSBpcyBtYXBwZWQgb3IgdW5tYXBwZWQuDQorICovDQorc3Rh dGljIGlubGluZSBpbnQgZ2V0X2h1Z2V0bGJfcnNzKHN0cnVjdCBtbV9zdHJ1Y3QgKm1tKQ0KK3sN CisJcmV0dXJuIGdldF9tbV9jb3VudGVyKG1tLCBNTV9IVUdFVExCUEFHRVMpOw0KK30NCisNCitz dGF0aWMgaW5saW5lIHZvaWQgbW9kX2h1Z2V0bGJfcnNzKHN0cnVjdCBtbV9zdHJ1Y3QgKm1tLCBs b25nIHZhbHVlKQ0KK3sNCisJYWRkX21tX2NvdW50ZXIobW0sIE1NX0hVR0VUTEJQQUdFUywgdmFs dWUpOw0KK30NCisNCiAjZWxzZQkvKiBDT05GSUdfSFVHRVRMQl9QQUdFICovDQogc3RydWN0IGhz dGF0ZSB7fTsNCiAjZGVmaW5lIGFsbG9jX2h1Z2VfcGFnZV9ub2RlKGgsIG5pZCkgTlVMTA0KQEAg LTUwNCw2ICs1MTksMTUgQEAgc3RhdGljIGlubGluZSBzcGlubG9ja190ICpodWdlX3B0ZV9sb2Nr cHRyKHN0cnVjdCBoc3RhdGUgKmgsDQogew0KIAlyZXR1cm4gJm1tLT5wYWdlX3RhYmxlX2xvY2s7 DQogfQ0KKw0KK3N0YXRpYyBpbmxpbmUgZ2V0X2h1Z2V0bGJfcnNzKHN0cnVjdCBtbV9zdHJ1Y3Qg Km1tKQ0KK3sNCisJcmV0dXJuIDA7DQorfQ0KKw0KK3N0YXRpYyBpbmxpbmUgbW9kX2h1Z2V0bGJf cnNzKHN0cnVjdCBtbV9zdHJ1Y3QgKm1tLCBsb25nIHZhbHVlKQ0KK3sNCit9DQogI2VuZGlmCS8q IENPTkZJR19IVUdFVExCX1BBR0UgKi8NCiANCiBzdGF0aWMgaW5saW5lIHNwaW5sb2NrX3QgKmh1 Z2VfcHRlX2xvY2soc3RydWN0IGhzdGF0ZSAqaCwNCmRpZmYgLS1naXQgdjQuMi1yYzQub3JpZy9p bmNsdWRlL2xpbnV4L21tLmggdjQuMi1yYzQvaW5jbHVkZS9saW51eC9tbS5oDQppbmRleCAyZTg3 MmY5MmRiYWMuLjkyMThhODg1NjQ4MyAxMDA2NDQNCi0tLSB2NC4yLXJjNC5vcmlnL2luY2x1ZGUv bGludXgvbW0uaA0KKysrIHY0LjItcmM0L2luY2x1ZGUvbGludXgvbW0uaA0KQEAgLTEzNTUsNiAr MTM1NSw5IEBAIHN0YXRpYyBpbmxpbmUgdm9pZCBzeW5jX21tX3JzcyhzdHJ1Y3QgbW1fc3RydWN0 ICptbSkNCiB9DQogI2VuZGlmDQogDQorZXh0ZXJuIGlubGluZSB2b2lkIGluaXRfcnNzX3ZlYyhp bnQgKnJzcyk7DQorZXh0ZXJuIGlubGluZSB2b2lkIGFkZF9tbV9yc3NfdmVjKHN0cnVjdCBtbV9z dHJ1Y3QgKm1tLCBpbnQgKnJzcyk7DQorDQogaW50IHZtYV93YW50c193cml0ZW5vdGlmeShzdHJ1 Y3Qgdm1fYXJlYV9zdHJ1Y3QgKnZtYSk7DQogDQogZXh0ZXJuIHB0ZV90ICpfX2dldF9sb2NrZWRf cHRlKHN0cnVjdCBtbV9zdHJ1Y3QgKm1tLCB1bnNpZ25lZCBsb25nIGFkZHIsDQpkaWZmIC0tZ2l0 IHY0LjItcmM0Lm9yaWcvaW5jbHVkZS9saW51eC9tbV90eXBlcy5oIHY0LjItcmM0L2luY2x1ZGUv bGludXgvbW1fdHlwZXMuaA0KaW5kZXggMDAzOGFjNzQ2NmZkLi44ODdiNDNiYTVhMTggMTAwNjQ0 DQotLS0gdjQuMi1yYzQub3JpZy9pbmNsdWRlL2xpbnV4L21tX3R5cGVzLmgNCisrKyB2NC4yLXJj NC9pbmNsdWRlL2xpbnV4L21tX3R5cGVzLmgNCkBAIC0zNDgsNiArMzQ4LDkgQEAgZW51bSB7DQog CU1NX0ZJTEVQQUdFUywNCiAJTU1fQU5PTlBBR0VTLA0KIAlNTV9TV0FQRU5UUywNCisjaWZkZWYg Q09ORklHX0hVR0VUTEJfUEFHRQ0KKwlNTV9IVUdFVExCUEFHRVMsDQorI2VuZGlmDQogCU5SX01N X0NPVU5URVJTDQogfTsNCiANCmRpZmYgLS1naXQgdjQuMi1yYzQub3JpZy9tbS9odWdldGxiLmMg djQuMi1yYzQvbW0vaHVnZXRsYi5jDQppbmRleCBhOGMzMDg3MDg5ZDguLjEyZTVlN2QzYjYwZiAx MDA2NDQNCi0tLSB2NC4yLXJjNC5vcmlnL21tL2h1Z2V0bGIuYw0KKysrIHY0LjItcmM0L21tL2h1 Z2V0bGIuYw0KQEAgLTI3NDMsOSArMjc0MywxMSBAQCBpbnQgY29weV9odWdldGxiX3BhZ2VfcmFu Z2Uoc3RydWN0IG1tX3N0cnVjdCAqZHN0LCBzdHJ1Y3QgbW1fc3RydWN0ICpzcmMsDQogCXVuc2ln bmVkIGxvbmcgbW11bl9zdGFydDsJLyogRm9yIG1tdV9ub3RpZmllcnMgKi8NCiAJdW5zaWduZWQg bG9uZyBtbXVuX2VuZDsJCS8qIEZvciBtbXVfbm90aWZpZXJzICovDQogCWludCByZXQgPSAwOw0K KwlpbnQgcnNzW05SX01NX0NPVU5URVJTXTsNCiANCiAJY293ID0gKHZtYS0+dm1fZmxhZ3MgJiAo Vk1fU0hBUkVEIHwgVk1fTUFZV1JJVEUpKSA9PSBWTV9NQVlXUklURTsNCiANCisJaW5pdF9yc3Nf dmVjKHJzcyk7DQogCW1tdW5fc3RhcnQgPSB2bWEtPnZtX3N0YXJ0Ow0KIAltbXVuX2VuZCA9IHZt YS0+dm1fZW5kOw0KIAlpZiAoY293KQ0KQEAgLTI3OTcsNiArMjc5OSw3IEBAIGludCBjb3B5X2h1 Z2V0bGJfcGFnZV9yYW5nZShzdHJ1Y3QgbW1fc3RydWN0ICpkc3QsIHN0cnVjdCBtbV9zdHJ1Y3Qg KnNyYywNCiAJCQlnZXRfcGFnZShwdGVwYWdlKTsNCiAJCQlwYWdlX2R1cF9ybWFwKHB0ZXBhZ2Up Ow0KIAkJCXNldF9odWdlX3B0ZV9hdChkc3QsIGFkZHIsIGRzdF9wdGUsIGVudHJ5KTsNCisJCQly c3NbTU1fSFVHRVRMQlBBR0VTXSArPSBwYWdlc19wZXJfaHVnZV9wYWdlKGgpOw0KIAkJfQ0KIAkJ c3Bpbl91bmxvY2soc3JjX3B0bCk7DQogCQlzcGluX3VubG9jayhkc3RfcHRsKTsNCkBAIC0yODA1 LDYgKzI4MDgsNyBAQCBpbnQgY29weV9odWdldGxiX3BhZ2VfcmFuZ2Uoc3RydWN0IG1tX3N0cnVj dCAqZHN0LCBzdHJ1Y3QgbW1fc3RydWN0ICpzcmMsDQogCWlmIChjb3cpDQogCQltbXVfbm90aWZp ZXJfaW52YWxpZGF0ZV9yYW5nZV9lbmQoc3JjLCBtbXVuX3N0YXJ0LCBtbXVuX2VuZCk7DQogDQor CWFkZF9tbV9yc3NfdmVjKGRzdCwgcnNzKTsNCiAJcmV0dXJuIHJldDsNCiB9DQogDQpAQCAtMjgy Myw2ICsyODI3LDcgQEAgdm9pZCBfX3VubWFwX2h1Z2VwYWdlX3JhbmdlKHN0cnVjdCBtbXVfZ2F0 aGVyICp0bGIsIHN0cnVjdCB2bV9hcmVhX3N0cnVjdCAqdm1hLA0KIAl1bnNpZ25lZCBsb25nIHN6 ID0gaHVnZV9wYWdlX3NpemUoaCk7DQogCWNvbnN0IHVuc2lnbmVkIGxvbmcgbW11bl9zdGFydCA9 IHN0YXJ0OwkvKiBGb3IgbW11X25vdGlmaWVycyAqLw0KIAljb25zdCB1bnNpZ25lZCBsb25nIG1t dW5fZW5kICAgPSBlbmQ7CS8qIEZvciBtbXVfbm90aWZpZXJzICovDQorCWludCByc3NbTlJfTU1f Q09VTlRFUlNdOw0KIA0KIAlXQVJOX09OKCFpc192bV9odWdldGxiX3BhZ2Uodm1hKSk7DQogCUJV R19PTihzdGFydCAmIH5odWdlX3BhZ2VfbWFzayhoKSk7DQpAQCAtMjgzMiw2ICsyODM3LDcgQEAg dm9pZCBfX3VubWFwX2h1Z2VwYWdlX3JhbmdlKHN0cnVjdCBtbXVfZ2F0aGVyICp0bGIsIHN0cnVj dCB2bV9hcmVhX3N0cnVjdCAqdm1hLA0KIAltbXVfbm90aWZpZXJfaW52YWxpZGF0ZV9yYW5nZV9z dGFydChtbSwgbW11bl9zdGFydCwgbW11bl9lbmQpOw0KIAlhZGRyZXNzID0gc3RhcnQ7DQogYWdh aW46DQorCWluaXRfcnNzX3ZlYyhyc3MpOw0KIAlmb3IgKDsgYWRkcmVzcyA8IGVuZDsgYWRkcmVz cyArPSBzeikgew0KIAkJcHRlcCA9IGh1Z2VfcHRlX29mZnNldChtbSwgYWRkcmVzcyk7DQogCQlp ZiAoIXB0ZXApDQpAQCAtMjg3Nyw2ICsyODgzLDcgQEAgdm9pZCBfX3VubWFwX2h1Z2VwYWdlX3Jh bmdlKHN0cnVjdCBtbXVfZ2F0aGVyICp0bGIsIHN0cnVjdCB2bV9hcmVhX3N0cnVjdCAqdm1hLA0K IAkJaWYgKGh1Z2VfcHRlX2RpcnR5KHB0ZSkpDQogCQkJc2V0X3BhZ2VfZGlydHkocGFnZSk7DQog DQorCQlyc3NbTU1fSFVHRVRMQlBBR0VTXSAtPSBwYWdlc19wZXJfaHVnZV9wYWdlKGgpOw0KIAkJ cGFnZV9yZW1vdmVfcm1hcChwYWdlKTsNCiAJCWZvcmNlX2ZsdXNoID0gIV9fdGxiX3JlbW92ZV9w YWdlKHRsYiwgcGFnZSk7DQogCQlpZiAoZm9yY2VfZmx1c2gpIHsNCkBAIC0yODkyLDYgKzI4OTks NyBAQCB2b2lkIF9fdW5tYXBfaHVnZXBhZ2VfcmFuZ2Uoc3RydWN0IG1tdV9nYXRoZXIgKnRsYiwg c3RydWN0IHZtX2FyZWFfc3RydWN0ICp2bWEsDQogdW5sb2NrOg0KIAkJc3Bpbl91bmxvY2socHRs KTsNCiAJfQ0KKwlhZGRfbW1fcnNzX3ZlYyhtbSwgcnNzKTsNCiAJLyoNCiAJICogbW11X2dhdGhl ciByYW4gb3V0IG9mIHJvb20gdG8gYmF0Y2ggcGFnZXMsIHdlIGJyZWFrIG91dCBvZg0KIAkgKiB0 aGUgUFRFIGxvY2sgdG8gYXZvaWQgZG9pbmcgdGhlIHBvdGVudGlhbCBleHBlbnNpdmUgVExCIGlu dmFsaWRhdGUNCkBAIC0zMjYxLDYgKzMyNjksNyBAQCBzdGF0aWMgaW50IGh1Z2V0bGJfbm9fcGFn ZShzdHJ1Y3QgbW1fc3RydWN0ICptbSwgc3RydWN0IHZtX2FyZWFfc3RydWN0ICp2bWEsDQogCQkJ CSYmICh2bWEtPnZtX2ZsYWdzICYgVk1fU0hBUkVEKSkpOw0KIAlzZXRfaHVnZV9wdGVfYXQobW0s IGFkZHJlc3MsIHB0ZXAsIG5ld19wdGUpOw0KIA0KKwltb2RfaHVnZXRsYl9yc3MobW0sIHBhZ2Vz X3Blcl9odWdlX3BhZ2UoaCkpOw0KIAlpZiAoKGZsYWdzICYgRkFVTFRfRkxBR19XUklURSkgJiYg ISh2bWEtPnZtX2ZsYWdzICYgVk1fU0hBUkVEKSkgew0KIAkJLyogT3B0aW1pemF0aW9uLCBkbyB0 aGUgQ09XIHdpdGhvdXQgYSBzZWNvbmQgZmF1bHQgKi8NCiAJCXJldCA9IGh1Z2V0bGJfY293KG1t LCB2bWEsIGFkZHJlc3MsIHB0ZXAsIG5ld19wdGUsIHBhZ2UsIHB0bCk7DQpkaWZmIC0tZ2l0IHY0 LjItcmM0Lm9yaWcvbW0vbWVtb3J5LmMgdjQuMi1yYzQvbW0vbWVtb3J5LmMNCmluZGV4IDM4OGRj ZjlhYTI4My4uZTA5YjUzZGEyNzMzIDEwMDY0NA0KLS0tIHY0LjItcmM0Lm9yaWcvbW0vbWVtb3J5 LmMNCisrKyB2NC4yLXJjNC9tbS9tZW1vcnkuYw0KQEAgLTYyMCwxMiArNjIwLDEyIEBAIGludCBf X3B0ZV9hbGxvY19rZXJuZWwocG1kX3QgKnBtZCwgdW5zaWduZWQgbG9uZyBhZGRyZXNzKQ0KIAly ZXR1cm4gMDsNCiB9DQogDQotc3RhdGljIGlubGluZSB2b2lkIGluaXRfcnNzX3ZlYyhpbnQgKnJz cykNCitpbmxpbmUgdm9pZCBpbml0X3Jzc192ZWMoaW50ICpyc3MpDQogew0KIAltZW1zZXQocnNz LCAwLCBzaXplb2YoaW50KSAqIE5SX01NX0NPVU5URVJTKTsNCiB9DQogDQotc3RhdGljIGlubGlu ZSB2b2lkIGFkZF9tbV9yc3NfdmVjKHN0cnVjdCBtbV9zdHJ1Y3QgKm1tLCBpbnQgKnJzcykNCitp bmxpbmUgdm9pZCBhZGRfbW1fcnNzX3ZlYyhzdHJ1Y3QgbW1fc3RydWN0ICptbSwgaW50ICpyc3Mp DQogew0KIAlpbnQgaTsNCiANCmRpZmYgLS1naXQgdjQuMi1yYzQub3JpZy9tbS9ybWFwLmMgdjQu Mi1yYzQvbW0vcm1hcC5jDQppbmRleCAxNzFiNjg3NjhkZjEuLjc4ZTc3YjBlYTNjMyAxMDA2NDQN Ci0tLSB2NC4yLXJjNC5vcmlnL21tL3JtYXAuYw0KKysrIHY0LjItcmM0L21tL3JtYXAuYw0KQEAg LTEyMzAsNyArMTIzMCw5IEBAIHN0YXRpYyBpbnQgdHJ5X3RvX3VubWFwX29uZShzdHJ1Y3QgcGFn ZSAqcGFnZSwgc3RydWN0IHZtX2FyZWFfc3RydWN0ICp2bWEsDQogCXVwZGF0ZV9oaXdhdGVyX3Jz cyhtbSk7DQogDQogCWlmIChQYWdlSFdQb2lzb24ocGFnZSkgJiYgIShmbGFncyAmIFRUVV9JR05P UkVfSFdQT0lTT04pKSB7DQotCQlpZiAoIVBhZ2VIdWdlKHBhZ2UpKSB7DQorCQlpZiAoUGFnZUh1 Z2UocGFnZSkpIHsNCisJCQltb2RfaHVnZXRsYl9yc3MobW0sIC0oMSA8PCBjb21wb3VuZF9vcmRl cihwYWdlKSkpOw0KKwkJfSBlbHNlIHsNCiAJCQlpZiAoUGFnZUFub24ocGFnZSkpDQogCQkJCWRl Y19tbV9jb3VudGVyKG1tLCBNTV9BTk9OUEFHRVMpOw0KIAkJCWVsc2UNCi0tIA0KMi40LjMNCg== -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
[toc] | [prev] | [next] | [standalone]
| From | Naoya Horiguchi <n-horiguchi@ah.jp.nec.com> |
|---|---|
| Date | 2015-08-10 03:20 +0200 |
| Subject | Re: [PATCH v3 2/3] mm: hugetlb: add VmHugetlbRSS: field in /proc/pid/status |
| Message-ID | <pVJUR-6wX-9@gated-at.bofh.it> |
| In reply to | #1203721 |
PiBAQCAtNTA0LDYgKzUxOSwxNSBAQCBzdGF0aWMgaW5saW5lIHNwaW5sb2NrX3QgKmh1Z2VfcHRl X2xvY2twdHIoc3RydWN0IGhzdGF0ZSAqaCwNCj4gIHsNCj4gIAlyZXR1cm4gJm1tLT5wYWdlX3Rh YmxlX2xvY2s7DQo+ICB9DQo+ICsNCj4gK3N0YXRpYyBpbmxpbmUgZ2V0X2h1Z2V0bGJfcnNzKHN0 cnVjdCBtbV9zdHJ1Y3QgKm1tKQ0KPiArew0KPiArCXJldHVybiAwOw0KPiArfQ0KPiArDQo+ICtz dGF0aWMgaW5saW5lIG1vZF9odWdldGxiX3JzcyhzdHJ1Y3QgbW1fc3RydWN0ICptbSwgbG9uZyB2 YWx1ZSkNCj4gK3sNCj4gK30NCj4gICNlbmRpZgkvKiBDT05GSUdfSFVHRVRMQl9QQUdFICovDQo+ ICANCj4gIHN0YXRpYyBpbmxpbmUgc3BpbmxvY2tfdCAqaHVnZV9wdGVfbG9jayhzdHJ1Y3QgaHN0 YXRlICpoLA0KDQpzb3JyeSBmb3IgbXkgc2lsbHkgbWlzdGFrZSwgdGhpcyBkb2Vzbid0IGJ1aWxk Lg0KTGV0IG1lIHJlc2VuZCB0aGlzLg0KDQpUaGFua3MsDQpOYW95YSBIb3JpZ3VjaGkNCi0tLQ0K RnJvbTogTmFveWEgSG9yaWd1Y2hpIDxuLWhvcmlndWNoaUBhaC5qcC5uZWMuY29tPg0KU3ViamVj dDogW1BBVENIXSBtbTogaHVnZXRsYjogYWRkIFZtSHVnZXRsYlJTUzogZmllbGQgaW4gL3Byb2Mv cGlkL3N0YXR1cw0KDQpDdXJyZW50bHkgdGhlcmUncyBubyBlYXN5IHdheSB0byBnZXQgcGVyLXBy b2Nlc3MgdXNhZ2Ugb2YgaHVnZXRsYiBwYWdlcywgd2hpY2gNCmlzIGluY29udmVuaWVudCBiZWNh dXNlIGFwcGxpY2F0aW9ucyB3aGljaCB1c2UgaHVnZXRsYiB0eXBpY2FsbHkgd2FudCB0byBjb250 cm9sDQp0aGVpciBwcm9jZXNzZXMgb24gdGhlIGJhc2lzIG9mIGhvdyBtdWNoIG1lbW9yeSAoaW5j bHVkaW5nIGh1Z2V0bGIpIHRoZXkgdXNlLg0KU28gdGhpcyBwYXRjaCBzaW1wbHkgcHJvdmlkZXMg ZWFzeSBhY2Nlc3MgdG8gdGhlIGluZm8gdmlhIC9wcm9jL3BpZC9zdGF0dXMuDQoNClRoaXMgcGF0 Y2ggc2hvdWxkbid0IGNoYW5nZSB0aGUgT09NIGJlaGF2aW9yIChzbyBodWdldGxiIHVzYWdlIGlz IGlnbm9yZWQgYXMNCmlzIG5vdywpIHdoaWNoIEkgZ3Vlc3MgaXMgZmluZSB1bnRpbCB3ZSBoYXZl IHNvbWUgc3Ryb25nIHJlYXNvbiB0byBkbyBpdC4NCg0KU2lnbmVkLW9mZi1ieTogTmFveWEgSG9y aWd1Y2hpIDxuLWhvcmlndWNoaUBhaC5qcC5uZWMuY29tPg0KLS0tDQp2MiAtPiB2MzoNCi0gdXNl IGlubGluZSBmdW5jdGlvbnMgaW5zdGVhZCBvZiBtYWNyb3MgZm9yICFDT05GSUdfSFVHRVRMQl9Q QUdFDQotLS0NCiBmcy9wcm9jL3Rhc2tfbW11LmMgICAgICAgfCAgNSArKysrLQ0KIGluY2x1ZGUv bGludXgvaHVnZXRsYi5oICB8IDI0ICsrKysrKysrKysrKysrKysrKysrKysrKw0KIGluY2x1ZGUv bGludXgvbW0uaCAgICAgICB8ICAzICsrKw0KIGluY2x1ZGUvbGludXgvbW1fdHlwZXMuaCB8ICAz ICsrKw0KIG1tL2h1Z2V0bGIuYyAgICAgICAgICAgICB8ICA5ICsrKysrKysrKw0KIG1tL21lbW9y eS5jICAgICAgICAgICAgICB8ICA0ICsrLS0NCiBtbS9ybWFwLmMgICAgICAgICAgICAgICAgfCAg NCArKystDQogNyBmaWxlcyBjaGFuZ2VkLCA0OCBpbnNlcnRpb25zKCspLCA0IGRlbGV0aW9ucygt KQ0KDQpkaWZmIC0tZ2l0IGEvZnMvcHJvYy90YXNrX21tdS5jIGIvZnMvcHJvYy90YXNrX21tdS5j DQppbmRleCBjNzIxODYwMzMwNmQuLmYxODFmNTZmY2NlMiAxMDA2NDQNCi0tLSBhL2ZzL3Byb2Mv dGFza19tbXUuYw0KKysrIGIvZnMvcHJvYy90YXNrX21tdS5jDQpAQCAtMjIsNyArMjIsNyBAQA0K IHZvaWQgdGFza19tZW0oc3RydWN0IHNlcV9maWxlICptLCBzdHJ1Y3QgbW1fc3RydWN0ICptbSkN CiB7DQogCXVuc2lnbmVkIGxvbmcgZGF0YSwgdGV4dCwgbGliLCBzd2FwLCBwdGVzLCBwbWRzOw0K LQl1bnNpZ25lZCBsb25nIGhpd2F0ZXJfdm0sIHRvdGFsX3ZtLCBoaXdhdGVyX3JzcywgdG90YWxf cnNzOw0KKwl1bnNpZ25lZCBsb25nIGhpd2F0ZXJfdm0sIHRvdGFsX3ZtLCBoaXdhdGVyX3Jzcywg dG90YWxfcnNzLCBodWdldGxiX3JzczsNCiANCiAJLyoNCiAJICogTm90ZTogdG8gbWluaW1pemUg dGhlaXIgb3ZlcmhlYWQsIG1tIG1haW50YWlucyBoaXdhdGVyX3ZtIGFuZA0KQEAgLTM3LDYgKzM3 LDcgQEAgdm9pZCB0YXNrX21lbShzdHJ1Y3Qgc2VxX2ZpbGUgKm0sIHN0cnVjdCBtbV9zdHJ1Y3Qg Km1tKQ0KIAloaXdhdGVyX3JzcyA9IHRvdGFsX3JzcyA9IGdldF9tbV9yc3MobW0pOw0KIAlpZiAo aGl3YXRlcl9yc3MgPCBtbS0+aGl3YXRlcl9yc3MpDQogCQloaXdhdGVyX3JzcyA9IG1tLT5oaXdh dGVyX3JzczsNCisJaHVnZXRsYl9yc3MgPSBnZXRfaHVnZXRsYl9yc3MobW0pOw0KIA0KIAlkYXRh ID0gbW0tPnRvdGFsX3ZtIC0gbW0tPnNoYXJlZF92bSAtIG1tLT5zdGFja192bTsNCiAJdGV4dCA9 IChQQUdFX0FMSUdOKG1tLT5lbmRfY29kZSkgLSAobW0tPnN0YXJ0X2NvZGUgJiBQQUdFX01BU0sp KSA+PiAxMDsNCkBAIC01MSw2ICs1Miw3IEBAIHZvaWQgdGFza19tZW0oc3RydWN0IHNlcV9maWxl ICptLCBzdHJ1Y3QgbW1fc3RydWN0ICptbSkNCiAJCSJWbVBpbjpcdCU4bHUga0JcbiINCiAJCSJW bUhXTTpcdCU4bHUga0JcbiINCiAJCSJWbVJTUzpcdCU4bHUga0JcbiINCisJCSJWbUh1Z2V0bGJS U1M6XHQlOGx1IGtCXG4iDQogCQkiVm1EYXRhOlx0JThsdSBrQlxuIg0KIAkJIlZtU3RrOlx0JThs dSBrQlxuIg0KIAkJIlZtRXhlOlx0JThsdSBrQlxuIg0KQEAgLTY0LDYgKzY2LDcgQEAgdm9pZCB0 YXNrX21lbShzdHJ1Y3Qgc2VxX2ZpbGUgKm0sIHN0cnVjdCBtbV9zdHJ1Y3QgKm1tKQ0KIAkJbW0t PnBpbm5lZF92bSA8PCAoUEFHRV9TSElGVC0xMCksDQogCQloaXdhdGVyX3JzcyA8PCAoUEFHRV9T SElGVC0xMCksDQogCQl0b3RhbF9yc3MgPDwgKFBBR0VfU0hJRlQtMTApLA0KKwkJaHVnZXRsYl9y c3MgPDwgKFBBR0VfU0hJRlQtMTApLA0KIAkJZGF0YSA8PCAoUEFHRV9TSElGVC0xMCksDQogCQlt bS0+c3RhY2tfdm0gPDwgKFBBR0VfU0hJRlQtMTApLCB0ZXh0LCBsaWIsDQogCQlwdGVzID4+IDEw LA0KZGlmZiAtLWdpdCBhL2luY2x1ZGUvbGludXgvaHVnZXRsYi5oIGIvaW5jbHVkZS9saW51eC9o dWdldGxiLmgNCmluZGV4IGQ4OTFmOTQ5NDY2YS4uOGM3MmU5MzViZGE4IDEwMDY0NA0KLS0tIGEv aW5jbHVkZS9saW51eC9odWdldGxiLmgNCisrKyBiL2luY2x1ZGUvbGludXgvaHVnZXRsYi5oDQpA QCAtNDY5LDYgKzQ2OSwyMSBAQCBzdGF0aWMgaW5saW5lIHNwaW5sb2NrX3QgKmh1Z2VfcHRlX2xv Y2twdHIoc3RydWN0IGhzdGF0ZSAqaCwNCiAjZGVmaW5lIGh1Z2VwYWdlc19zdXBwb3J0ZWQoKSAo SFBBR0VfU0hJRlQgIT0gMCkNCiAjZW5kaWYNCiANCisvKg0KKyAqIFRoaXMgc2ltcGxlIHdyYXBw ZXJzIGFyZSB0byBoaWRlIE1NX0hVR0VUTEJQQUdFUyBmcm9tIG91dHNpZGUgaHVnZXRsYmZzDQor ICogc3Vic3lzdGVtLiBUaGUgY291bnRlciBNTV9IVUdFVExCUEFHRVMgaXMgbWFpbnRhaW5lZCBp biBwYWdlIHVuaXQgYmFzaXMsDQorICogc28gaXQgY2hhbmdlcyBieSA1MTIgZm9yIGV4YW1wbGUg aWYgYSAyTUIgaHVnZXBhZ2UgaXMgbWFwcGVkIG9yIHVubWFwcGVkLg0KKyAqLw0KK3N0YXRpYyBp bmxpbmUgaW50IGdldF9odWdldGxiX3JzcyhzdHJ1Y3QgbW1fc3RydWN0ICptbSkNCit7DQorCXJl dHVybiBnZXRfbW1fY291bnRlcihtbSwgTU1fSFVHRVRMQlBBR0VTKTsNCit9DQorDQorc3RhdGlj IGlubGluZSB2b2lkIG1vZF9odWdldGxiX3JzcyhzdHJ1Y3QgbW1fc3RydWN0ICptbSwgbG9uZyB2 YWx1ZSkNCit7DQorCWFkZF9tbV9jb3VudGVyKG1tLCBNTV9IVUdFVExCUEFHRVMsIHZhbHVlKTsN Cit9DQorDQogI2Vsc2UJLyogQ09ORklHX0hVR0VUTEJfUEFHRSAqLw0KIHN0cnVjdCBoc3RhdGUg e307DQogI2RlZmluZSBhbGxvY19odWdlX3BhZ2Vfbm9kZShoLCBuaWQpIE5VTEwNCkBAIC01MDQs NiArNTE5LDE1IEBAIHN0YXRpYyBpbmxpbmUgc3BpbmxvY2tfdCAqaHVnZV9wdGVfbG9ja3B0cihz dHJ1Y3QgaHN0YXRlICpoLA0KIHsNCiAJcmV0dXJuICZtbS0+cGFnZV90YWJsZV9sb2NrOw0KIH0N CisNCitzdGF0aWMgaW5saW5lIGludCBnZXRfaHVnZXRsYl9yc3Moc3RydWN0IG1tX3N0cnVjdCAq bW0pDQorew0KKwlyZXR1cm4gMDsNCit9DQorDQorc3RhdGljIGlubGluZSB2b2lkIG1vZF9odWdl dGxiX3JzcyhzdHJ1Y3QgbW1fc3RydWN0ICptbSwgbG9uZyB2YWx1ZSkNCit7DQorfQ0KICNlbmRp ZgkvKiBDT05GSUdfSFVHRVRMQl9QQUdFICovDQogDQogc3RhdGljIGlubGluZSBzcGlubG9ja190 ICpodWdlX3B0ZV9sb2NrKHN0cnVjdCBoc3RhdGUgKmgsDQpkaWZmIC0tZ2l0IGEvaW5jbHVkZS9s aW51eC9tbS5oIGIvaW5jbHVkZS9saW51eC9tbS5oDQppbmRleCAyZTg3MmY5MmRiYWMuLjkyMThh ODg1NjQ4MyAxMDA2NDQNCi0tLSBhL2luY2x1ZGUvbGludXgvbW0uaA0KKysrIGIvaW5jbHVkZS9s aW51eC9tbS5oDQpAQCAtMTM1NSw2ICsxMzU1LDkgQEAgc3RhdGljIGlubGluZSB2b2lkIHN5bmNf bW1fcnNzKHN0cnVjdCBtbV9zdHJ1Y3QgKm1tKQ0KIH0NCiAjZW5kaWYNCiANCitleHRlcm4gaW5s aW5lIHZvaWQgaW5pdF9yc3NfdmVjKGludCAqcnNzKTsNCitleHRlcm4gaW5saW5lIHZvaWQgYWRk X21tX3Jzc192ZWMoc3RydWN0IG1tX3N0cnVjdCAqbW0sIGludCAqcnNzKTsNCisNCiBpbnQgdm1h X3dhbnRzX3dyaXRlbm90aWZ5KHN0cnVjdCB2bV9hcmVhX3N0cnVjdCAqdm1hKTsNCiANCiBleHRl cm4gcHRlX3QgKl9fZ2V0X2xvY2tlZF9wdGUoc3RydWN0IG1tX3N0cnVjdCAqbW0sIHVuc2lnbmVk IGxvbmcgYWRkciwNCmRpZmYgLS1naXQgYS9pbmNsdWRlL2xpbnV4L21tX3R5cGVzLmggYi9pbmNs dWRlL2xpbnV4L21tX3R5cGVzLmgNCmluZGV4IDAwMzhhYzc0NjZmZC4uODg3YjQzYmE1YTE4IDEw MDY0NA0KLS0tIGEvaW5jbHVkZS9saW51eC9tbV90eXBlcy5oDQorKysgYi9pbmNsdWRlL2xpbnV4 L21tX3R5cGVzLmgNCkBAIC0zNDgsNiArMzQ4LDkgQEAgZW51bSB7DQogCU1NX0ZJTEVQQUdFUywN CiAJTU1fQU5PTlBBR0VTLA0KIAlNTV9TV0FQRU5UUywNCisjaWZkZWYgQ09ORklHX0hVR0VUTEJf UEFHRQ0KKwlNTV9IVUdFVExCUEFHRVMsDQorI2VuZGlmDQogCU5SX01NX0NPVU5URVJTDQogfTsN CiANCmRpZmYgLS1naXQgYS9tbS9odWdldGxiLmMgYi9tbS9odWdldGxiLmMNCmluZGV4IGE4YzMw ODcwODlkOC4uMTJlNWU3ZDNiNjBmIDEwMDY0NA0KLS0tIGEvbW0vaHVnZXRsYi5jDQorKysgYi9t bS9odWdldGxiLmMNCkBAIC0yNzQzLDkgKzI3NDMsMTEgQEAgaW50IGNvcHlfaHVnZXRsYl9wYWdl X3JhbmdlKHN0cnVjdCBtbV9zdHJ1Y3QgKmRzdCwgc3RydWN0IG1tX3N0cnVjdCAqc3JjLA0KIAl1 bnNpZ25lZCBsb25nIG1tdW5fc3RhcnQ7CS8qIEZvciBtbXVfbm90aWZpZXJzICovDQogCXVuc2ln bmVkIGxvbmcgbW11bl9lbmQ7CQkvKiBGb3IgbW11X25vdGlmaWVycyAqLw0KIAlpbnQgcmV0ID0g MDsNCisJaW50IHJzc1tOUl9NTV9DT1VOVEVSU107DQogDQogCWNvdyA9ICh2bWEtPnZtX2ZsYWdz ICYgKFZNX1NIQVJFRCB8IFZNX01BWVdSSVRFKSkgPT0gVk1fTUFZV1JJVEU7DQogDQorCWluaXRf cnNzX3ZlYyhyc3MpOw0KIAltbXVuX3N0YXJ0ID0gdm1hLT52bV9zdGFydDsNCiAJbW11bl9lbmQg PSB2bWEtPnZtX2VuZDsNCiAJaWYgKGNvdykNCkBAIC0yNzk3LDYgKzI3OTksNyBAQCBpbnQgY29w eV9odWdldGxiX3BhZ2VfcmFuZ2Uoc3RydWN0IG1tX3N0cnVjdCAqZHN0LCBzdHJ1Y3QgbW1fc3Ry dWN0ICpzcmMsDQogCQkJZ2V0X3BhZ2UocHRlcGFnZSk7DQogCQkJcGFnZV9kdXBfcm1hcChwdGVw YWdlKTsNCiAJCQlzZXRfaHVnZV9wdGVfYXQoZHN0LCBhZGRyLCBkc3RfcHRlLCBlbnRyeSk7DQor CQkJcnNzW01NX0hVR0VUTEJQQUdFU10gKz0gcGFnZXNfcGVyX2h1Z2VfcGFnZShoKTsNCiAJCX0N CiAJCXNwaW5fdW5sb2NrKHNyY19wdGwpOw0KIAkJc3Bpbl91bmxvY2soZHN0X3B0bCk7DQpAQCAt MjgwNSw2ICsyODA4LDcgQEAgaW50IGNvcHlfaHVnZXRsYl9wYWdlX3JhbmdlKHN0cnVjdCBtbV9z dHJ1Y3QgKmRzdCwgc3RydWN0IG1tX3N0cnVjdCAqc3JjLA0KIAlpZiAoY293KQ0KIAkJbW11X25v dGlmaWVyX2ludmFsaWRhdGVfcmFuZ2VfZW5kKHNyYywgbW11bl9zdGFydCwgbW11bl9lbmQpOw0K IA0KKwlhZGRfbW1fcnNzX3ZlYyhkc3QsIHJzcyk7DQogCXJldHVybiByZXQ7DQogfQ0KIA0KQEAg LTI4MjMsNiArMjgyNyw3IEBAIHZvaWQgX191bm1hcF9odWdlcGFnZV9yYW5nZShzdHJ1Y3QgbW11 X2dhdGhlciAqdGxiLCBzdHJ1Y3Qgdm1fYXJlYV9zdHJ1Y3QgKnZtYSwNCiAJdW5zaWduZWQgbG9u ZyBzeiA9IGh1Z2VfcGFnZV9zaXplKGgpOw0KIAljb25zdCB1bnNpZ25lZCBsb25nIG1tdW5fc3Rh cnQgPSBzdGFydDsJLyogRm9yIG1tdV9ub3RpZmllcnMgKi8NCiAJY29uc3QgdW5zaWduZWQgbG9u ZyBtbXVuX2VuZCAgID0gZW5kOwkvKiBGb3IgbW11X25vdGlmaWVycyAqLw0KKwlpbnQgcnNzW05S X01NX0NPVU5URVJTXTsNCiANCiAJV0FSTl9PTighaXNfdm1faHVnZXRsYl9wYWdlKHZtYSkpOw0K IAlCVUdfT04oc3RhcnQgJiB+aHVnZV9wYWdlX21hc2soaCkpOw0KQEAgLTI4MzIsNiArMjgzNyw3 IEBAIHZvaWQgX191bm1hcF9odWdlcGFnZV9yYW5nZShzdHJ1Y3QgbW11X2dhdGhlciAqdGxiLCBz dHJ1Y3Qgdm1fYXJlYV9zdHJ1Y3QgKnZtYSwNCiAJbW11X25vdGlmaWVyX2ludmFsaWRhdGVfcmFu Z2Vfc3RhcnQobW0sIG1tdW5fc3RhcnQsIG1tdW5fZW5kKTsNCiAJYWRkcmVzcyA9IHN0YXJ0Ow0K IGFnYWluOg0KKwlpbml0X3Jzc192ZWMocnNzKTsNCiAJZm9yICg7IGFkZHJlc3MgPCBlbmQ7IGFk ZHJlc3MgKz0gc3opIHsNCiAJCXB0ZXAgPSBodWdlX3B0ZV9vZmZzZXQobW0sIGFkZHJlc3MpOw0K IAkJaWYgKCFwdGVwKQ0KQEAgLTI4NzcsNiArMjg4Myw3IEBAIHZvaWQgX191bm1hcF9odWdlcGFn ZV9yYW5nZShzdHJ1Y3QgbW11X2dhdGhlciAqdGxiLCBzdHJ1Y3Qgdm1fYXJlYV9zdHJ1Y3QgKnZt YSwNCiAJCWlmIChodWdlX3B0ZV9kaXJ0eShwdGUpKQ0KIAkJCXNldF9wYWdlX2RpcnR5KHBhZ2Up Ow0KIA0KKwkJcnNzW01NX0hVR0VUTEJQQUdFU10gLT0gcGFnZXNfcGVyX2h1Z2VfcGFnZShoKTsN CiAJCXBhZ2VfcmVtb3ZlX3JtYXAocGFnZSk7DQogCQlmb3JjZV9mbHVzaCA9ICFfX3RsYl9yZW1v dmVfcGFnZSh0bGIsIHBhZ2UpOw0KIAkJaWYgKGZvcmNlX2ZsdXNoKSB7DQpAQCAtMjg5Miw2ICsy ODk5LDcgQEAgdm9pZCBfX3VubWFwX2h1Z2VwYWdlX3JhbmdlKHN0cnVjdCBtbXVfZ2F0aGVyICp0 bGIsIHN0cnVjdCB2bV9hcmVhX3N0cnVjdCAqdm1hLA0KIHVubG9jazoNCiAJCXNwaW5fdW5sb2Nr KHB0bCk7DQogCX0NCisJYWRkX21tX3Jzc192ZWMobW0sIHJzcyk7DQogCS8qDQogCSAqIG1tdV9n YXRoZXIgcmFuIG91dCBvZiByb29tIHRvIGJhdGNoIHBhZ2VzLCB3ZSBicmVhayBvdXQgb2YNCiAJ ICogdGhlIFBURSBsb2NrIHRvIGF2b2lkIGRvaW5nIHRoZSBwb3RlbnRpYWwgZXhwZW5zaXZlIFRM QiBpbnZhbGlkYXRlDQpAQCAtMzI2MSw2ICszMjY5LDcgQEAgc3RhdGljIGludCBodWdldGxiX25v X3BhZ2Uoc3RydWN0IG1tX3N0cnVjdCAqbW0sIHN0cnVjdCB2bV9hcmVhX3N0cnVjdCAqdm1hLA0K IAkJCQkmJiAodm1hLT52bV9mbGFncyAmIFZNX1NIQVJFRCkpKTsNCiAJc2V0X2h1Z2VfcHRlX2F0 KG1tLCBhZGRyZXNzLCBwdGVwLCBuZXdfcHRlKTsNCiANCisJbW9kX2h1Z2V0bGJfcnNzKG1tLCBw YWdlc19wZXJfaHVnZV9wYWdlKGgpKTsNCiAJaWYgKChmbGFncyAmIEZBVUxUX0ZMQUdfV1JJVEUp ICYmICEodm1hLT52bV9mbGFncyAmIFZNX1NIQVJFRCkpIHsNCiAJCS8qIE9wdGltaXphdGlvbiwg ZG8gdGhlIENPVyB3aXRob3V0IGEgc2Vjb25kIGZhdWx0ICovDQogCQlyZXQgPSBodWdldGxiX2Nv dyhtbSwgdm1hLCBhZGRyZXNzLCBwdGVwLCBuZXdfcHRlLCBwYWdlLCBwdGwpOw0KZGlmZiAtLWdp dCBhL21tL21lbW9yeS5jIGIvbW0vbWVtb3J5LmMNCmluZGV4IDM4OGRjZjlhYTI4My4uZTA5YjUz ZGEyNzMzIDEwMDY0NA0KLS0tIGEvbW0vbWVtb3J5LmMNCisrKyBiL21tL21lbW9yeS5jDQpAQCAt NjIwLDEyICs2MjAsMTIgQEAgaW50IF9fcHRlX2FsbG9jX2tlcm5lbChwbWRfdCAqcG1kLCB1bnNp Z25lZCBsb25nIGFkZHJlc3MpDQogCXJldHVybiAwOw0KIH0NCiANCi1zdGF0aWMgaW5saW5lIHZv aWQgaW5pdF9yc3NfdmVjKGludCAqcnNzKQ0KK2lubGluZSB2b2lkIGluaXRfcnNzX3ZlYyhpbnQg KnJzcykNCiB7DQogCW1lbXNldChyc3MsIDAsIHNpemVvZihpbnQpICogTlJfTU1fQ09VTlRFUlMp Ow0KIH0NCiANCi1zdGF0aWMgaW5saW5lIHZvaWQgYWRkX21tX3Jzc192ZWMoc3RydWN0IG1tX3N0 cnVjdCAqbW0sIGludCAqcnNzKQ0KK2lubGluZSB2b2lkIGFkZF9tbV9yc3NfdmVjKHN0cnVjdCBt bV9zdHJ1Y3QgKm1tLCBpbnQgKnJzcykNCiB7DQogCWludCBpOw0KIA0KZGlmZiAtLWdpdCBhL21t L3JtYXAuYyBiL21tL3JtYXAuYw0KaW5kZXggMTcxYjY4NzY4ZGYxLi43OGU3N2IwZWEzYzMgMTAw NjQ0DQotLS0gYS9tbS9ybWFwLmMNCisrKyBiL21tL3JtYXAuYw0KQEAgLTEyMzAsNyArMTIzMCw5 IEBAIHN0YXRpYyBpbnQgdHJ5X3RvX3VubWFwX29uZShzdHJ1Y3QgcGFnZSAqcGFnZSwgc3RydWN0 IHZtX2FyZWFfc3RydWN0ICp2bWEsDQogCXVwZGF0ZV9oaXdhdGVyX3JzcyhtbSk7DQogDQogCWlm IChQYWdlSFdQb2lzb24ocGFnZSkgJiYgIShmbGFncyAmIFRUVV9JR05PUkVfSFdQT0lTT04pKSB7 DQotCQlpZiAoIVBhZ2VIdWdlKHBhZ2UpKSB7DQorCQlpZiAoUGFnZUh1Z2UocGFnZSkpIHsNCisJ CQltb2RfaHVnZXRsYl9yc3MobW0sIC0oMSA8PCBjb21wb3VuZF9vcmRlcihwYWdlKSkpOw0KKwkJ fSBlbHNlIHsNCiAJCQlpZiAoUGFnZUFub24ocGFnZSkpDQogCQkJCWRlY19tbV9jb3VudGVyKG1t LCBNTV9BTk9OUEFHRVMpOw0KIAkJCWVsc2UNCi0tIA0KMi40LjMNCg0KDQo= -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
[toc] | [prev] | [next] | [standalone]
Page 1 of 2 [1] 2 Next page →
Back to top | Article view | linux.kernel
csiph-web