From patchwork Fri Nov 2 21:29:36 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Omar Sandoval X-Patchwork-Id: 10666201 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 104C613B5 for ; Fri, 2 Nov 2018 21:30:14 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 0403F2B30C for ; Fri, 2 Nov 2018 21:30:14 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id EC19F2B5C1; Fri, 2 Nov 2018 21:30:13 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-7.9 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,MAILING_LIST_MULTI,RCVD_IN_DNSWL_HI autolearn=unavailable version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id A31DC2B30C for ; Fri, 2 Nov 2018 21:30:13 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728267AbeKCGi7 (ORCPT ); Sat, 3 Nov 2018 02:38:59 -0400 Received: from mail-io1-f67.google.com ([209.85.166.67]:44333 "EHLO mail-io1-f67.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728221AbeKCGi6 (ORCPT ); Sat, 3 Nov 2018 02:38:58 -0400 Received: by mail-io1-f67.google.com with SMTP id c6-v6so2371234iob.11 for ; Fri, 02 Nov 2018 14:30:11 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=osandov-com.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=EQlijbwv+Tr3pUQAHsipW5yfTslWROfiw9T5rb7jgu0=; b=2CrmXRvaIi60DMI2J1g6sHeOhxeb7nAsaBjhmrPq1JdDFWNPdDFZFvW3GqWePCJq1L LYaJrGehYiw4NWwFN9OXd5Olat0rqgqJOqhanxoKX4VYQc7+zq2hk15ABO95erQwjqtb 1dGSiDtktpSQwBdS0d2I4sTPtxg9N2oYMyVCu0g9TKvfvR4UPZUK/WkklOSScC4mpm12 ioiGaTvI/EhG6rkHZXiVgE8wAjt7+JMGiMKkW92DVE7Pkv9QEVsUxIwTPjF/2txpi5Z1 m9gkZye71mAimrKlZ0sQj0ubAQ+J08mcS1jKAOkY9S6bmIUr/QS//MfOmM3eAXVi+Hx5 mFng== 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:in-reply-to :references:mime-version:content-transfer-encoding; bh=EQlijbwv+Tr3pUQAHsipW5yfTslWROfiw9T5rb7jgu0=; b=NHow88mqn3n9q776XzEQDcDKUAxenhWIpU5lFrq/2RoJheju4XHaHbkKB9E2e7V0hA xQtJOepspQbYqEtP/CDM+BItSXbqwmhE4Yi40aPzjnfKZ4bTb72HvuwovXaaGiUJDp1N X/hx9d2v+1FmYI9gqP3Tnw+dI+k8PVBZo+5+IMYcmJkBkwvJMeCVdml+zJreM3bHo4wh 8+VWVxMol68ksC/Sk2o0JntA56PzQI+Fsxttg7gCpI5PzbiG6toeuA15fDfxB9p7AJ/2 PqUt30ZSHtEqs82cdhKxBYkpHiju7MhumB8S6ui7ZiOM8b4WUjGb8c1y5TwTfusZePKm QGXg== X-Gm-Message-State: AGRZ1gKK26mxYTxc4eJV+aXBgHXwYYRgAY9OIg8gGduM5uY6X5zk2EFK hhcdJZMcwNoIhO65kElfCxlNQR2vzwY= X-Google-Smtp-Source: AJdET5edwha3rIfxJul9TnrVpVxmft3j4L5wiwshdotFlIyYE+VdISJMBThQ8iBOqOzDbikxz3c/WA== X-Received: by 2002:a6b:1412:: with SMTP id 18-v6mr10433619iou.214.1541194210497; Fri, 02 Nov 2018 14:30:10 -0700 (PDT) Received: from vader.thefacebook.com ([2620:10d:c090:200::4:e24f]) by smtp.gmail.com with ESMTPSA id n130-v6sm929419itb.36.2018.11.02.14.30.09 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 02 Nov 2018 14:30:10 -0700 (PDT) From: Omar Sandoval To: fstests@vger.kernel.org Cc: kernel-team@fb.com, linux-btrfs@vger.kernel.org Subject: [PATCH 1/7] generic/{472,496,497}: fix $seeqres typo Date: Fri, 2 Nov 2018 14:29:36 -0700 Message-Id: X-Mailer: git-send-email 2.19.1 In-Reply-To: References: MIME-Version: 1.0 Sender: fstests-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: fstests@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP From: Omar Sandoval Signed-off-by: Omar Sandoval --- tests/generic/472 | 2 +- tests/generic/496 | 2 +- tests/generic/497 | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/tests/generic/472 b/tests/generic/472 index c74d6c70..04ed3e73 100755 --- a/tests/generic/472 +++ b/tests/generic/472 @@ -51,7 +51,7 @@ swapfile_cycle() { $CHATTR_PROG +C $swapfile >> $seqres.full 2>&1 "$here/src/mkswap" $swapfile >> $seqres.full "$here/src/swapon" $swapfile 2>&1 | _filter_scratch - swapoff $swapfile 2>> $seeqres.full + swapoff $swapfile 2>> $seqres.full rm -f $swapfile } diff --git a/tests/generic/496 b/tests/generic/496 index 1c9651ad..968b8012 100755 --- a/tests/generic/496 +++ b/tests/generic/496 @@ -53,7 +53,7 @@ swapfile_cycle() { $CHATTR_PROG +C $swapfile >> $seqres.full 2>&1 "$here/src/mkswap" $swapfile >> $seqres.full "$here/src/swapon" $swapfile 2>&1 | _filter_scratch - swapoff $swapfile 2>> $seeqres.full + swapoff $swapfile 2>> $seqres.full rm -f $swapfile } diff --git a/tests/generic/497 b/tests/generic/497 index 584af58a..3d5502ef 100755 --- a/tests/generic/497 +++ b/tests/generic/497 @@ -53,7 +53,7 @@ swapfile_cycle() { $CHATTR_PROG +C $swapfile >> $seqres.full 2>&1 "$here/src/mkswap" $swapfile >> $seqres.full "$here/src/swapon" $swapfile 2>&1 | _filter_scratch - swapoff $swapfile 2>> $seeqres.full + swapoff $swapfile 2>> $seqres.full rm -f $swapfile } From patchwork Fri Nov 2 21:29:37 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Omar Sandoval X-Patchwork-Id: 10666203 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 8F71717DF for ; Fri, 2 Nov 2018 21:30:14 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 811112B30C for ; Fri, 2 Nov 2018 21:30:14 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 7594A2B6F5; Fri, 2 Nov 2018 21:30:14 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-7.9 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,MAILING_LIST_MULTI,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 1586B2B30C for ; Fri, 2 Nov 2018 21:30:14 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728273AbeKCGi7 (ORCPT ); Sat, 3 Nov 2018 02:38:59 -0400 Received: from mail-it1-f195.google.com ([209.85.166.195]:37622 "EHLO mail-it1-f195.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728265AbeKCGi7 (ORCPT ); Sat, 3 Nov 2018 02:38:59 -0400 Received: by mail-it1-f195.google.com with SMTP id e74-v6so5076067ita.2 for ; Fri, 02 Nov 2018 14:30:12 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=osandov-com.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=m5BROwurQKxczGsj4fbck9Sm2kxpwdnTNwXP0TSnM/Q=; b=jZNu/xsrLTHV/usJ/NccmGwYetRzYCkBGMzJPRaS+RXm2kGZGjQw6KYwe654zLOBe0 2XunczJmF1qQb4fbntXHwBQgJUHTGrlEVmfdPwwNxz5dAwbSLuj1CDmAVP7P/0EH4fAb Pf1QIISgtYKhXYJcevc/EExcKWcGkHtfJeQh9+td1EacpEo2Wr55hsevElhx+dF8SpbX Q9jLY2mZS+AImdVfYhGPIkFHv7F89NHusGmApP0NF9j2Xiq4WfE0XR865U5SECAtnxvj 5QJBlSX2PTDesKvoVPgyUH9UlNjtLEHJ2fRlfJB+v//dq8YQsXlJR8ST/M92tFSEHRKE pejg== 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:in-reply-to :references:mime-version:content-transfer-encoding; bh=m5BROwurQKxczGsj4fbck9Sm2kxpwdnTNwXP0TSnM/Q=; b=b3RzQhmwqhdZHjePLBO+9A24n9isc/H5Zt59nC2zFtCVuMMNigNxN6/LvayBAiUa7p 6bWpy5q5O9URIGtAg5sN1rFdkuknSQdGyoadXyMrSAsQhiNcg6wzriZ/vr3ffDvzF8Or ZmKKH3FrhP39i5CVpUwi0/JdBK1vchoA+TwrAnXar5LR2HOb3EBjMc5SzzLt7/EQ6mUZ Jm+uHM1DUJvIun0e2zqSGV+U2JDx6oA3I3tzFPnug3TmlLVDhBkGByMx977/T4z4D2nf 6Yvz8PmzLTme1Z+YYE/Ymf3IxWdDFrjR33YApbhOki/O08j7oy6ER5uGUoAdaxE4qucM L4yg== X-Gm-Message-State: AGRZ1gKyU6o8Y0p3+QE+dXL8DhN2DNHgmX1VSA8V9KDCSVzyWzjidA0k AnAfsFnk9yd8no0pN9WTXvQHv4NSqwg= X-Google-Smtp-Source: AJdET5eGNytvkYSuq8Z50y/lglN8O3bKKH1iGw4FRdjX433N2jtiQM7cYy4oS2JE1iQbkbt/1VgsFQ== X-Received: by 2002:a02:2b29:: with SMTP id h41-v6mr11470226jaa.12.1541194211724; Fri, 02 Nov 2018 14:30:11 -0700 (PDT) Received: from vader.thefacebook.com ([2620:10d:c090:200::4:e24f]) by smtp.gmail.com with ESMTPSA id n130-v6sm929419itb.36.2018.11.02.14.30.10 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 02 Nov 2018 14:30:11 -0700 (PDT) From: Omar Sandoval To: fstests@vger.kernel.org Cc: kernel-team@fb.com, linux-btrfs@vger.kernel.org Subject: [PATCH 2/7] generic/{472,496}: fix swap file creation on Btrfs Date: Fri, 2 Nov 2018 14:29:37 -0700 Message-Id: <6da5f398715af4f7478554920470a85e8a186b50.1541193856.git.osandov@fb.com> X-Mailer: git-send-email 2.19.1 In-Reply-To: References: MIME-Version: 1.0 Sender: fstests-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: fstests@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP From: Omar Sandoval The swap file must be set nocow before it is written to, otherwise it is ignored and Btrfs refuses to activate it as swap. Fixes: 25ce9740065e ("generic: test swapfile creation, activation, and deactivation") Signed-off-by: Omar Sandoval --- tests/generic/472 | 14 ++++++-------- tests/generic/496 | 6 +++--- 2 files changed, 9 insertions(+), 11 deletions(-) diff --git a/tests/generic/472 b/tests/generic/472 index 04ed3e73..aba4a007 100755 --- a/tests/generic/472 +++ b/tests/generic/472 @@ -42,13 +42,15 @@ _scratch_mount >>$seqres.full 2>&1 swapfile=$SCRATCH_MNT/swap len=$((2 * 1048576)) -page_size=$(get_page_size) swapfile_cycle() { local swapfile="$1" + local len="$2" + touch $swapfile # Swap files must be nocow on Btrfs. $CHATTR_PROG +C $swapfile >> $seqres.full 2>&1 + _pwrite_byte 0x58 0 $len $swapfile >> $seqres.full "$here/src/mkswap" $swapfile >> $seqres.full "$here/src/swapon" $swapfile 2>&1 | _filter_scratch swapoff $swapfile 2>> $seqres.full @@ -57,20 +59,16 @@ swapfile_cycle() { # Create a regular swap file echo "regular swap" | tee -a $seqres.full -_pwrite_byte 0x58 0 $len $swapfile >> $seqres.full -swapfile_cycle $swapfile +swapfile_cycle $swapfile $len # Create a swap file with a little too much junk on the end echo "too long swap" | tee -a $seqres.full -_pwrite_byte 0x58 0 $((len + 3)) $swapfile >> $seqres.full -swapfile_cycle $swapfile +swapfile_cycle $swapfile $((len + 3)) # Create a ridiculously small swap file. Each swap file must have at least # two pages after the header page. echo "tiny swap" | tee -a $seqres.full -tiny_len=$((page_size * 3)) -_pwrite_byte 0x58 0 $tiny_len $swapfile >> $seqres.full -swapfile_cycle $swapfile +swapfile_cycle $swapfile $(($(get_page_size) * 3)) status=0 exit diff --git a/tests/generic/496 b/tests/generic/496 index 968b8012..3083eef0 100755 --- a/tests/generic/496 +++ b/tests/generic/496 @@ -49,8 +49,6 @@ page_size=$(get_page_size) swapfile_cycle() { local swapfile="$1" - # Swap files must be nocow on Btrfs. - $CHATTR_PROG +C $swapfile >> $seqres.full 2>&1 "$here/src/mkswap" $swapfile >> $seqres.full "$here/src/swapon" $swapfile 2>&1 | _filter_scratch swapoff $swapfile 2>> $seqres.full @@ -59,8 +57,10 @@ swapfile_cycle() { # Create a fallocated swap file echo "fallocate swap" | tee -a $seqres.full -$XFS_IO_PROG -f -c "falloc 0 $len" $swapfile >> $seqres.full +touch $swapfile +# Swap files must be nocow on Btrfs. $CHATTR_PROG +C $swapfile >> $seqres.full 2>&1 +$XFS_IO_PROG -f -c "falloc 0 $len" $swapfile >> $seqres.full "$here/src/mkswap" $swapfile "$here/src/swapon" $swapfile >> $seqres.full 2>&1 || \ _notrun "fallocated swap not supported here" From patchwork Fri Nov 2 21:29:38 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Omar Sandoval X-Patchwork-Id: 10666207 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id DA35513B5 for ; Fri, 2 Nov 2018 21:30:14 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id CD0242B4F1 for ; Fri, 2 Nov 2018 21:30:14 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id C166D2B51A; Fri, 2 Nov 2018 21:30:14 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-7.9 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,MAILING_LIST_MULTI,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 64EDD2B5C1 for ; Fri, 2 Nov 2018 21:30:14 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728265AbeKCGjA (ORCPT ); Sat, 3 Nov 2018 02:39:00 -0400 Received: from mail-it1-f195.google.com ([209.85.166.195]:40608 "EHLO mail-it1-f195.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728271AbeKCGjA (ORCPT ); Sat, 3 Nov 2018 02:39:00 -0400 Received: by mail-it1-f195.google.com with SMTP id e11so1798373itl.5 for ; Fri, 02 Nov 2018 14:30:13 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=osandov-com.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=gjAp51U3ifmg7JidLZjofYnOVIERTT3c+O16DBDrf0o=; b=J0jh2ZCOaUtghrsSdyyeE3/taEK5VVjiNqgcTWboUZCLEUjezqnPASvTCDw4qahvtH hnYfH0169xpE7/77kAJjPLp118ym5eptgAetkVNOdp1Z2btrJVoZHWDicgAEEYOAr8LG aIwHyMzpkH3RktRtr0TcOmtaVh1+/fk7Ez+zl8orEiSxrrpbP+PFaPtHWee0slMsyEBD 5xyN1lwoS2HPh943ZExr+RU70jzac+IpavUPDYoCJC4lB1U00f9r1O0iADOXpOe4D6qP HyQP9g2Uhd6RszY5kgrGB84e1nc1e17mmtpH9FHEt1ifVcY+z6OdMy8/INMadMXB9RVb jEYw== 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:in-reply-to :references:mime-version:content-transfer-encoding; bh=gjAp51U3ifmg7JidLZjofYnOVIERTT3c+O16DBDrf0o=; b=jr6AAOLeJhaQiJflisO/a44b85bjr7Pt7sVR47UQGYSLC75mSKCNoUzNAgRbbWDKfE QyVMMwRrWX388H21UGnv31EC7PeRzvj48YDa7O/en4YqpVsAfCOQr++W4YwRDPg/s4TE tLzADKCY7OBoSNP8gaEpSFfBiGbcalraXYsMGOIJIaPieU7ZB9zECMOvttt5hVMV/cOA aVuCoGotEzveQt1HSWxJg8yqzLHM/fMsaPdsT6/2kGY/WsEvGl7YbfprkJU4p+YQEj7C RqqkArW3aoYtOwxyNJktESLyNTWYoTZhn/7/NXKKggPFcrhH7T8XBydsa+4osz9Txmgx Zi9Q== X-Gm-Message-State: AGRZ1gKbt+U84PbeUm7uYfiju5VKWyEkZGqvm6XUPNOwpp/HXmiRSpBL +MgGyHwo81RSBJnn9zzMoY1LH0vRIU4= X-Google-Smtp-Source: AJdET5dGuckXyhnDFdOYsNPE3hwpvpg6laqhCPgseJ+50pWta0afgjy3oQB9jEa3qMMfFSiFHvCZfQ== X-Received: by 2002:a05:660c:611:: with SMTP id i17mr270580itk.117.1541194212701; Fri, 02 Nov 2018 14:30:12 -0700 (PDT) Received: from vader.thefacebook.com ([2620:10d:c090:200::4:e24f]) by smtp.gmail.com with ESMTPSA id n130-v6sm929419itb.36.2018.11.02.14.30.11 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 02 Nov 2018 14:30:12 -0700 (PDT) From: Omar Sandoval To: fstests@vger.kernel.org Cc: kernel-team@fb.com, linux-btrfs@vger.kernel.org Subject: [PATCH 3/7] btrfs: test swap file activation restrictions Date: Fri, 2 Nov 2018 14:29:38 -0700 Message-Id: <9eeea2eecff0b9fad27f49c082e987232edb40c0.1541193856.git.osandov@fb.com> X-Mailer: git-send-email 2.19.1 In-Reply-To: References: MIME-Version: 1.0 Sender: fstests-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: fstests@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP From: Omar Sandoval Swap files on Btrfs have some restrictions not applicable to other filesystems. Signed-off-by: Omar Sandoval --- tests/btrfs/173 | 55 +++++++++++++++++++++++++++++++++++++++++++++ tests/btrfs/173.out | 5 +++++ tests/btrfs/group | 1 + 3 files changed, 61 insertions(+) create mode 100755 tests/btrfs/173 create mode 100644 tests/btrfs/173.out diff --git a/tests/btrfs/173 b/tests/btrfs/173 new file mode 100755 index 00000000..665bec39 --- /dev/null +++ b/tests/btrfs/173 @@ -0,0 +1,55 @@ +#! /bin/bash +# SPDX-License-Identifier: GPL-2.0 +# Copyright (c) 2018 Facebook. All Rights Reserved. +# +# FS QA Test 173 +# +# Test swap file activation restrictions specific to Btrfs. +# +seq=`basename $0` +seqres=$RESULT_DIR/$seq +echo "QA output created by $seq" + +here=`pwd` +tmp=/tmp/$$ +status=1 # failure is the default! +trap "_cleanup; exit \$status" 0 1 2 3 15 + +_cleanup() +{ + cd / + rm -f $tmp.* +} + +. ./common/rc +. ./common/filter + +rm -f $seqres.full + +_supported_fs generic +_supported_os Linux +_require_scratch_swapfile + +_scratch_mkfs >> $seqres.full 2>&1 +_scratch_mount + +echo "COW file" +# We can't use _format_swapfile because we don't want chattr +C, and we can't +# unset it after the swap file has been created. +rm -f "$SCRATCH_MNT/swap" +touch "$SCRATCH_MNT/swap" +chmod 0600 "$SCRATCH_MNT/swap" +_pwrite_byte 0x61 0 $(($(get_page_size) * 10)) "$SCRATCH_MNT/swap" >> $seqres.full +mkswap "$SCRATCH_MNT/swap" >> $seqres.full +swapon "$SCRATCH_MNT/swap" 2>&1 | _filter_scratch +swapoff "$SCRATCH_MNT/swap" >/dev/null 2>&1 + +echo "Compressed file" +rm -f "$SCRATCH_MNT/swap" +_format_swapfile "$SCRATCH_MNT/swap" $(($(get_page_size) * 10)) +$CHATTR_PROG +c "$SCRATCH_MNT/swap" +swapon "$SCRATCH_MNT/swap" 2>&1 | _filter_scratch +swapoff "$SCRATCH_MNT/swap" >/dev/null 2>&1 + +status=0 +exit diff --git a/tests/btrfs/173.out b/tests/btrfs/173.out new file mode 100644 index 00000000..6d7856bf --- /dev/null +++ b/tests/btrfs/173.out @@ -0,0 +1,5 @@ +QA output created by 173 +COW file +swapon: SCRATCH_MNT/swap: swapon failed: Invalid argument +Compressed file +swapon: SCRATCH_MNT/swap: swapon failed: Invalid argument diff --git a/tests/btrfs/group b/tests/btrfs/group index a490d7eb..3525014f 100644 --- a/tests/btrfs/group +++ b/tests/btrfs/group @@ -175,3 +175,4 @@ 170 auto quick snapshot 171 auto quick qgroup 172 auto quick punch +173 auto quick swap From patchwork Fri Nov 2 21:29:39 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Omar Sandoval X-Patchwork-Id: 10666215 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 64CAF17DF for ; Fri, 2 Nov 2018 21:30:17 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 586212B30C for ; Fri, 2 Nov 2018 21:30:17 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 4CD482B51A; Fri, 2 Nov 2018 21:30:17 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-7.9 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,MAILING_LIST_MULTI,RCVD_IN_DNSWL_HI autolearn=unavailable version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id DBDA52B4F1 for ; Fri, 2 Nov 2018 21:30:16 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728293AbeKCGjC (ORCPT ); Sat, 3 Nov 2018 02:39:02 -0400 Received: from mail-it1-f196.google.com ([209.85.166.196]:36144 "EHLO mail-it1-f196.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728285AbeKCGjC (ORCPT ); Sat, 3 Nov 2018 02:39:02 -0400 Received: by mail-it1-f196.google.com with SMTP id w7-v6so5099024itd.1 for ; Fri, 02 Nov 2018 14:30:15 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=osandov-com.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=7WJ4Yqbj2Id5SCHuIySXT6D3UoIlfHfJgVX+bIhu2CE=; b=acKuu1FW1q8iICIi57YZm4lbNU5C1tMQ1KM/JfJVpMgfcGDNpm3SIW8UOQCRrgHgFo qszCUyJZeNonZM4akztNJw3q9qpgALqm++CMfF/0oIFbs+nBFpotEYuZGV5QLJbSpElV PnILCXHbPXfbl8vs1Gjp1of6lziYumJ0PHo56i4A/4dCQ1UYsc46LP87WKW57VmUTEv4 BKgaxbZF5x80DFHYIAY0uP7T3rrWeZeWIKdRrI7eG41o53qPnsN4Uw1TAcI/mRHdVwEu CBhOGOW+Sz2jbHLDcSJUf1URQVGUBIVzIldG8tTEa02o7XS30EmUCASBBJC9GwxYgoCi ihMQ== 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:in-reply-to :references:mime-version:content-transfer-encoding; bh=7WJ4Yqbj2Id5SCHuIySXT6D3UoIlfHfJgVX+bIhu2CE=; b=J4Lhw1RwsxZ1quUHFRL42pbqxTQILHVG5erSRcnVfXYDSaQZfOywm5u6CNyQG9O0RC 1HdNagXJM6s8ifAbapFrvm4UK9nUFfUsrVTs/6egKek7/xuWrYFF8aLhu/VV0nuwmT2F 84kLZ6r8qKGAGFByRgM/5GFm4RSYyRYD4spsyeFjM+5IBzf7Y8d3JRShnVXWVeFOmcpZ haVzLEqu2hJah9Jc149AOkX1CFjp26eJIB/OGUb0palnCmEPHnLzWlLp/cfnxmqid2i0 OpSshCopmEHlBMt6fz1krQEu0+DVr5Z8MyxnCVDHQJLQYO9qNPUEWZvFgKXnsJA6Qy8L LKnA== X-Gm-Message-State: AGRZ1gLyg3w/s8SgluFCh/bmSrHNfPo11CWpUrsepJmNKWHdYTFKWdQd JIj3BPEpxkTgYA6BvXf+mwMqLK4H/AI= X-Google-Smtp-Source: AJdET5cXSIhZPLiJAiJzgJJH1ixD0D4wRC2Ssju9newr+8kwz/LJcq6hQbQXggD6vKQUkWOJ5iJ2ng== X-Received: by 2002:a02:5c5a:: with SMTP id q87-v6mr11432497jab.36.1541194214501; Fri, 02 Nov 2018 14:30:14 -0700 (PDT) Received: from vader.thefacebook.com ([2620:10d:c090:200::4:e24f]) by smtp.gmail.com with ESMTPSA id n130-v6sm929419itb.36.2018.11.02.14.30.12 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 02 Nov 2018 14:30:13 -0700 (PDT) From: Omar Sandoval To: fstests@vger.kernel.org Cc: kernel-team@fb.com, linux-btrfs@vger.kernel.org Subject: [PATCH 4/7] btrfs: test invalid operations on a swap file Date: Fri, 2 Nov 2018 14:29:39 -0700 Message-Id: X-Mailer: git-send-email 2.19.1 In-Reply-To: References: MIME-Version: 1.0 Sender: fstests-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: fstests@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP From: Omar Sandoval Btrfs forbids some operations which should not be done on a swap file. Signed-off-by: Omar Sandoval --- tests/btrfs/174 | 66 +++++++++++++++++++++++++++++++++++++++++++++ tests/btrfs/174.out | 10 +++++++ tests/btrfs/group | 1 + 3 files changed, 77 insertions(+) create mode 100755 tests/btrfs/174 create mode 100644 tests/btrfs/174.out diff --git a/tests/btrfs/174 b/tests/btrfs/174 new file mode 100755 index 00000000..a26e6669 --- /dev/null +++ b/tests/btrfs/174 @@ -0,0 +1,66 @@ +#! /bin/bash +# SPDX-License-Identifier: GPL-2.0 +# Copyright (c) 2018 Facebook. All Rights Reserved. +# +# FS QA Test 174 +# +# Test restrictions on operations that can be done on an active swap file +# specific to Btrfs. +# +seq=`basename $0` +seqres=$RESULT_DIR/$seq +echo "QA output created by $seq" + +here=`pwd` +tmp=/tmp/$$ +status=1 # failure is the default! +trap "_cleanup; exit \$status" 0 1 2 3 15 + +_cleanup() +{ + cd / + rm -f $tmp.* +} + +. ./common/rc +. ./common/filter + +rm -f $seqres.full + +_supported_fs generic +_supported_os Linux +_require_scratch_swapfile + +_scratch_mkfs >> $seqres.full 2>&1 +_scratch_mount + +$BTRFS_UTIL_PROG subvol create "$SCRATCH_MNT/swapvol" >> $seqres.full +swapfile="$SCRATCH_MNT/swapvol/swap" +_format_swapfile "$swapfile" $(($(get_page_size) * 10)) +swapon "$swapfile" + +# Turning off nowcow doesn't do anything because the file is not empty, not +# because the file is a swap file, but make sure this works anyways. +echo "Disable nocow" +$CHATTR_PROG -C "$swapfile" +lsattr -l "$swapfile" | _filter_scratch | _filter_spaces + +# Compression we reject outright. +echo "Enable compression" +$CHATTR_PROG +c "$swapfile" 2>&1 | grep -o "Text file busy" +lsattr -l "$swapfile" | _filter_scratch | _filter_spaces + +echo "Snapshot" +$BTRFS_UTIL_PROG subvol snap "$SCRATCH_MNT/swapvol" \ + "$SCRATCH_MNT/swapsnap" 2>&1 | grep -o "Text file busy" + +echo "Defrag" +# We pass the -c (compress) flag to force defrag even if the file isn't +# fragmented. +$BTRFS_UTIL_PROG filesystem defrag -c "$swapfile" 2>&1 | grep -o "Text file busy" + +swapoff "$swapfile" +_scratch_unmount + +status=0 +exit diff --git a/tests/btrfs/174.out b/tests/btrfs/174.out new file mode 100644 index 00000000..bc24f1fb --- /dev/null +++ b/tests/btrfs/174.out @@ -0,0 +1,10 @@ +QA output created by 174 +Disable nocow +SCRATCH_MNT/swapvol/swap No_COW +Enable compression +Text file busy +SCRATCH_MNT/swapvol/swap No_COW +Snapshot +Text file busy +Defrag +Text file busy diff --git a/tests/btrfs/group b/tests/btrfs/group index 3525014f..2e10f7df 100644 --- a/tests/btrfs/group +++ b/tests/btrfs/group @@ -176,3 +176,4 @@ 171 auto quick qgroup 172 auto quick punch 173 auto quick swap +174 auto quick swap From patchwork Fri Nov 2 21:29:40 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Omar Sandoval X-Patchwork-Id: 10666217 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 7657D13B5 for ; Fri, 2 Nov 2018 21:30:18 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 680522B30C for ; Fri, 2 Nov 2018 21:30:18 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 5C1B02B51A; Fri, 2 Nov 2018 21:30:18 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-7.9 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,MAILING_LIST_MULTI,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id E89B22B30C for ; Fri, 2 Nov 2018 21:30:17 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728298AbeKCGjD (ORCPT ); Sat, 3 Nov 2018 02:39:03 -0400 Received: from mail-it1-f196.google.com ([209.85.166.196]:35261 "EHLO mail-it1-f196.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728285AbeKCGjC (ORCPT ); Sat, 3 Nov 2018 02:39:02 -0400 Received: by mail-it1-f196.google.com with SMTP id p64-v6so5105028itp.0 for ; Fri, 02 Nov 2018 14:30:16 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=osandov-com.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=+0BAr6ugQZBwUjY0CTCqajmOFpD2mjWfzLQIRXf3JXg=; b=aWZSYusPimP4lMAJOTR8cxcNMVSVBCBGcme4ZDwyagfKS6zGA757UCj5AM4fCwy87U 38svtzKKMXvySfb3Cf0P3vtrCnQqdqjlr+BMJGES7kklH1O8tqqnheRvRjCY8wgdwd1b 8GoLbCJVdtd2cZm4B/MvpioZfTdMWvjnb+A5HbAUXTL0N/0sb0+A0f5mgcA6/l72UVkL 2k1BdFq3aamjBFrSeNPxcrRrF0N9+ifoDvTGuLVrbJjfrlavOeGuBUYGJ89L/aYMfk3h j29AQoSZeKAExOgEOiWM3B/vPq7cTTpjHZOGICEg+gkE9TyMAMJ9bXLll/853TfyWICc bKzQ== 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:in-reply-to :references:mime-version:content-transfer-encoding; bh=+0BAr6ugQZBwUjY0CTCqajmOFpD2mjWfzLQIRXf3JXg=; b=Q2FXfVkrynS7D4k5uPiIazRUaEbHEIatIQtVW0CujdeYow2tWM2D+pRSQCyiwwvtVx IogtYHJe1RF1o/0cGlXE2cdtWEGnkEMfMq0R4NNcrTHleNtnrTwRImhWMJMuRYl9TH39 MEO/PvVkzm4bBF5/3aN8scwO8I9B5fWkUNj1GYeX5Up50V5h3kYmQuFfnEMITeolTPD/ h67Ew1DXzmP0oHnTWWclpy4SlltnPs4vc54R8HKDeNpQLGtDwookwN3vfa4DGk7BW9A2 d1pRbghPSuMQB0q+A4KAa8AvykHfogk6b/iKNJ5RIhjrltAwWzAi6WTKuwEELGJPSPaq c0GA== X-Gm-Message-State: AGRZ1gJE3H+9Lyj2TiX8ejrc7ndSBzVB4FT/AUoQBqrbIxdeghWtpefh ggQeE9ClT7qDveOVSQcGyCHBKy74BYA= X-Google-Smtp-Source: AJdET5fAsAp+6sx27PyfCEiRLpWcVbQ3U1jJd7TGibYroltA1DZiW9w1xpTKERZQWvxQFNsFAnb8WQ== X-Received: by 2002:a02:242c:: with SMTP id f44-v6mr12504787jaa.21.1541194215595; Fri, 02 Nov 2018 14:30:15 -0700 (PDT) Received: from vader.thefacebook.com ([2620:10d:c090:200::4:e24f]) by smtp.gmail.com with ESMTPSA id n130-v6sm929419itb.36.2018.11.02.14.30.14 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 02 Nov 2018 14:30:15 -0700 (PDT) From: Omar Sandoval To: fstests@vger.kernel.org Cc: kernel-team@fb.com, linux-btrfs@vger.kernel.org Subject: [PATCH 5/7] btrfs: test swap files on multiple devices Date: Fri, 2 Nov 2018 14:29:40 -0700 Message-Id: X-Mailer: git-send-email 2.19.1 In-Reply-To: References: MIME-Version: 1.0 Sender: fstests-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: fstests@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP From: Omar Sandoval Swap files currently need to exist on exactly one device in exactly one place. Signed-off-by: Omar Sandoval --- tests/btrfs/175 | 73 +++++++++++++++++++++++++++++++++++++++++++++ tests/btrfs/175.out | 8 +++++ tests/btrfs/group | 1 + 3 files changed, 82 insertions(+) create mode 100755 tests/btrfs/175 create mode 100644 tests/btrfs/175.out diff --git a/tests/btrfs/175 b/tests/btrfs/175 new file mode 100755 index 00000000..64afc4f0 --- /dev/null +++ b/tests/btrfs/175 @@ -0,0 +1,73 @@ +#! /bin/bash +# SPDX-License-Identifier: GPL-2.0 +# Copyright (c) 2018 Facebook. All Rights Reserved. +# +# FS QA Test 175 +# +# Test swap file activation on multiple devices. +# +seq=`basename $0` +seqres=$RESULT_DIR/$seq +echo "QA output created by $seq" + +here=`pwd` +tmp=/tmp/$$ +status=1 # failure is the default! +trap "_cleanup; exit \$status" 0 1 2 3 15 + +_cleanup() +{ + cd / + rm -f $tmp.* +} + +. ./common/rc +. ./common/filter + +rm -f $seqres.full + +_supported_fs generic +_supported_os Linux +_require_scratch_dev_pool 2 +_require_scratch_swapfile + +cycle_swapfile() { + local sz=${1:-$(($(get_page_size) * 10))} + _format_swapfile "$SCRATCH_MNT/swap" "$sz" + swapon "$SCRATCH_MNT/swap" 2>&1 | _filter_scratch + swapoff "$SCRATCH_MNT/swap" > /dev/null 2>&1 +} + +echo "RAID 1" +_scratch_pool_mkfs -d raid1 -m raid1 >> $seqres.full 2>&1 +_scratch_mount +cycle_swapfile +_scratch_unmount + +echo "DUP" +_scratch_pool_mkfs -d dup -m dup >> $seqres.full 2>&1 +_scratch_mount +cycle_swapfile +_scratch_unmount + +echo "Single on multiple devices" +_scratch_pool_mkfs -d single -m raid1 -b $((1024 * 1024 * 1024)) >> $seqres.full 2>&1 +_scratch_mount +# Each device is only 1 GB, so 1.5 GB must be split across multiple devices. +cycle_swapfile $((3 * 1024 * 1024 * 1024 / 2)) +_scratch_unmount + +echo "Single on one device" +_scratch_mkfs >> $seqres.full 2>&1 +_scratch_mount +# Create the swap file, then add the device. That way we know it's all on one +# device. +_format_swapfile "$SCRATCH_MNT/swap" $(($(get_page_size) * 10)) +scratch_dev2="$(echo "${SCRATCH_DEV_POOL}" | awk '{ print $2 }')" +$BTRFS_UTIL_PROG device add -f "$scratch_dev2" "$SCRATCH_MNT" +swapon "$SCRATCH_MNT/swap" 2>&1 | _filter_scratch +swapoff "$SCRATCH_MNT/swap" > /dev/null 2>&1 +_scratch_unmount + +status=0 +exit diff --git a/tests/btrfs/175.out b/tests/btrfs/175.out new file mode 100644 index 00000000..ce2e5992 --- /dev/null +++ b/tests/btrfs/175.out @@ -0,0 +1,8 @@ +QA output created by 175 +RAID 1 +swapon: SCRATCH_MNT/swap: swapon failed: Invalid argument +DUP +swapon: SCRATCH_MNT/swap: swapon failed: Invalid argument +Single on multiple devices +swapon: SCRATCH_MNT/swap: swapon failed: Invalid argument +Single on one device diff --git a/tests/btrfs/group b/tests/btrfs/group index 2e10f7df..b6160b72 100644 --- a/tests/btrfs/group +++ b/tests/btrfs/group @@ -177,3 +177,4 @@ 172 auto quick punch 173 auto quick swap 174 auto quick swap +175 auto quick swap From patchwork Fri Nov 2 21:29:41 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Omar Sandoval X-Patchwork-Id: 10666227 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id DEAAF17DF for ; Fri, 2 Nov 2018 21:30:21 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id D0FD02B30C for ; Fri, 2 Nov 2018 21:30:21 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id C508B2B51A; Fri, 2 Nov 2018 21:30:21 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-7.9 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,MAILING_LIST_MULTI,RCVD_IN_DNSWL_HI autolearn=unavailable version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 6177F2B4F1 for ; Fri, 2 Nov 2018 21:30:21 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726100AbeKCGjE (ORCPT ); Sat, 3 Nov 2018 02:39:04 -0400 Received: from mail-it1-f193.google.com ([209.85.166.193]:51327 "EHLO mail-it1-f193.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728297AbeKCGjE (ORCPT ); Sat, 3 Nov 2018 02:39:04 -0400 Received: by mail-it1-f193.google.com with SMTP id h13so5119610itl.1 for ; Fri, 02 Nov 2018 14:30:17 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=osandov-com.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=ScrOuE0sHGud3TqjIk0wYm9JjwuLoYRgwGBWLEeghFQ=; b=d+cSrvbHunhqHHGIahRtY49sC9QMS4d52bivA0NfglmWHW/eSfwytswNx0Eytij7fS qjFIeWkE5PNaZzqw3rvGbU6707BE6bK5TUlVCf7zHr7IBqOr0Tdt2npfsvmpQ+DcD7Zu BSQAPC3r63MhHjZEMfGIaEW2at6Cxvx8HDBRUxu5+37mcfE40MOK/dv+PPM4UheSCwte oDOcrtiDoZ9QJgLLBTPikVjeKRNh9qIsbZnpmH2hhIesO2lDHAOWnfMXIZAF24gsJJgl EffcFHHYoN2g2+2vBLM6XXqR/Ir3a1rFlyuk/krE/1o/OviPw9cE6c4cpLN412ptB7og mQrQ== 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:in-reply-to :references:mime-version:content-transfer-encoding; bh=ScrOuE0sHGud3TqjIk0wYm9JjwuLoYRgwGBWLEeghFQ=; b=BF/lMKPy1QzoXpPMwwtuvj8MaXCz7rwMJeiZBzCBi5uMkJMzarI+0Aj6x3v388fWHs QObcvFrSJ9Ur2JDjP+FPH/hwCJxKcvhCZteqsJgsTNY8swx1E2ZouATqwvb5bG1sFjKY t193oeBamyvZyn1cDXS23tmX4aGlLyQnte7rXSIZ1KSUTskXEX3slTlt2Mvvf1N1mX/n ChxOFV0Rl3KKKfaO+b+s3Op+Sp0svzr7QemMwHmmsi+Tbv/z0w0Fu2KQidm1G8id6Uzt sMMA8Cxm1nzdm2xMYhk7SHC3izviLZ9rL9a17ndsE2/jiWjy7w10xHki+pX+Tx83EBwg jonw== X-Gm-Message-State: AGRZ1gJBJsHaN9mxQo+6KP6WzRXZWxEzy4PYQuvg7gR1W9kOW0R2CkJu AeTYGa9xvL6vaA0QPECVoZ8K33TgG84= X-Google-Smtp-Source: AJdET5e2xsxdPh0B0fmkBe5iKF6aPbKWWpdxFQwGsnvTow2ARj+0uP0Xa0U12mA8+29FiprLWlTlYA== X-Received: by 2002:a02:c8d8:: with SMTP id q24-v6mr12384724jao.20.1541194216748; Fri, 02 Nov 2018 14:30:16 -0700 (PDT) Received: from vader.thefacebook.com ([2620:10d:c090:200::4:e24f]) by smtp.gmail.com with ESMTPSA id n130-v6sm929419itb.36.2018.11.02.14.30.15 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 02 Nov 2018 14:30:16 -0700 (PDT) From: Omar Sandoval To: fstests@vger.kernel.org Cc: kernel-team@fb.com, linux-btrfs@vger.kernel.org Subject: [PATCH 6/7] btrfs: test device add/remove/replace with an active swap file Date: Fri, 2 Nov 2018 14:29:41 -0700 Message-Id: X-Mailer: git-send-email 2.19.1 In-Reply-To: References: MIME-Version: 1.0 Sender: fstests-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: fstests@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP From: Omar Sandoval Make sure that we don't remove or replace a device with an active swap file but can add, remove, and replace other devices. Signed-off-by: Omar Sandoval --- tests/btrfs/176 | 82 +++++++++++++++++++++++++++++++++++++++++++++ tests/btrfs/176.out | 5 +++ tests/btrfs/group | 1 + 3 files changed, 88 insertions(+) create mode 100755 tests/btrfs/176 create mode 100644 tests/btrfs/176.out diff --git a/tests/btrfs/176 b/tests/btrfs/176 new file mode 100755 index 00000000..1e576149 --- /dev/null +++ b/tests/btrfs/176 @@ -0,0 +1,82 @@ +#! /bin/bash +# SPDX-License-Identifier: GPL-2.0 +# Copyright (c) 2018 Facebook. All Rights Reserved. +# +# FS QA Test 176 +# +# Test device remove/replace with an active swap file. +# +seq=`basename $0` +seqres=$RESULT_DIR/$seq +echo "QA output created by $seq" + +here=`pwd` +tmp=/tmp/$$ +status=1 # failure is the default! +trap "_cleanup; exit \$status" 0 1 2 3 15 + +_cleanup() +{ + cd / + rm -f $tmp.* +} + +# get standard environment, filters and checks +. ./common/rc +. ./common/filter + +# remove previous $seqres.full before test +rm -f $seqres.full + +# real QA test starts here + +# Modify as appropriate. +_supported_fs generic +_supported_os Linux +_require_scratch_dev_pool 3 +_require_scratch_swapfile + +# We check the filesystem manually because we move devices around. +rm -f "${RESULT_DIR}/require_scratch" + +scratch_dev1="$(echo "${SCRATCH_DEV_POOL}" | awk '{ print $1 }')" +scratch_dev2="$(echo "${SCRATCH_DEV_POOL}" | awk '{ print $2 }')" +scratch_dev3="$(echo "${SCRATCH_DEV_POOL}" | awk '{ print $3 }')" + +echo "Remove device" +_scratch_mkfs >> $seqres.full 2>&1 +_scratch_mount +_format_swapfile "$SCRATCH_MNT/swap" $(($(get_page_size) * 10)) +$BTRFS_UTIL_PROG device add -f "$scratch_dev2" "$SCRATCH_MNT" +swapon "$SCRATCH_MNT/swap" 2>&1 | _filter_scratch +# We know the swap file is on device 1 because we added device 2 after it was +# already created. +$BTRFS_UTIL_PROG device delete "$scratch_dev1" "$SCRATCH_MNT" 2>&1 | grep -o "Text file busy" +# Deleting/readding device 2 should still work. +$BTRFS_UTIL_PROG device delete "$scratch_dev2" "$SCRATCH_MNT" +$BTRFS_UTIL_PROG device add -f "$scratch_dev2" "$SCRATCH_MNT" +swapoff "$SCRATCH_MNT/swap" > /dev/null 2>&1 +# Deleting device 1 should work again after swapoff. +$BTRFS_UTIL_PROG device delete "$scratch_dev1" "$SCRATCH_MNT" +_scratch_unmount +_check_scratch_fs "$scratch_dev2" + +echo "Replace device" +_scratch_mkfs >> $seqres.full 2>&1 +_scratch_mount +_format_swapfile "$SCRATCH_MNT/swap" $(($(get_page_size) * 10)) +$BTRFS_UTIL_PROG device add -f "$scratch_dev2" "$SCRATCH_MNT" +swapon "$SCRATCH_MNT/swap" 2>&1 | _filter_scratch +# Again, we know the swap file is on device 1. +$BTRFS_UTIL_PROG replace start -fB "$scratch_dev1" "$scratch_dev3" "$SCRATCH_MNT" 2>&1 | grep -o "Text file busy" +# Replacing device 2 should still work. +$BTRFS_UTIL_PROG replace start -fB "$scratch_dev2" "$scratch_dev3" "$SCRATCH_MNT" +swapoff "$SCRATCH_MNT/swap" > /dev/null 2>&1 +# Replacing device 1 should work again after swapoff. +$BTRFS_UTIL_PROG replace start -fB "$scratch_dev1" "$scratch_dev2" "$SCRATCH_MNT" +_scratch_unmount +_check_scratch_fs "$scratch_dev2" + +# success, all done +status=0 +exit diff --git a/tests/btrfs/176.out b/tests/btrfs/176.out new file mode 100644 index 00000000..5c99e0fd --- /dev/null +++ b/tests/btrfs/176.out @@ -0,0 +1,5 @@ +QA output created by 176 +Remove device +Text file busy +Replace device +Text file busy diff --git a/tests/btrfs/group b/tests/btrfs/group index b6160b72..3562420b 100644 --- a/tests/btrfs/group +++ b/tests/btrfs/group @@ -178,3 +178,4 @@ 173 auto quick swap 174 auto quick swap 175 auto quick swap +176 auto quick swap From patchwork Fri Nov 2 21:29:42 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Omar Sandoval X-Patchwork-Id: 10666225 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id B669417D4 for ; Fri, 2 Nov 2018 21:30:21 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id AA64D2B30C for ; Fri, 2 Nov 2018 21:30:21 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 9E65B2B5C1; Fri, 2 Nov 2018 21:30:21 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-7.9 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,MAILING_LIST_MULTI,RCVD_IN_DNSWL_HI autolearn=unavailable version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 3F6EA2B30C for ; Fri, 2 Nov 2018 21:30:21 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728322AbeKCGjG (ORCPT ); Sat, 3 Nov 2018 02:39:06 -0400 Received: from mail-it1-f195.google.com ([209.85.166.195]:40617 "EHLO mail-it1-f195.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728294AbeKCGjF (ORCPT ); Sat, 3 Nov 2018 02:39:05 -0400 Received: by mail-it1-f195.google.com with SMTP id e11so1798597itl.5 for ; Fri, 02 Nov 2018 14:30:18 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=osandov-com.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=6cGVZs5ipFV2C2zFWLLEGyUdHu2+6/U98A9UMPDkDlM=; b=CWkXexCu7Bxl4UHPiobq1boVMFwt+q+3IhdZxivEj+AWnzI8i2yE0NM5dEelZmqdo+ yldrsugjhek2RocQkoFCC/I7pR8VGzRZNFCuuSQ4oIjUyDCgiArkAoZMM1Hveb3iF6l7 eFvb76X7y6eShj6iISgzX8CPpuNU7GxfT1qG1Ut2JoQrgz8Nk8GVmS9uVoCa4UvWFTv3 nqMBN+GvsuD5IFgRag44imZwW1WJyaQvhsZmvUs9tXBQ23peYX/sPAPmSCJHIUBU6pHs ohs5vK1x5vlqZoKvZbOY1CIAYjabdUu2vRL7+0z+X+NgzFYhoJMN45GOEWAd/LyLiju5 0Y+g== 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:in-reply-to :references:mime-version:content-transfer-encoding; bh=6cGVZs5ipFV2C2zFWLLEGyUdHu2+6/U98A9UMPDkDlM=; b=R3Fss155/rXdQDWY5rTrasdgZ1V1GMKTniorT/LEw5y+MX2udyz6+0dGhot5k3VJOu J8NvYJuUahQEotP345X39OxGhHCe/7zjsjWoUFIvyP3mPhZBJb6WaohoqV84v7k2Dfbb q71B3fuCo7FqUTbqDzid+wHRfq2G6oY+LB1GPG7fkFY433eiT0jZrpn0o5o1EQp5qRpn jVfMEnZNrlQSfg6RkJ62ooBn2CNvhjMuWOf41eYBX9wSfOF+V3UMc2+2cMQOr5QKo03+ Yb5ALGaSaukvJF8J9ix0px7//mJxfeWZGru5e49AR9P4YbU7q7aoS669/t4QMKpVAJqQ 3MRA== X-Gm-Message-State: AGRZ1gLPhgTCTimyRxRFenSMz6/Hboe2MeHYnojM/xgfgy1Lmsnhy7Aj bfyXIRPNEMDTpK6PpDOnfbVXHwQ/NA0= X-Google-Smtp-Source: AJdET5f0lXUgq0BvIyCfrZ2t0kSoskfrI4h/VpwB/RwYqTkVdMc8y222QAIhxBEVyq+5rUmCTJx6NA== X-Received: by 2002:a02:b699:: with SMTP id i25-v6mr12087120jam.117.1541194217901; Fri, 02 Nov 2018 14:30:17 -0700 (PDT) Received: from vader.thefacebook.com ([2620:10d:c090:200::4:e24f]) by smtp.gmail.com with ESMTPSA id n130-v6sm929419itb.36.2018.11.02.14.30.16 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 02 Nov 2018 14:30:17 -0700 (PDT) From: Omar Sandoval To: fstests@vger.kernel.org Cc: kernel-team@fb.com, linux-btrfs@vger.kernel.org Subject: [PATCH 7/7] btrfs: test balance and resize with an active swap file Date: Fri, 2 Nov 2018 14:29:42 -0700 Message-Id: X-Mailer: git-send-email 2.19.1 In-Reply-To: References: MIME-Version: 1.0 Sender: fstests-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: fstests@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP From: Omar Sandoval Make sure we don't shrink the device past an active swap file, but allow shrinking otherwise, as well as growing and balance. Signed-off-by: Omar Sandoval --- tests/btrfs/177 | 64 +++++++++++++++++++++++++++++++++++++++++++++ tests/btrfs/177.out | 6 +++++ tests/btrfs/group | 1 + 3 files changed, 71 insertions(+) create mode 100755 tests/btrfs/177 create mode 100644 tests/btrfs/177.out diff --git a/tests/btrfs/177 b/tests/btrfs/177 new file mode 100755 index 00000000..12dad8fc --- /dev/null +++ b/tests/btrfs/177 @@ -0,0 +1,64 @@ +#! /bin/bash +# SPDX-License-Identifier: GPL-2.0 +# Copyright (c) 2018 Facebook. All Rights Reserved. +# +# FS QA Test 177 +# +# Test relocation (balance and resize) with an active swap file. +# +seq=`basename $0` +seqres=$RESULT_DIR/$seq +echo "QA output created by $seq" + +here=`pwd` +tmp=/tmp/$$ +status=1 # failure is the default! +trap "_cleanup; exit \$status" 0 1 2 3 15 + +_cleanup() +{ + cd / + rm -f $tmp.* +} + +. ./common/rc +. ./common/filter +. ./common/btrfs + +rm -f $seqres.full + +# Modify as appropriate. +_supported_fs generic +_supported_os Linux +_require_scratch_swapfile + +swapfile="$SCRATCH_MNT/swap" + +# First, create a 1GB filesystem and fill it up. +_scratch_mkfs_sized $((1024 * 1024 * 1024)) >> $seqres.full 2>&1 +_scratch_mount +dd if=/dev/zero of="$SCRATCH_MNT/fill" bs=1024k >> $seqres.full 2>&1 +# Now add more space and create a swap file. We know that the first 1GB of the +# filesystem was used, so the swap file must be in the new part of the +# filesystem. +$BTRFS_UTIL_PROG filesystem resize 2G "$SCRATCH_MNT" | _filter_scratch +_format_swapfile "$swapfile" $((32 * 1024 * 1024)) +swapon "$swapfile" +# Add even more space which we know is unused. +$BTRFS_UTIL_PROG filesystem resize 3G "$SCRATCH_MNT" | _filter_scratch +# Free up the first 1GB of the filesystem. +rm -f "$SCRATCH_MNT/fill" +# Get rid of empty block groups and also make sure that balance skips block +# groups containing active swap files. +_run_btrfs_balance_start "$SCRATCH_MNT" +# Shrink away the unused space. +$BTRFS_UTIL_PROG filesystem resize 2G "$SCRATCH_MNT" | _filter_scratch +# Try to shrink away the area occupied by the swap file, which should fail. +$BTRFS_UTIL_PROG filesystem resize 1G "$SCRATCH_MNT" 2>&1 | grep -o "Text file busy" +swapoff "$swapfile" +# It should work again after swapoff. +$BTRFS_UTIL_PROG filesystem resize 1G "$SCRATCH_MNT" | _filter_scratch +_scratch_unmount + +status=0 +exit diff --git a/tests/btrfs/177.out b/tests/btrfs/177.out new file mode 100644 index 00000000..6ced01da --- /dev/null +++ b/tests/btrfs/177.out @@ -0,0 +1,6 @@ +QA output created by 177 +Resize 'SCRATCH_MNT' of '2G' +Resize 'SCRATCH_MNT' of '3G' +Resize 'SCRATCH_MNT' of '2G' +Text file busy +Resize 'SCRATCH_MNT' of '1G' diff --git a/tests/btrfs/group b/tests/btrfs/group index 3562420b..0b62e58a 100644 --- a/tests/btrfs/group +++ b/tests/btrfs/group @@ -179,3 +179,4 @@ 174 auto quick swap 175 auto quick swap 176 auto quick swap +177 auto quick swap