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 CB67EE65D25 for ; Fri, 22 Nov 2024 05:42:39 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id CE20E8D0008; Fri, 22 Nov 2024 00:42:38 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id C91B18D0007; Fri, 22 Nov 2024 00:42:38 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id B80608D0008; Fri, 22 Nov 2024 00:42:38 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0017.hostedemail.com [216.40.44.17]) by kanga.kvack.org (Postfix) with ESMTP id 9A1378D0007 for ; Fri, 22 Nov 2024 00:42:38 -0500 (EST) Received: from smtpin12.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay06.hostedemail.com (Postfix) with ESMTP id 0F08FAF08B for ; Fri, 22 Nov 2024 05:42:38 +0000 (UTC) X-FDA: 82812634842.12.13A0DFA Received: from nyc.source.kernel.org (nyc.source.kernel.org [147.75.193.91]) by imf01.hostedemail.com (Postfix) with ESMTP id CC8D940005 for ; Fri, 22 Nov 2024 05:41:54 +0000 (UTC) Authentication-Results: imf01.hostedemail.com; dkim=pass header.d=linux-foundation.org header.s=korg header.b=jpMFcOGV; spf=pass (imf01.hostedemail.com: domain of akpm@linux-foundation.org designates 147.75.193.91 as permitted sender) smtp.mailfrom=akpm@linux-foundation.org; dmarc=none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1732253908; 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=KTGL3gYaTqxsFpyJnWm9ZHXYwt/O2VVNh9LLFokA6os=; b=nY/DRjj3qVo49w8IN8y+UNAyyGnqR7YD9xCQc4xkitvKCmdHP0vqxzpHBY9KF6j553BOPG euxv7qC2DiVUeLcC7bi9Nnw4O6GlPxa0pP/5UW3/8617+HkCW3OjORGrrggKXaS2d9tS2/ cvDe6zexpDkrdaMc6MCm0L0jBIOVVMM= ARC-Authentication-Results: i=1; imf01.hostedemail.com; dkim=pass header.d=linux-foundation.org header.s=korg header.b=jpMFcOGV; spf=pass (imf01.hostedemail.com: domain of akpm@linux-foundation.org designates 147.75.193.91 as permitted sender) smtp.mailfrom=akpm@linux-foundation.org; dmarc=none ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1732253908; a=rsa-sha256; cv=none; b=BGLEI/BKTTfjNuj1SXoVMYobepWWTg46Lp4kGdvWVtqZ71c29nRkK64FBoicb1O0U89B0S ry4NfjKdOWvXki7fGYZLX3+v9MyT5oTecEutIqgFwB7ow/v75wWbLtSr8N/19JMa/ckgoE Dhj1w8As9QHdLVwub3b+vStyGBzethY= Received: from smtp.kernel.org (transwarp.subspace.kernel.org [100.75.92.58]) by nyc.source.kernel.org (Postfix) with ESMTP id 12A11A40128; Fri, 22 Nov 2024 05:40:42 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 0BFE5C4CECE; Fri, 22 Nov 2024 05:42:32 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linux-foundation.org; s=korg; t=1732254155; bh=NWopFJbUd56WuHEPeK22+c6oGsR2DCkaOH6RGADlLcA=; h=Date:From:To:Cc:Subject:In-Reply-To:References:From; b=jpMFcOGV2Xxj5FeCYuQc8wblX63XQFm8f5ScmcNMYhyFCQ8RKRRGIUmaPiYGf0caU Uuo+uFDu+gnhAPBh+ftWjk7yOXWoJ9dG8vtqYz9nvZUyq6sLIyCy3DbjnOEaHKuFjc pafWiWkW564hP4cMIIOBO4tEuiW8z+O7jo/wjMk0= Date: Thu, 21 Nov 2024 21:42:29 -0800 From: Andrew Morton To: Matthew Wilcox 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: <20241121214229.8fe091954f9bf0d26f54ed88@linux-foundation.org> In-Reply-To: References: <20241118193001.6aefcadd7426feafedf824e1@linux-foundation.org> X-Mailer: Sylpheed 3.7.0 (GTK+ 2.24.33; x86_64-pc-linux-gnu) Mime-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit X-Rspamd-Server: rspam06 X-Rspamd-Queue-Id: CC8D940005 X-Stat-Signature: r1dgeyjdnogahrhtq5csy5bgd3fnk1ns X-Rspam-User: X-HE-Tag: 1732254114-593305 X-HE-Meta: U2FsdGVkX184bEWLGH9kpvncc+zwxdgbBDB/QLVDTTC8NjAu1lQpoNCprWV4xjLQd/X2MNoNS9sU+v/JcP3DY0qUjp5LYlLHNC3+SedcFsMHGFwb3oUTsWzvg168oCPGh0A0ZQflxwJ7LYRQDMizkXVCNlIppx+QmIY6ILRBf1g0I/Ssywl/zhn0cWumlFmBylfW6j2bcQvSNIc055k8u7e4d+h4oBxqUwE/PvUKxLshELZ/pjAv72AWaxZs8RVYmCBh9mpB4Z3y1Wzzbvnva8KJZgP+4w0B2LCxs0MYslfX4Q2Q6Hng3FM85NQy6JjbkujKDb28uDZvow6p1H7GaZ6HzrFuTZPxInlN9dF/Bk8QuYGg/Rt7t2KDB+kjHDKjrEVkK9nmVHYNXwp1R4o75BxEKGuwubhY0OivAv/JDVSkoVIK9Q34HOyYK9x7rSNDFPobIPkdnDfas0bREiLjengsDGSANoMZIjbnYqVSsalCkydluZWjZwKwvK5WF4v9vKXNMx4YYbKxG4+qAtrjZv1RRPvR7rpV3zBfL53K1zFxXLrLmq6iLdp6Gzf+CTVvxIS+g4csNthhjyTCuK/WzDwqObAqTq8JjxwACJPMsdRE14qM3ejAi2rS5GzdgYJ4LwgQN3Qm30CgeKtNj4PUBCKtyySEQ6u5P036//hL6MdiqIsCNhL9lTGRGss+3uW+Ei4u4uzNHl7GbRPtNIN4y5cxGavwroVhI1xY1FAKsH66y5v6rA63dCT/fn91Oesr9KT3BmulnB8p5tlpEeiOnYak8vlTnAOhpR49IEAjqqpOdggTiw9tIBH2UypaD5KBz4F4qD+1wtrNUg3c3+fTanqTeLQCBgdXvY99tSbz8gt6sJFpdi7oIwdi45x9jcxVvBaXNBhOxB83l2AQ8isdugBBYvMKx1JflQla6XvBtSkBdSLu4wcb/5J801fHjIc5AV83rXzezcKrI6MgMo4 YaWnJvOX W7VxJ3waJot08mXfpQCh3OKz/wgXJXvGfnqoEMgH64LSAOPI+33BcYJRPVDz3h3l6vP9BkjDfFcUAsKhiEYm2Qjiz6OCQZq9eD4Is5W+92HMXmpbOC/jQXOmEosZCEVQpbcd0qsUdmSLNhnEo20jxYdAlxIqHlOgKdAmR3BIwkT5We8XQC3FxzJG/rDTcEqRb586dA4uO6TtwCPhKvw45YD4DbN+rnuvECANpeyDx5F6r/ct9/fe9sV/bIfn5PcmK1Sk5DHMzMk4DiQ7DhQtUxzi4ao0FBkd6f29+WdWsHsiWwmp4CNdvfpNEBSZlRDMVn5UHRopZzc5aLBaO83uZnIR9KHjlhIeFcI1k 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 Tue, 19 Nov 2024 04:35:47 +0000 Matthew Wilcox wrote: > 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. It isn't only Huawai people. David acked Gaosheng's patch and it snuck past me (again). People keep on getting tricked by this idiom and I think we'd be better off with some nicely named wrapper to help readers understand what's going on. > --- 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; > } Linus has already asked us to avoid this "funky sh*t": https://lkml.kernel.org/r/CAHk-=wicaWSn3JLwpexH=gu1HoHWpecyWoLYBwD3qPd0-t9aJA@mail.gmail.com