From: Jaegeuk Kim <jaegeuk@kernel.org>
To: Wu Bo <bo.wu@vivo.com>
Cc: Chao Yu <chao@kernel.org>,
linux-f2fs-devel@lists.sourceforge.net,
linux-kernel@vger.kernel.org, Wu Bo <wubo.oduw@gmail.com>,
Liao Yuanhong <liaoyuanhong@vivo.com>
Subject: Re: [PATCH] f2fs: fix block migration when section is not aligned to pow2
Date: Mon, 29 Apr 2024 17:42:01 +0000 [thread overview]
Message-ID: <Zi_b6alGIb2wAkb5@google.com> (raw)
In-Reply-To: <Zi_a0wEZpCNW8jHL@google.com>
On 04/29, Jaegeuk Kim wrote:
> On 04/26, Wu Bo wrote:
> > As for zoned-UFS, f2fs section size is forced to zone size. And zone
> > size may not aligned to pow2.
> >
> > Fixes: 859fca6b706e ("f2fs: swap: support migrating swapfile in aligned write mode")
> > Signed-off-by: Liao Yuanhong <liaoyuanhong@vivo.com>
> > Signed-off-by: Wu Bo <bo.wu@vivo.com>
> > ---
> > fs/f2fs/data.c | 5 ++---
> > 1 file changed, 2 insertions(+), 3 deletions(-)
> >
> > diff --git a/fs/f2fs/data.c b/fs/f2fs/data.c
> > index d9494b5fc7c1..7ff5ad3fd5dc 100644
> > --- a/fs/f2fs/data.c
> > +++ b/fs/f2fs/data.c
> > @@ -3904,7 +3904,6 @@ static int check_swap_activate(struct swap_info_struct *sis,
> > int nr_extents = 0;
> > unsigned long nr_pblocks;
> > unsigned int blks_per_sec = BLKS_PER_SEC(sbi);
> > - unsigned int sec_blks_mask = BLKS_PER_SEC(sbi) - 1;
> > unsigned int not_aligned = 0;
> > int ret = 0;
> >
> > @@ -3942,8 +3941,8 @@ static int check_swap_activate(struct swap_info_struct *sis,
> > pblock = map.m_pblk;
> > nr_pblocks = map.m_len;
> >
> > - if ((pblock - SM_I(sbi)->main_blkaddr) & sec_blks_mask ||
> > - nr_pblocks & sec_blks_mask ||
> > + if ((pblock - SM_I(sbi)->main_blkaddr) % blks_per_sec ||
> > + nr_pblocks % blks_per_sec ||
>
> Modified a bit to address udiv issue like below. Let's see.
Ok, I took v2 instead of this.
>
> --- a/fs/f2fs/data.c
> +++ b/fs/f2fs/data.c
> @@ -3923,8 +3923,8 @@ static int check_swap_activate(struct swap_info_struct *sis,
> sector_t highest_pblock = 0;
> int nr_extents = 0;
> unsigned long nr_pblocks;
> + u32 align;
> unsigned int blks_per_sec = BLKS_PER_SEC(sbi);
> - unsigned int sec_blks_mask = BLKS_PER_SEC(sbi) - 1;
> unsigned int not_aligned = 0;
> int ret = 0;
>
> @@ -3961,10 +3961,10 @@ static int check_swap_activate(struct swap_info_struct *sis,
>
> pblock = map.m_pblk;
> nr_pblocks = map.m_len;
> + div_u64_rem(nr_pblocks, blks_per_sec, &align);
>
> - if ((pblock - SM_I(sbi)->main_blkaddr) & sec_blks_mask ||
> - nr_pblocks & sec_blks_mask ||
> - !f2fs_valid_pinned_area(sbi, pblock)) {
> + if ((pblock - SM_I(sbi)->main_blkaddr) % blks_per_sec ||
> + align || !f2fs_valid_pinned_area(sbi, pblock)) {
> bool last_extent = false;
>
> not_aligned++;
>
> > !f2fs_valid_pinned_area(sbi, pblock)) {
> > bool last_extent = false;
> >
> > --
> > 2.25.1
prev parent reply other threads:[~2024-04-29 17:42 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-04-26 10:41 [PATCH] f2fs: fix block migration when section is not aligned to pow2 Wu Bo
2024-04-27 1:57 ` Chao Yu
2024-04-29 17:37 ` Jaegeuk Kim
2024-04-29 17:42 ` Jaegeuk Kim [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=Zi_b6alGIb2wAkb5@google.com \
--to=jaegeuk@kernel.org \
--cc=bo.wu@vivo.com \
--cc=chao@kernel.org \
--cc=liaoyuanhong@vivo.com \
--cc=linux-f2fs-devel@lists.sourceforge.net \
--cc=linux-kernel@vger.kernel.org \
--cc=wubo.oduw@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).