On Tue, Mar 21, 2023 at 05:09:48PM +0000, Catalin Marinas wrote:
> On Tue, Mar 21, 2023 at 12:25:11PM +0000, Mark Rutland wrote:
> > +static void assert_size_valid(struct kunit *test,
> > + const struct usercopy_params *params,
> > + unsigned long ret)
> > +{
> > + const unsigned long size = params->size;
> > + const unsigned long offset = params->offset;
>
> I think you should drop the 'unsigned' for 'offset', it better matches
> the usercopy_params structure and the 'offset < 0' test.
Agreed. I'll go fix all offset values to use long.
[...]
> > + if (ret < (offset + size) - PAGE_SIZE) {
> > + KUNIT_ASSERT_FAILURE(test,
> > + "too many bytes consumed (offset=%ld, size=%lu, ret=%lu)",
> > + offset, size, ret);
> > + }
> > +}
>
> Nitpick: slightly less indentation probably if we write the above as:
>
> KUNIT_ASSERT_TRUE_MSG(test,
> ret < (offset + size) - PAGE_SIZE,
> "too many bytes consumed (offset=%ld, size=%lu, ret=%lu)",
> offset, size, ret);
>
> Not sure this works for the early return cases above.
I had originally used KUNIT_ASSERT_*_MSG(), but found those produced a lot of
unhelpful output; lemme go check what KUNIT_ASSERT_TRUE_MSG() produces.
[...]
> > + /*
> > + * A usercopy MUST NOT modify any bytes before the destination buffer.
> > + */
> > + for (int i = 0; i < dst_offset; i++) {
> > + char val = dst[i];
> > +
> > + if (val == 0)
> > + continue;
> > +
> > + KUNIT_ASSERT_FAILURE(test,
> > + "pre-destination bytes modified (dst_page[%d]=0x%x, offset=%ld, size=%lu, ret=%lu)",
> > + i, val, offset, size, ret);
> > + }
> > +
> > + /*
> > + * A usercopy MUST NOT modify any bytes after the end of the destination
> > + * buffer.
> > + */
>
> Without looking at the arm64 fixes in this series, I think such test can
> fail for us currently given the right offset.
Yes, it can.
The test matches the documened semantic, so in that sense it's correctly
detecting that arm64 doesn't match the documentation.
Whether the documentation is right is clearly the key issue here. :)
> > +/*
> > + * Generate the size and offset combinations to test.
> > + *
> > + * Usercopies may have different paths for small/medium/large copies, but
> > + * typically max out at 64 byte chunks. We test sizes 0 to 128 bytes to check
> > + * all combinations of leading/trailing chunks and bulk copies.
> > + *
> > + * For each size, we test every offset relative to a leading and trailing page
> > + * boundary (i.e. [size, 0] and [PAGE_SIZE - size, PAGE_SIZE]) to check every
> > + * possible faulting boundary.
> > + */
> > +#define for_each_size_offset(size, offset) \
> > + for (unsigned long size = 0; size <= 128; size++) \
> > + for (long offset = -size; \
> > + offset <= (long)PAGE_SIZE; \
> > + offset = (offset ? offset + 1: (PAGE_SIZE - size)))
> > +
> > +static void test_copy_to_user(struct kunit *test)
> > +{
> > + const struct usercopy_env *env = test->priv;
> > +
> > + for_each_size_offset(size, offset) {
> > + const struct usercopy_params params = {
> > + .size = size,
> > + .offset = offset,
> > + };
> > + unsigned long ret;
> > +
> > + buf_init_zero(env->ubuf);
> > + buf_init_pattern(env->kbuf);
> > +
> > + ret = do_copy_to_user(env, ¶ms);
> > +
> > + assert_size_valid(test, ¶ms, ret);
> > + assert_src_valid(test, ¶ms, env->kbuf, 0, ret);
> > + assert_dst_valid(test, ¶ms, env->ubuf, params.offset, ret);
> > + assert_copy_valid(test, ¶ms,
> > + env->ubuf, params.offset,
> > + env->kbuf, 0,
> > + ret);
> > + }
> > +}
>
> IIUC, in such tests you only vary the destination offset. Our copy
> routines in general try to align the source and leave the destination
> unaligned for performance. It would be interesting to add some variation
> on the source offset as well to spot potential issues with that part of
> the memcpy routines.
I have that on my TODO list; I had intended to drop that into the
usercopy_params. The only problem is that the cross product of size,
src_offset, and dst_offset gets quite large.
Thanks,
Mark.
