Received-SPF: pass (google.com: domain of linux-kernel+bounces-105435-linux.lists.archive=gmail.com@vger.kernel.org designates 2604:1380:45e3:2400::1 as permitted sender) client-ip=2604:1380:45e3:2400::1;
Precedence: bulk
MIME-Version: 1.0
References: <20240311164638.2015063-1-pasha.tatashin@soleen.com>
 <20240311164638.2015063-5-pasha.tatashin@soleen.com> <0c6974b4-ba1f-474c-aed4-6c06d26ddb0a@wanadoo.fr>
In-Reply-To: <0c6974b4-ba1f-474c-aed4-6c06d26ddb0a@wanadoo.fr>
From: Pasha Tatashin <pasha.tatashin@soleen.com>
Date: Sun, 17 Mar 2024 11:14:41 -0400
Message-ID: <CA+CK2bANnehyxC4qqgG3Qsj7UwM81PMQRkX_XrkZb=RoK7re5A@mail.gmail.com>
Subject: Re: [RFC 04/14] fork: Remove assumption that vm_area->nr_pages equals
 to THREAD_SIZE
To: Christophe JAILLET <christophe.jaillet@wanadoo.fr>
Cc: linux-kernel@vger.kernel.org, linux-mm@kvack.org, 
	akpm@linux-foundation.org, x86@kernel.org, bp@alien8.de, brauner@kernel.org, 
	bristot@redhat.com, bsegall@google.com, dave.hansen@linux.intel.com, 
	dianders@chromium.org, dietmar.eggemann@arm.com, eric.devolder@oracle.com, 
	hca@linux.ibm.com, hch@infradead.org, hpa@zytor.com, 
	jacob.jun.pan@linux.intel.com, jgg@ziepe.ca, jpoimboe@kernel.org, 
	jroedel@suse.de, juri.lelli@redhat.com, kent.overstreet@linux.dev, 
	kinseyho@google.com, kirill.shutemov@linux.intel.com, lstoakes@gmail.com, 
	luto@kernel.org, mgorman@suse.de, mic@digikod.net, 
	michael.christie@oracle.com, mingo@redhat.com, mjguzik@gmail.com, 
	mst@redhat.com, npiggin@gmail.com, peterz@infradead.org, pmladek@suse.com, 
	rick.p.edgecombe@intel.com, rostedt@goodmis.org, surenb@google.com, 
	tglx@linutronix.de, urezki@gmail.com, vincent.guittot@linaro.org
Content-Type: text/plain; charset="UTF-8"
Content-Transfer-Encoding: quoted-printable

On Sun, Mar 17, 2024 at 10:45=E2=80=AFAM Christophe JAILLET
<christophe.jaillet@wanadoo.fr> wrote:
>
> Le 11/03/2024 =C3=A0 17:46, Pasha Tatashin a =C3=A9crit :
> > In many places number of pages in the stack is detremined via
> > (THREAD_SIZE / PAGE_SIZE). There is also a BUG_ON() that ensures that
> > (THREAD_SIZE / PAGE_SIZE) is indeed equals to vm_area->nr_pages.
> >
> > However, with dynamic stacks, the number of pages in vm_area will grow
> > with stack, therefore, use vm_area->nr_pages to determine the actual
> > number of pages allocated in stack.
> >
> > Signed-off-by: Pasha Tatashin <pasha.tatashin@soleen.com>
> > ---
> >   kernel/fork.c | 18 +++++++++---------
> >   1 file changed, 9 insertions(+), 9 deletions(-)
> >
> > diff --git a/kernel/fork.c b/kernel/fork.c
> > index 60e812825a7a..a35f4008afa0 100644
> > --- a/kernel/fork.c
> > +++ b/kernel/fork.c
> > @@ -243,13 +243,11 @@ static int free_vm_stack_cache(unsigned int cpu)
> >
> >   static int memcg_charge_kernel_stack(struct vm_struct *vm)
>
> Maybe s/vm/vm_area/ as done in 03/14?

Yes, I will add it to 03/14.

Thank you,
Pasha

>
> CJ
>
> >   {
> > -     int i;
> > -     int ret;
> > +     int i, ret, nr_pages;
> >       int nr_charged =3D 0;
> >
> > -     BUG_ON(vm->nr_pages !=3D THREAD_SIZE / PAGE_SIZE);
> > -
> > -     for (i =3D 0; i < THREAD_SIZE / PAGE_SIZE; i++) {
> > +     nr_pages =3D vm->nr_pages;
> > +     for (i =3D 0; i < nr_pages; i++) {
> >               ret =3D memcg_kmem_charge_page(vm->pages[i], GFP_KERNEL, =
0);
> >               if (ret)
> >                       goto err;
> > @@ -531,9 +529,10 @@ static void account_kernel_stack(struct task_struc=
t *tsk, int account)
> >   {
> >       if (IS_ENABLED(CONFIG_VMAP_STACK)) {
> >               struct vm_struct *vm =3D task_stack_vm_area(tsk);
> > -             int i;
> > +             int i, nr_pages;
> >
> > -             for (i =3D 0; i < THREAD_SIZE / PAGE_SIZE; i++)
> > +             nr_pages =3D vm->nr_pages;
> > +             for (i =3D 0; i < nr_pages; i++)
> >                       mod_lruvec_page_state(vm->pages[i], NR_KERNEL_STA=
CK_KB,
> >                                             account * (PAGE_SIZE / 1024=
));
> >       } else {
> > @@ -551,10 +550,11 @@ void exit_task_stack_account(struct task_struct *=
tsk)
> >
> >       if (IS_ENABLED(CONFIG_VMAP_STACK)) {
> >               struct vm_struct *vm;
> > -             int i;
> > +             int i, nr_pages;
> >
> >               vm =3D task_stack_vm_area(tsk);
> > -             for (i =3D 0; i < THREAD_SIZE / PAGE_SIZE; i++)
> > +             nr_pages =3D vm->nr_pages;
> > +             for (i =3D 0; i < nr_pages; i++)
> >                       memcg_kmem_uncharge_page(vm->pages[i], 0);
> >       }
> >   }
>