Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67;
From:   Sasha Levin <Alexander.Levin@microsoft.com>
To:     "stable@vger.kernel.org" <stable@vger.kernel.org>,
        "linux-kernel@vger.kernel.org" <linux-kernel@vger.kernel.org>
CC:     Yunlong Song <yunlong.song@huawei.com>,
        Chao Yu <yuchao0@huawei.com>, Jaegeuk Kim <jaegeuk@kernel.org>,
        Sasha Levin <Alexander.Levin@microsoft.com>
Subject: [PATCH AUTOSEL 4.18 040/131] f2fs: issue discard align to section in
 LFS mode
Thread-Topic: [PATCH AUTOSEL 4.18 040/131] f2fs: issue discard align to
 section in LFS mode
Thread-Index: AQHUQr1loxtRh3HyFU6G0RMpn7HaZg==
Date:   Sun, 2 Sep 2018 13:03:51 +0000
Message-ID: <20180902064601.183036-40-alexander.levin@microsoft.com>
References: <20180902064601.183036-1-alexander.levin@microsoft.com>
In-Reply-To: <20180902064601.183036-1-alexander.levin@microsoft.com>
Accept-Language: en-US
Content-Language: en-US
received-spf: None (protection.outlook.com: microsoft.com does not designate
 permitted sender hosts)
spamdiagnosticoutput: 1:99
spamdiagnosticmetadata: NSPM
Content-Type: text/plain; charset="iso-8859-1"
Content-Transfer-Encoding: quoted-printable
MIME-Version: 1.0
X-MS-Exchange-CrossTenant-Network-Message-Id: 5751436b-b87e-4581-b94b-08d610d49304
X-MS-Exchange-CrossTenant-originalarrivaltime: 02 Sep 2018 13:03:51.7530
 (UTC)
X-MS-Exchange-CrossTenant-fromentityheader: Hosted
X-MS-Exchange-CrossTenant-id: 72f988bf-86f1-41af-91ab-2d7cd011db47
X-MS-Exchange-Transport-CrossTenantHeadersStamped: CY4PR21MB0135
Sender: linux-kernel-owner@vger.kernel.org
Precedence: bulk
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

From: Yunlong Song <yunlong.song@huawei.com>

[ Upstream commit ad6672bbc527727dc8968e8d92687f55ae928ce5 ]

For the case when sbi->segs_per_sec > 1 with lfs mode, take
section:segment =3D 5 for example, if the section prefree_map is
...previous section | current section (1 1 0 1 1) | next section...,
then the start =3D x, end =3D x + 1, after start =3D start_segno +
sbi->segs_per_sec, start =3D x + 5, then it will skip x + 3 and x + 4, but
their bitmap is still set, which will cause duplicated
f2fs_issue_discard of this same section in the next write_checkpoint:

round 1: section bitmap : 1 1 1 1 1, all valid, prefree_map: 0 0 0 0 0
then rm data block NO.2, block NO.2 becomes invalid, prefree_map: 0 0 1 0 0
write_checkpoint: section bitmap: 1 1 0 1 1, prefree_map: 0 0 0 0 0,
prefree of NO.2 is cleared, and no discard issued

round 2: rm data block NO.0, NO.1, NO.3, NO.4
all invalid, but prefree bit of NO.2 is set and cleared in round 1, then
prefree_map: 1 1 0 1 1
write_checkpoint: section bitmap: 0 0 0 0 0, prefree_map: 0 0 0 1 1, no
valid blocks of this section, so discard issued, but this time prefree
bit of NO.3 and NO.4 is skipped due to start =3D start_segno + sbi->segs_pe=
r_sec;

round 3:
write_checkpoint: section bitmap: 0 0 0 0 0, prefree_map: 0 0 0 1 1 ->
0 0 0 0 0, no valid blocks of this section, so discard issued,
this time prefree bit of NO.3 and NO.4 is cleared, but the discard of
this section is sent again...

To fix this problem, we can align the start and end value to section
boundary for fstrim and real-time discard operation, and decide to issue
discard only when the whole section is invalid, which can issue discard
aligned to section size as much as possible and avoid redundant discard.

Signed-off-by: Yunlong Song <yunlong.song@huawei.com>
Signed-off-by: Chao Yu <yuchao0@huawei.com>
Reviewed-by: Chao Yu <yuchao0@huawei.com>
Signed-off-by: Jaegeuk Kim <jaegeuk@kernel.org>
Signed-off-by: Sasha Levin <alexander.levin@microsoft.com>
---
 fs/f2fs/segment.c | 20 +++++++++++++++++---
 1 file changed, 17 insertions(+), 3 deletions(-)

diff --git a/fs/f2fs/segment.c b/fs/f2fs/segment.c
index 9efce174c51a..43fecd5eb252 100644
--- a/fs/f2fs/segment.c
+++ b/fs/f2fs/segment.c
@@ -1643,21 +1643,30 @@ void f2fs_clear_prefree_segments(struct f2fs_sb_inf=
o *sbi,
 	unsigned int start =3D 0, end =3D -1;
 	unsigned int secno, start_segno;
 	bool force =3D (cpc->reason & CP_DISCARD);
+	bool need_align =3D test_opt(sbi, LFS) && sbi->segs_per_sec > 1;
=20
 	mutex_lock(&dirty_i->seglist_lock);
=20
 	while (1) {
 		int i;
+
+		if (need_align && end !=3D -1)
+			end--;
 		start =3D find_next_bit(prefree_map, MAIN_SEGS(sbi), end + 1);
 		if (start >=3D MAIN_SEGS(sbi))
 			break;
 		end =3D find_next_zero_bit(prefree_map, MAIN_SEGS(sbi),
 								start + 1);
=20
-		for (i =3D start; i < end; i++)
-			clear_bit(i, prefree_map);
+		if (need_align) {
+			start =3D rounddown(start, sbi->segs_per_sec);
+			end =3D roundup(end, sbi->segs_per_sec);
+		}
=20
-		dirty_i->nr_dirty[PRE] -=3D end - start;
+		for (i =3D start; i < end; i++) {
+			if (test_and_clear_bit(i, prefree_map))
+				dirty_i->nr_dirty[PRE]--;
+		}
=20
 		if (!test_opt(sbi, DISCARD))
 			continue;
@@ -2437,6 +2446,7 @@ int f2fs_trim_fs(struct f2fs_sb_info *sbi, struct fst=
rim_range *range)
 	struct discard_policy dpolicy;
 	unsigned long long trimmed =3D 0;
 	int err =3D 0;
+	bool need_align =3D test_opt(sbi, LFS) && sbi->segs_per_sec > 1;
=20
 	if (start >=3D MAX_BLKADDR(sbi) || range->len < sbi->blocksize)
 		return -EINVAL;
@@ -2454,6 +2464,10 @@ int f2fs_trim_fs(struct f2fs_sb_info *sbi, struct fs=
trim_range *range)
 	start_segno =3D (start <=3D MAIN_BLKADDR(sbi)) ? 0 : GET_SEGNO(sbi, start=
);
 	end_segno =3D (end >=3D MAX_BLKADDR(sbi)) ? MAIN_SEGS(sbi) - 1 :
 						GET_SEGNO(sbi, end);
+	if (need_align) {
+		start_segno =3D rounddown(start_segno, sbi->segs_per_sec);
+		end_segno =3D roundup(end_segno + 1, sbi->segs_per_sec) - 1;
+	}
=20
 	cpc.reason =3D CP_DISCARD;
 	cpc.trim_minlen =3D max_t(__u64, 1, F2FS_BYTES_TO_BLK(range->minlen));
--=20
2.17.1