All of lore.kernel.org
 help / color / mirror / Atom feed
From: David Gow <davidgow@google.com>
To: "Luís Mendes" <luis.p.mendes@gmail.com>,
	"Christian König" <christian.koenig@amd.com>,
	"Maarten Lankhorst" <maarten.lankhorst@linux.intel.com>,
	"Maxime Ripard" <mripard@kernel.org>,
	"Thomas Zimmermann" <tzimmermann@suse.de>,
	"David Airlie" <airlied@gmail.com>,
	"Daniel Vetter" <daniel@ffwll.ch>,
	"Maíra Canal" <mairacanal@riseup.net>,
	"Arthur Grillo" <arthurgrillo@riseup.net>
Cc: David Gow <davidgow@google.com>,
	dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org
Subject: [PATCH 2/2] drm: test: Fix 32-bit issue in drm_buddy_test
Date: Wed, 29 Mar 2023 14:55:34 +0800	[thread overview]
Message-ID: <20230329065532.2122295-2-davidgow@google.com> (raw)
In-Reply-To: <20230329065532.2122295-1-davidgow@google.com>

The drm_buddy_test KUnit tests verify that returned blocks have sizes
which are powers of two using is_power_of_2(). However, is_power_of_2()
operations on a 'long', but the block size is a u64. So on systems where
long is 32-bit, this can sometimes fail even on correctly sized blocks.

This only reproduces randomly, as the parameters passed to the buddy
allocator in this test are random. The seed 0xb2e06022 reproduced it
fine here.

For now, just hardcode an is_power_of_2() implementation using
x & (x - 1).

Signed-off-by: David Gow <davidgow@google.com>
---

There are actually a couple of is_power_of_2_u64() implementations
already around in:
- drivers/gpu/drm/i915/i915_utils.h
- fs/btrfs/misc.h (called is_power_of_two_u64) 

So the ideal thing would be to consolidate these in one place.


---
 drivers/gpu/drm/tests/drm_buddy_test.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/drivers/gpu/drm/tests/drm_buddy_test.c b/drivers/gpu/drm/tests/drm_buddy_test.c
index f8ee714df396..09ee6f6af896 100644
--- a/drivers/gpu/drm/tests/drm_buddy_test.c
+++ b/drivers/gpu/drm/tests/drm_buddy_test.c
@@ -89,7 +89,8 @@ static int check_block(struct kunit *test, struct drm_buddy *mm,
 		err = -EINVAL;
 	}
 
-	if (!is_power_of_2(block_size)) {
+	/* We can't use is_power_of_2() for a u64 on 32-bit systems. */
+	if (block_size & (block_size - 1)) {
 		kunit_err(test, "block size not power of two\n");
 		err = -EINVAL;
 	}
-- 
2.40.0.348.gf938b09366-goog


WARNING: multiple messages have this Message-ID (diff)
From: David Gow <davidgow@google.com>
To: "Luís Mendes" <luis.p.mendes@gmail.com>,
	"Christian König" <christian.koenig@amd.com>,
	"Maarten Lankhorst" <maarten.lankhorst@linux.intel.com>,
	"Maxime Ripard" <mripard@kernel.org>,
	"Thomas Zimmermann" <tzimmermann@suse.de>,
	"David Airlie" <airlied@gmail.com>,
	"Daniel Vetter" <daniel@ffwll.ch>,
	"Maíra Canal" <mairacanal@riseup.net>,
	"Arthur Grillo" <arthurgrillo@riseup.net>
Cc: dri-devel@lists.freedesktop.org, David Gow <davidgow@google.com>,
	linux-kernel@vger.kernel.org
Subject: [PATCH 2/2] drm: test: Fix 32-bit issue in drm_buddy_test
Date: Wed, 29 Mar 2023 14:55:34 +0800	[thread overview]
Message-ID: <20230329065532.2122295-2-davidgow@google.com> (raw)
In-Reply-To: <20230329065532.2122295-1-davidgow@google.com>

The drm_buddy_test KUnit tests verify that returned blocks have sizes
which are powers of two using is_power_of_2(). However, is_power_of_2()
operations on a 'long', but the block size is a u64. So on systems where
long is 32-bit, this can sometimes fail even on correctly sized blocks.

This only reproduces randomly, as the parameters passed to the buddy
allocator in this test are random. The seed 0xb2e06022 reproduced it
fine here.

For now, just hardcode an is_power_of_2() implementation using
x & (x - 1).

Signed-off-by: David Gow <davidgow@google.com>
---

There are actually a couple of is_power_of_2_u64() implementations
already around in:
- drivers/gpu/drm/i915/i915_utils.h
- fs/btrfs/misc.h (called is_power_of_two_u64) 

So the ideal thing would be to consolidate these in one place.


---
 drivers/gpu/drm/tests/drm_buddy_test.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/drivers/gpu/drm/tests/drm_buddy_test.c b/drivers/gpu/drm/tests/drm_buddy_test.c
index f8ee714df396..09ee6f6af896 100644
--- a/drivers/gpu/drm/tests/drm_buddy_test.c
+++ b/drivers/gpu/drm/tests/drm_buddy_test.c
@@ -89,7 +89,8 @@ static int check_block(struct kunit *test, struct drm_buddy *mm,
 		err = -EINVAL;
 	}
 
-	if (!is_power_of_2(block_size)) {
+	/* We can't use is_power_of_2() for a u64 on 32-bit systems. */
+	if (block_size & (block_size - 1)) {
 		kunit_err(test, "block size not power of two\n");
 		err = -EINVAL;
 	}
-- 
2.40.0.348.gf938b09366-goog


  reply	other threads:[~2023-03-29  6:56 UTC|newest]

Thread overview: 20+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2023-03-29  6:55 [PATCH 1/2] drm: buddy_allocator: Fix buddy allocator init on 32-bit systems David Gow
2023-03-29  6:55 ` David Gow
2023-03-29  6:55 ` David Gow [this message]
2023-03-29  6:55   ` [PATCH 2/2] drm: test: Fix 32-bit issue in drm_buddy_test David Gow
2023-03-29  9:39   ` Jani Nikula
2023-03-29  9:39     ` Jani Nikula
2023-03-29  9:42     ` Jani Nikula
2023-03-29  9:42       ` Jani Nikula
2023-03-29 10:54   ` Maíra Canal
2023-03-29 10:54     ` Maíra Canal
2023-03-29 11:28     ` Jani Nikula
2023-03-29 13:14       ` Christian König
2023-03-29  7:04 ` [PATCH 1/2] drm: buddy_allocator: Fix buddy allocator init on 32-bit systems Christian König
2023-03-29  7:04   ` Christian König
2023-03-30 10:53 ` Jani Nikula
2023-03-30 10:53   ` Jani Nikula
2023-03-30 10:56   ` Christian König
2023-03-30 10:56     ` Christian König
2023-03-30 11:12     ` Jani Nikula
2023-03-30 11:12       ` Jani Nikula

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=20230329065532.2122295-2-davidgow@google.com \
    --to=davidgow@google.com \
    --cc=airlied@gmail.com \
    --cc=arthurgrillo@riseup.net \
    --cc=christian.koenig@amd.com \
    --cc=daniel@ffwll.ch \
    --cc=dri-devel@lists.freedesktop.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=luis.p.mendes@gmail.com \
    --cc=maarten.lankhorst@linux.intel.com \
    --cc=mairacanal@riseup.net \
    --cc=mripard@kernel.org \
    --cc=tzimmermann@suse.de \
    /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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.