From patchwork Tue Jun 20 19:38:28 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrew Morton X-Patchwork-Id: 13286373 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 B3B96EB64D8 for ; Tue, 20 Jun 2023 19:38:33 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 24D558D0002; Tue, 20 Jun 2023 15:38:33 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 1FCB48D0001; Tue, 20 Jun 2023 15:38:33 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 0ECAB8D0002; Tue, 20 Jun 2023 15:38:33 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0014.hostedemail.com [216.40.44.14]) by kanga.kvack.org (Postfix) with ESMTP id 00B538D0001 for ; Tue, 20 Jun 2023 15:38:32 -0400 (EDT) Received: from smtpin14.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay04.hostedemail.com (Postfix) with ESMTP id BAA9D1A064B for ; Tue, 20 Jun 2023 19:38:32 +0000 (UTC) X-FDA: 80924138064.14.9ACFF65 Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by imf25.hostedemail.com (Postfix) with ESMTP id 1D5A0A0005 for ; Tue, 20 Jun 2023 19:38:30 +0000 (UTC) Authentication-Results: imf25.hostedemail.com; dkim=pass header.d=linux-foundation.org header.s=korg header.b=v4aSTvcV; dmarc=none; spf=pass (imf25.hostedemail.com: domain of akpm@linux-foundation.org designates 139.178.84.217 as permitted sender) smtp.mailfrom=akpm@linux-foundation.org ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1687289911; a=rsa-sha256; cv=none; b=n3hBjnNRQl0/Ss4278elZfFSCJ0dtb/hWEABePH+eJctIspWd3G/7NZNThiB9bASVXPjaO J/9T2qcFcCNN8ZdS3qjB5y5YKq3Q3E6Bdo140qhHLKoChjO0yyLqTrXMkuOJhz2jfdQNRi zxtFgKtJJi/BCkpNgeA6pdh/EvfC300= ARC-Authentication-Results: i=1; imf25.hostedemail.com; dkim=pass header.d=linux-foundation.org header.s=korg header.b=v4aSTvcV; dmarc=none; spf=pass (imf25.hostedemail.com: domain of akpm@linux-foundation.org designates 139.178.84.217 as permitted sender) smtp.mailfrom=akpm@linux-foundation.org ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1687289911; 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: references:dkim-signature; bh=h1L0Kpuom+Gwf1OU5fyjASq5ZE8sIWrID1IZFwx9yzA=; b=vRwuQfR7NPlGpPfjkzTFDZQPHepPH/qbS9GS3s/AkTwKLoY2OloJJYvDbRXwpL3OVskYSQ FLx7vEb5hzsCcZug/7cf7aDAaf/+jJ7pVfLy+OM1jZ7sOuUdgzyx4rFhDWL2LeH6rI3X6s jtr14sREr3oLuXqIbUUUab61zTWzLSQ= Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id F27E8601D6; Tue, 20 Jun 2023 19:38:29 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 45C18C433C8; Tue, 20 Jun 2023 19:38:29 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linux-foundation.org; s=korg; t=1687289909; bh=MMluyfwA1vD8Mi/bjHxE0Sq0bwvjuec9WKzPP/4G8B8=; h=Date:From:To:Cc:Subject:From; b=v4aSTvcVr+uM2h/Zrc+wiaTGrFuUhBhUccPLCwcRpN7Hyz2EOr2ZmTXLs6ctoaKT6 E3bAyNxz0zFZCg+UunfyxW7IyEAqTyW3q9Oc4sby5ThdH96Kdx7mp0LZMl5sNLxR8T XW7IluujfnJ79oMMggVYZLt7Z5Ip/SInCGtOUAYQ= Date: Tue, 20 Jun 2023 12:38:28 -0700 From: Andrew Morton To: Linus Torvalds Cc: linux-mm@kvack.org, linux-kernel@vger.kernel.org, mm-commits@vger.kernel.org Subject: [GIT PULL] hotfixes against 6.4-rc7 Message-Id: <20230620123828.813b1140d9c13af900e8edb3@linux-foundation.org> X-Mailer: Sylpheed 3.8.0beta1 (GTK+ 2.24.33; x86_64-pc-linux-gnu) Mime-Version: 1.0 X-Rspam-User: X-Rspamd-Server: rspam06 X-Rspamd-Queue-Id: 1D5A0A0005 X-Stat-Signature: zwrhh8ouem7jowohgh69z95adxu4bt69 X-HE-Tag: 1687289910-225356 X-HE-Meta: U2FsdGVkX18Rx6+56DKylLLsU4VXRNgRwLOQLf8wSD8P2vrPe3+iSuzfB14dIuD12UXNcE2V/0K+G5TTfSOd0hLZdNvGdJwbP70PddsCUZq9/vFF3A7VfvBWgtSq5GN6cHTEXV7p3cl4SUZvCnKFXtpYDXTnOio2uxYrdNnTrgJqRvktrpT9ySlvRDNd9/oxJqqYKHysEIbFOCn7TBqwtDVKgMv3ABeGzBQvCmMpTFdLLj2NzJzEU2IC4TP5rJn2ZFCM/2r0U3QGm92UPobixePPZczV6O9RifTlExVEszgU0QZLm+VO/1x7FQHw+4AUjjBwEFr0wSqELNZ6l63vfqzWpHaeDNK6QRY0oVXEErxTO+kH3gBhCZmhhMmQBLwG4fV3slFGqYI1PT3dNcFBzYvFGDRIkQMiokvDXZWX68+FlypC9KCzFnCziJWK0dQL97q2tn5Ow6YI3La29K9SlnwMl/vAZmVvPhfww0juCwAvy8qhJLo4uwdt4t91fAPSgjIMjn0fO1tgHTOc+MFejU5yJcMlpuwI2p2r/s6UvWHbYr6xZZoDzxX4ykDJHAY/Jh5Vy+07/LTry4q/kt8BBXra7sWROwFVv7P9fAkQ97zvq7D3TiMP/JrEZMWa7uKpTa7f5iB0n4KmsKirxbdeb31pL/Cvn9f8LwNtI8nejxDKwMz4uKqg0OAmVRZPYFnw0YZvwpbpKuo+kMvskfzjQKTTuBLmZeWNc/UVNkBPJSNEaYoSYPfb/yycg69V18/D4iLd5ATLhgBHc8zkIhj4HNhZy/IgypL/CV1T52V0asZ3ckVEURc8t+2RQHfMdiMgCdaaPM1utUuuWcAs192xc04Jz04eo+mCZylmpw84XF9z7hEwO1NgbYLbbK28aFKLcNh7+knrnKlIK3jWkgfpfCFecRLz/0EU7GQVpIrOpAfNIZT97XbIRFICHImfJ1NXCTSO2uvGuWhhcqXymXj 4l63QZw5 2KaHw4lxcDwhD9wn7Tje2lrEopLx/Q2UQZEI4+4if3Apd8lV/vmFVGzTMPv7wjYJmB+EAiXagJA4DzDgKKwSn25zvNmtq0GF+AOUVHHhg8lyOE3oh9HvGlCVnhfw5HlazprHw9CxCn+FZUJ6gefDS+7Er7xwLEi5lSXcqGFfgk/aXA1/vowvgJFQ2eFbur7hxsHpx7k78DaEJbyUS9eokrR9geGV1ozJQI5Jl0409zs0NUnxXgtxndRfbFVyLfNfsWUIegQyN8CpFZrzSp1bl9QuZPQ/sBW/NoeEO/IFr+344xyihTn9zhB61tysPdlAUBeeVrNXbEMzefQMjviWMscRICwLp4PR/KbJrbNwDvfp1GOI2KM1w4MzjrAvupdHcuFWx 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: Linus, please merge this batch of hotfixes, thanks. The following changes since commit 0bdf0efa180a9cb1361cbded4e2260a49306ac89: zswap: do not shrink if cgroup may not zswap (2023-06-12 11:31:52 -0700) are available in the Git repository at: git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm tags/mm-hotfixes-stable-2023-06-20-12-31 for you to fetch changes up to 0518dbe97fe629fea255318841cf3ef1b4532d66: selftests/mm: fix cross compilation with LLVM (2023-06-19 13:19:35 -0700) ---------------------------------------------------------------- 19 hotfixes. 8 of these are cc:stable. This includes a wholesale reversion of the post-6.4 series "make slab shrink lockless". After input from Dave Chinner it has been decided that we should go a different way. Thread starts at https://lkml.kernel.org/r/ZH6K0McWBeCjaf16@dread.disaster.area. ---------------------------------------------------------------- Ben Dooks (1): mailmap: add entries for Ben Dooks David Stevens (1): mm/khugepaged: fix iteration in collapse_file Florian Fainelli (1): scripts/gdb: fix SB_* constants parsing Liam R. Howlett (1): mm/mprotect: fix do_mprotect_pkey() limit check Lorenzo Stoakes (1): mm/vmalloc: do not output a spurious warning when huge vmalloc() fails Mark Brown (1): selftests/mm: fix cross compilation with LLVM Mike Kravetz (1): udmabuf: revert 'Add support for mapping hugepages (v4)' Prathu Baronia (1): scripts: fix the gfp flags header path in gfp-translate Qi Zheng (7): Revert "mm: shrinkers: convert shrinker_rwsem to mutex" Revert "mm: vmscan: remove shrinker_rwsem from synchronize_shrinkers()" Revert "mm: vmscan: hold write lock to reparent shrinker nr_deferred" Revert "mm: shrinkers: make count and scan in shrinker debugfs lockless" Revert "mm: vmscan: add shrinker_srcu_generation" Revert "mm: vmscan: make memcg slab shrink lockless" Revert "mm: vmscan: make global slab shrink lockless" Rafael Aquini (1): writeback: fix dereferencing NULL mapping->host on writeback_page_template Roberto Sassu (1): memfd: check for non-NULL file_seals in memfd_create() syscall Ryusuke Konishi (2): nilfs2: fix buffer corruption due to concurrent device reads nilfs2: prevent general protection fault in nilfs_clear_dirty_page() .mailmap | 2 + drivers/dma-buf/udmabuf.c | 47 ++------------ drivers/md/dm-cache-metadata.c | 2 +- drivers/md/dm-thin-metadata.c | 2 +- fs/nilfs2/page.c | 10 ++- fs/nilfs2/segbuf.c | 6 ++ fs/nilfs2/segment.c | 7 ++ fs/nilfs2/super.c | 23 ++++++- fs/super.c | 2 +- include/trace/events/writeback.h | 2 +- mm/khugepaged.c | 1 - mm/memfd.c | 9 ++- mm/mprotect.c | 2 +- mm/shrinker_debug.c | 39 ++++++----- mm/vmalloc.c | 17 +++-- mm/vmscan.c | 125 ++++++++++++++++-------------------- scripts/gdb/linux/constants.py.in | 12 ++-- scripts/gfp-translate | 6 +- tools/testing/selftests/mm/Makefile | 13 ++-- 19 files changed, 172 insertions(+), 155 deletions(-)