From patchwork Fri Apr 20 14:21:55 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David Sterba X-Patchwork-Id: 10352827 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 EB059602B1 for ; Fri, 20 Apr 2018 14:24:31 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id DBD9D28789 for ; Fri, 20 Apr 2018 14:24:31 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id D0B602878F; Fri, 20 Apr 2018 14:24:31 +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, 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 6CCAA28789 for ; Fri, 20 Apr 2018 14:24:31 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755260AbeDTOY3 (ORCPT ); Fri, 20 Apr 2018 10:24:29 -0400 Received: from mx2.suse.de ([195.135.220.15]:58871 "EHLO mx2.suse.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755160AbeDTOY1 (ORCPT ); Fri, 20 Apr 2018 10:24:27 -0400 X-Virus-Scanned: by amavisd-new at test-mx.suse.de Received: from relay2.suse.de (charybdis-ext.suse.de [195.135.220.254]) by mx2.suse.de (Postfix) with ESMTP id 7FE84AEBF for ; Fri, 20 Apr 2018 14:24:26 +0000 (UTC) Received: by ds.suse.cz (Postfix, from userid 10065) id 1F92EDAE0B; Fri, 20 Apr 2018 16:21:55 +0200 (CEST) From: David Sterba To: linux-btrfs@vger.kernel.org Cc: David Sterba Subject: [PATCH 5/6] btrfs: add discard secure to clear unused space Date: Fri, 20 Apr 2018 16:21:55 +0200 Message-Id: X-Mailer: git-send-email 2.16.2 In-Reply-To: References: Sender: linux-btrfs-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-btrfs@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Signed-off-by: David Sterba --- fs/btrfs/extent-tree.c | 14 ++++++++++++-- include/uapi/linux/btrfs.h | 1 + 2 files changed, 13 insertions(+), 2 deletions(-) diff --git a/fs/btrfs/extent-tree.c b/fs/btrfs/extent-tree.c index 21a24fff32dd..285bace8e2c6 100644 --- a/fs/btrfs/extent-tree.c +++ b/fs/btrfs/extent-tree.c @@ -2037,10 +2037,15 @@ static int remove_extent_backref(struct btrfs_trans_handle *trans, static int btrfs_issue_clear_op(struct block_device *bdev, u64 start, u64 size, enum btrfs_clear_op_type clear) { + int flags = 0; + switch (clear) { + case BTRFS_CLEAR_OP_DISCARD_SECURE: + flags = BLKDEV_DISCARD_SECURE; + /* fall through */ case BTRFS_CLEAR_OP_DISCARD: return blkdev_issue_discard(bdev, start >> 9, size >> 9, - GFP_NOFS, 0); + GFP_NOFS, flags); case BTRFS_CLEAR_OP_ZERO: return blkdev_issue_zeroout(bdev, start >> 9, size >> 9, GFP_NOFS, 0); @@ -2129,7 +2134,8 @@ int btrfs_discard_extent(struct btrfs_fs_info *fs_info, u64 bytenr, struct btrfs_bio *bbio = NULL; int rw; - if (clear == BTRFS_CLEAR_OP_DISCARD) + if (clear == BTRFS_CLEAR_OP_DISCARD || + clear == BTRFS_CLEAR_OP_DISCARD_SECURE) rw = BTRFS_MAP_DISCARD; else rw = BTRFS_MAP_WRITE; @@ -2160,6 +2166,10 @@ int btrfs_discard_extent(struct btrfs_fs_info *fs_info, u64 bytenr, !blk_queue_discard(req_q)) continue; + if (clear == BTRFS_CLEAR_OP_DISCARD_SECURE && + !blk_queue_secure_erase(req_q)) + continue; + ret = btrfs_issue_discard(stripe->dev->bdev, stripe->physical, stripe->length, diff --git a/include/uapi/linux/btrfs.h b/include/uapi/linux/btrfs.h index 860f9df01614..1becbb241e53 100644 --- a/include/uapi/linux/btrfs.h +++ b/include/uapi/linux/btrfs.h @@ -743,6 +743,7 @@ enum btrfs_err_code { enum btrfs_clear_op_type { BTRFS_CLEAR_OP_DISCARD = 0, BTRFS_CLEAR_OP_ZERO, + BTRFS_CLEAR_OP_DISCARD_SECURE, BTRFS_NR_CLEAR_OP_TYPES, };