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 015B6C3ABBE for ; Tue, 6 May 2025 07:58:04 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id B29646B0082; Tue, 6 May 2025 03:58:01 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id A9D086B0089; Tue, 6 May 2025 03:58:01 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 6C5A16B0085; Tue, 6 May 2025 03:58:01 -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 4289D6B0082 for ; Tue, 6 May 2025 03:58:01 -0400 (EDT) Received: from smtpin27.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay10.hostedemail.com (Postfix) with ESMTP id B2942C1D83 for ; Tue, 6 May 2025 07:58:02 +0000 (UTC) X-FDA: 83411729604.27.A780297 Received: from mail-lf1-f43.google.com (mail-lf1-f43.google.com [209.85.167.43]) by imf05.hostedemail.com (Postfix) with ESMTP id B59F5100006 for ; Tue, 6 May 2025 07:58:00 +0000 (UTC) Authentication-Results: imf05.hostedemail.com; dkim=pass header.d=linaro.org header.s=google header.b=gXAnFtXo; dmarc=pass (policy=none) header.from=linaro.org; spf=pass (imf05.hostedemail.com: domain of linus.walleij@linaro.org designates 209.85.167.43 as permitted sender) smtp.mailfrom=linus.walleij@linaro.org ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1746518280; 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=clPG0PKd/xwbFiWMy/JETCJv6JDhmlp+eEpLJWWcVYU=; b=8rSShvsbxx1WUyp47634RaT4tmGmoKzsUr8HSTz7enA23Csm6lvcJcEPAXS5wEmM6Jh682 ILv/Kv3WbPSPl+UTYRjqVhgOVR4vqnz987QtCfnKHOQBfwQrPNLd0s9SbzV1hXVWD2qLO7 lUsJVZcCKKq4CLx0Pc7O6lfHPxVnsp0= ARC-Authentication-Results: i=1; imf05.hostedemail.com; dkim=pass header.d=linaro.org header.s=google header.b=gXAnFtXo; dmarc=pass (policy=none) header.from=linaro.org; spf=pass (imf05.hostedemail.com: domain of linus.walleij@linaro.org designates 209.85.167.43 as permitted sender) smtp.mailfrom=linus.walleij@linaro.org ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1746518280; a=rsa-sha256; cv=none; b=1Ihx7v5isJe3czDRI47VQ9wqK8vlvWD/Y3hAMC9qttQ2qMbnL/AtQxXQfX8fFnnqv2V9WT 0IjxlzzWABBvkD2pIit8BFoUFamsT9NSuqYPWF0nEhhTpE9XmlC4cHP8FizpVeglceq7gP OWJ5tEZqvzuhZyJ9t/Swz5klb92or5s= Received: by mail-lf1-f43.google.com with SMTP id 2adb3069b0e04-5498d2a8b89so6594377e87.1 for ; Tue, 06 May 2025 00:58:00 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1746518279; x=1747123079; 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=clPG0PKd/xwbFiWMy/JETCJv6JDhmlp+eEpLJWWcVYU=; b=gXAnFtXoj1NzekrMrORto/cigXP1L1ZWtIDMsdepvKjya0bxHDrJxyIsblj/ZVGMy+ e0XRFXsKjodGXyyxQVPr86Tk1ZpUvC1KDYDf4nEVP65PUp0a1a6YoWB6mW014MWbL+nE 8S9ZPpAF+wRlCGS3c599wYTVk/ZF0swhlsjDYVQo8DW+uTL2RpYj0BzdjPDCj9AXCH5p eWE0Q6HulPakIcnjCeoDhLeo01olBF0mGFhiiOaaBhYm8uEp/B6+TNmTl0CEgkVSxJEb eH0xeWhd1UDnPKmKuKyLKtltnrRpWwje5Vb3BHGQ3hXzJS2/Mwuu48TfDqfOW0Z7nMbl UkSw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1746518279; x=1747123079; 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=clPG0PKd/xwbFiWMy/JETCJv6JDhmlp+eEpLJWWcVYU=; b=pLYSSmTtzHWf0u/WG5erBqXdmv+i4CcQK0gy3jk2acwOY6fkgh5ErMUpYNkt41I2Co OtN2kMhed1b+cY5ca5dge7Dz4SztwCNP/6M0J+/gY82suVZWWmpQz3q0D1SUQN31mJNs YEOhbACsxlE3to7RJQNhATbCt2Nz7AFz918cvSIJOa1cry8IDXZHIGwJtooAphm+Gcz2 UYad1roeX9h9vySNjqt6Ai798J2NxGYTsOzXdGDJVm3qg1ejPJHlFt7feQZcPzjIodzX uVqmUpOLaoPmUAyGTIB8NlkKCMKZflRQNCgVQVh5zBLNwWoM6DDfn9Ag3pq2Roebqz9s YNgA== X-Forwarded-Encrypted: i=1; AJvYcCUECZbzo/RQq7n1gKbf+XIPCo3spnH2BI5GprwNvhr4ARXPRf+XF1CtG/kwrxrTMgBWw0HrNaylZA==@kvack.org X-Gm-Message-State: AOJu0Yy+o9dbq45LmbDh0RBYh+AT1Vx0oui8eOt5aoUlzqFYFGWbJrRS e/wPMRohGwSFt/+o9dWdvyKcEUb7xOvwinPprNkHMjvPF8OgZYG9MpbD0GIpmfjzEJ7tq/tqZsj G X-Gm-Gg: ASbGncvRnRnLd7vk03zV4Iw64/N0v35yZfUnSiaJsnZJx+j1mTTdkC7an0izlNgl7/A 3efCAo+3/6YN1Zb5WJd7vTVWiZQ2ycl15GWjqAGMmUXNdlIgDBdBOHteoxfXnGaVcwHY9GoC1bY aGYx/narPTNhuFHW7oVWDTJUxPk5iyx16i13cLab2drWpYLCcehAGNOvwZ1zkoMlsKI8wGE2T3r 3ZhL7/JhBNR0vBdNFctAQdGlf7IUc4G5xUsagvWYRbgRT3eerhGrqeTll0mciF70C+h7KrgeBSk TTg9FVoTJXUinFODGbf4R1J2Gi+3uAw0+QG7H+emOq6bybfp6pc= X-Google-Smtp-Source: AGHT+IHHqF7yhAsFoeaESR/oJp/yj8lpBjjjHSgqn++2FVV/QuSwWnO8elKmUTH/j+Z7JrBYu/QB7g== X-Received: by 2002:a05:6512:1585:b0:549:b0f3:43a1 with SMTP id 2adb3069b0e04-54f9f872e48mr2867234e87.30.1746518278598; Tue, 06 May 2025 00:57:58 -0700 (PDT) Received: from [192.168.1.140] ([85.235.12.238]) by smtp.gmail.com with ESMTPSA id 2adb3069b0e04-54ea94ee0efsm1990757e87.158.2025.05.06.00.57.58 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 06 May 2025 00:57:58 -0700 (PDT) From: Linus Walleij Date: Tue, 06 May 2025 09:57:53 +0200 Subject: [PATCH 1/5] fork: Clean-up ifdef logic around stack allocation MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit Message-Id: <20250506-fork-fixes-v1-1-bd35b63f0f1b@linaro.org> References: <20250506-fork-fixes-v1-0-bd35b63f0f1b@linaro.org> In-Reply-To: <20250506-fork-fixes-v1-0-bd35b63f0f1b@linaro.org> To: Andrew Morton , linux-mm@kvack.org, Pasha Tatashin Cc: Linus Walleij X-Mailer: b4 0.14.2 X-Stat-Signature: fb18qk9wa5yi5d5btohe4w7qmkfcndmy X-Rspamd-Queue-Id: B59F5100006 X-Rspam-User: X-Rspamd-Server: rspam05 X-HE-Tag: 1746518280-447091 X-HE-Meta: U2FsdGVkX18csrHhXtr7jwGtA/q22MnEJ+3d92Elzx/rroeiq1or2Htq5LJgbudhIlZONhZXs8G5AtVGzchyNdNIQkPRuVaiYITDNYaJmB8dTv8r+G06r0a7kL07cTVvtbF0tUjNRJNmaclq10/ogkzZh9+PD2P3uf2sqgbv9hMllOtj4Xh3gNx0zRAuxGrLu+BRp/pqVoqYUyd405GG2cVsovx013uhkuZmwaNeFR+VPeHt0JAkUmpdXbIh+K+ob/+NC0r1HyAE1aZ2GA1kkFUe769zp3bJEY78EebGZ23DfDi8wKhMbTnPRIGGAxxPT909lQULpzv7hzpxuJ65nf5nBzFjUB+sOSKd2+zPg3Wy1WY66nZjmg5wVMABHBKltZBSsgVF4OUFNZm+eRm+BdJcqHrcN4zIdn68wFFWfjHrCX1hfdL9+0ZO81ZOujNQBiOdl+RW41JiW5fdtveFqiu9yAKh8h7FEoFLY99aech3jcN6rBrnHZ115ODD6mepad+uDhzAxqKwkBnYcHj4EIkJTQ5HTf0c1qlqMIAesD+21iWNO144dK+GZlJlJ4rYbe0lAgqCy6YEoSxCi5NdkJgqS5hC9/uJjomYjrkDaf77HWT8F3HPwsoi+/h8KTN4zUCF87tq8twMHqNIPv182fwjFo8xNbQXxwYvHw49XKawIt3lC9dIIWJavToJSSo+E/8CCDD13gid5ihgqdLfHOf2RFk/yzRpvj2NRYFmJzQlwqQ4Z9bjGdGJvzZFLc79yctar8s/R3ZVBBi/15+nRi6IjE31mB0er/vFDJEhn5ajJbdvr9QnQSbViBRx5X3LcnNxJo+qLOWrvmiG+4+NlmYrAq/NRZg8XMQlE/gtZt4OhhS214PKhJALT9lXBzUdf1rw45IHw82rTREV27lTNODYWRSkx6oOaUzNB5m2R/kmpHMcdTwTfp0+tLJVg5S04tMeF12wVvRFhZf+eBQ +B5dgEWb NJefIX7ArjRIseGuiA7bl1LFRzqvjQIa/GSAowLhNOmAJsd8f7hduxFVL1zKU8EswChTB6laVxvvYZcSsLroO+8vc9mZv2TX9/N2rvZlaJ5Ap/k15GTD+ZcHJcKIlVTgC6dvgt7VRZ5BA1gWPFVp309qUxpRaPyZe/ulp3cZfjVvKmv6V6iEVNzg6zYGimTdM8WjS9mH2ZERdbGo2IUbTzX1N96Q8FRD0Gv/+Uno7Mij/gsT23sJI3WTDALTApwBoa0okKItyGKGJ+H+zbaUMH9oB7bLMViaiuQVf3kvxR/wxgYJbANxpzHDUa9MZskHTYoQDnki3vMhcBLrClN2GdzjUfk39VXCqq15w8AHMohooVOgPJjscGlRuX2rzebvEEnqOJbTa4hUOqjAfeHAImOHBYi9LLzJR8Ve8 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 is unneeded OR in the ifdef functions that are used to allocate and free kernel stacks based on direct map or vmap. Therefore, clean up by Changing the order so OR is no longer needed. Signed-off-by: Pasha Tatashin Link: https://lore.kernel.org/20240311164638.2015063-3-pasha.tatashin@soleen.com Signed-off-by: Linus Walleij --- kernel/fork.c | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/kernel/fork.c b/kernel/fork.c index c4b26cd8998b8e7b2b516e0bb0b1d4676ff644dc..7b9e1ad141baaeb158b1807ea9fc3ef246f5f3a7 100644 --- a/kernel/fork.c +++ b/kernel/fork.c @@ -185,13 +185,7 @@ static inline void free_task_struct(struct task_struct *tsk) kmem_cache_free(task_struct_cachep, tsk); } -/* - * Allocate pages if THREAD_SIZE is >= PAGE_SIZE, otherwise use a - * kmemcache based allocator. - */ -# if THREAD_SIZE >= PAGE_SIZE || defined(CONFIG_VMAP_STACK) - -# ifdef CONFIG_VMAP_STACK +#ifdef CONFIG_VMAP_STACK /* * vmalloc() is a bit slow, and calling vfree() enough times will force a TLB * flush. Try to minimize the number of calls by caching stacks. @@ -342,7 +336,13 @@ static void free_thread_stack(struct task_struct *tsk) tsk->stack_vm_area = NULL; } -# else /* !CONFIG_VMAP_STACK */ +#else /* !CONFIG_VMAP_STACK */ + +/* + * Allocate pages if THREAD_SIZE is >= PAGE_SIZE, otherwise use a + * kmemcache based allocator. + */ +#if THREAD_SIZE >= PAGE_SIZE static void thread_stack_free_rcu(struct rcu_head *rh) { @@ -374,8 +374,7 @@ static void free_thread_stack(struct task_struct *tsk) tsk->stack = NULL; } -# endif /* CONFIG_VMAP_STACK */ -# else /* !(THREAD_SIZE >= PAGE_SIZE || defined(CONFIG_VMAP_STACK)) */ +#else /* !(THREAD_SIZE >= PAGE_SIZE) */ static struct kmem_cache *thread_stack_cache; @@ -414,7 +413,8 @@ void thread_stack_cache_init(void) BUG_ON(thread_stack_cache == NULL); } -# endif /* THREAD_SIZE >= PAGE_SIZE || defined(CONFIG_VMAP_STACK) */ +#endif /* THREAD_SIZE >= PAGE_SIZE */ +#endif /* CONFIG_VMAP_STACK */ /* SLAB cache for signal_struct structures (tsk->signal) */ static struct kmem_cache *signal_cachep; -- 2.49.0