From patchwork Wed Apr 12 14:46:20 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Murphy Zhou X-Patchwork-Id: 9677593 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 7114D601C3 for ; Wed, 12 Apr 2017 14:47:00 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 616C528395 for ; Wed, 12 Apr 2017 14:47:00 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 54931284D8; Wed, 12 Apr 2017 14:47:00 +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=-6.9 required=2.0 tests=BAYES_00,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 B5D0E28395 for ; Wed, 12 Apr 2017 14:46:59 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754159AbdDLOq7 (ORCPT ); Wed, 12 Apr 2017 10:46:59 -0400 Received: from mx1.redhat.com ([209.132.183.28]:54938 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753968AbdDLOq6 (ORCPT ); Wed, 12 Apr 2017 10:46:58 -0400 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 225C07F7B2; Wed, 12 Apr 2017 14:46:53 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mx1.redhat.com 225C07F7B2 Authentication-Results: ext-mx04.extmail.prod.ext.phx2.redhat.com; dmarc=none (p=none dis=none) header.from=redhat.com Authentication-Results: ext-mx04.extmail.prod.ext.phx2.redhat.com; spf=pass smtp.mailfrom=xzhou@redhat.com DKIM-Filter: OpenDKIM Filter v2.11.0 mx1.redhat.com 225C07F7B2 Received: from localhost (dhcp-12-130.nay.redhat.com [10.66.12.130]) by smtp.corp.redhat.com (Postfix) with ESMTP id 3E9AC77FE0; Wed, 12 Apr 2017 14:46:52 +0000 (UTC) From: Xiong Zhou To: fstests@vger.kernel.org Cc: ross.zwisler@linux.intel.com, dan.j.williams@intel.com, jmoyer@redhat.com, eguan@redhat.com, Xiong Zhou Subject: [PATCH v3 4/4] generic: mmap write readonly DAX file Date: Wed, 12 Apr 2017 22:46:20 +0800 Message-Id: <1492008380-29164-5-git-send-email-xzhou@redhat.com> In-Reply-To: <1492008380-29164-1-git-send-email-xzhou@redhat.com> References: <20170412062608.y2u5og3xz2oly44b@XZHOUW.usersys.redhat.com> <1492008380-29164-1-git-send-email-xzhou@redhat.com> X-Scanned-By: MIMEDefang 2.79 on 10.5.11.15 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.28]); Wed, 12 Apr 2017 14:46:53 +0000 (UTC) Sender: fstests-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: fstests@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Regression case that one can write to read-only file in a DAX mountpoint. Signed-off-by: Xiong Zhou --- .gitignore | 1 + src/Makefile | 2 +- src/t_mmap_write_ro.c | 76 ++++++++++++++++++++++++++++++++++++++++++ tests/generic/424 | 92 +++++++++++++++++++++++++++++++++++++++++++++++++++ tests/generic/424.out | 2 ++ tests/generic/group | 1 + 6 files changed, 173 insertions(+), 1 deletion(-) create mode 100644 src/t_mmap_write_ro.c create mode 100755 tests/generic/424 create mode 100644 tests/generic/424.out diff --git a/.gitignore b/.gitignore index 1ed2a92..ee9329f 100644 --- a/.gitignore +++ b/.gitignore @@ -131,6 +131,7 @@ /src/renameat2 /src/t_rename_overwrite /src/t_mmap_dio +/src/t_mmap_write_ro # dmapi/ binaries /dmapi/src/common/cmd/read_invis diff --git a/src/Makefile b/src/Makefile index a7f27f0..2604f52 100644 --- a/src/Makefile +++ b/src/Makefile @@ -12,7 +12,7 @@ TARGETS = dirstress fill fill2 getpagesize holes lstat64 \ godown resvtest writemod makeextents itrash rename \ multi_open_unlink dmiperf unwritten_sync genhashnames t_holes \ t_mmap_writev t_truncate_cmtime dirhash_collide t_rename_overwrite \ - holetest t_truncate_self t_mmap_dio + holetest t_truncate_self t_mmap_dio t_mmap_write_ro LINUX_TARGETS = xfsctl bstat t_mtab getdevicesize preallo_rw_pattern_reader \ preallo_rw_pattern_writer ftrunc trunc fs_perms testx looptest \ diff --git a/src/t_mmap_write_ro.c b/src/t_mmap_write_ro.c new file mode 100644 index 0000000..b6bf2a7 --- /dev/null +++ b/src/t_mmap_write_ro.c @@ -0,0 +1,76 @@ +#include +#include +#include +#include +#include +#include +#include +#include + +void +err_exit(char *op) +{ + fprintf(stderr, "%s: %s\n", op, strerror(errno)); + exit(1); +} + +int +main(int argc, char **argv) +{ + int fd, pfd, ret; + char *buf; + volatile char foo; + int pagesize = getpagesize(); + + if (argc < 2) { + printf("Usage: %s \n", basename(argv[0])); + exit(0); + } + + fd = open(argv[1], O_RDONLY|O_DIRECT); + if (fd < 0) + err_exit("open"); + + pfd = open(argv[2], O_RDONLY); + if (pfd < 0) + err_exit("pmem open"); + + buf = mmap(NULL, pagesize, PROT_READ, MAP_SHARED, pfd, 0); + if (buf == MAP_FAILED) + err_exit("mmap"); + + /* + * Read from the DAX mmap to populate the first page in the + * address_space with a read-only mapping. + */ + foo = *buf; + + /* quiet the compiler's "unused-but-set-variable" warning */ + foo; + + /* + * Now write to the DAX mmap. This *should* fail, but if the bug is + * present in __get_user_pages_fast(), it will succeed. + */ + ret = read(fd, buf, pagesize); + if (ret != pagesize) + err_exit("read"); + + ret = msync(buf, pagesize, MS_SYNC); + if (ret != 0) + err_exit("msync"); + + ret = munmap(buf, pagesize); + if (ret < 0) + err_exit("munmap"); + + ret = close(fd); + if (ret < 0) + err_exit("clsoe fd"); + + ret = close(pfd); + if (ret < 0) + err_exit("close pfd"); + + exit(0); +} diff --git a/tests/generic/424 b/tests/generic/424 new file mode 100755 index 0000000..f73e08a --- /dev/null +++ b/tests/generic/424 @@ -0,0 +1,92 @@ +#! /bin/bash +# FS QA Test 424 +# +# This is a regression test for kernel commit +# ef947b2 x86, mm: fix gup_pte_range() vs DAX mappings +# created by Jeffrey Moyer +# +# This is reproducible only when testing on pmem device +# which is configured in "memory mode", not in "raw mode". +# +#----------------------------------------------------------------------- +# Copyright (c) 2017 Red Hat. All Rights Reserved. +# +# This program is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License as +# published by the Free Software Foundation. +# +# This program is distributed in the hope that it would be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write the Free Software Foundation, +# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA +#----------------------------------------------------------------------- +# + +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 -rf $tmp.* +} + +# get standard environment, filters and checks +. ./common/rc +. ./common/filter + +# remove previous $seqres.full before test +rm -f $seqres.full + +# Modify as appropriate. +_supported_fs generic +_supported_os Linux +_require_scratch_dax +_require_test_program "t_mmap_write_ro" +_require_user + +# real QA test starts here + +_scratch_mkfs >>$seqres.full 2>&1 +_scratch_mount "-o dax" + +# remount TEST_DEV wo/ dax +export MOUNT_OPTIONS="" +export TEST_FS_MOUNT_OPTS="" +_test_cycle_mount + +# prepare a 4k read-only DAX file, save its md5sum +$XFS_IO_PROG -f -c "pwrite -S 0xFFFF 0 4096" \ + $SCRATCH_MNT/readonlyfile >> $seqres.full 2>&1 +chmod 0644 $SCRATCH_MNT/readonlyfile +md5_1="$(_md5_checksum $SCRATCH_MNT/readonlyfile)" + +# prepare another larger non-DAX file +$XFS_IO_PROG -f -c "pwrite -S 0x0000 0 40960" \ + $TEST_DIR/${seq}.largefile >> $seqres.full 2>&1 +# allow qa_user access +chown $qa_user $TEST_DIR/${seq}.largefile + +# run test programme, read another larger file writing into +# the read-only file with mmap, which should fail. +_user_do "src/t_mmap_write_ro $TEST_DIR/${seq}.largefile \ + $SCRATCH_MNT/readonlyfile" + +# read-only file should not get updated, md5sum again. +md5_2="$(_md5_checksum $SCRATCH_MNT/readonlyfile)" + +[ "$md5_1" != "$md5_2" ] && echo "read only file changed" + +# success, all done +status=0 +exit diff --git a/tests/generic/424.out b/tests/generic/424.out new file mode 100644 index 0000000..c836ec8 --- /dev/null +++ b/tests/generic/424.out @@ -0,0 +1,2 @@ +QA output created by 424 +read: Bad address diff --git a/tests/generic/group b/tests/generic/group index 52553fa..81db660 100644 --- a/tests/generic/group +++ b/tests/generic/group @@ -426,3 +426,4 @@ 421 auto quick encrypt dangerous 422 auto quick 423 auto quick +424 auto quick