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 BCF7CC3ABB9 for ; Mon, 5 May 2025 19:35:25 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 5C4DE6B009B; Mon, 5 May 2025 15:35:24 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 54F126B009C; Mon, 5 May 2025 15:35:24 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 3F0B36B009D; Mon, 5 May 2025 15:35:24 -0400 (EDT) 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 1935F6B009B for ; Mon, 5 May 2025 15:35:24 -0400 (EDT) Received: from smtpin22.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay01.hostedemail.com (Postfix) with ESMTP id 93D4F1CC852 for ; Mon, 5 May 2025 19:35:24 +0000 (UTC) X-FDA: 83409858168.22.F472C86 Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by imf15.hostedemail.com (Postfix) with ESMTP id DCAD2A000F for ; Mon, 5 May 2025 19:35:22 +0000 (UTC) Authentication-Results: imf15.hostedemail.com; dkim=pass header.d=kernel.org header.s=k20201202 header.b=WMWv89U6; dmarc=pass (policy=quarantine) header.from=kernel.org; spf=pass (imf15.hostedemail.com: domain of mcgrof@kernel.org designates 139.178.84.217 as permitted sender) smtp.mailfrom=mcgrof@kernel.org ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1746473723; a=rsa-sha256; cv=none; b=Ag9HG7IcPAXFi/Ddo8k8chNuF00gTnbWtZVKcr1YpbJe9Yk8qsOxZMEgoT6ZoywJZxIj+V thIHLLfDlf3F3he39+nEAqyfJ4dGXOh0SYq/IL8nF9pM8EA+aU/AeR6j/RDGLEBL5/ihj3 I/LifJbc7nD9uctZp6TWAmdDFrkg3SA= ARC-Authentication-Results: i=1; imf15.hostedemail.com; dkim=pass header.d=kernel.org header.s=k20201202 header.b=WMWv89U6; dmarc=pass (policy=quarantine) header.from=kernel.org; spf=pass (imf15.hostedemail.com: domain of mcgrof@kernel.org designates 139.178.84.217 as permitted sender) smtp.mailfrom=mcgrof@kernel.org ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1746473723; 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=bUXrsrz/9zbrdk02fAXf9U8mjqH5dSi42GJkRJsLMio=; b=yM/muKKJamvnkUT5DD5pakyhn4M6Hx6yg5OVx8HXL83gVMFwcEmyH/e0ih2KP4ZQ8n+Xh9 yYLoeEM2cKgrzsosL4wh3I+RzUq0r4dfNaDDkSvsU0PHQax6HUCQoR5v6jjdzZLjDr1Vf1 dhxP2OEu6ZutVMnFFRnN4qxW1ZWUT+4= Received: from smtp.kernel.org (transwarp.subspace.kernel.org [100.75.92.58]) by dfw.source.kernel.org (Postfix) with ESMTP id 625655C594B; Mon, 5 May 2025 19:33:04 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 0FE68C4CEE4; Mon, 5 May 2025 19:35:21 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1746473721; bh=kkVGLS5k8ofegIDhfT5iFiahxbKTEbpN7507mhzkw3k=; h=Date:From:To:Cc:Subject:References:In-Reply-To:From; b=WMWv89U6riQOg0Z7sRsgfFg/QNM6QL8JKKlbKGR9I/ualu31CVxgMhqjNat+xeidx vI7vJ5QeO2CBwinrGlGSc/S5FIW9A4qrtPWbPzcBX5QlxEHlVjHY7AT+PgM9iMrr3X 51Z8YyBZ68t/1GuxeZD2ghFHd+AuZCcj1+HF1A+XqHSXiHloGCSADphdQ4SCszwYAx /pg6hf0Ftjclu36skX8o/ORuzqwep//Xa/lNbjQF8TpzcCF48rhFmvygMhNjxpNow2 0bHUuCdMtSIdOGrg8fBLbntRGHTCggDRBz1UedOQEALdvYVKwK5OzEA5ZP0RnMbQPy XJp7go4YHbFAw== Date: Mon, 5 May 2025 12:35:19 -0700 From: Luis Chamberlain To: Christian Brauner Cc: akpm@linux-foundation.org, linux-fsdevel@vger.kernel.org, linux-block@vger.kernel.org, linux-mm@kvack.org, gost.dev@samsung.com, p.raghav@samsung.com, da.gomez@samsung.com Subject: [PATCH v2] swapfile: disable swapon for bs > ps devices Message-ID: References: <20250502231309.766016-1-mcgrof@kernel.org> <20250505-schildern-wolfsrudel-6d867c48f9db@brauner> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20250505-schildern-wolfsrudel-6d867c48f9db@brauner> X-Rspam-User: X-Rspamd-Queue-Id: DCAD2A000F X-Rspamd-Server: rspam04 X-Stat-Signature: 8uz9nsr1o8zwh6wc17fpabx9x64r515d X-HE-Tag: 1746473722-380856 X-HE-Meta: U2FsdGVkX18AQcAaJBQ7HLWiSoK+02T+ZW++zS+6wqbQslEDQ1ACH05APAh9a9ia02GlL6NIPt4Y60kLZORKlGAXx5iwMVDcb5hbUG8Nt61XVi63IMiI6Ay+Ko/L7ObhY8aYy/usFJY73Ox3wuElb5XY1xP8d27S6Kn2jh54nFrYGDGDIBz/8uMr2YhEHVGlBElMyLqWKttbfDHaeIINgBuMsMdG+GDpBTq1tkL9IeIJy4Myk9n78djN7dLUrR3AKAfkMPCH0uVPBulB1wbu0WwsG470EJSRFQRz1AfWY73B65j1JbuiruHlRp6hWvV1zV4OtQ5M62EqXnTp/VzaqVankqcCrXvSDw0TYW6YU/GAfkNXYe3qC4OgyW+dguNR9mpW51d4in8xF+IOXQrOCC5WqDHLBL9YcdAxez4WHsR/40dU1GfMgbQuU438f4W76/axq+mLD112t1Yry4tatKHhrEdkt7QfQ74fEKXDwGJwRUHkvHV5cs12azXE0ZD3pWcEvxMmC6YpGlXw3HPDKRC8CZ/kSbckDiLu5hlD6y5T1q3GJp/vKJT5s/iiZVTv7UL4yyjrTUsiM5RT7K5KorbFBn6U6YG5v+FuQhqwT92hZvI3pWRDFTBcvmb00g3qZYj/5IYge52lJjkWUP+cxBN91ZnZLWpFNb68nShFiU9LsqWIXC8GWlNAIxmyuMX9CnhnChA8mJgSQNHTXUfUbmERmImdsjvoSANWiyCFfjDBOb885mGDFQCviJUiqbqIJDBMyFAcDAH4L1RlHrQmMMNVSdX71sp2oBApNkhnS8/lyQJQEx7iAVEo+YvlgWw2kNJQiLT7FvPeH4mUYA6kiU+0wUkz0ZZGDURSJISz07w/kRNGyX1kXsSVyyprzeqS/PBCrA50u4WFZfvqG4HHDY+l+l7ypcmkso5dyVsy6qlrVJNbP2woeWq+aAhRwXmxrBRJBivUvhm8l6olaCQ 5UDDR13D Rj+Bmh/ry8timeX6YpZ0ry2SvrDPCt5Xh4FZQyTz6tDACgPwbjokuf8zbacUbtFNuVsKCsRTAF0uMZ5CqQqERixCRCi99cz0hMBYbhIPkRdXoG64aA68G80kzF4Jq/Grl5VQlaKVkc+ovGaq49JLOQq7jKXiBN9agxe2Nb6C+StXVLZg6f195TSHsbaN4B2s50AvKdDA0577ETDiDtnXvk3U2figa+r50s5Vven53EkvdF5EO7Kxph1l3n+dTsptEE/+7lpbD0+2b4vrbYKwekxALIQOkUuwClFvlwGONMTxMazo= 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: Devices which have a requirement for bs > ps cannot be supported for swap as swap still needs work. Now that the block device cache sets the min order for block devices we need this stop gap otherwise all swap operations are rejected. Without this you'll end up with errors on these devices as the swap code still needs much love to support min order. With this we at least now put a stop gap of its use, until the swap subsystem completes its major overhaul: mkswap: /dev/nvme3n1: warning: wiping old swap signature. Setting up swapspace version 1, size = 100 GiB (107374178304 bytes) no label, UUID=6af76b5c-7e7b-4902-b7f7-4c24dde6fa36 swapon: /dev/nvme3n1: swapon failed: Invalid argument Reviewed-by: Davidlohr Bueso Signed-off-by: Luis Chamberlain --- mm/swapfile.c | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/mm/swapfile.c b/mm/swapfile.c index 2eff8b51a945..9e49875ca1fd 100644 --- a/mm/swapfile.c +++ b/mm/swapfile.c @@ -3322,6 +3322,15 @@ SYSCALL_DEFINE2(swapon, const char __user *, specialfile, int, swap_flags) goto bad_swap_unlock_inode; } + /* + * The swap subsystem needs a major overhaul to support this. + * It doesn't work yet so just disable it for now. + */ + if (mapping_min_folio_order(mapping) > 0) { + error = -EINVAL; + goto bad_swap_unlock_inode; + } + /* * Read the swap header. */ -- 2.47.2