From patchwork Thu Jun 15 16:42:02 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jens Axboe X-Patchwork-Id: 9789269 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 8FD0A60384 for ; Thu, 15 Jun 2017 16:42:27 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 7A9002852E for ; Thu, 15 Jun 2017 16:42:27 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 6F7CA286B5; Thu, 15 Jun 2017 16:42:27 +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,DKIM_SIGNED, DKIM_VALID,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 EA36F28542 for ; Thu, 15 Jun 2017 16:42:26 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751958AbdFOQmY (ORCPT ); Thu, 15 Jun 2017 12:42:24 -0400 Received: from mail-it0-f51.google.com ([209.85.214.51]:35145 "EHLO mail-it0-f51.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751879AbdFOQmU (ORCPT ); Thu, 15 Jun 2017 12:42:20 -0400 Received: by mail-it0-f51.google.com with SMTP id m62so21370976itc.0 for ; Thu, 15 Jun 2017 09:42:20 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=kernel-dk.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=37UbpHBJnZS+OvIEqTKZf69y49IqfjSgC2qQAdZeemE=; b=Ma5LJ1d7kpYjvvB7zBS7DT8BUfRDocz6qWjD2ThzqoM2R3xhAwYb21P+Wr0lFoRhak XHV5kC8y/aw/HFugtpGp2ntssEJb67fjbfYpVLPQsUf14IO2f0CxUmx1nvU9dKtp6xc9 SZGXuKDOnGFF9Zjn2/QQRj0gProXlrNGaYpZZu9+XEp/AtI+FK6iNfQuj5GbmtUZuT9Z bfe6cFfAACtAE7jpeu7kv0GS2N9ouoMHwSwkABDy8YrXsyR9oPGUzh8dAh1TAKaT8q7/ 3gTmkbcEc5hqdWUy992+CXBDSbspZru7MAGth62DdsmUj0rEdwiBptEDNdAu8m2GBKnA ckSg== 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; bh=37UbpHBJnZS+OvIEqTKZf69y49IqfjSgC2qQAdZeemE=; b=qfQevjM1Cg7eO7iBmYXCmMcn7Mk5LZJhjvEDUe+bXCBXmxBfFUrHKRa5uMmjirlIl6 kLHXHWuABZikKNCK/ukCzLtTN69G2SYLdbHiWbekpyK7E4ykJzFOlT7r4U2y9g+uPsLU cGAdap7yocRkScGfWWnPs0BIeXip9W2RCvD9KGB0LJ1yaO5dNRuOcPExRC/0eCtdWb8J qATPWZ9r3CRCrkFfNr6YCxwZ5wkL4pu73PRKYpDe/KWidHbJF0KbxD5M6CQzuNnqz1Nz /rEDY+rfMWWwLKWeV5rYp3ODxxTIZCqn8hANWaHTTlPGWsS6T8ErA59i2eeSGjSeIxkv Z4ug== X-Gm-Message-State: AKS2vOzPLBhFd3SvWFfoWbor1W3kacpM265dpZGYpE2SnMnjA1NVq/T8 1wZShKKj9+38C1ACcDkmoA== X-Received: by 10.36.74.195 with SMTP id k186mr6453551itb.63.1497544939163; Thu, 15 Jun 2017 09:42:19 -0700 (PDT) Received: from localhost.localdomain ([216.160.245.98]) by smtp.gmail.com with ESMTPSA id 97sm313476iot.25.2017.06.15.09.42.17 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 15 Jun 2017 09:42:18 -0700 (PDT) From: Jens Axboe To: linux-fsdevel@vger.kernel.org, linux-block@vger.kernel.org Cc: adilger@dilger.ca, hch@infradead.org, martin.petersen@oracle.com, Jens Axboe Subject: [PATCH 04/12] fs: add support for allowing applications to pass in write life time hints Date: Thu, 15 Jun 2017 10:42:02 -0600 Message-Id: <1497544930-19174-5-git-send-email-axboe@kernel.dk> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1497544930-19174-1-git-send-email-axboe@kernel.dk> References: <1497544930-19174-1-git-send-email-axboe@kernel.dk> Sender: linux-fsdevel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-fsdevel@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Add four flags for the pwritev2(2) system call, allowing an application to give the kernel a hint about what on-media life times can be expected from a given write. The intent is for these values to be relative to each other, no absolute meaning should be attached to these flag names. Set aside 3 bits in the iocb flags structure to carry this information over from the pwritev2 RWF_WRITE_LIFE_* flags. Signed-off-by: Jens Axboe --- fs/read_write.c | 12 +++++++++++- include/linux/fs.h | 12 ++++++++++++ include/uapi/linux/fs.h | 10 ++++++++++ 3 files changed, 33 insertions(+), 1 deletion(-) diff --git a/fs/read_write.c b/fs/read_write.c index 47c1d4484df9..871e97ae4147 100644 --- a/fs/read_write.c +++ b/fs/read_write.c @@ -675,10 +675,11 @@ EXPORT_SYMBOL(iov_shorten); static ssize_t do_iter_readv_writev(struct file *filp, struct iov_iter *iter, loff_t *ppos, int type, int flags) { + struct inode *inode = file_inode(filp); struct kiocb kiocb; ssize_t ret; - if (flags & ~(RWF_HIPRI | RWF_DSYNC | RWF_SYNC)) + if (flags & ~(RWF_HIPRI | RWF_DSYNC | RWF_SYNC | RWF_WRITE_LIFE_MASK)) return -EOPNOTSUPP; init_sync_kiocb(&kiocb, filp); @@ -688,6 +689,15 @@ static ssize_t do_iter_readv_writev(struct file *filp, struct iov_iter *iter, kiocb.ki_flags |= IOCB_DSYNC; if (flags & RWF_SYNC) kiocb.ki_flags |= (IOCB_DSYNC | IOCB_SYNC); + if ((flags & RWF_WRITE_LIFE_MASK) || + mask_to_write_hint(inode->i_flags, S_WRITE_LIFE_SHIFT)) { + enum write_hint hint; + + hint = mask_to_write_hint(flags, RWF_WRITE_LIFE_SHIFT); + + inode_set_write_hint(inode, hint); + kiocb.ki_flags |= write_hint_to_mask(hint, IOCB_WRITE_LIFE_SHIFT); + } kiocb.ki_pos = *ppos; if (type == READ) diff --git a/include/linux/fs.h b/include/linux/fs.h index bef0b350f890..24803ed57ec6 100644 --- a/include/linux/fs.h +++ b/include/linux/fs.h @@ -269,6 +269,12 @@ struct writeback_control; #define IOCB_SYNC (1 << 5) #define IOCB_WRITE (1 << 6) +/* + * Steal 3 bits for stream information, this allows 8 valid streams + */ +#define IOCB_WRITE_LIFE_SHIFT 7 +#define IOCB_WRITE_LIFE_MASK (BIT(7) | BIT(8) | BIT(9)) + struct kiocb { struct file *ki_filp; loff_t ki_pos; @@ -292,6 +298,12 @@ static inline void init_sync_kiocb(struct kiocb *kiocb, struct file *filp) }; } +static inline int iocb_write_hint(const struct kiocb *iocb) +{ + return (iocb->ki_flags & IOCB_WRITE_LIFE_MASK) >> + IOCB_WRITE_LIFE_SHIFT; +} + /* * "descriptor" for what we're up to with a read. * This allows us to use the same read code yet diff --git a/include/uapi/linux/fs.h b/include/uapi/linux/fs.h index 58fbe0903016..1feac96b43b9 100644 --- a/include/uapi/linux/fs.h +++ b/include/uapi/linux/fs.h @@ -374,4 +374,14 @@ enum write_hint { #define RWF_DSYNC 0x00000002 /* per-IO O_DSYNC */ #define RWF_SYNC 0x00000004 /* per-IO O_SYNC */ +/* + * Data life time write flags, steal 3 bits for that + */ +#define RWF_WRITE_LIFE_SHIFT 4 +#define RWF_WRITE_LIFE_MASK 0x00000070 /* 3 bits of write hints */ +#define RWF_WRITE_LIFE_SHORT (WRITE_HINT_SHORT << RWF_WRITE_LIFE_SHIFT) +#define RWF_WRITE_LIFE_MEDIUM (WRITE_HINT_MEDIUM << RWF_WRITE_LIFE_SHIFT) +#define RWF_WRITE_LIFE_LONG (WRITE_HINT_LONG << RWF_WRITE_LIFE_SHIFT) +#define RWF_WRITE_LIFE_EXTREME (WRITE_HINT_EXTREME << RWF_WRITE_LIFE_SHIFT) + #endif /* _UAPI_LINUX_FS_H */