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 0A716C3ABC3 for ; Fri, 9 May 2025 06:29:34 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id DFD196B00A4; Fri, 9 May 2025 02:29:32 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id DAC106B00A5; Fri, 9 May 2025 02:29:32 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id C4E676B00A6; Fri, 9 May 2025 02:29:32 -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 A60816B00A5 for ; Fri, 9 May 2025 02:29:32 -0400 (EDT) Received: from smtpin23.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay04.hostedemail.com (Postfix) with ESMTP id 91C031A0F7F for ; Fri, 9 May 2025 06:29:32 +0000 (UTC) X-FDA: 83422392984.23.756EB39 Received: from mail-lf1-f48.google.com (mail-lf1-f48.google.com [209.85.167.48]) by imf05.hostedemail.com (Postfix) with ESMTP id 8E3B2100009 for ; Fri, 9 May 2025 06:29:30 +0000 (UTC) Authentication-Results: imf05.hostedemail.com; dkim=pass header.d=linaro.org header.s=google header.b=fEkJYPJL; spf=pass (imf05.hostedemail.com: domain of linus.walleij@linaro.org designates 209.85.167.48 as permitted sender) smtp.mailfrom=linus.walleij@linaro.org; dmarc=pass (policy=none) header.from=linaro.org ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1746772170; 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=OpOGwKsGQAwt/jaQ6TfRTv/FeI2RdjXWwWmt/VQTSdrrPLyLpBvvRUxVhmh2u5+3zGm8Hb LGgPDMbjObwBdkj+79Hvc3UJ27sMhFQVPL++EUaCbChokk48Xhdu+5eK8Hhi7JT+6+kg2y HL5QWq9Y9qVOdY4xZZoPxF7VNy9MeCA= ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1746772170; a=rsa-sha256; cv=none; b=ZhVFvLwlBxJQSI1jZex0+Z/CwOA4+Tg6L4oenKVYvc8NcNjgloezBGUuHXgXvITscwkpF9 FUBeF33hUa0fol3dR8sfugxZafhxffosz0wjcE2kI5+PwSJhTGotTbalP/QdFpUp/yUC4a uo/nb8EC43DFJa1rfoWbt0r8J4kx94Q= ARC-Authentication-Results: i=1; imf05.hostedemail.com; dkim=pass header.d=linaro.org header.s=google header.b=fEkJYPJL; spf=pass (imf05.hostedemail.com: domain of linus.walleij@linaro.org designates 209.85.167.48 as permitted sender) smtp.mailfrom=linus.walleij@linaro.org; dmarc=pass (policy=none) header.from=linaro.org Received: by mail-lf1-f48.google.com with SMTP id 2adb3069b0e04-54d6f933152so2385242e87.1 for ; Thu, 08 May 2025 23:29:30 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1746772168; x=1747376968; 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=fEkJYPJLSoGlelnkZkTSaprF4C6/FveQtwRvtURZ9mtIgJlaQMeR+DBN64E9+LO9OH qjEObStEtIQVakUNizQ9jZsHdAeajwJRFo3uYL0DaHyk4uXKJK+T8b3joHGKH9RdgyJ+ o+6tDIr6sb5Pr+i9exeRymOfZ7v4wDG1iX+8xF/6lvNeaVYZ4vUCX0ttFprTZugfZTIz XzQ5QLHTUOpkDs6ED83HeF6/MHUQTWIdJgS5xRq+faye8pAV3JgjDbPJgeGuCHOEiKC6 38b2jYIPQiNRKxwb/eweoMVvj5jnFecKk+n6eBgsXU0gThL1HdaSQZ15ZIRjhqe121OK be1Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1746772168; x=1747376968; 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=k87rMi3nexwHH4p4LEtgHkDFNqpHuFaENlxW6Ho2R2NmBVr3Lt4BYhK9ttmWxxW2Vk yEKaStlftjXYQWyuhXueN4eBfu/J8iOtF92Wb7BcZy46BHd4R3uG0JqD0dYIQu6s7l/7 ONr7wPCyPh/4I7czfabvykV9+gQJ6H1veLZC+Ytp8PYKIz3JiTscra/dsDhqQdV/1tL/ J8l6Rr4MqonFd31u/w/olDeHEqN42bBVbxZLDb/PO8cR59dYao4VhFWEII6cILpGsqFi Yr5Q1Usfgr3E3w5LpvYkEdK0NPPDGCAyq2zQ5tRJTXv+G5EBmmLxc1FvT9LbIlrx6v4M D5GA== X-Forwarded-Encrypted: i=1; AJvYcCWL7IprvvJ4/dagWDOqzps8dIyZo5Fx3y89bOBjGWHW3kiZiA6Ayw+aAVCSwZpPky6dyWjk7PWI1g==@kvack.org X-Gm-Message-State: AOJu0Yz2ZCLENnjYb+rLSoXqnV8OoYfomCIO9BHLja55Jl6ISpqvuEKR 3Fv9X2uiXDNAuoWM5QwL+xn4lZbnZ3rTcObPZ2YapgMtzQd3TL+h/fZG1nsDnYdOt/ED/+O3D/0 5 X-Gm-Gg: ASbGncukiTzSA8SOfJNRt7WVXhrTqocW9tL2ICNs4WGj0mfFRuu9aXxrwjRng9LPVdw v9Uab0SJwm7PfgvzlUqtltITCjGOQl9HSt0501WPwSGj4NCMwrpFCDgHNqppdKCY9ar0m07Sc0r I5XQYacOulMeI4UEyTm7BmT/AYMDMmc93vMMmz3I/iOJ3O57JHOSej0Q9rYUJnYClu/QDQXLeMy yxY1PAHO/jWl4xvsnUCW5oKw2IdnIey/Y/rjiOorv89w3Xsg6rBwXiApYNk6F3oswm76HtuuwMx wMQeVF8oPR++HqUkAuduS9ISmJ6Ad7nwep/4QEOOUwtmzeM2k8c= X-Google-Smtp-Source: AGHT+IEuCU0J1PrFcCBwRBX6vnDBDVzHxgR+q5c1nRLSSpQ+u3L3A5ZoLOlcjal6LKFRc7BJojTgnQ== X-Received: by 2002:a05:6512:3091:b0:549:7354:e4d1 with SMTP id 2adb3069b0e04-54fc67e1f59mr621814e87.38.1746772168475; Thu, 08 May 2025 23:29:28 -0700 (PDT) Received: from [192.168.1.140] ([85.235.12.238]) by smtp.gmail.com with ESMTPSA id 2adb3069b0e04-54fc64b6dfdsm184223e87.117.2025.05.08.23.29.28 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 08 May 2025 23:29:28 -0700 (PDT) From: Linus Walleij Date: Fri, 09 May 2025 08:29:26 +0200 Subject: [PATCH v3 1/3] 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: <20250509-fork-fixes-v3-1-e6c69dd356f2@linaro.org> References: <20250509-fork-fixes-v3-0-e6c69dd356f2@linaro.org> In-Reply-To: <20250509-fork-fixes-v3-0-e6c69dd356f2@linaro.org> To: Andrew Morton , linux-mm@kvack.org, Pasha Tatashin , Mateusz Guzik Cc: Linus Walleij X-Mailer: b4 0.14.2 X-Stat-Signature: ekybqmirj1tu7r54fnqr6xu8oyhxfkf4 X-Rspamd-Queue-Id: 8E3B2100009 X-Rspam-User: X-Rspamd-Server: rspam02 X-HE-Tag: 1746772170-45037 X-HE-Meta: U2FsdGVkX19RXsRMxYr2/5n1OP+CmnQwbOi6cVFSQZRrFXJzkBTWE6GHSJykVoESFkN7INtgJJ4m64lB0soTIrhxhlxphngy16kLFAxFKCB/PeTNYm5NuxmMS/Rne+mN3kiYY2T6UzWLqDOunqrg6tOvhX1y28blEPxygXMBlxVKSdByKdPmvAh3DGXbVuBXf8RN+Ip8h4nnpWBBQ9Np6Alte8qlQ4Knl85mXNwy+DNgqACMluAdOClZUXvkkUum7hXRZMLGdssTFLuS6wWZz3ckTrwEqRfCbV83W5XQRJg5k0BH9uXMTex1kZO5lQfu7ZvABXQhe2eGsDLwAHiXLe2AZ6l9Sd5cdMtm0UqYyf01LNBOJ5DinFMEK1g2vXsU1v5wnvh21lpbzLdMXv3Wc+ADtad7eqdywmw6xpP9QCnoRzoIuf5gmz3N3oNPXymzVYGGeNk7Uhm1l/FLZUjyn/lSznAE820PjW0+VPA7L9XqhQqLCE19plFPmwTN+CzyS14vSb/F9763D51GGFXyiFg9E7AMXc7I0NcyBPrpq+4C/W0KuwmBcnW3XUj0yuGw4UZrCGQ3kvoDHssQ2ps8oJZCPFNt9KQDNJFNGrw6eTZtsbRS8HU8jX5uIWGzYkhmusQKPPYYM3Gan5uk/3GzpjAkMiQ+UVphszWqDthHX/rF5CpOfk0uJMjqMJ+5JXgQsEM3htxe6NdtPR1eh/sl3vFfhydlFP6kJOceVZ79LDx51YV9muQraC6S1T4JpPd7642jPdqeM3foiN+Tc7Dekzjo+0CUDGdlZARGAcP0a8FzkKlUSqwYutwOjEeZ9h3HCQQJkPpw8UrfnHXJg6tVz65qXTsS6+HooLI/Khfu/wpxqNg8mLRy3urWl97nCqzPNeivq+P/0yaBoNyMqup94qeuab+r/O2IZ4AS3VUUj/S9VNzITS5Zt1cEavD3hTfLz8nQF56yOMBHkdBEjya Io/eaJ6P tyqQrDD2XzCKEjDRVBcGQC4a9/b4OWq/fdv2507f18sHoEiUhNR+TnWjZzOeG8mWv5jR3PTVYfWFQU3ruEM5TlWTJKr0DB4LB55hKtMcyXUchVEeDlfkDcAAwIPKb1BFHUPBhhGG9Wvg/UXI5IE4Y173zYQ9osQs9GLABWfGj2UZyQL4PW3QIANvKLgBZI0QXmK+r2yr/6ZDRBn6NsV5qcVgIlEhqdwfpaDcfKrE/nX+vxLmMNTH1TwVpkMD5T5p2W4s1JO/x54G+SvjsVFS2i87s1jy48+uqUDtGidNiedxUDORRPYqpT4cLhrtOjRVO/mWzu0bGDETWcsR9+wdmtoXdrB/3d22Xb0CAUE8pT8A90RhRPlQ5i7X/saUZURwP08dEB4h95MVvoPaLNfy8AKNKPGA3lLcr0CVe 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