On Thu, May 06, 2021 at 04:30:39PM -0700, harshad shirwadkar wrote:
> > -static inline void tl_to_darg(struct dentry_info_args *darg,
> > +static inline int tl_to_darg(struct dentry_info_args *darg,
> > struct ext4_fc_tl *tl)
> > {
> > - struct ext4_fc_dentry_info *fcd;
> > + struct ext4_fc_dentry_info fcd;
> > int tag = le16_to_cpu(tl->fc_tag);
> The above line where we dereference tl, this can also result in
> unaligned accesses. So, we need to do memcpy stuff for "tl" too.
> Changing all access of tl to a memcpy-ed local variable is itself a
> big change which I'll send along with your patch.
Ah, I didn't realize that 16-bit shorts could be misaligned. With the
jbd2 checksum v2, that wasn't an issue, since the entries were always
an even number of bytes, so it was only the 32-bit accesses that were
problematic. But yeah, if the dentry is an odd number of bytes, we're
not padding that out.
> >
> > - fcd = (struct ext4_fc_dentry_info *)ext4_fc_tag_val(tl);
> > + memcpy(&fcd, ext4_fc_tag_val(tl), sizeof(fcd));
>
> If we do the memcpy fix here, ext4_fc_tag_val macro becomes unusable -
> since at this point that macro just does (tl + 1), which will fail on
> a memcpy-ed version of "tl".
Well, we can make define them as:
/* Get length of a particular tlv */
static inline int ext4_fc_tag_len(struct ext4_fc_tl *tl)
{
__u8 *p = (__u8 *) tl;
return *cp + (*(cp+1) << 8);
}
/* Get a pointer to "value" of a tlv */
static inline __u8 *ext4_fc_tag_val(struct ext4_fc_tl *tl)
{
__u8 *p = ((__u8 *) tl) + 2;
return *cp + (*(cp+1) << 8);
}
> Interesting bit is that even the kernel does these kinds of accesses
> in the recovery code. I have a suspicion that these unaligned accesses
> are the reason why you see failures on sparc?
Yeah, it could be that arm allows unaligned 16-bit dereferences, which
is why this isn't blowing up on armhf and armel.
But at least with this patch, armhf and armel builds aren't blowing
up, and UBSAN is happy. (Although I wonder why UBSAN isn't
complaining about the unaligned 16-bit dereferences.)
- Ted
