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 7A301ECAAA1 for ; Fri, 9 Sep 2022 13:08:46 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 030F86B0071; Fri, 9 Sep 2022 09:08:46 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id F21CB6B0072; Fri, 9 Sep 2022 09:08:45 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id E11A46B0073; Fri, 9 Sep 2022 09:08:45 -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 D0C996B0071 for ; Fri, 9 Sep 2022 09:08:45 -0400 (EDT) Received: from smtpin24.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay07.hostedemail.com (Postfix) with ESMTP id A2CB816099A for ; Fri, 9 Sep 2022 13:08:45 +0000 (UTC) X-FDA: 79892576610.24.2EDA75A Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) by imf31.hostedemail.com (Postfix) with ESMTP id E3C6A2009D for ; Fri, 9 Sep 2022 13:08:42 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=bombadil.20210309; h=Content-Transfer-Encoding: MIME-Version:Message-Id:Date:Subject:Cc:To:From:Sender:Reply-To:Content-Type: Content-ID:Content-Description:In-Reply-To:References; bh=bg9BWg4f3GliH1mgv1hphuaEyjF3oTeViLNrQEtKa7o=; b=rfPMKjGs9zgoJew5jojQVc4VH8 +WwTVJ626t11hF0OiGaTeER3zHylNH0giUY0HdeVSbWbGbPJYXu+KFbyaoapBf0+WMMjTwW7MguxS cRl/4RslnN8B0I8TjqPFGInXjL2B3WmXws+I2sBFRnU6kHVdiemxZS4OmKHYD0g6glnuzMDMZ4F7C 3jTE2fpzR6reotGY6weIVjnZjqNZp/MW2HXogPEukzQ0iY7XWF/TWHjjTsvU2bjODYG7OS6c1rCjl ytDGgDMgiEwBx3t1EhAhPReHSxqcxZLl4B/2f/TxQigteqERprlPxdEavxxpNmCpP2TIbrubB1qPj wFJ8ukpw==; Received: from [2001:4bb8:198:38af:a077:6a38:dc23:be2c] (helo=localhost) by bombadil.infradead.org with esmtpsa (Exim 4.94.2 #2 (Red Hat Linux)) id 1oWdkK-00GFJV-Tz; Fri, 09 Sep 2022 13:08:37 +0000 From: Christoph Hellwig To: konrad.wilk@oracle.com, akpm@linux-foundation.org Cc: liushixin2@huawei.com, linux-mm@kvack.org, Nathan Chancellor Subject: [PATCH] frontswap: don't call ->init if no ops are registered Date: Fri, 9 Sep 2022 15:08:29 +0200 Message-Id: <20220909130829.3262926-1-hch@lst.de> X-Mailer: git-send-email 2.30.2 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SRS-Rewrite: SMTP reverse-path rewritten from by bombadil.infradead.org. See http://www.infradead.org/rpr.html ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1662728925; a=rsa-sha256; cv=none; b=txfAPb3mIhhx6HV90HTmttDYf0tBKBCgrW30AST0t3FX25mYV17FOJO+eZGzyal8Bw0ZsM 1aSC1T7GLKCyLLzSovQtTs+vPJM3BUjyOsbDTinZpH10XV9hvtvL1MAyLSHchHM0w6AQVp RjR07x/azv592RIghUQKP1TJr6AZtNo= ARC-Authentication-Results: i=1; imf31.hostedemail.com; dkim=pass header.d=infradead.org header.s=bombadil.20210309 header.b=rfPMKjGs; spf=none (imf31.hostedemail.com: domain of BATV+6858b4fb5979d481332a+6956+infradead.org+hch@bombadil.srs.infradead.org has no SPF policy when checking 198.137.202.133) smtp.mailfrom=BATV+6858b4fb5979d481332a+6956+infradead.org+hch@bombadil.srs.infradead.org; dmarc=none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1662728925; 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:references:dkim-signature; bh=bg9BWg4f3GliH1mgv1hphuaEyjF3oTeViLNrQEtKa7o=; b=QlYEqaUdPXoC3Vnmp4R1IYAq4hQ1b//EaW+2Y8EXq5Oo/VUfaeA8sGo5wvtMvFzQlPjRMp rjoGh/UbzRSAP9aQgIO8QiEmU9RLlM2mK4i2vz3TrsmF9PKqz/IQj30J7CEUpBGEWeBc/M VsRfEEcxR1cvMeuH8lOcQp7hgOCZKyM= X-Rspamd-Queue-Id: E3C6A2009D Authentication-Results: imf31.hostedemail.com; dkim=pass header.d=infradead.org header.s=bombadil.20210309 header.b=rfPMKjGs; spf=none (imf31.hostedemail.com: domain of BATV+6858b4fb5979d481332a+6956+infradead.org+hch@bombadil.srs.infradead.org has no SPF policy when checking 198.137.202.133) smtp.mailfrom=BATV+6858b4fb5979d481332a+6956+infradead.org+hch@bombadil.srs.infradead.org; dmarc=none X-Rspam-User: X-Rspamd-Server: rspam06 X-Stat-Signature: azo3apn3579imunmku6sg1j9qwjogjeg X-HE-Tag: 1662728922-946346 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: If no frontswap module (i.e. zswap) was registered, frontswap_ops will be NULL. In such situation, swapon crashes with the following stack trace: Unable to handle kernel access to user memory outside uaccess routines at virtual address 0000000000000000 Mem abort info: ESR = 0x0000000096000004 EC = 0x25: DABT (current EL), IL = 32 bits SET = 0, FnV = 0 EA = 0, S1PTW = 0 FSC = 0x04: level 0 translation fault Data abort info: ISV = 0, ISS = 0x00000004 CM = 0, WnR = 0 user pgtable: 4k pages, 48-bit VAs, pgdp=00000020a4fab000 [0000000000000000] pgd=0000000000000000, p4d=0000000000000000 Internal error: Oops: 96000004 [#1] SMP Modules linked in: zram fsl_dpaa2_eth pcs_lynx phylink ahci_qoriq crct10dif_ce ghash_ce sbsa_gwdt fsl_mc_dpio nvme lm90 nvme_core at803x xhci_plat_hcd rtc_fsl_ftm_alarm xgmac_mdio ahci_platform i2c_imx ip6_tables ip_tables fuse Unloaded tainted modules: cppc_cpufreq():1 CPU: 10 PID: 761 Comm: swapon Not tainted 6.0.0-rc2-00454-g22100432cf14 #1 Hardware name: SolidRun Ltd. SolidRun CEX7 Platform, BIOS EDK II Jun 21 2022 pstate: 00400005 (nzcv daif +PAN -UAO -TCO -DIT -SSBS BTYPE=--) pc : frontswap_init+0x38/0x60 lr : __do_sys_swapon+0x8a8/0x9f4 sp : ffff80000969bcf0 x29: ffff80000969bcf0 x28: ffff37bee0d8fc00 x27: ffff80000a7f5000 x26: fffffcdefb971e80 x25: ffffaba797453b90 x24: 0000000000000064 x23: ffff37c1f209d1a8 x22: ffff37bee880e000 x21: ffffaba797748560 x20: ffff37bee0d8fce4 x19: ffffaba797748488 x18: 0000000000000014 x17: 0000000030ec029a x16: ffffaba795a479b0 x15: 0000000000000000 x14: 0000000000000000 x13: 0000000000000030 x12: 0000000000000001 x11: ffff37c63c0aba18 x10: 0000000000000000 x9 : ffffaba7956b8c88 x8 : ffff80000969bcd0 x7 : 0000000000000000 x6 : 0000000000000000 x5 : 0000000000000001 x4 : 0000000000000000 x3 : ffffaba79730f000 x2 : ffff37bee0d8fc00 x1 : 0000000000000000 x0 : 0000000000000000 Call trace: frontswap_init+0x38/0x60 __do_sys_swapon+0x8a8/0x9f4 __arm64_sys_swapon+0x28/0x3c invoke_syscall+0x78/0x100 el0_svc_common.constprop.0+0xd4/0xf4 do_el0_svc+0x38/0x4c el0_svc+0x34/0x10c el0t_64_sync_handler+0x11c/0x150 el0t_64_sync+0x190/0x194 Code: d000e283 910003fd f9006c41 f946d461 (f9400021) ---[ end trace 0000000000000000 ]--- Fixes: 1da0d94a3ec8 ("frontswap: remove support for multiple ops") Reported-by: Nathan Chancellor Signed-off-by: Liu Shixin --- This is the non-invaside fix the frontswap regression, instead of the massively overreaching revert from Liu, mm/frontswap.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/mm/frontswap.c b/mm/frontswap.c index 1a97610308cbc2..279e55b4ed8739 100644 --- a/mm/frontswap.c +++ b/mm/frontswap.c @@ -125,6 +125,9 @@ void frontswap_init(unsigned type, unsigned long *map) * p->frontswap set to something valid to work properly. */ frontswap_map_set(sis, map); + + if (!frontswap_enabled()) + return; frontswap_ops->init(type); } -- 2.30.2