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 3B491C3ABBF for ; Wed, 7 May 2025 12:46:39 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id B40EE6B0089; Wed, 7 May 2025 08:46:35 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 9D3BE6B008C; Wed, 7 May 2025 08:46:35 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 7FDD06B0089; Wed, 7 May 2025 08:46:35 -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 5639F6B0088 for ; Wed, 7 May 2025 08:46:35 -0400 (EDT) Received: from smtpin12.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay08.hostedemail.com (Postfix) with ESMTP id 947F81404D8 for ; Wed, 7 May 2025 12:46:36 +0000 (UTC) X-FDA: 83416085592.12.00180A0 Received: from mail-lf1-f52.google.com (mail-lf1-f52.google.com [209.85.167.52]) by imf05.hostedemail.com (Postfix) with ESMTP id 9EB1C100012 for ; Wed, 7 May 2025 12:46:34 +0000 (UTC) Authentication-Results: imf05.hostedemail.com; dkim=pass header.d=linaro.org header.s=google header.b="V0Pk/kBZ"; dmarc=pass (policy=none) header.from=linaro.org; spf=pass (imf05.hostedemail.com: domain of linus.walleij@linaro.org designates 209.85.167.52 as permitted sender) smtp.mailfrom=linus.walleij@linaro.org ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1746621994; a=rsa-sha256; cv=none; b=gBBmiBou5t0mnzBpnO4bl4f9bk+X/VsxAViljA0uT37+Y7/GoLO/QHLcCVpuBGK7QRBEtV d4LhMBPasRD0gvtWarGmXnggDkCLvz7epqhuCG+Eyel+OnnARwMp30CY86dBZNSe8tXN5s 7lBdRGY68qSYz9CSwnhEagYDTYgp1zQ= ARC-Authentication-Results: i=1; imf05.hostedemail.com; dkim=pass header.d=linaro.org header.s=google header.b="V0Pk/kBZ"; dmarc=pass (policy=none) header.from=linaro.org; spf=pass (imf05.hostedemail.com: domain of linus.walleij@linaro.org designates 209.85.167.52 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=1746621994; 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=g+w7HJ4516/Tx/JwJoMM7mBFLHN8kIE+nz4icUuzImE=; b=REhS66UFYpNuI6X88k1Wb5J0q0rtmFrSN7n00Fva9CnCKAVCRLiezblBXP2jKS3MC/pY/Z gLnoE208qESJNB526INA48xyI5aVH9aFNZaNrUdbeitbnIxuchTVz6e8vfSlPZOkjHX5hO /NXrdvefB9z9rxU4FhpnlJ5i0niRTMM= Received: by mail-lf1-f52.google.com with SMTP id 2adb3069b0e04-54fbd1ba65dso1872e87.0 for ; Wed, 07 May 2025 05:46:34 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1746621992; x=1747226792; 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=g+w7HJ4516/Tx/JwJoMM7mBFLHN8kIE+nz4icUuzImE=; b=V0Pk/kBZzhKAr7SzbQrLxD/OvQU32ylgxUcaz88KdIzREi98f9dV07yBJLEszY5PWu CX7b6vl8wx9igzlyj4erk1n9SFFztMQ//izT2wwUh9usyqr3NwxtBWzyA6lREdLUzfFS 6wMZO1ll64FzvMRcZvSp52DE/EajyGC3guDp6Nz//h+H4ECQSQEJDKAv1n3imjN92LWb jSHsX6fH1dwXuJXpC6DSTipwQQihcH9b8aNhFxETn+rIQw86Je9wABNahqYnck4pGI6T ipaLPdM2FH/197pBcHuCFtc2qR3R5CO6Ymri0OqjTwzbKvxtOZWF0yOKKJuyizFQ9ykp Grsw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1746621992; x=1747226792; 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=g+w7HJ4516/Tx/JwJoMM7mBFLHN8kIE+nz4icUuzImE=; b=IWAarlL/0jLrUl/qNzlkj/FQez8ht5YXG3mN3jskb/91dVFJ4pLB03+GBl0jjJVwjm apgECJklXqD6oUQjnRxE0m0QwlOQ0H8lDjQ5hTZPuN0S59ze4wxVkUJotigfbF2Vn9gP N5R7hq2FajQF6oL1hM05+Amle2WMATnUpTYOzdIDl5evSVnpiAaJToVj+MuXqhMKscm5 Hi1ADmIK1b+b4r8UjYlHmYqYoUY4mS0WPqXmpO+YhZdEc1IEZP4uZXIraJRxmlGQ2i5l 7rQHtgsDNbtZ4kQ95lXU6e3K9OAiVTBElvtCi1wnuXYk2iT/oKd+QxfhzTy+Fl2nI1Cy 49OQ== X-Forwarded-Encrypted: i=1; AJvYcCW8WYwzjADW+FGHKGeRlWiZTzPspxf1K4Tj/xDW3VRCLL6x17N1huqSv7DKgoLpJ0umqPZK3XlmgA==@kvack.org X-Gm-Message-State: AOJu0YwQtr0DXDfUEHXVlglNBF1cCPLtiX9TYV5uAr00Dxgean4nT3kz GSoEHIc9ekdhf12nLtx9q6vejmRm3Yd+jUmXqOVKxr89GSaP/75BxJ1vs+Ii4qchaUP14//AO0n B X-Gm-Gg: ASbGnct5cwQkja3k+2K1TExXxAcw32P99wcjng6U8GjsDs9qeChtU3dw2xYtUlIhXwO jhPhk0OdZh67GcckB0gv/EHzAh5bu/XAmc8mmf7EiZ3O9cFJLi5HTa+1zfZ4VETbCnEYrtX+9bx Kr2nDZ3EcBfxqA/CRLP8J5ue9N7xbE8k3mMtMT+MgBomX0Y9/mPLWYHDtD3dkm7oIkPFAcCuCfu 4eAfW2PlShHpGHQjhCPRqkAF0zEktwQY6DmEXxNV/Fsfsbx87vBf+JQvuLphWZaYOYuEjFSZ0Dv ewOrVvb+npj9Tl4oe4S3Ij2k0PCv1X9wEh2NIa06m5zVDgpVT0A= X-Google-Smtp-Source: AGHT+IFZ5oFZgMwbNYYy6qHex8nMzBWN06pajUHDn3TdDkvDNK5QiHb83trNFOVaxoXsHHg6SXRu/Q== X-Received: by 2002:ac2:4bce:0:b0:54d:6dd3:614f with SMTP id 2adb3069b0e04-54fb95fb713mr1149114e87.21.1746621992331; Wed, 07 May 2025 05:46:32 -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.31 (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:27 +0200 Subject: [PATCH v2 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: <20250507-fork-fixes-v2-1-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: rspam10 X-Rspamd-Queue-Id: 9EB1C100012 X-Stat-Signature: gowztnd4gw14w8wrcrq7erej7te9xxfh X-Rspam-User: X-HE-Tag: 1746621994-446926 X-HE-Meta: U2FsdGVkX1//hzJVUHU7ZNnih5KTr4bMzglYl5J9lkLnToa2FaS4Oamm30q6pf1DbD6r6GKjjREPjkFPz1/Lfm1j0bLW758R/ftWgRVWN5UsKfDXfnu4B/veAHxPHg5TIOyvursPKwoSPqiXjKh7IoLaVfmaocpExPq0/CMvYL+vKTqKwUgJPkM3HLQ38Y7tHsSB20kv9JsNj7avB9E5XTc9a7NTox8DdJLY3rpHBia6AN2WZU5dKBnaruARFcbqvai0N/zEPBClcE0K9548AopB+7kxjsBL+4k9SI+lLs41Eyla04R1+ukZKkzUBBO1WkcVl/Qo3vkoU18JcZFRUwH+zRiXYeinA5XOU0aw+9/8ZTelR7sD72H/tPlK2cPrFpUMRZiLk7ZU61EyOAcFfsMusp/iAuxeh2VKNPJQyVP/5ZrIHa9ay8LXGkTixNoucBC3oXCZx1kZ19ZFhpG2mcnJEHXogRFoNb9DBWTTR5hJ/AMR2L7fpJjoVKeoEj8fgpmkkKrMx6GahBOVrpFikrzthwVXwiu4Nkeki6inbYzHqMEiooemhKMb5aEBMZYs9aWovFuG3XgvRVEbAm8++KBHA/XcVb6ihRkULdJ4tXtSmnob+OWEyKvOPYWgkoLVb+eQReC3cFnkyJpNLHTmM9zTRYf90xMGQxR6Xi6s9lwbjtX25tRZ+9/2jGygXVEWW2AJVFyPRnR3BP6GesFomWNy5FBNHSjwrFo6vPiU5yVDKTGRbYDbSOBei9+AGXYh8R9hWl9zZrnF2S26jW982FtlQD75tf4r195hZlpBno8GL2si1k/10p//NqZPGbPUebWX6VEGK5iszLQxiNDUSdFCgjyVGxliiWDwtXn3P5tiXhTJq+2Iu4VdyXGLKwFLRBTfUkt2iwZs9ROitRGO9/QkP8b5crLvIFmFaU1h3EWQ67itBMYMhs0KRSsKahV94KDAtKMaPz5GS3oBX0n X1XQd6qv npi072WEOVGdv14SIq78O3KDYjljWxLyvduguhOiXiOLtAsn9IKSGkaVWjFcbVMw968yMhyE66gW78d55jSHotI6lrHHk4g8jP1CM0TGo99Kdw7Kd/FQF0mxzZo/vUUKOKzFDATEoEbG3/qdjYJnhO3AkblHwfvzNu7nPrlGGzqRtMG90GSqPXgeZDqkTkv7qGBVRKxMfDkDqiyPjxE5okvXGO6AUhj8RbseVcuMPjUtc2IfEjsa/Zdy1VYDO+DLmZJYCepqlMLDgPp9T/p6EcExpULZmxYgXz+hY4hgRYwJg/RslmiPGaqFqexrU83wWngix4wbB3ZAkJjvzaawD8+7pv9TPb8fqNIdYJuuDZcbTmtsY5Vi5HlnNNuvjrydtjtpm9wn/kfg+TiZOoAmdb57lc7UcQFGi19Br 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 [linus.walleij@linaro.org: Rebased] 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