From patchwork Thu Apr 13 14:34:52 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Xiongwei Song X-Patchwork-Id: 13210360 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 847A8C77B61 for ; Thu, 13 Apr 2023 14:36:07 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 276E3900004; Thu, 13 Apr 2023 10:36:07 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 226166B007E; Thu, 13 Apr 2023 10:36:07 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 13C44900004; Thu, 13 Apr 2023 10:36:07 -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 02A296B007D for ; Thu, 13 Apr 2023 10:36:07 -0400 (EDT) Received: from smtpin30.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay10.hostedemail.com (Postfix) with ESMTP id CF241C0275 for ; Thu, 13 Apr 2023 14:36:06 +0000 (UTC) X-FDA: 80676617532.30.BF98B52 Received: from pv50p00im-ztdg10011301.me.com (pv50p00im-ztdg10011301.me.com [17.58.6.40]) by imf09.hostedemail.com (Postfix) with ESMTP id DA73A14000C for ; Thu, 13 Apr 2023 14:36:04 +0000 (UTC) Authentication-Results: imf09.hostedemail.com; dkim=pass header.d=me.com header.s=1a1hai header.b=JvOgqw6h; dmarc=pass (policy=quarantine) header.from=me.com; spf=pass (imf09.hostedemail.com: domain of sxwjean@me.com designates 17.58.6.40 as permitted sender) smtp.mailfrom=sxwjean@me.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1681396565; 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=MbAmcnG2CXhNY1EHnQtPRAGFD2rG2vh6+CqnhkUIkDg=; b=L5qhWX2CMu1soLK62rbJakKaqMBiUeirzLQ0IP89KmUK/yRs1lClSjPQVJGqwrJWYRXjQd 1geyseWb1k36zuiKm4OMTKmcyw1V3WCdMTTIR8Sg/QKBtmZt7MmIN56vPHh/oDiYnMJeHd HZXcOZ4PHmCcuUnxSajZ8xWbVucZ6VY= ARC-Authentication-Results: i=1; imf09.hostedemail.com; dkim=pass header.d=me.com header.s=1a1hai header.b=JvOgqw6h; dmarc=pass (policy=quarantine) header.from=me.com; spf=pass (imf09.hostedemail.com: domain of sxwjean@me.com designates 17.58.6.40 as permitted sender) smtp.mailfrom=sxwjean@me.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1681396565; a=rsa-sha256; cv=none; b=YWaCbS5LosDElVSMyY85VThqHE5g6JfyO96EztHkTXBtCdlocrrzPd2X0WWhAJJ/CACsI1 sFqqwuUd+omsRUozBwF5UI4byUpHWDHOzvhucM6QyhO4oS0mur+lHCJKBHhG+ulW1iB1FA uCVWUWVqkHEJDr/9nmA+qmXybZCjmYM= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=me.com; s=1a1hai; t=1681396563; bh=MbAmcnG2CXhNY1EHnQtPRAGFD2rG2vh6+CqnhkUIkDg=; h=From:To:Subject:Date:Message-Id:MIME-Version; b=JvOgqw6hQO6n706BQdyO1B5LykXqDdOsxC0Bat5AR7nSJZ3p1SJ3qIl3wSiTXSFyO wVvA9qtPK016jKajDu3n+P0tiMWM4FMq28xZnd7xUYbY/MPwODpTNsD7xkcEblz6Et QrfwEr+Zf5Tv3QDroo6WkXUc2MqwJ9yYBfeltVVuofA1zyEk+trEPIDlD20sMFsc85 AQr3Gqz4B7MNDCJ6Ei4lch97oAxilcSTnaezMb9H7+j6jJXRdeUUbIn1geZQpfs9sS ul0O/SS2Xizt0f0davmFhyeq88cIzma7kCuo0S8OQaGOjCHbSQJMWN7k/80Na58tgj XJl+AQFv11KZw== Received: from xiongwei.. (pv50p00im-dlb-asmtp-mailmevip.me.com [17.56.9.10]) by pv50p00im-ztdg10011301.me.com (Postfix) with ESMTPSA id A6CC818099F; Thu, 13 Apr 2023 14:35:56 +0000 (UTC) From: sxwjean@me.com To: cl@linux.com, penberg@kernel.org, rientjes@google.com, iamjoonsoo.kim@lge.com, akpm@linux-foundation.org, vbabka@suse.cz, roman.gushchin@linux.dev, 42.hyeyoo@gmail.com, keescook@chromium.org Cc: linux-mm@kvack.org, linux-kernel@vger.kernel.org, linux-hardening@vger.kernel.org, Xiongwei Song Subject: [PATCH 5/5] slub: Don't read nr_slabs and total_objects directly Date: Thu, 13 Apr 2023 22:34:52 +0800 Message-Id: <20230413143452.211250-6-sxwjean@me.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20230413143452.211250-1-sxwjean@me.com> References: <20230413143452.211250-1-sxwjean@me.com> MIME-Version: 1.0 X-Proofpoint-GUID: nAzode42SKfbD2lWdSEdjskVbXveXf7e X-Proofpoint-ORIG-GUID: nAzode42SKfbD2lWdSEdjskVbXveXf7e X-Proofpoint-Virus-Version: =?utf-8?q?vendor=3Dfsecure_engine=3D1=2E1=2E170-?= =?utf-8?q?22c6f66c430a71ce266a39bfe25bc2903e8d5c8f=3A6=2E0=2E517=2C18=2E0?= =?utf-8?q?=2E883=2C17=2E0=2E605=2E474=2E0000000_definitions=3D2022-06-21=5F?= =?utf-8?q?08=3A2022-06-21=5F01=2C2022-06-21=5F08=2C2020-01-23=5F02_signatur?= =?utf-8?q?es=3D0?= X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 spamscore=0 phishscore=0 clxscore=1015 bulkscore=0 malwarescore=0 adultscore=0 suspectscore=0 mlxlogscore=683 mlxscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2209130000 definitions=main-2304130130 X-Rspamd-Queue-Id: DA73A14000C X-Rspamd-Server: rspam09 X-Rspam-User: X-Stat-Signature: bywggqifrth5fxnm4s1i8hrg1wznbtfc X-HE-Tag: 1681396564-444023 X-HE-Meta: U2FsdGVkX1/JkEDo7UP9Dy1ki8f8pH67eXAOU1836VS2PTt4Iwz+JtwpYVzQ4iY8pCKIMLaC43/Sus/BdE66eqH9WK9jym6z2Bd4ms4vqaip89xfP32NnPrtpimCxqtSRFJW3NmOxS+gDZyfPvQM+mpKtxO72UuEc5SQUER/gYEs8+S/8CVawOdDP4m/10jx2eH5Ja0lu5luz8/GdqsGtHkUldx9p5QjkcLogb1C/6C2Xn41QYHyzWgiRNESg7SlwzuPbkRdrAiSSsPAvDTxFVqyJl9sbdi3s3JlJ9TxvZLY+5PU4vvkcspmD3VkqKELCkhnKY7rQK5pFIeVljGRM9KYurWQRMXi9wbbs4KhJz+o/Fkn/XXneBCUthSC9275YOGEv4baK6OlUsb0xwjHlNPvRMQ73+gzpyL55yHaAj7CzrWA4yjYFw+cT0Hkj/zE0xeINdERB0q/ti3DhkvJgZ/o+7jAAXJlyBYlw6ikTsMdg0Kfvyd5VkbdS62mJvF04IT1Cs/8EqVHk5KznW+FS1CNfPQt465JJhYBhr8Zfuz8+LIccN7YRJe6yanbq1SUT57ei2jo1J3D7IxCKU/T2SSsRuzDM9K6OOPgYiTinLZzhMxO9ycjyKADOUC5ZTx31ggpi5IcKdFmbkozLo4itOQ82gn7VlTgjqjZ3tG5sA6O3TyKDzHp0VymnxIpRNRgxn3qQOuX6CXpvwsnBqaiyjy1ZGCSQM2iIMmaqf47/iqHhrGEnhaZDlv0c+d1wTbEQ6eFRVADp8Wr+29JjnzAmdEoa6pWsZ/lWaAWEvTGtHcnMWLp+wylGoWovwdzREkUP8PGOG1jsdhk40UBgS/BeCfCCJgXal3JXdneidXHiF7oIwp37ixduaVSNkK9hvfpyXc0dSZkW4Xxmn/14pzBINLbDpjN8qMVunUbmz9Xn92FcYgNPpDG+OLoWMZFtH8GjQpClr8b3vzPLUyE0/s ZVu09E94 nq6S7DXnS8EwW5qT4d2pKB6XFTcr8vUyeyRmSsCPGEFY4qNXIx5LjMMbl5TR8nA7+bxDGzWncZfutPfOxBvV0/uH8XsEsfhA4xRiYGgy/eIX0UU9hK3vemSx0DomHZP5d5e+rypOW4085hgB91aHwfodjH3eTK070csQ+Vb3Kjfixa279qJQK+oBq6Wgk8GNixRg51w71XUu1aqsKFZM8VtM/LePKX4rJdm5afYS2Z/X7o1gU5Z/gtML1O/dYS8+oNYbIwplC6EXHtJ0LmaP5PEFGWfmurg+xOgUjBJTGfFP4mc2b2qn3FkdAvlJABXIu23HjXOemwgxuNtY/lLu9N6Q410YIOKk6irMk6V0BCPxPL+vxamfRkJWX2/QA6stcF/vSiekfCmzJsPM1wATRo6f97A== 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: Xiongwei Song We have node_nr_slabs() to read nr_slabs, node_nr_objs() to read total_objects in a kmem_cache_node, so no need to access the two members directly. Signed-off-by: Xiongwei Song --- mm/slub.c | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/mm/slub.c b/mm/slub.c index 33b4fec6bc7a..2c3af399d9d6 100644 --- a/mm/slub.c +++ b/mm/slub.c @@ -5157,9 +5157,9 @@ static int validate_slab_node(struct kmem_cache *s, validate_slab(s, slab, obj_map); count++; } - if (count != atomic_long_read(&n->nr_slabs)) { + if (count != node_nr_slabs(n)) { pr_err("SLUB: %s %ld slabs counted but counter=%ld\n", - s->name, count, atomic_long_read(&n->nr_slabs)); + s->name, count, node_nr_slabs(n)); slab_add_kunit_errors(); } @@ -5443,12 +5443,11 @@ static ssize_t show_slab_objects(struct kmem_cache *s, for_each_kmem_cache_node(s, node, n) { if (flags & SO_TOTAL) - x = atomic_long_read(&n->total_objects); + x = node_nr_objs(n); else if (flags & SO_OBJECTS) - x = atomic_long_read(&n->total_objects) - - count_partial(n, count_free); + x = node_nr_objs(n) - count_partial(n, count_free); else - x = atomic_long_read(&n->nr_slabs); + x = node_nr_slabs(n); total += x; nodes[node] += x; } @@ -6387,7 +6386,7 @@ static int slab_debug_trace_open(struct inode *inode, struct file *filep) unsigned long flags; struct slab *slab; - if (!atomic_long_read(&n->nr_slabs)) + if (!node_nr_slabs(n)) continue; spin_lock_irqsave(&n->list_lock, flags);