From: Josh Poimboeuf <jpoimboe@redhat.com>
To: Andy Lutomirski <luto@kernel.org>
Cc: x86@kernel.org, linux-kernel@vger.kernel.org,
linux-arch@vger.kernel.org, Borislav Petkov <bp@alien8.de>,
Nadav Amit <nadav.amit@gmail.com>,
Kees Cook <keescook@chromium.org>,
Brian Gerst <brgerst@gmail.com>,
"kernel-hardening@lists.openwall.com"
<kernel-hardening@lists.openwall.com>,
Linus Torvalds <torvalds@linux-foundation.org>,
Jann Horn <jann@thejh.net>,
Heiko Carstens <heiko.carstens@de.ibm.com>
Subject: [kernel-hardening] Re: [PATCH v2 06/13] fork: Add generic vmalloced stack support
Date: Fri, 17 Jun 2016 15:57:28 -0500 [thread overview]
Message-ID: <20160617205728.qgha2qeubdkg73uh@treble> (raw)
In-Reply-To: <44f658aacbabd9d1689b3e0aae60ee8746881eff.1466192946.git.luto@kernel.org>
On Fri, Jun 17, 2016 at 01:00:42PM -0700, Andy Lutomirski wrote:
> @@ -213,24 +232,46 @@ struct kmem_cache *vm_area_cachep;
> /* SLAB cache for mm_struct structures (tsk->mm) */
> static struct kmem_cache *mm_cachep;
>
> -static void account_kernel_stack(struct thread_info *ti, int account)
> +static void account_kernel_stack(struct task_struct *tsk, int account)
> {
> - struct zone *zone = page_zone(virt_to_page(ti));
> + struct zone *zone;
> + struct thread_info *ti = task_thread_info(tsk);
> + struct vm_struct *vm = task_stack_vm_area(tsk);
> +
> + BUILD_BUG_ON(IS_ENABLED(CONFIG_VMAP_STACK) && PAGE_SIZE % 1024 != 0);
> +
> + if (vm) {
> + int i;
>
> - mod_zone_page_state(zone, NR_KERNEL_STACK_KB,
> - THREAD_SIZE / 1024 * account);
> + BUG_ON(vm->nr_pages != THREAD_SIZE / PAGE_SIZE);
>
> - /* All stack pages belong to the same memcg. */
> - memcg_kmem_update_page_stat(
> - virt_to_page(ti), MEMCG_KERNEL_STACK,
> - account * (THREAD_SIZE / PAGE_SIZE));
> + for (i = 0; i < THREAD_SIZE / PAGE_SIZE; i++) {
> + mod_zone_page_state(page_zone(vm->pages[i]),
> + 1, PAGE_SIZE / 1024 * account);
Shouldn't the second argument be NR_KERNEL_STACK_KB instead of 1?
--
Josh
next prev parent reply other threads:[~2016-06-17 20:57 UTC|newest]
Thread overview: 28+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-06-17 20:00 [kernel-hardening] [PATCH v2 00/13] Virtually mapped stacks with guard pages (x86, core) Andy Lutomirski
2016-06-17 20:00 ` [kernel-hardening] [PATCH v2 01/13] x86/mm/hotplug: Don't remove PGD entries in remove_pagetable() Andy Lutomirski
2016-06-17 20:00 ` [kernel-hardening] [PATCH v2 02/13] x86/cpa: In populate_pgd, don't set the pgd entry until it's populated Andy Lutomirski
2016-06-17 20:00 ` [kernel-hardening] [PATCH v2 03/13] x86/cpa: Warn if kernel_unmap_pages_in_pgd is used inappropriately Andy Lutomirski
2016-06-17 20:30 ` [kernel-hardening] " Borislav Petkov
2016-06-18 10:29 ` Andy Lutomirski
2016-06-18 10:37 ` Borislav Petkov
2016-06-17 20:00 ` [kernel-hardening] [PATCH v2 04/13] mm: Track NR_KERNEL_STACK in KiB instead of number of stacks Andy Lutomirski
2016-06-20 13:16 ` [kernel-hardening] " Michal Hocko
2016-06-17 20:00 ` [kernel-hardening] [PATCH v2 05/13] mm: Move memcg stack accounting to account_kernel_stack Andy Lutomirski
2016-06-17 20:55 ` [kernel-hardening] " Josh Poimboeuf
2016-06-17 22:18 ` Andy Lutomirski
2016-06-20 13:02 ` Michal Hocko
2016-06-20 16:05 ` Andy Lutomirski
2016-06-17 20:00 ` [kernel-hardening] [PATCH v2 06/13] fork: Add generic vmalloced stack support Andy Lutomirski
2016-06-17 20:57 ` Josh Poimboeuf [this message]
2016-06-17 22:18 ` [kernel-hardening] " Andy Lutomirski
2016-06-20 13:36 ` Michal Hocko
2016-06-20 16:13 ` Andy Lutomirski
2016-06-21 8:46 ` Michal Hocko
2016-06-21 17:01 ` Andy Lutomirski
2016-06-17 20:00 ` [kernel-hardening] [PATCH v2 07/13] x86/die: Don't try to recover from an OOPS on a non-default stack Andy Lutomirski
2016-06-17 20:00 ` [kernel-hardening] [PATCH v2 08/13] x86/dumpstack: When OOPSing, rewind the stack before do_exit Andy Lutomirski
2016-06-17 20:00 ` [kernel-hardening] [PATCH v2 09/13] x86/dumpstack: When dumping stack bytes due to OOPS, start with regs->sp Andy Lutomirski
2016-06-17 20:00 ` [kernel-hardening] [PATCH v2 10/13] x86/dumpstack: Try harder to get a call trace on stack overflow Andy Lutomirski
2016-06-17 20:00 ` [kernel-hardening] [PATCH v2 11/13] x86/dumpstack/64: Handle faults when printing the "Stack:" part of an OOPS Andy Lutomirski
2016-06-17 20:00 ` [kernel-hardening] [PATCH v2 12/13] x86/mm/64: Enable vmapped stacks Andy Lutomirski
2016-06-17 20:00 ` [kernel-hardening] [PATCH v2 13/13] x86/mm: Improve stack-overflow #PF handling Andy Lutomirski
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20160617205728.qgha2qeubdkg73uh@treble \
--to=jpoimboe@redhat.com \
--cc=bp@alien8.de \
--cc=brgerst@gmail.com \
--cc=heiko.carstens@de.ibm.com \
--cc=jann@thejh.net \
--cc=keescook@chromium.org \
--cc=kernel-hardening@lists.openwall.com \
--cc=linux-arch@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=luto@kernel.org \
--cc=nadav.amit@gmail.com \
--cc=torvalds@linux-foundation.org \
--cc=x86@kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).