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 25080D60CEF for ; Tue, 19 Nov 2024 04:35:57 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 006806B0092; Mon, 18 Nov 2024 23:35:57 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id EF8D26B0093; Mon, 18 Nov 2024 23:35:56 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id DE7366B0095; Mon, 18 Nov 2024 23:35:56 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0013.hostedemail.com [216.40.44.13]) by kanga.kvack.org (Postfix) with ESMTP id BFC226B0092 for ; Mon, 18 Nov 2024 23:35:56 -0500 (EST) Received: from smtpin28.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay10.hostedemail.com (Postfix) with ESMTP id 25FFEC013A for ; Tue, 19 Nov 2024 04:35:56 +0000 (UTC) X-FDA: 82801581408.28.0A46523 Received: from casper.infradead.org (casper.infradead.org [90.155.50.34]) by imf27.hostedemail.com (Postfix) with ESMTP id D936740004 for ; Tue, 19 Nov 2024 04:35:00 +0000 (UTC) Authentication-Results: imf27.hostedemail.com; dkim=pass header.d=infradead.org header.s=casper.20170209 header.b=bD+Ns0SG; dmarc=none; spf=none (imf27.hostedemail.com: domain of willy@infradead.org has no SPF policy when checking 90.155.50.34) smtp.mailfrom=willy@infradead.org ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1731990888; a=rsa-sha256; cv=none; b=2IMLzvFv4aujD0K3dTTSxb9LzZ7E4MmoF9YOBS/qkhwF8yHa7JPvu46wT4RDmGAhfzjMuj P/dKd+q87qlR2169Vh6QFGfiXjJIuOLs2DEU0q0Zw6ItgvRCVCT8qxME5/ruVErpoBs23i ZBJ0ik8EpRzrHUUcwUx8P4dSwq4RuE0= ARC-Authentication-Results: i=1; imf27.hostedemail.com; dkim=pass header.d=infradead.org header.s=casper.20170209 header.b=bD+Ns0SG; dmarc=none; spf=none (imf27.hostedemail.com: domain of willy@infradead.org has no SPF policy when checking 90.155.50.34) smtp.mailfrom=willy@infradead.org ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1731990888; 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: in-reply-to:in-reply-to:references:references:dkim-signature; bh=NYXK4nFnPpYMEZT3S9Dt2971MXd1ugdi63573+G36wI=; b=fL/SaGgLpYya7BGGpqWSsfqf7lX+IkhBAiH0Qlm72FxM0+UxKDNl/O+1GvL+VPf37UYsXs lVD/V1t5khmfSjHIm8TyBnGZtw4TPxZ8WZCal5SgHYJFi1apRipLeMHjAP/0KjBJ/X3Ipa ljER6I1FHpOUX7/6kHShboqAPi4USmo= DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=casper.20170209; h=In-Reply-To:Content-Type:MIME-Version: References:Message-ID:Subject:Cc:To:From:Date:Sender:Reply-To: Content-Transfer-Encoding:Content-ID:Content-Description; bh=NYXK4nFnPpYMEZT3S9Dt2971MXd1ugdi63573+G36wI=; b=bD+Ns0SGIFFAmzjZjGEG4Gu05W It8124t3EJvCXRFnwEY80jO+xt9BaQXUIOlg8JeUjrIWZBcwda3PsMNFqMOjdeFeutEK0A/i2h/5h cusCExaBqIQWO/wJmf4Dy5pUFJDL7rFRItQbo4sz7dOWIC7T97B+Bt/UFrg+/qX8Gw8ykT5pPRYLo RFql7zmbxGE2EDJnO9/aOhf6JLOihccPny3t0K2D5BhPT1xU2FKuV4OFxY+GyiDW9YT3O2qv2HyTW Ui4ssg9GknGqiMqaNw82R3otvqJUDe5Ke6QSPaxdQ/3+Uwlbf/MY0TC2oLMRSraEnP0/XuGhYQ/2C sEJG6ksw==; Received: from willy by casper.infradead.org with local (Exim 4.98 #2 (Red Hat Linux)) id 1tDFxr-00000003gdx-1TVR; Tue, 19 Nov 2024 04:35:47 +0000 Date: Tue, 19 Nov 2024 04:35:47 +0000 From: Matthew Wilcox To: Andrew Morton Cc: Linus Torvalds , linux-mm@kvack.org, mm-commits@vger.kernel.org, linux-kernel@vger.kernel.org Subject: Re: [GIT PULL] MM updates for 6.13-rc1 Message-ID: References: <20241118193001.6aefcadd7426feafedf824e1@linux-foundation.org> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20241118193001.6aefcadd7426feafedf824e1@linux-foundation.org> X-Rspam-User: X-Rspamd-Queue-Id: D936740004 X-Rspamd-Server: rspam01 X-Stat-Signature: 5a5x698nr1jhd8r7gfs8ehch8rduadh7 X-HE-Tag: 1731990900-532069 X-HE-Meta: U2FsdGVkX18hdZyVKnJGvxsizTAMfxJ+Vnx7qV9K7RBusndWmLxNtpmmtN2Z58nKF4OjokEZhgtjhOtiunubdHHVG2ILC9dZb0PATnbvVfY+er3F5U6f5Z2Y8PMeJFskmW+PHd4DNhW1NttK/Y37FKHkuosIoL7dXm/W4Rd8/+NWlQqQ/216OfJqzWj8PDBhwQijfu0LVxi7X5b50F/Ttq6v+eYWuf3zcGBrkgsCP1HI/wej8t8u9k4x+jEOh6H1YB2u3H6y/j6Eh/lF2e+Mmgegap+GeSH+la9gRgAyu+fp6RYQcM3U7CMQBU/dm9Ahzu5CHqL9xpE5ERPrUuIDWOj1cRZoUqjdlFLmQ95xGNq/B702kUIB1TmPsz9dOCFPkYApPhlSz+XLQfpOWdD5SqasFux/S8pC1c/Y8yhbpm7LA8n/Y4Frah6/lq02jQZLtC61YgHhOpb7WMcOV4FJECS7FS/uhwaU4BA+72I31c9d0tcwxDuvHOkfEspVL0ktwUSDrvCQaTCccaTRMRJEn8w9n5HkFktZnUyF8y2g1OkKHOSqQFivRcGV+T9bt0JU2M2M1Sd4ZEMt2F+Hnh9ZAUhCjGyY9OQt/Iid4Qu9QNB/kN0/+PjN+yLzKBb2ykvqcFkkST41+kiOl/PSHJnswtg/BcY1oPYfAHqz0F9TG6KOwa0ATmiyshyduR6cRnPNABmh0PDiJMHEgy4CrX6/IpJ7tFaYO25T3iHBWbKEHFBkwTQs1W6cICr0IiGYphxPm+KPs4FUdGlEw1X26Ocbs2CcgI5RcJzHGWecBeLRhuZu8fuVyJZuQcYStczSGwbhjDgCBCnHroDikCgXF9JHK1ymSBSNpQ1u7x88QwT2S2qLg868aCQTZDrZUOwY4dk0dLmKaxd9eVh4/N3Z8ciSUQJ0k3f6f6sZz/K8SgB1vkBAfVmINOYVuAodBmcmcHkKTikv1ZvG2mcSY2UbUdn wvpHQBOs O3Rl8iu1sJhbLcdTRLDqPjq9S5LVpcSaBFC+tUMj1hhvxPenWbfG64db6ounANLTVYkTLTTd23nWDr3AwjqGN6sT0N8dBvEvGfDkO81QcZIUbwOfIItyPPkctXEa25Y78r8TydlwcCct8ajblNrE7YrFf1ClAlXyTEllbEbRIdn5lsAcm5MrvCPY07lIiHju8zM5e4WvFWWsLQqG6iddjHiTRa6lQkouSDi5BR9bVrrmpC9bLuMesCd7K1NH2ixj11ufVvaNucM/Yvyz2qPYq5/GVrMFXF18CbjRp 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: On Mon, Nov 18, 2024 at 07:30:01PM -0800, Andrew Morton wrote: > Matthew Wilcox (Oracle) (13): > ksm: use a folio in try_to_merge_one_page() > ksm: convert cmp_and_merge_page() to use a folio Unfortunately you left the crap patch in from Gaosheng. Linus, can you apply this fixup? >From 3d7e7319bbb3ced1dfb9c82bb7e8c7386380799b Mon Sep 17 00:00:00 2001 From: "Matthew Wilcox (Oracle)" Date: Mon, 18 Nov 2024 23:32:25 -0500 Subject: [PATCH] mm: Revert IS_ERR_OR_NULL check &foo->bar is address arithmetic, not a dereference of foo. Huawei engineers seem particularly prone to not knowing this. Signed-off-by: Matthew Wilcox (Oracle) --- mm/ksm.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/mm/ksm.c b/mm/ksm.c index 7ac59cde626c..31a9bc365437 100644 --- a/mm/ksm.c +++ b/mm/ksm.c @@ -2261,8 +2261,7 @@ static void cmp_and_merge_page(struct page *page, struct ksm_rmap_item *rmap_ite /* Start by searching for the folio in the stable tree */ kfolio = stable_tree_search(page); - if (!IS_ERR_OR_NULL(kfolio) && &kfolio->page == page && - rmap_item->head == stable_node) { + if (&kfolio->page == page && rmap_item->head == stable_node) { folio_put(kfolio); return; } -- 2.45.2