From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-13.5 required=3.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED,DKIM_INVALID,DKIM_SIGNED,FREEMAIL_FORGED_FROMDOMAIN, FREEMAIL_FROM,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER, INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id A17EDC4338F for ; Thu, 22 Jul 2021 23:14:12 +0000 (UTC) Received: from lists.sourceforge.net (lists.sourceforge.net [216.105.38.7]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 4A6B960E8F; Thu, 22 Jul 2021 23:14:12 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.1 mail.kernel.org 4A6B960E8F Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=lists.sourceforge.net Received: from [127.0.0.1] (helo=sfs-ml-2.v29.lw.sourceforge.com) by sfs-ml-2.v29.lw.sourceforge.com with esmtp (Exim 4.92.3) (envelope-from ) id 1m6htL-0005LU-08; Thu, 22 Jul 2021 23:14:11 +0000 Received: from [172.30.20.202] (helo=mx.sourceforge.net) by sfs-ml-2.v29.lw.sourceforge.com with esmtps (TLSv1.2:ECDHE-RSA-AES256-GCM-SHA384:256) (Exim 4.92.3) (envelope-from ) id 1m6htJ-0005LM-Kh for linux-f2fs-devel@lists.sourceforge.net; Thu, 22 Jul 2021 23:14:09 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=sourceforge.net; s=x; h=Content-Transfer-Encoding:MIME-Version:Message-Id: Date:Subject:Cc:To:From:Sender:Reply-To:Content-Type:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:In-Reply-To:References:List-Id:List-Help:List-Unsubscribe: List-Subscribe:List-Post:List-Owner:List-Archive; bh=SegNg7H7cBrrJSTIu9IxhK9gndrxnfwXCQId3QaK+t4=; b=V4zG3Pe2/59nbtACeyPJhdqozM 0xKHWqfcHsj+hEZJGaVq6oWDzc2920RtufW3zrU1Fuv9LH1+e0W4UWqmZ8qATkoHPQ1L6uTRiiUqd qnvlHh+cyjRGOsZQ4bn6Jwfx/oaPVgkPdDlFsGPx3ySarfczyFIaWzc4sHZgAxIqwLiI=; DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=sf.net; s=x ; h=Content-Transfer-Encoding:MIME-Version:Message-Id:Date:Subject:Cc:To:From :Sender:Reply-To:Content-Type:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To: References:List-Id:List-Help:List-Unsubscribe:List-Subscribe:List-Post: List-Owner:List-Archive; bh=SegNg7H7cBrrJSTIu9IxhK9gndrxnfwXCQId3QaK+t4=; b=b ESwz5/yHe2Nzpy4EFcP6nv24WH1M+bFHs1YpHJE9J0L7wpT+ktxXA92zO4Zp/6pzd4lKIagk0tdNK w13U0+uf8Hy1M8uH6zXahyjyJlSr5OGK9Ak/iUPYDJe5UQMMToSREGwxCcYdp0AlyJCUHIt6/9/4g o5LteUSEIB59DRuU=; Received: from mail-pj1-f48.google.com ([209.85.216.48]) by sfi-mx-2.v28.lw.sourceforge.com with esmtps (TLSv1.2:ECDHE-RSA-AES128-GCM-SHA256:128) (Exim 4.92.3) id 1m6htI-0001Ga-5K for linux-f2fs-devel@lists.sourceforge.net; Thu, 22 Jul 2021 23:14:09 +0000 Received: by mail-pj1-f48.google.com with SMTP id j1so6475227pjj.4 for ; Thu, 22 Jul 2021 16:14:08 -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=SegNg7H7cBrrJSTIu9IxhK9gndrxnfwXCQId3QaK+t4=; b=pejoMsBXtkdB2ryuxXkEQ1dqQkG3twf1hTpmIjbAk970ydOc31x9Mv80KEK4ttynMk 2qEHSuwTva/NY53x2NJTXyGp5KsHZ+M9vaxO5XlkcKSYwSlrl5BgKqPV6A3qV2TSa5qj ibNegrXaAd3faBJKNZ6MwBC0hOsWxPMUf75EQkqzFlp6cSa3zGE55W0FySt022VG8r9L R45bFQWXLeJ3T2oV0HoxrwRnRJZbCtpa+ql/i9vD0+Tcwu7l4weC4qxDC7O9CJjukIT4 mB6mfjatTtP3Sr6n1mfxNDkmXyipdzZhFpqNkb9dHseejwuseJE9ROuj9wAVTPEI71H6 CWpQ== 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=SegNg7H7cBrrJSTIu9IxhK9gndrxnfwXCQId3QaK+t4=; b=JwNiBcJ7KzOAWi86u4VPnKoHZZIhyAIjIL1rxShomACPYHO1E8v4YaRLWbm3KDCd56 7uohSyo/SXH6RM5HvP16h64J5GMD76IE0Ah26L3woN8npeTDB9VlTgGneuclA/xkHiO4 UFELZV4+yhrNLgAFrtxUZtQLO2VDFZA22XDlO7XstbJhLXZOQaEJENyfMtYlDsp386Lw HQvpQsUcZ12W4yx+9YkuAcSrigcUz5Zz0pKpIC841UEMjnxhqUZgod7NWduOgjt/VWdk u9rJKzuUwxm11ZbnwuH1EvpRfBqx/CkFRQc6oVbMEERuv0otUkk7V6VCQue1vmK7sYFn C2Yw== X-Gm-Message-State: AOAM533FLNVSSrOrPk6E2bwsxsJ+if45mG2CdZmQrzFK5WVCMn2+SfVL pVHXOmg33KfgmXNUhiDQjOA= X-Google-Smtp-Source: ABdhPJyuNcQNX49/ZMge3MPp6VSqkojAVznHFT5gNfz9ZlqDeqjJm958BzqCifmLQypswYRjXJQE8g== X-Received: by 2002:a17:90b:3b4c:: with SMTP id ot12mr1944328pjb.218.1626995642606; Thu, 22 Jul 2021 16:14:02 -0700 (PDT) Received: from daehojeong-desktop.mtv.corp.google.com ([2620:15c:211:201:4610:babe:3aeb:2b63]) by smtp.gmail.com with ESMTPSA id a35sm20934756pgm.66.2021.07.22.16.14.01 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 22 Jul 2021 16:14:02 -0700 (PDT) From: Daeho Jeong To: linux-kernel@vger.kernel.org, linux-f2fs-devel@lists.sourceforge.net, kernel-team@android.com Date: Thu, 22 Jul 2021 16:13:58 -0700 Message-Id: <20210722231358.611801-1-daeho43@gmail.com> X-Mailer: git-send-email 2.32.0.432.gabb21c7263-goog MIME-Version: 1.0 X-Headers-End: 1m6htI-0001Ga-5K Subject: [f2fs-dev] [PATCH] f2fs: add sysfs node to control ra_pages for fadvise seq file X-BeenThere: linux-f2fs-devel@lists.sourceforge.net X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Daeho Jeong Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: linux-f2fs-devel-bounces@lists.sourceforge.net From: Daeho Jeong fadvise() allows the user to expand the readahead window to double with POSIX_FADV_SEQUENTIAL, now. But, in some use cases, it is not that sufficient and we need to meet the need in a restricted way. We can control the multiplier value of bdi device readahead between 2 (default) and 256 for POSIX_FADV_SEQUENTIAL advise option. Signed-off-by: Daeho Jeong --- Documentation/ABI/testing/sysfs-fs-f2fs | 6 +++++ fs/f2fs/f2fs.h | 2 ++ fs/f2fs/file.c | 32 +++++++++++++++++++++++++ fs/f2fs/super.c | 1 + fs/f2fs/sysfs.c | 10 ++++++++ 5 files changed, 51 insertions(+) diff --git a/Documentation/ABI/testing/sysfs-fs-f2fs b/Documentation/ABI/testing/sysfs-fs-f2fs index 3d1f853c6681..60f1f176374e 100644 --- a/Documentation/ABI/testing/sysfs-fs-f2fs +++ b/Documentation/ABI/testing/sysfs-fs-f2fs @@ -507,3 +507,9 @@ Date: July 2021 Contact: "Daeho Jeong" Description: You can control for which gc mode the "gc_reclaimed_segments" node shows. Refer to the description of the modes in "gc_reclaimed_segments". + +What: /sys/fs/f2fs//seq_file_ra_mul +Date: July 2021 +Contact: "Daeho Jeong" +Description: You can control the multiplier value of bdi device readahead window size + between 2 (default) and 256 for POSIX_FADV_SEQUENTIAL advise option. diff --git a/fs/f2fs/f2fs.h b/fs/f2fs/f2fs.h index 502e47936651..c59329dcb1f6 100644 --- a/fs/f2fs/f2fs.h +++ b/fs/f2fs/f2fs.h @@ -1733,6 +1733,8 @@ struct f2fs_sb_info { unsigned int gc_segment_mode; /* GC state for reclaimed segments */ unsigned int gc_reclaimed_segs[MAX_GC_MODE]; /* Reclaimed segs for each mode */ + unsigned long seq_file_ra_mul; /* multiplier for ra_pages of seq. files in fadvise */ + #ifdef CONFIG_F2FS_FS_COMPRESSION struct kmem_cache *page_array_slab; /* page array entry */ unsigned int page_array_slab_size; /* default page array slab size */ diff --git a/fs/f2fs/file.c b/fs/f2fs/file.c index 6afd4562335f..f71c90236815 100644 --- a/fs/f2fs/file.c +++ b/fs/f2fs/file.c @@ -23,6 +23,7 @@ #include #include #include +#include #include "f2fs.h" #include "node.h" @@ -4332,6 +4333,36 @@ static ssize_t f2fs_file_write_iter(struct kiocb *iocb, struct iov_iter *from) return ret; } +static int f2fs_file_fadvise(struct file *filp, loff_t offset, loff_t len, + int advice) +{ + int ret; + struct inode *inode; + struct address_space *mapping; + struct backing_dev_info *bdi; + + if (advice == POSIX_FADV_SEQUENTIAL) { + inode = file_inode(filp); + if (S_ISFIFO(inode->i_mode)) + return -ESPIPE; + + mapping = filp->f_mapping; + if (!mapping || len < 0) + return -EINVAL; + + bdi = inode_to_bdi(mapping->host); + filp->f_ra.ra_pages = bdi->ra_pages * F2FS_I_SB(inode)->seq_file_ra_mul; + spin_lock(&filp->f_lock); + filp->f_mode &= ~FMODE_RANDOM; + spin_unlock(&filp->f_lock); + return 0; + } + + ret = generic_fadvise(filp, offset, len, advice); + + return ret; +} + #ifdef CONFIG_COMPAT struct compat_f2fs_gc_range { u32 sync; @@ -4460,4 +4491,5 @@ const struct file_operations f2fs_file_operations = { #endif .splice_read = generic_file_splice_read, .splice_write = iter_file_splice_write, + .fadvise = f2fs_file_fadvise, }; diff --git a/fs/f2fs/super.c b/fs/f2fs/super.c index 9089303f7f8c..ccb745807fe1 100644 --- a/fs/f2fs/super.c +++ b/fs/f2fs/super.c @@ -3312,6 +3312,7 @@ static void init_sb_info(struct f2fs_sb_info *sbi) sbi->next_victim_seg[FG_GC] = NULL_SEGNO; sbi->max_victim_search = DEF_MAX_VICTIM_SEARCH; sbi->migration_granularity = sbi->segs_per_sec; + sbi->seq_file_ra_mul = 2; sbi->dir_level = DEF_DIR_LEVEL; sbi->interval_time[CP_TIME] = DEF_CP_INTERVAL; diff --git a/fs/f2fs/sysfs.c b/fs/f2fs/sysfs.c index 15fe30d3aeb5..9a21be63436d 100644 --- a/fs/f2fs/sysfs.c +++ b/fs/f2fs/sysfs.c @@ -538,6 +538,14 @@ static ssize_t __sbi_store(struct f2fs_attr *a, return count; } + if (!strcmp(a->attr.name, "seq_file_ra_mul")) { + if (t >= 2 && t <= 256) + sbi->seq_file_ra_mul = t; + else + return -EINVAL; + return count; + } + *ui = (unsigned int)t; return count; @@ -763,6 +771,7 @@ F2FS_RW_ATTR(ATGC_INFO, atgc_management, atgc_candidate_count, max_candidate_cou F2FS_RW_ATTR(ATGC_INFO, atgc_management, atgc_age_weight, age_weight); F2FS_RW_ATTR(ATGC_INFO, atgc_management, atgc_age_threshold, age_threshold); +F2FS_RW_ATTR(F2FS_SBI, f2fs_sb_info, seq_file_ra_mul, seq_file_ra_mul); F2FS_RW_ATTR(F2FS_SBI, f2fs_sb_info, gc_segment_mode, gc_segment_mode); F2FS_RW_ATTR(F2FS_SBI, f2fs_sb_info, gc_reclaimed_segments, gc_reclaimed_segs); @@ -838,6 +847,7 @@ static struct attribute *f2fs_attrs[] = { ATTR_LIST(atgc_candidate_count), ATTR_LIST(atgc_age_weight), ATTR_LIST(atgc_age_threshold), + ATTR_LIST(seq_file_ra_mul), ATTR_LIST(gc_segment_mode), ATTR_LIST(gc_reclaimed_segments), NULL, -- 2.32.0.432.gabb21c7263-goog _______________________________________________ Linux-f2fs-devel mailing list Linux-f2fs-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/linux-f2fs-devel