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 X-Spam-Level: X-Spam-Status: No, score=-12.8 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS, URIBL_BLOCKED,USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 56ED6C433E1 for ; Wed, 19 Aug 2020 19:57:03 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id D273D207FF for ; Wed, 19 Aug 2020 19:57:02 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="idhxjtQ9" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org D273D207FF Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=owner-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix) id BF2CA6B00B8; Wed, 19 Aug 2020 15:57:01 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id BA01D6B00B9; Wed, 19 Aug 2020 15:57:01 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id A90988D0037; Wed, 19 Aug 2020 15:57:01 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0064.hostedemail.com [216.40.44.64]) by kanga.kvack.org (Postfix) with ESMTP id 92A7A6B00B8 for ; Wed, 19 Aug 2020 15:57:01 -0400 (EDT) Received: from smtpin18.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay03.hostedemail.com (Postfix) with ESMTP id 492AA8248068 for ; Wed, 19 Aug 2020 19:57:01 +0000 (UTC) X-FDA: 77168376642.18.snail94_54011912702a Received: from filter.hostedemail.com (10.5.16.251.rfc1918.com [10.5.16.251]) by smtpin18.hostedemail.com (Postfix) with ESMTP id 03C56100EC666 for ; Wed, 19 Aug 2020 19:57:00 +0000 (UTC) X-HE-Tag: snail94_54011912702a X-Filterd-Recvd-Size: 5499 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [216.205.24.124]) by imf11.hostedemail.com (Postfix) with ESMTP for ; Wed, 19 Aug 2020 19:57:00 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1597867019; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:content-type:content-type; bh=JDGvX0s3CfGuroZ3WjQYFXy/cRxyJCVnz+Pf0p7uSV8=; b=idhxjtQ9F1JU6t3sN/VzG3xkiTDZgu6V08FxX3Dmvh30xCmGyRveo4bytohNQnweU4IptE S6T67mDyb0ajXFi+7pfWwqFSM4jhOrv1JNiumiEklZC1TVKy4uwlq33s0fXGIBBDU8CQ/r tml9sxfOXYNn/Ko+ud9Tlh5ACXhiBpo= Received: from mail-pj1-f69.google.com (mail-pj1-f69.google.com [209.85.216.69]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-83-Ikz0Z9qjPjWhts-3b1LpaA-1; Wed, 19 Aug 2020 15:56:58 -0400 X-MC-Unique: Ikz0Z9qjPjWhts-3b1LpaA-1 Received: by mail-pj1-f69.google.com with SMTP id hi12so1937392pjb.6 for ; Wed, 19 Aug 2020 12:56:57 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=JDGvX0s3CfGuroZ3WjQYFXy/cRxyJCVnz+Pf0p7uSV8=; b=XvbNlXLWOx0mcJyZShilWkkz1b5qs3+NpgUdD6vxhizYqS6w4fVJULULw5xxTsaY9I rAwh00RVdy1Xdvtxb9P+ykmuNUzqODf308v7oUUg1ne5r/gvCqfeMJq1u46tAFC4sU53 5mwDM6T1jkbje7+8d6GGN3Z8I0Qq14dDFXZDObHs5YAf+JaRoE2vEIoa9hIRaySg4LNH USetkV4ljaqZ8OBetGWD31QKGaC4NxXN3pr7CrRey+rymMqDmRZx+xVdzjdkOp7bkuEB IgEZyOkZj2b4wrWty4E9hVlyelGtECaxotg1QdpdYsrs6GQnCMJNWl+MPxQO8TdHyj6K cXMQ== X-Gm-Message-State: AOAM5314kd47R7/t4Pnrm08WWbo7x9Qasj/FHiz7JCz50vvT6oLnc5hm Y2ppEHiMBbSP19o11B7/p4etxv5rzIW/kQNHN8X4287estxpQjgFUBrKgTt7SiLg9TwZYJxhux7 Nl75cjL6Uj34= X-Received: by 2002:a63:7d3:: with SMTP id 202mr32004pgh.230.1597867017030; Wed, 19 Aug 2020 12:56:57 -0700 (PDT) X-Google-Smtp-Source: ABdhPJz+3Pl230CH6ILGZIOeiNaXL82ndPKRgPsgS1lrqvcaMUejchfEYQFco8vhnakaJtiE2tTzPw== X-Received: by 2002:a63:7d3:: with SMTP id 202mr31995pgh.230.1597867016665; Wed, 19 Aug 2020 12:56:56 -0700 (PDT) Received: from xiangao.remote.csb ([209.132.188.80]) by smtp.gmail.com with ESMTPSA id i39sm3906880pje.8.2020.08.19.12.56.53 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 19 Aug 2020 12:56:56 -0700 (PDT) From: Gao Xiang To: Andrew Morton Cc: linux-mm@kvack.org, linux-kernel@vger.kernel.org, Rafael Aquini , Carlos Maiolino , Eric Sandeen , Gao Xiang , "Huang, Ying" , stable Subject: [PATCH] mm, THP, swap: fix allocating cluster for swapfile by mistake Date: Thu, 20 Aug 2020 03:56:13 +0800 Message-Id: <20200819195613.24269-1-hsiangkao@redhat.com> X-Mailer: git-send-email 2.18.1 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=hsiangkao@redhat.com X-Mimecast-Spam-Score: 0.001 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset=US-ASCII X-Rspamd-Queue-Id: 03C56100EC666 X-Spamd-Result: default: False [0.00 / 100.00] X-Rspamd-Server: rspam04 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: SWP_FS doesn't mean the device is file-backed swap device, which just means each writeback request should go through fs by DIO. Or it'll just use extents added by .swap_activate(), but it also works as file-backed swap device. So in order to achieve the goal of the original patch, SWP_BLKDEV should be used instead. FS corruption can be observed with SSD device + XFS + fragmented swapfile due to CONFIG_THP_SWAP=y. Fixes: f0eea189e8e9 ("mm, THP, swap: Don't allocate huge cluster for file backed swap device") Fixes: 38d8b4e6bdc8 ("mm, THP, swap: delay splitting THP during swap out") Cc: "Huang, Ying" Cc: stable Signed-off-by: Gao Xiang --- I reproduced the issue with the following details: Environment: QEMU + upstream kernel + buildroot + NVMe (2 GB) Kernel config: CONFIG_BLK_DEV_NVME=y CONFIG_THP_SWAP=y Some reproducable steps: mkfs.xfs -f /dev/nvme0n1 mkdir /tmp/mnt mount /dev/nvme0n1 /tmp/mnt bs="32k" sz="1024m" # doesn't matter too much, I also tried 16m xfs_io -f -c "pwrite -R -b $bs 0 $sz" -c "fdatasync" /tmp/mnt/sw xfs_io -f -c "pwrite -R -b $bs 0 $sz" -c "fdatasync" /tmp/mnt/sw xfs_io -f -c "pwrite -R -b $bs 0 $sz" -c "fdatasync" /tmp/mnt/sw xfs_io -f -c "pwrite -F -S 0 -b $bs 0 $sz" -c "fdatasync" /tmp/mnt/sw xfs_io -f -c "pwrite -R -b $bs 0 $sz" -c "fsync" /tmp/mnt/sw mkswap /tmp/mnt/sw swapon /tmp/mnt/sw stress --vm 2 --vm-bytes 600M # doesn't matter too much as well Symptoms: - FS corruption (e.g. checksum failure) - memory corruption at: 0xd2808010 - segfault ... mm/swapfile.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mm/swapfile.c b/mm/swapfile.c index 6c26916e95fd..2937daf3ca02 100644 --- a/mm/swapfile.c +++ b/mm/swapfile.c @@ -1074,7 +1074,7 @@ int get_swap_pages(int n_goal, swp_entry_t swp_entries[], int entry_size) goto nextsi; } if (size == SWAPFILE_CLUSTER) { - if (!(si->flags & SWP_FS)) + if (si->flags & SWP_BLKDEV) n_ret = swap_alloc_cluster(si, swp_entries); } else n_ret = scan_swap_map_slots(si, SWAP_HAS_CACHE, -- 2.18.1