Received: by 2002:a25:683:0:0:0:0:0 with SMTP id 125csp987412ybg; Wed, 10 Jun 2020 20:21:18 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyqlTMACCphdZYGUwu79t6hLluWYMHBcy9I6ZzC7qZNroqsYnA5Uyubv5dXzdL/zjm5i/lN X-Received: by 2002:a50:f611:: with SMTP id c17mr4983233edn.60.1591845678331; Wed, 10 Jun 2020 20:21:18 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1591845678; cv=none; d=google.com; s=arc-20160816; b=AJk1B/vr8xivPUqYd5ohIXnxTV/f9EQz3WrhuRR6y5WieuxUmlCP5gOJkwZ8Hjqv5s Gyys/yMwAT+1fQx5MxJpUJU5WgkuZgVLLS4+Z8YzlrcZ3PGK6ub0oX4d4BRcVN5e4C6T lQYPQ+T/RLcRO/y51PFCs0HQN8kXE/D9k++a6JBzYT7vY/GNgi7uYugXBuKWH9Y8IDY9 a1i3ra7anKgg67y7eKvFAf3DtQgK4X1VXq+l7zVL9BXmOZ3OdfMY+47WsYWrcJfUx3U0 kQayqJ9WTtspPy8Pook/b3oVesmAOGA9I9OvhkWCNIY5+SPRw8ueMOLl/M1rXsgKyaZa Ramg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :message-id:date:subject:cc:to:from:dkim-signature; bh=ehrgS32gMf6wPQo2vNkaEDhcW2sOAF2ZJzxzXWBGECE=; b=MfKf/2m1brkPzxeSZoCSY85XTYVNQgW0T5V4og0aQg8RO7iJBErZr6YTrFvVl2CEsz g5TGm/SbhaaZpS9DXuEny8sWHWxg3GyuCS4w7OXQ4DJmBLd4glssK2YpTJ0mH2Irr53N M6N+ghIjXxoi2X8TK2XWwSfbb9C4Qyq13r61dKjlrBs3OCuQiSRoNGwT4TcD8Xd/pyj7 WKyPKDP6TOn2kvvdVVR7q1TQLkX5Pf0uXxQXl8cUe97beQmRro50e1MtdBaX6YKP7dVN ukc3hmzMC5Nz9ghmjmd5TMJXak/3wevzvd421CL4WFfVBoJ/fsVmGgjX2tj95iBncxaI KCzQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@gmail.com header.s=20161025 header.b=iKUJ1gjm; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id d6si1107268eja.468.2020.06.10.20.20.55; Wed, 10 Jun 2020 20:21:18 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@gmail.com header.s=20161025 header.b=iKUJ1gjm; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726369AbgFKDRD (ORCPT + 99 others); Wed, 10 Jun 2020 23:17:03 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:40936 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726279AbgFKDRD (ORCPT ); Wed, 10 Jun 2020 23:17:03 -0400 Received: from mail-pl1-x644.google.com (mail-pl1-x644.google.com [IPv6:2607:f8b0:4864:20::644]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 803FCC08C5C1 for ; Wed, 10 Jun 2020 20:17:03 -0700 (PDT) Received: by mail-pl1-x644.google.com with SMTP id y18so1777302plr.4 for ; Wed, 10 Jun 2020 20:17:03 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=ehrgS32gMf6wPQo2vNkaEDhcW2sOAF2ZJzxzXWBGECE=; b=iKUJ1gjmx8FK5WMjR56zqFzj41etGkG2tlvexAS1BxA0N1SRoPGOp5m9wMjUxUVhHM e/6LRxyGoBHD9/Aqdl1tMGsY+F5j+ffRerFV94peqdvE9F75WF7Mrsd/3gbYEUAR/qew FeFx2GO/IA18JN1L6Pok/AItEq+1QNPgEYTBjupNGfUCGOgxo6jNKhorCg+8hRjVHaRc UaHh5tAZY7kV/SiR7FIZyHH8V30nWkNr+Sp8+VjsLcy5OFOPsJSbVrlF8OI2EdIBI+W3 ROo7VLAM0ZGJWfd3lRljqSvPwM7WL2Nbm6fELXUq6YkNhVMgv9EYgRzfXPyigP7SSLJq bqzQ== 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:mime-version :content-transfer-encoding; bh=ehrgS32gMf6wPQo2vNkaEDhcW2sOAF2ZJzxzXWBGECE=; b=kAj4RlUzjY/adMKkCOLGz/XqQyXEcXDSVxaWjLFpptA2trV6qyK7NhsKuZAXsBLkoq MFVnolByAhSaYKdrFpoYTJ/aVx9JV9BDWaK9c362R2+pCUKUpm13TVoZCeMXLKroZ5K6 Y7erdn3H1P2Wd+udouqczrz4t0Z6pxUFyX/ciDBPQSkJ/AjoPXEzA9qVfsDvmiyMjoIS 5y987LIrseF8c8gsREJ43J1Btri3a1GTs7KsJuzbHqc6XfvL4udKESYxw7xhz2c8XcOA SXnBR9ji516DVyMI0PMHVyywJE84mNygxZR0KiX9eiNKGekVzcZw5i4SBWH/mvlBBZvM 01TQ== X-Gm-Message-State: AOAM530QujiDkVYkoK9MaXopkbvXDVhKeM0MXOMyNRrdexnMIDNl6Sa5 ksXhJHsK2dYlt4IavNgi4eHP25LIYtldnw== X-Received: by 2002:a17:90b:46ca:: with SMTP id jx10mr6247863pjb.3.1591845422545; Wed, 10 Jun 2020 20:17:02 -0700 (PDT) Received: from daehojeong1.seo.corp.google.com ([2401:fa00:d:1:b8f4:bbde:37ba:20bd]) by smtp.gmail.com with ESMTPSA id ha16sm1030196pjb.40.2020.06.10.20.17.00 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 10 Jun 2020 20:17:01 -0700 (PDT) From: Daeho Jeong To: linux-kernel@vger.kernel.org, linux-f2fs-devel@lists.sourceforge.net, kernel-team@android.com Cc: Daeho Jeong Subject: [PATCH v2] f2fs: add F2FS_IOC_SEC_TRIM_FILE ioctl Date: Thu, 11 Jun 2020 12:16:52 +0900 Message-Id: <20200611031652.200401-1-daeho43@gmail.com> X-Mailer: git-send-email 2.27.0.278.ge193c7cf3a9-goog MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Daeho Jeong Added a new ioctl to send discard commands or/and zero out to whole data area of a regular file for security reason. Signed-off-by: Daeho Jeong --- fs/f2fs/f2fs.h | 8 +++ fs/f2fs/file.c | 143 +++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 151 insertions(+) diff --git a/fs/f2fs/f2fs.h b/fs/f2fs/f2fs.h index c812fb8e2d9c..ca139fac5a73 100644 --- a/fs/f2fs/f2fs.h +++ b/fs/f2fs/f2fs.h @@ -434,6 +434,7 @@ static inline bool __has_cursum_space(struct f2fs_journal *journal, _IOR(F2FS_IOCTL_MAGIC, 18, __u64) #define F2FS_IOC_RESERVE_COMPRESS_BLOCKS \ _IOR(F2FS_IOCTL_MAGIC, 19, __u64) +#define F2FS_IOC_SEC_TRIM_FILE _IOW(F2FS_IOCTL_MAGIC, 20, __u32) #define F2FS_IOC_GET_VOLUME_NAME FS_IOC_GETFSLABEL #define F2FS_IOC_SET_VOLUME_NAME FS_IOC_SETFSLABEL @@ -453,6 +454,13 @@ static inline bool __has_cursum_space(struct f2fs_journal *journal, #define F2FS_GOING_DOWN_METAFLUSH 0x3 /* going down with meta flush */ #define F2FS_GOING_DOWN_NEED_FSCK 0x4 /* going down to trigger fsck */ +/* + * Flags used by F2FS_IOC_SEC_TRIM_FILE + */ +#define F2FS_TRIM_FILE_DISCARD 0x1 /* send discard command */ +#define F2FS_TRIM_FILE_ZEROOUT 0x2 /* zero out */ +#define F2FS_TRIM_FILE_MASK 0x3 + #if defined(__KERNEL__) && defined(CONFIG_COMPAT) /* * ioctl commands in 32 bit emulation diff --git a/fs/f2fs/file.c b/fs/f2fs/file.c index dfa1ac2d751a..ba9b7ec5d6bf 100644 --- a/fs/f2fs/file.c +++ b/fs/f2fs/file.c @@ -3749,6 +3749,146 @@ static int f2fs_reserve_compress_blocks(struct file *filp, unsigned long arg) return ret; } +static int f2fs_secure_erase(struct block_device *bdev, block_t block, + block_t len, u32 flags) +{ + struct request_queue *q = bdev_get_queue(bdev); + sector_t sector = SECTOR_FROM_BLOCK(block); + sector_t nr_sects = SECTOR_FROM_BLOCK(len); + int ret = 0; + + if (!q) + return -ENXIO; + + if (flags & F2FS_TRIM_FILE_DISCARD) + ret = blkdev_issue_discard(bdev, sector, nr_sects, GFP_NOFS, + blk_queue_secure_erase(q) ? + BLKDEV_DISCARD_SECURE : 0); + + if (!ret && (flags & F2FS_TRIM_FILE_ZEROOUT)) + ret = blkdev_issue_zeroout(bdev, sector, nr_sects, GFP_NOFS, 0); + + return ret; +} + +static int f2fs_sec_trim_file(struct file *filp, unsigned long arg) +{ + struct inode *inode = file_inode(filp); + struct f2fs_sb_info *sbi = F2FS_I_SB(inode); + struct address_space *mapping = inode->i_mapping; + struct block_device *prev_bdev = NULL; + pgoff_t index, pg_start = 0, pg_end; + block_t prev_block = 0, len = 0; + u32 flags; + int ret = 0; + + if (!(filp->f_mode & FMODE_WRITE)) + return -EBADF; + + if (get_user(flags, (u32 __user *)arg)) + return -EFAULT; + if (flags == 0 || (flags & ~F2FS_TRIM_FILE_MASK)) + return -EINVAL; + + if ((flags & F2FS_TRIM_FILE_DISCARD) && !f2fs_hw_support_discard(sbi)) + return -EOPNOTSUPP; + + file_start_write(filp); + inode_lock(inode); + + if (!S_ISREG(inode->i_mode) || f2fs_is_atomic_file(inode) || + f2fs_compressed_file(inode)) { + ret = -EINVAL; + goto err; + } + + if (!inode->i_size) + goto err; + pg_end = DIV_ROUND_UP(inode->i_size, PAGE_SIZE); + + ret = f2fs_convert_inline_inode(inode); + if (ret) + goto err; + + down_write(&F2FS_I(inode)->i_gc_rwsem[WRITE]); + down_write(&F2FS_I(inode)->i_mmap_sem); + + ret = filemap_write_and_wait(mapping); + if (ret) + goto out; + + truncate_inode_pages(mapping, 0); + + for (index = pg_start; index < pg_end;) { + struct dnode_of_data dn; + unsigned int end_offset; + + set_new_dnode(&dn, inode, NULL, NULL, 0); + ret = f2fs_get_dnode_of_data(&dn, index, LOOKUP_NODE); + if (ret) + goto out; + + end_offset = ADDRS_PER_PAGE(dn.node_page, inode); + if (pg_end < end_offset + index) + end_offset = pg_end - index; + + for (; dn.ofs_in_node < end_offset; + dn.ofs_in_node++, index++) { + struct block_device *cur_bdev; + block_t blkaddr = f2fs_data_blkaddr(&dn); + + if (__is_valid_data_blkaddr(blkaddr)) { + if (!f2fs_is_valid_blkaddr(F2FS_I_SB(inode), + blkaddr, DATA_GENERIC_ENHANCE)) { + ret = -EFSCORRUPTED; + goto out; + } + } else + continue; + + cur_bdev = f2fs_target_device(sbi, blkaddr, NULL); + if (f2fs_is_multi_device(sbi)) { + int i = f2fs_target_device_index(sbi, blkaddr); + + blkaddr -= FDEV(i).start_blk; + } + + if (len) { + if (prev_bdev == cur_bdev && + blkaddr == prev_block + len) { + len++; + } else { + ret = f2fs_secure_erase(prev_bdev, + prev_block, len, flags); + if (ret) + goto out; + + len = 0; + } + } + + if (!len) { + prev_bdev = cur_bdev; + prev_block = blkaddr; + len = 1; + } + } + + f2fs_put_dnode(&dn); + } + + if (len) + ret = f2fs_secure_erase(prev_bdev, prev_block, len, flags); +out: + up_write(&F2FS_I(inode)->i_mmap_sem); + up_write(&F2FS_I(inode)->i_gc_rwsem[WRITE]); +err: + inode_unlock(inode); + file_end_write(filp); + + return ret; +} + long f2fs_ioctl(struct file *filp, unsigned int cmd, unsigned long arg) { if (unlikely(f2fs_cp_error(F2FS_I_SB(file_inode(filp))))) @@ -3835,6 +3975,8 @@ long f2fs_ioctl(struct file *filp, unsigned int cmd, unsigned long arg) return f2fs_release_compress_blocks(filp, arg); case F2FS_IOC_RESERVE_COMPRESS_BLOCKS: return f2fs_reserve_compress_blocks(filp, arg); + case F2FS_IOC_SEC_TRIM_FILE: + return f2fs_sec_trim_file(filp, arg); default: return -ENOTTY; } @@ -4004,6 +4146,7 @@ long f2fs_compat_ioctl(struct file *file, unsigned int cmd, unsigned long arg) case F2FS_IOC_GET_COMPRESS_BLOCKS: case F2FS_IOC_RELEASE_COMPRESS_BLOCKS: case F2FS_IOC_RESERVE_COMPRESS_BLOCKS: + case F2FS_IOC_SEC_TRIM_FILE: break; default: return -ENOIOCTLCMD; -- 2.27.0.278.ge193c7cf3a9-goog