From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by smtp.lore.kernel.org (Postfix) with ESMTP id 82581C54E67 for ; Sun, 17 Mar 2024 14:42:43 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 9EB506B0085; Sun, 17 Mar 2024 10:42:42 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 99A176B0087; Sun, 17 Mar 2024 10:42:42 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 8619C6B0088; Sun, 17 Mar 2024 10:42:42 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0015.hostedemail.com [216.40.44.15]) by kanga.kvack.org (Postfix) with ESMTP id 776966B0085 for ; Sun, 17 Mar 2024 10:42:42 -0400 (EDT) Received: from smtpin28.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay08.hostedemail.com (Postfix) with ESMTP id 1E3B61407D1 for ; Sun, 17 Mar 2024 14:42:42 +0000 (UTC) X-FDA: 81906797364.28.80B2B59 Received: from smtp.smtpout.orange.fr (smtp-27.smtpout.orange.fr [80.12.242.27]) by imf17.hostedemail.com (Postfix) with ESMTP id D857840008 for ; Sun, 17 Mar 2024 14:42:39 +0000 (UTC) Authentication-Results: imf17.hostedemail.com; dkim=pass header.d=wanadoo.fr header.s=t20230301 header.b=lUI78kaR; dmarc=pass (policy=quarantine) header.from=wanadoo.fr; spf=pass (imf17.hostedemail.com: domain of christophe.jaillet@wanadoo.fr designates 80.12.242.27 as permitted sender) smtp.mailfrom=christophe.jaillet@wanadoo.fr ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1710686560; a=rsa-sha256; cv=none; b=MRi9DSj9dk4m/0sAxCd1FVSBQ+yfQSoCbYbVeVf2OwiSE9k2ksnLFmXnbg07fLX4BGxFkU RwtqjKodi9xR15nCFc0M+No41GBthTbeP2dGwlsclJz/AFRxOVSM4bRejzxndTqeCRDohr sF5AB4G3dfWCpJDyXgI+nQSj8587y9s= ARC-Authentication-Results: i=1; imf17.hostedemail.com; dkim=pass header.d=wanadoo.fr header.s=t20230301 header.b=lUI78kaR; dmarc=pass (policy=quarantine) header.from=wanadoo.fr; spf=pass (imf17.hostedemail.com: domain of christophe.jaillet@wanadoo.fr designates 80.12.242.27 as permitted sender) smtp.mailfrom=christophe.jaillet@wanadoo.fr ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1710686560; h=from:from:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:dkim-signature; bh=Yan/AlvVbMuiA/SKqp2eF5APWJaKjCjDOI2XvgxxnbI=; b=FvD8w9nBhGqd9mziL24ZM6xrJOyqlOcFWeDaPz26NTp/TK/pvuUOgw6xeah+h0UjpSVIfY 6m7RF/ok5rEVuw4ZHnNd2WLORlhBcFLDLL2oHgnktzZyM+qhpHF5Z9suKmBwhEPdohwRKQ p1O1CGHpZcqc5QJyOH6HBdkkqY7Akcs= Received: from [192.168.1.18] ([92.140.202.140]) by smtp.orange.fr with ESMTPA id lriWr6OaujgOxlriWrD77y; Sun, 17 Mar 2024 15:42:38 +0100 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=wanadoo.fr; s=t20230301; t=1710686558; bh=Yan/AlvVbMuiA/SKqp2eF5APWJaKjCjDOI2XvgxxnbI=; h=Message-ID:Date:MIME-Version:Subject:To:From; b=lUI78kaRgm8mQYNgkli/z47tX53piBtp36x9s69tM+jOLyIyL8Nu/h3Bu5CgBSJ+V mAwK4TZiAvdrZdxYo7bF38IaBsij+VPgnTWa6/H+6dl3Sni29cG8OViMakFdXrsV0C HoP9Gd7Bs8ETWFDvG1KG1ZeWMSzuwAlHuOe1wfqSfbGol9NixjsXPiyU5a71rjL/VI 9DxZF7AbfCCfyHj0WbaNJH7OETzZ2r3Ains3VR1erE+An2B+d/Mn3NRFrbxw7gRixS 9DBS6zg8ZxmuGhiAlv5BzILvh8j6fguqGJkTTFZm4Va6Yc1RobmqnU43ysRXaMsI2k WpOz6ZUKQeNzQ== X-ME-Helo: [192.168.1.18] X-ME-Auth: Y2hyaXN0b3BoZS5qYWlsbGV0QHdhbmFkb28uZnI= X-ME-Date: Sun, 17 Mar 2024 15:42:38 +0100 X-ME-IP: 92.140.202.140 Message-ID: <1af02bc8-1b20-4508-909d-342f3b06bf78@wanadoo.fr> Date: Sun, 17 Mar 2024 15:42:28 +0100 MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Subject: Re: [RFC 03/14] fork: Clean-up naming of vm_strack/vm_struct variables in vmap stacks code Content-Language: en-MW To: Pasha Tatashin , 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 References: <20240311164638.2015063-1-pasha.tatashin@soleen.com> <20240311164638.2015063-4-pasha.tatashin@soleen.com> From: Christophe JAILLET In-Reply-To: <20240311164638.2015063-4-pasha.tatashin@soleen.com> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 8bit X-Rspam-User: X-Rspamd-Server: rspam06 X-Rspamd-Queue-Id: D857840008 X-Stat-Signature: fsbijw6d63qk7u366ueo5jjnzezxcn1y X-HE-Tag: 1710686559-380845 X-HE-Meta: U2FsdGVkX1/axvos3Yye+jrnQIcwI+nXixb4RTQEqxUaGhWteJTC0A8rbCLwaQGgJSMhCyaj8w4qVSwYEP5HW794wQSbjQi2Crca4TyPxIxCKuMk0KSXZsAQj6Ml+vNA7G+4WQFgzyOqWhSAvgC/TjbP5jS2ctk+m/4DkcCUmkTLdwdQGSsVtwrbdFnHuJp7psvx0KWBvWiKEM8OGPZsrXY+pnD/NSFArJhAr5EQRe2S8mdDbh8nTBivEolWs/Q42QY2iDsOY2zPq+y43HmGmaj7zxCo2PmGWDU8IdpOfBChA4qAyk+SJWL3wfHU3/Dz8UjwW6qcZFvy4f8IXgSnnYOvEMnIKlpEJBgu4wFkBLvRmZ5kUV7GPOtGBNNf3BpmuSKzJEqTvjP//ZZO92lgZGdHcrCNVIxVbLN9z4tELiGUr+TNOKOfp5ImQ3X5t4qV53NYfdOlIO0fo6461FSFpfhTxdYcMRp2Xdg9xphdCKRtZJJV42uq+uOGeKBm/tEFQQn7sUJvh5StR9ega/YEdAJUYH83m/KItAqjtEnlltGwCaFzZwAXyuCi1o6gUkQft6wIq2eNeAGe5sB51Ko0iy8QHwD2ZRjx18gADjJkFt3Md36KjyUoqf2486KKhBgaUSK5NFKmHcZX6THccr18ab5mTbnXpVHIt3TWxYU+FvwzDuTcXHDsSIIk8eXAcOrSUeBmJ4lda1oNUHO+wGNnYTzPhpdvmEP0dYsr28mV8SQcwYxbaV12YKqNEX4RHhVMhRjo2PS8EJsHqSal8yyPx+XDbI9P7/n8spMZVMoX6kCuWyunWg4ZZu8TOnb1oMdpyX16c1J6TaEJ5rpWwSfcJArneWexSgwv7q9XfdQHo5eOri5Do5Gr9pq0/uGBJogXj5v+BXcePIUpXQlF/ijKcUzOiKex5YWySItCwpaBo7khOn3vEqaXQM3GieyB5oJW6Mhpvca0JKGK6fajQrd ztqRY7I6 +QTiMg6HgDiOFY0E541XmJjPk1Bw4XrVRNvuNdISI5Yt0vxVdsw0Bb/PtfwBYd57LuFsozexfVsKEovjdrzIv2rrvgxEKiAvnoEOZBkxp6JR+CHcmOrWTAYNeMBcnbgUgeuXry81If9DBTTTupnhiB2pfGoVhGQcUb1l4STChzcoWeFNxm62KE8am+jkgd3vRyn3GqIdCz0PNVdgMKvCKUocUhXQIXcCr/Ku++f6v/bQk4fy8euRApfW43R8I5R8Xs3+2nE6k/zTTtUS8MfoOWKwVVNYztr5rM1nXV5LvPcwBUJ8aadTz0iJQUoMhtLqK8u7l7ccre7QiZJZNj1FBF8IwK/X/C1yDsDBMEhswTZ+he1O8H4bR+7AIIWVw852/0eMJvumo7Oc5VaAR78diZfkzlpi2gY5+yKDZjmfLDvMaXTXqwPJYbzyCiJfQRK3cOV9hdJRi6zH4zTeP0Y/NcNTJT0GgfYLeuYrl X-Bogosity: Ham, tests=bogofilter, spamicity=0.001091, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: List-Subscribe: List-Unsubscribe: Le 11/03/2024 à 17:46, Pasha Tatashin a écrit : > There are two data types: "struct vm_struct" and "struct vm_stack" that > have the same local variable names: vm_stack, or vm, or s, which makes > code confusing to read. > > Change the code so the naming is consisent: Nit: consistent > > struct vm_struct is always called vm_area > struct vm_stack is always called vm_stack > > Signed-off-by: Pasha Tatashin > --- > kernel/fork.c | 38 ++++++++++++++++++-------------------- > 1 file changed, 18 insertions(+), 20 deletions(-) > > diff --git a/kernel/fork.c b/kernel/fork.c > index 32600bf2422a..60e812825a7a 100644 > --- a/kernel/fork.c > +++ b/kernel/fork.c > @@ -192,12 +192,12 @@ struct vm_stack { > struct vm_struct *stack_vm_area; > }; > > -static bool try_release_thread_stack_to_cache(struct vm_struct *vm) > +static bool try_release_thread_stack_to_cache(struct vm_struct *vm_area) > { > unsigned int i; > > for (i = 0; i < NR_CACHED_STACKS; i++) { > - if (this_cpu_cmpxchg(cached_stacks[i], NULL, vm) != NULL) > + if (this_cpu_cmpxchg(cached_stacks[i], NULL, vm_area) != NULL) > continue; > return true; > } > @@ -207,11 +207,12 @@ static bool try_release_thread_stack_to_cache(struct vm_struct *vm) > static void thread_stack_free_rcu(struct rcu_head *rh) > { > struct vm_stack *vm_stack = container_of(rh, struct vm_stack, rcu); > + struct vm_struct *vm_area = vm_stack->stack_vm_area; > > if (try_release_thread_stack_to_cache(vm_stack->stack_vm_area)) > return; > > - vfree(vm_stack); > + vfree(vm_area->addr); This does not look like only a renaming of a variable. Is it? If no, should there be a Fixes tag and should it be detailed in the commit description? CJ > } > > static void thread_stack_delayed_free(struct task_struct *tsk) > @@ -228,12 +229,12 @@ static int free_vm_stack_cache(unsigned int cpu) > int i; > > for (i = 0; i < NR_CACHED_STACKS; i++) { > - struct vm_struct *vm_stack = cached_vm_stacks[i]; > + struct vm_struct *vm_area = cached_vm_stacks[i]; > > - if (!vm_stack) > + if (!vm_area) > continue; > > - vfree(vm_stack->addr); > + vfree(vm_area->addr); > cached_vm_stacks[i] = NULL; > } > > @@ -263,32 +264,29 @@ static int memcg_charge_kernel_stack(struct vm_struct *vm) > > static int alloc_thread_stack_node(struct task_struct *tsk, int node) > { > - struct vm_struct *vm; > + struct vm_struct *vm_area; > void *stack; > int i; > > for (i = 0; i < NR_CACHED_STACKS; i++) { > - struct vm_struct *s; > - > - s = this_cpu_xchg(cached_stacks[i], NULL); > - > - if (!s) > + vm_area = this_cpu_xchg(cached_stacks[i], NULL); > + if (!vm_area) > continue; > > /* Reset stack metadata. */ > - kasan_unpoison_range(s->addr, THREAD_SIZE); > + kasan_unpoison_range(vm_area->addr, THREAD_SIZE); > > - stack = kasan_reset_tag(s->addr); > + stack = kasan_reset_tag(vm_area->addr); > > /* Clear stale pointers from reused stack. */ > memset(stack, 0, THREAD_SIZE); > > - if (memcg_charge_kernel_stack(s)) { > - vfree(s->addr); > + if (memcg_charge_kernel_stack(vm_area)) { > + vfree(vm_area->addr); > return -ENOMEM; > } > > - tsk->stack_vm_area = s; > + tsk->stack_vm_area = vm_area; > tsk->stack = stack; > return 0; > } > @@ -306,8 +304,8 @@ static int alloc_thread_stack_node(struct task_struct *tsk, int node) > if (!stack) > return -ENOMEM; > > - vm = find_vm_area(stack); > - if (memcg_charge_kernel_stack(vm)) { > + vm_area = find_vm_area(stack); > + if (memcg_charge_kernel_stack(vm_area)) { > vfree(stack); > return -ENOMEM; > } > @@ -316,7 +314,7 @@ static int alloc_thread_stack_node(struct task_struct *tsk, int node) > * free_thread_stack() can be called in interrupt context, > * so cache the vm_struct. > */ > - tsk->stack_vm_area = vm; > + tsk->stack_vm_area = vm_area; > stack = kasan_reset_tag(stack); > tsk->stack = stack; > return 0;