Re: [PATCH v4 29/45] block: kmsan: skip bio block merging logic for KMSAN

Alexander Potapenko
2022-08-02T17:48:01Z

On Wed, Jul 13, 2022 at 12:23 PM Marco Elver <elver@google.com> wrote:
>
> On Fri, Jul 01, 2022 at 04:22PM +0200, 'Alexander Potapenko' via kasan-dev wrote:
> [...]
> > --- a/block/bio.c
> > +++ b/block/bio.c
> > @@ -867,6 +867,8 @@ static inline bool page_is_mergeable(const struct bio_vec *bv,
> > return false;
> >
> > *same_page = ((vec_end_addr & PAGE_MASK) == page_addr);
> > + if (!*same_page && IS_ENABLED(CONFIG_KMSAN))
> > + return false;
> > if (*same_page)
> > return true;
>
> if (*same_page)
> return true;
> else if (IS_ENABLED(CONFIG_KMSAN))
> return false;
>
Done.
> > return (bv->bv_page + bv_end / PAGE_SIZE) == (page + off / PAGE_SIZE);

--
Alexander Potapenko
Software Engineer

Google Germany GmbH
Erika-Mann-Straße, 33
80636 München

Geschäftsführer: Paul Manicle, Liana Sebastian
Registergericht und -nummer: Hamburg, HRB 86891
Sitz der Gesellschaft: Hamburg