From patchwork Sat Oct 21 14:43:15 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Chengming Zhou X-Patchwork-Id: 13431527 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 90FCEC001E0 for ; Sat, 21 Oct 2023 14:44:22 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 2983E8E0005; Sat, 21 Oct 2023 10:44:22 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 248368D0008; Sat, 21 Oct 2023 10:44:22 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 0C2CC8E0005; Sat, 21 Oct 2023 10:44:22 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0011.hostedemail.com [216.40.44.11]) by kanga.kvack.org (Postfix) with ESMTP id EEB2D8D0008 for ; Sat, 21 Oct 2023 10:44:21 -0400 (EDT) Received: from smtpin10.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay02.hostedemail.com (Postfix) with ESMTP id C56661204D9 for ; Sat, 21 Oct 2023 14:44:21 +0000 (UTC) X-FDA: 81369739122.10.6BDE498 Received: from out-210.mta1.migadu.com (out-210.mta1.migadu.com [95.215.58.210]) by imf22.hostedemail.com (Postfix) with ESMTP id 22302C000E for ; Sat, 21 Oct 2023 14:44:19 +0000 (UTC) Authentication-Results: imf22.hostedemail.com; dkim=pass header.d=linux.dev header.s=key1 header.b=PRz3bzrm; spf=pass (imf22.hostedemail.com: domain of chengming.zhou@linux.dev designates 95.215.58.210 as permitted sender) smtp.mailfrom=chengming.zhou@linux.dev; dmarc=pass (policy=none) header.from=linux.dev ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1697899460; 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-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:dkim-signature; bh=nWmtXPvIlob45jfvRK/RuModS0a7G4PIYKuavHC2hOU=; b=jQ3sG+arjFhhqDZY53huny9XoC492sSDARFA22mmZp6qLQrOMnRny8NlG8vqZha1BKk5Qf iYVK5N8d474doNVgcX2QKYYmuynsaO6t0BLySiqpAJCGL3a/7Qq4kN0MKe0oMcXlAgTcWf T69PsPqU/glkPkljbKQ5rcqOADp/jLw= ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1697899460; a=rsa-sha256; cv=none; b=GgVNpcKczXPpXRwmq8vCwcdwPe91EkawJXvV8UeDLiViw2MfIbYobE22k2cOojhMPJyNH2 erQBoZ5S6dPRWokEikxW0iTGv+FV+hWqKS9Ug8Fu04/Cg7WqdDFOHNYMgd7KL6Cwm9K4HE UWtUUApCDxh48QbjW1ZSmnHJL7CT9nM= ARC-Authentication-Results: i=1; imf22.hostedemail.com; dkim=pass header.d=linux.dev header.s=key1 header.b=PRz3bzrm; spf=pass (imf22.hostedemail.com: domain of chengming.zhou@linux.dev designates 95.215.58.210 as permitted sender) smtp.mailfrom=chengming.zhou@linux.dev; dmarc=pass (policy=none) header.from=linux.dev X-Report-Abuse: Please report any abuse attempt to abuse@migadu.com and include these headers. DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linux.dev; s=key1; t=1697899458; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=nWmtXPvIlob45jfvRK/RuModS0a7G4PIYKuavHC2hOU=; b=PRz3bzrmS8EEMlbH+t4XO9cRe385YlpMQbBC+PJkV+mYGBOQDvOobTnnsiBIQwzbWk3dGH 53MwwtqQ/0FHj6idagxgeusX/wx+o/QH+LERI272V7ONmJtNIhQsZj5RYWyxmNgUWef9WU zq8+O024g84F8rDMjvJ1FPttWXr+WJw= From: chengming.zhou@linux.dev To: cl@linux.com, penberg@kernel.org Cc: rientjes@google.com, iamjoonsoo.kim@lge.com, akpm@linux-foundation.org, vbabka@suse.cz, roman.gushchin@linux.dev, 42.hyeyoo@gmail.com, willy@infradead.org, pcc@google.com, tytso@mit.edu, maz@kernel.org, ruansy.fnst@fujitsu.com, vishal.moola@gmail.com, lrh2000@pku.edu.cn, hughd@google.com, linux-kernel@vger.kernel.org, linux-mm@kvack.org, chengming.zhou@linux.dev, Chengming Zhou Subject: [RFC PATCH v2 4/6] slub: Simplify acquire_slab() Date: Sat, 21 Oct 2023 14:43:15 +0000 Message-Id: <20231021144317.3400916-5-chengming.zhou@linux.dev> In-Reply-To: <20231021144317.3400916-1-chengming.zhou@linux.dev> References: <20231021144317.3400916-1-chengming.zhou@linux.dev> MIME-Version: 1.0 X-Migadu-Flow: FLOW_OUT X-Rspamd-Queue-Id: 22302C000E X-Rspam-User: X-Rspamd-Server: rspam11 X-Stat-Signature: bpbruqjscanbqptgpzgftj7oshaczyz5 X-HE-Tag: 1697899459-255531 X-HE-Meta: U2FsdGVkX18LWs6aOhrx6HRXOEUa7jb2gy4kHDDJvDO+zj3CfHkUR3CPBG8ySWTDfERQaxygs0ds5tMJgU2I1jv3NqYeyBQThkf35JRTPlBphJDgJEoh91TLCKbh7yklq3A5h/wv+y7SejKDRM8nRK+AQq/pF6HkJCFwSX1KXXrutfigJPm7mkkSD1uGiilERyIQZQobwHv+PPhOyF57skToGb9ExNsERdFxebSQWzHVwc7kDA9FtPmRObhQXPdH7umQ/ciDYHSWprxXwR7CUcQdHmcw7GqlhtpfVtq3aglSCvfkf7/axIreJ/+YF4a2a454QYa935OBJGroIUbklXGWgHX25G4CBP6ZozSxREE9yeZdE/WZxj+0jC8hGWSwX2ETA5z4GEpwvjIoxOeSHhJegSK4XlQXEve89EfeQLDkG9k70+iFH5twWjcJ9WCmWAE9CTnOXfHG5hPNyQychowss/LC7WqFpclcnOdI/4324rFAS9qKEwVjh1ols2ko4g5wubDeo1BEpZvzJjbLHxQ0mXSKqkyDfd7ljn4qlJJ59tZxODI0Bj4fHDLVHjjwq+1gaqE+tI/ES88sbrp2uuoQLWnGtTK18IrcE+4yUPzX/FS3NTcRwvrBnzpH5kG1U7MYsb+3QgQPnX6W7bV6QD7BAszqEOl0jUi3aL+A0vlVwwqaWJHUiXCO03G7qOkQEy4PikCqN5WEivyh6n8rF/FryJFr3ITc5ca/Zb3UqakjoNlhr0relYPtXvO5KZec1CztbMlGxQlaAHOpr113bBkOUNr3qr841pQibdJfXFjRdYNR8g21yqAAn2YupiDEGYDI5dk9NKI1CNof4IY/ybbiyISb9vujVgpNgBOdJGK9QlcgSk9N1yagoC8K/3zl4YmuE0cwaCzi3syqt4VA+BUP9zvS6/FAIXKkurRsCEmHHTiN3kAkG8BBi9lWfYFUDn9hPqBNMZ2P102lHrO OAKP189J erkn+42FB7oiVosOQymQ6cfavQdm8/35GfXwVks/NzLiJwFSRh6uBa+n+SApXrLsIDCbM0j3SwqpIBdYRVMocU/gWROPFr93wznCzFonnsIVncKPcwNR0y77wU2ATYQ0Dvwfbr0hKZfYBPXoE6JOZOW3pmetgiPYlPIXNQ6hLV2TO0FN4bQ2LUIyWrwnlQamzm2a+LlytCv23EUsHlPx7yGcybEbN4VLxxP+721u0En4UGbc98iL2BcQwSnolunJAxziP 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: From: Chengming Zhou Now the object == NULL is always true, simplify acquire_slab(). Signed-off-by: Chengming Zhou --- mm/slub.c | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) diff --git a/mm/slub.c b/mm/slub.c index 61ee82ea21b6..9f0b80fefc70 100644 --- a/mm/slub.c +++ b/mm/slub.c @@ -2222,8 +2222,7 @@ static void *alloc_single_from_new_slab(struct kmem_cache *s, * Returns a list of objects or NULL if it fails. */ static inline void *acquire_slab(struct kmem_cache *s, - struct kmem_cache_node *n, struct slab *slab, - int mode) + struct kmem_cache_node *n, struct slab *slab) { void *freelist; unsigned long counters; @@ -2239,12 +2238,8 @@ static inline void *acquire_slab(struct kmem_cache *s, freelist = slab->freelist; counters = slab->counters; new.counters = counters; - if (mode) { - new.inuse = slab->objects; - new.freelist = NULL; - } else { - new.freelist = freelist; - } + new.inuse = slab->objects; + new.freelist = NULL; VM_BUG_ON(new.frozen); new.frozen = 1; @@ -2306,7 +2301,7 @@ static void *get_partial_node(struct kmem_cache *s, struct kmem_cache_node *n, } if (!object) { - t = acquire_slab(s, n, slab, object == NULL); + t = acquire_slab(s, n, slab); if (t) { *pc->slab = slab; stat(s, ALLOC_FROM_PARTIAL);