mirror of https://lore.kernel.org/lkml/
 help / color / mirror / Atom feed
From: Andrew Morton <akpm@linux-foundation.org>
To: Haifeng Xu <haifeng.xu@shopee.com>
Cc: luto@kernel.org, bigeasy@linutronix.de, tglx@linutronix.de,
	bristot@kernel.org, linux-kernel@vger.kernel.org
Subject: Re: [PATCH] fork: optimize memcg_charge_kernel_stack() a bit
Date: Fri, 12 May 2023 17:26:18 -0700	[thread overview]
Message-ID: <20230512172618.1120ab4c1e6d3026081c20d9@linux-foundation.org> (raw)
In-Reply-To: <20230508064458.32855-1-haifeng.xu@shopee.com>

On Mon,  8 May 2023 06:44:58 +0000 Haifeng Xu <haifeng.xu@shopee.com> wrote:

> Since commit f1c1a9ee00e4 ("fork: Move memcg_charge_kernel_stack()
> into CONFIG_VMAP_STACK"), memcg_charge_kernel_stack() has been moved
> into CONFIG_VMAP_STACK block, so the CONFIG_VMAP_STACK check can be
> removed.
> 
> Furthermore, memcg_charge_kernel_stack() is only invoked by
> alloc_thread_stack_node() instead of dup_task_struct(). If
> memcg_kmem_charge_page() fails, the uncharge process is handled in
> memcg_charge_kernel_stack() itself instead of free_thread_stack(),
> so remove the incorrect comments.
> 
> If memcg_charge_kernel_stack() fails to charge pages used by kernel
> stack, only charged pages need to be uncharged. It's unnecessary to
> uncharge those pages which memory cgroup pointer is NULL.
> 
> ...
>
> --- a/kernel/fork.c
> +++ b/kernel/fork.c
> @@ -250,23 +250,20 @@ static int memcg_charge_kernel_stack(struct vm_struct *vm)
>  {
>  	int i;
>  	int ret;
> +	int nr_charged = 0;
>  
> -	BUILD_BUG_ON(IS_ENABLED(CONFIG_VMAP_STACK) && PAGE_SIZE % 1024 != 0);
> +	BUILD_BUG_ON(PAGE_SIZE % 1024 != 0);

This check now deserves some sort of award.  I'll remove it.

>  	BUG_ON(vm->nr_pages != THREAD_SIZE / PAGE_SIZE);
>  
>  	for (i = 0; i < THREAD_SIZE / PAGE_SIZE; i++) {
>  		ret = memcg_kmem_charge_page(vm->pages[i], GFP_KERNEL, 0);
>  		if (ret)
>  			goto err;
> +		nr_charged++;
>  	}
>  	return 0;
>  err:
> -	/*
> -	 * If memcg_kmem_charge_page() fails, page's memory cgroup pointer is
> -	 * NULL, and memcg_kmem_uncharge_page() in free_thread_stack() will
> -	 * ignore this page.
> -	 */
> -	for (i = 0; i < THREAD_SIZE / PAGE_SIZE; i++)
> +	for (i = 0; i < nr_charged; i++)
>  		memcg_kmem_uncharge_page(vm->pages[i], 0);
>  	return ret;

We don't really need nr_charged - we could just do

	while (--i >= 0)

but nr_charged is straightforward, which is always a good choice.

      reply	other threads:[~2023-05-13  0:27 UTC|newest]

Thread overview: 2+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2023-05-08  6:44 Haifeng Xu
2023-05-13  0:26 ` Andrew Morton [this message]

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=20230512172618.1120ab4c1e6d3026081c20d9@linux-foundation.org \
    --to=akpm@linux-foundation.org \
    --cc=bigeasy@linutronix.de \
    --cc=bristot@kernel.org \
    --cc=haifeng.xu@shopee.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=luto@kernel.org \
    --cc=tglx@linutronix.de \
    /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

all inboxes | Powered by JetHome®