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 C89ECC3ABC0 for ; Wed, 7 May 2025 12:46:41 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 3C31E6B0088; Wed, 7 May 2025 08:46:37 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 36E836B008A; Wed, 7 May 2025 08:46:37 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 1999D6B008C; Wed, 7 May 2025 08:46:37 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0010.hostedemail.com [216.40.44.10]) by kanga.kvack.org (Postfix) with ESMTP id EA6406B0088 for ; Wed, 7 May 2025 08:46:36 -0400 (EDT) Received: from smtpin06.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay08.hostedemail.com (Postfix) with ESMTP id 5D8D91404D8 for ; Wed, 7 May 2025 12:46:38 +0000 (UTC) X-FDA: 83416085676.06.74BD437 Received: from mail-lf1-f51.google.com (mail-lf1-f51.google.com [209.85.167.51]) by imf14.hostedemail.com (Postfix) with ESMTP id 6107010000E for ; Wed, 7 May 2025 12:46:36 +0000 (UTC) Authentication-Results: imf14.hostedemail.com; dkim=pass header.d=linaro.org header.s=google header.b="zJ/uz8jV"; dmarc=pass (policy=none) header.from=linaro.org; spf=pass (imf14.hostedemail.com: domain of linus.walleij@linaro.org designates 209.85.167.51 as permitted sender) smtp.mailfrom=linus.walleij@linaro.org ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1746621996; a=rsa-sha256; cv=none; b=HvEeXWQ6/AquNPz09xIBH+YHSOQZ7p90aUn9AsieUDlE0TYrztWaYHgrvfDCVpAY2D55Pe rwLdDKGZACZTSHnz4BrjI2LwrTfQzq1iZMKxKKx9rLoRPLk+Yrh47FJoDQ8SFEEMgxIN8t kl0MW1rG/lkhyyJ9sorCnDw3kEN/+I4= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1746621996; h=from:from:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc: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=TkazibaUN7CDErGeZNaSeWzDI4Jt6SFgyeJ8hQi/8UY=; b=jmUDPWK9KP5u6NfLLE4GS+zIRtpUSF8pZVeghT+Mse8o+L6bKcmTc44jBr1tFxHPciRh1y T6OslpTr6ZWdxSLFWi2qBd6X43e3sC/frHO2lSxIUFPLkadO/0t+mB93cXgzZi30tcqdMX 1IDA2mkVdSmWT4a0vhalkBdNsBdHaHo= ARC-Authentication-Results: i=1; imf14.hostedemail.com; dkim=pass header.d=linaro.org header.s=google header.b="zJ/uz8jV"; dmarc=pass (policy=none) header.from=linaro.org; spf=pass (imf14.hostedemail.com: domain of linus.walleij@linaro.org designates 209.85.167.51 as permitted sender) smtp.mailfrom=linus.walleij@linaro.org Received: by mail-lf1-f51.google.com with SMTP id 2adb3069b0e04-549b116321aso8506605e87.3 for ; Wed, 07 May 2025 05:46:36 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1746621994; x=1747226794; darn=kvack.org; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:from:to:cc:subject:date:message-id :reply-to; bh=TkazibaUN7CDErGeZNaSeWzDI4Jt6SFgyeJ8hQi/8UY=; b=zJ/uz8jVWjGNVxay+enyFc6PIT9FTe3rmet+u7zmCCVyaFu6UcTh/LdEld+quiAhSw mjqzBTxvgZhKHxxfj36FvZol6iaN9wkzwlnTlfnnav6tmc5XNTbG5V3W8lK4sdF6Yjdl OuX6dq1BVBJZGv5WsLhaom1v3sV2zViV8L2er0+mwecEXYLuWj407yJebGFQavMm9X14 1Vo/rGmJtBf7QPOw5m5VHnVfQA6q3HMlyP7jYLWW3xBKOZ+/xvs/iKqzzk9Jp7jWod9b YvRKyr8Q9nPjPFe7Gz9BRek3saCS39LSEzX3qude/qaC4UIWu4mVtp2iMxQd++Ab9NVI kPLg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1746621994; x=1747226794; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=TkazibaUN7CDErGeZNaSeWzDI4Jt6SFgyeJ8hQi/8UY=; b=vq66IPWkCKtMGPhgx4XXy1ue47nU9AtFWZwI4ca8hLaqVnIbW7nJLSb3dJ7bJPaDmS fkurWYek2OVHv+qcCW5FN3hdGCRLBm7jqUhQClXq+ItmM+6VRQh9KUZZHLX7cg+lw1oV 1pRSWbqR4IxwrRBDyF1eLxkJxuAYUBvbM53XrEnRE81RuYvoSbfqtwyT6WXhCJjKQqiD Fj2dyfWCqiDWaMGYze3MCT2a+ES7holXg4nH4MlnEicHlp+7NhENlhIHbJQlGDxW8kkl zoTVbGv5PHF0tXEYDHCeMw3To4oVlSREdcwUSe4yFqYgzQ6QH6vRBcb1SZ3yTuoESqHJ BS8w== X-Forwarded-Encrypted: i=1; AJvYcCUQbkFO7mA0RMfBxPHqBjMoZEF09Whp4b6Sn2V/LkB32tEHv0BIhbBeopgtbgf0eP6hM+GkpLRSpg==@kvack.org X-Gm-Message-State: AOJu0Yxle1XSTHUmO0CfLzAcnUOLEe7MxzV3Ga891fYjniYyaZIM8CCS ja/u/gk0RLvdfBQRL2nOQfyCw+zaJcuApTtMy8+omELh51gWnbTGy2IZDsO9X7Fb1PzSICHKHTt v X-Gm-Gg: ASbGncvuFzh/g44sikMXK+WXtARYBcGZQUmd+Y7To27A7NbxRcrjgRM6YtiU0SMNJ47 ZUUrnjTj4aX0mT2bb8uuR3Jqn9WvK4gt1aXX7vT4ZxKkv+u0r6fzOrWiQ/dm3BGzxE+TCRvSYlU k/2guDEe29F4ZUMhFgreJmxLyME7tgzzPQK147e4Wx8bvBOeibCTEXVIsMrudmH3XmHyHuhULlG sm/BdMaRhP5NnGDBeBIe73+wAZhvlVNL6B6zaJWdPKLqqdyDrDcCCwZny3WRq90eWRdpKrGOuY6 3w3cQK9piZaKnIi7+gBhNYJh981I1jdFz98mX+mr2XsxesxQgTQ= X-Google-Smtp-Source: AGHT+IFAJ0TzRnYfY073h/J359Bw2ULvjYOoudHHZLy8aGP7x2e7plj41wwGF9GjDQGpCAXH6WurIA== X-Received: by 2002:ac2:51cc:0:b0:54e:8160:d316 with SMTP id 2adb3069b0e04-54fb9630631mr1052742e87.40.1746621993706; Wed, 07 May 2025 05:46:33 -0700 (PDT) Received: from [192.168.1.140] ([85.235.12.238]) by smtp.gmail.com with ESMTPSA id 2adb3069b0e04-54ea94bedd4sm2323003e87.55.2025.05.07.05.46.32 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 07 May 2025 05:46:32 -0700 (PDT) From: Linus Walleij Date: Wed, 07 May 2025 14:46:28 +0200 Subject: [PATCH v2 2/5] fork: Clean-up naming of vm_stack/vm_struct variables in vmap stacks code MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit Message-Id: <20250507-fork-fixes-v2-2-82ab1e42cde3@linaro.org> References: <20250507-fork-fixes-v2-0-82ab1e42cde3@linaro.org> In-Reply-To: <20250507-fork-fixes-v2-0-82ab1e42cde3@linaro.org> To: Andrew Morton , linux-mm@kvack.org, Pasha Tatashin Cc: Linus Walleij X-Mailer: b4 0.14.2 X-Rspamd-Server: rspam06 X-Rspamd-Queue-Id: 6107010000E X-Stat-Signature: dwpn88kenkyn4gkiep59m34owdrdbdwa X-Rspam-User: X-HE-Tag: 1746621996-906878 X-HE-Meta: U2FsdGVkX183cNvdIA+5EsKTTq4nZ6mKZarDBMYjSbmJDEY8619rr+MvYdbMBDKrMuWoXL3C0gs1MRPBpu8zHuGtCl1TTrgcCX1YdNx/bJuzHJ9I2TbF97E2Kid7VCZcBmq/j09e/S5Ywb+jzxcIVS2bZ+exQd5B4AeF9iVs3LELMCpO86tDxtyQruTlKMlkVM2R+h5zW6RnwL0MyOVwuep7sYKVFd49Hnlt+b9B45Dt8rD3WnEWim1R4c2HEd/4SfHWWCv4jGNd657KF1MzK75xRaGCSkZo7EkSVuTmmt4YqRQT+j90xMRBwnT75EPutfj3mTRPxRJ2w/PslXIdUxe3YjHWnVmzDGALiXSm2DvcubynV8rju6Hkv/UGE5at0gQJx7ffs0tkEueY2hSIFN3+/Bsafr0Xth8YHS0DeYjMkJ1HaW0KUx1UixiBybOAfkG1ERW5q8XJBWDH8J4/1j0akiAJrnURyiAjhLn7wuA5zsaiqhmAnvlld5A86vFcZ5w4dQySblM1t51qO0yzQzu3YMKR6uku3P6pCyqb+i2jt6XbRXWj+Jtn+6n0TSLwYO3paM0+LQ/Ehpwwd3n8ThsLt6fCia9ReifahiZwybv74cpJ0zmMi2Q7k8FKfyX0LknHrQZo80NDF2s1D3OJEsQJ6TqJn4m83CWyBIenQglPYti0xOvFpPV5r4UcNvGDL4jLRRAEi1gR4qlSMPvaWb7C8hbB3rszsg/X5ZKcVdzdVWqdS84uDbFsXYZ3tqXGZoGi/2pAK+5lSJkcWYvlOklkD58TFceze230w1yOZo4zHlRbl1Ir0WmN2+9dZToi+B30yU0cKASokJ2mDfWuYl5zIsh9OGAdVBTKIPxYj1MRSxCuaCLLEEHR6c05GExDeNn5hiRedpBGGzh8FchaJofLDEbCoTAlS7NjinFnRABa/7SD8Tas5appM9/Y88cnJ4bZ9gG8qhF6lX0SXyX XNpWWXcN 5MSiLRmgtpXdmDLoknXMk3x9zzLMjJC3JXyFALr3LGD7HN33E18xYQY7CDW5prl/dkfCLgaV/R4ptJXVh9jNU0CzvXwhSSLBTNRdDEpYttRMJo+rjJ1GYLBPmjJ3h6GbHEVIMCK0odHpnmuXyccFasCKQzsmgSTrXWjsJSxL2WrlOD3hGFnDCTg1COomtJRKXSr1Fpw/yYU4qUkPQ+kFik5LLS+XNhD+Rs+rFJq/DQ2FWa61JPacF9/Y0SKACZqFYLQWoMJrHyzihhbre4AGj1vvKFT389e27ZDkU/8nIMSdEk9mUmRA2ekbkUWFRA+L/OLdQQjMj/O0i7AHFBfI+CXIaI9m38koyqW1l1KFfH6QhSAVYtXebrK8ToehNZze3lCh4c4N0fu6nX8Ht2Tjdfo3RRvMbRmNj3n4FpAGy3Hy/0qS+hIZHKyZ27sOzEwf0uF1sG4D3J3278K22asvB7kcJtQ== X-Bogosity: Ham, tests=bogofilter, spamicity=0.000000, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: List-Subscribe: List-Unsubscribe: From: Pasha Tatashin 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 the code confusing to read. Change the code so the naming is consistent: struct vm_struct is always called vm_area struct vm_stack is always called vm_stack One change altering vfree(vm_stack) to vfree(vm_area->addr) may look like a semantic change but it is not: vm_area->addr points to the vm_stack. This was done to improve readability. Signed-off-by: Pasha Tatashin Link: https://lore.kernel.org/20240311164638.2015063-4-pasha.tatashin@soleen.com [linus.walleij@linaro.org: Rebased and added new users of the variable names, address review comments] Signed-off-by: Linus Walleij --- kernel/fork.c | 60 +++++++++++++++++++++++++++++------------------------------ 1 file changed, 29 insertions(+), 31 deletions(-) diff --git a/kernel/fork.c b/kernel/fork.c index 7b9e1ad141baaeb158b1807ea9fc3ef246f5f3a7..8b8457562740c114c640a8cc230876f6a286b246 100644 --- a/kernel/fork.c +++ b/kernel/fork.c @@ -198,14 +198,14 @@ 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++) { struct vm_struct *tmp = NULL; - if (this_cpu_try_cmpxchg(cached_stacks[i], &tmp, vm)) + if (this_cpu_try_cmpxchg(cached_stacks[i], &tmp, vm_area)) return true; } return false; @@ -214,11 +214,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); } static void thread_stack_delayed_free(struct task_struct *tsk) @@ -231,32 +232,32 @@ static void thread_stack_delayed_free(struct task_struct *tsk) static int free_vm_stack_cache(unsigned int cpu) { - struct vm_struct **cached_vm_stacks = per_cpu_ptr(cached_stacks, cpu); + struct vm_struct **cached_vm_stack_areas = per_cpu_ptr(cached_stacks, 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_stack_areas[i]; - if (!vm_stack) + if (!vm_area) continue; - vfree(vm_stack->addr); - cached_vm_stacks[i] = NULL; + vfree(vm_area->addr); + cached_vm_stack_areas[i] = NULL; } return 0; } -static int memcg_charge_kernel_stack(struct vm_struct *vm) +static int memcg_charge_kernel_stack(struct vm_struct *vm_area) { int i; int ret; int nr_charged = 0; - BUG_ON(vm->nr_pages != THREAD_SIZE / PAGE_SIZE); + BUG_ON(vm_area->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); + ret = memcg_kmem_charge_page(vm_area->pages[i], GFP_KERNEL, 0); if (ret) goto err; nr_charged++; @@ -264,38 +265,35 @@ static int memcg_charge_kernel_stack(struct vm_struct *vm) return 0; err: for (i = 0; i < nr_charged; i++) - memcg_kmem_uncharge_page(vm->pages[i], 0); + memcg_kmem_uncharge_page(vm_area->pages[i], 0); return ret; } 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; } @@ -311,8 +309,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; } @@ -321,7 +319,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; @@ -517,11 +515,11 @@ void vm_area_free(struct vm_area_struct *vma) static void account_kernel_stack(struct task_struct *tsk, int account) { if (IS_ENABLED(CONFIG_VMAP_STACK)) { - struct vm_struct *vm = task_stack_vm_area(tsk); + struct vm_struct *vm_area = task_stack_vm_area(tsk); int i; for (i = 0; i < THREAD_SIZE / PAGE_SIZE; i++) - mod_lruvec_page_state(vm->pages[i], NR_KERNEL_STACK_KB, + mod_lruvec_page_state(vm_area->pages[i], NR_KERNEL_STACK_KB, account * (PAGE_SIZE / 1024)); } else { void *stack = task_stack_page(tsk); @@ -537,12 +535,12 @@ void exit_task_stack_account(struct task_struct *tsk) account_kernel_stack(tsk, -1); if (IS_ENABLED(CONFIG_VMAP_STACK)) { - struct vm_struct *vm; + struct vm_struct *vm_area; int i; - vm = task_stack_vm_area(tsk); + vm_area = task_stack_vm_area(tsk); for (i = 0; i < THREAD_SIZE / PAGE_SIZE; i++) - memcg_kmem_uncharge_page(vm->pages[i], 0); + memcg_kmem_uncharge_page(vm_area->pages[i], 0); } } -- 2.49.0