From: Takashi Iwai <tiwai@suse.de> To: Thomas Zimmermann <tzimmermann@suse.de> Cc: linux-kernel@vger.kernel.org, dri-devel@lists.freedesktop.org Subject: [PATCH 11/12] drm/udl: Don't re-initialize stuff at retrying the URB list allocation Date: Tue, 16 Aug 2022 17:36:54 +0200 [thread overview] Message-ID: <20220816153655.27526-12-tiwai@suse.de> (raw) In-Reply-To: <20220816153655.27526-1-tiwai@suse.de> udl_alloc_urb_list() retires the allocation if there is no enough room left, and it reinitializes the stuff unnecessarily such as the linked list head and the waitqueue, which could be harmful. Those should be outside the retry loop. Signed-off-by: Takashi Iwai <tiwai@suse.de> --- drivers/gpu/drm/udl/udl_main.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/drivers/gpu/drm/udl/udl_main.c b/drivers/gpu/drm/udl/udl_main.c index 19dc8317e843..c1f4b6199949 100644 --- a/drivers/gpu/drm/udl/udl_main.c +++ b/drivers/gpu/drm/udl/udl_main.c @@ -187,15 +187,14 @@ static int udl_alloc_urb_list(struct drm_device *dev, int count, size_t size) struct usb_device *udev = udl_to_usb_device(udl); spin_lock_init(&udl->urbs.lock); - -retry: - udl->urbs.size = size; INIT_LIST_HEAD(&udl->urbs.list); - init_waitqueue_head(&udl->urbs.sleep); udl->urbs.count = 0; udl->urbs.available = 0; +retry: + udl->urbs.size = size; + while (udl->urbs.count * size < wanted_size) { unode = kzalloc(sizeof(struct urb_node), GFP_KERNEL); if (!unode) -- 2.35.3
WARNING: multiple messages have this Message-ID (diff)
From: Takashi Iwai <tiwai@suse.de> To: Thomas Zimmermann <tzimmermann@suse.de> Cc: dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org Subject: [PATCH 11/12] drm/udl: Don't re-initialize stuff at retrying the URB list allocation Date: Tue, 16 Aug 2022 17:36:54 +0200 [thread overview] Message-ID: <20220816153655.27526-12-tiwai@suse.de> (raw) In-Reply-To: <20220816153655.27526-1-tiwai@suse.de> udl_alloc_urb_list() retires the allocation if there is no enough room left, and it reinitializes the stuff unnecessarily such as the linked list head and the waitqueue, which could be harmful. Those should be outside the retry loop. Signed-off-by: Takashi Iwai <tiwai@suse.de> --- drivers/gpu/drm/udl/udl_main.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/drivers/gpu/drm/udl/udl_main.c b/drivers/gpu/drm/udl/udl_main.c index 19dc8317e843..c1f4b6199949 100644 --- a/drivers/gpu/drm/udl/udl_main.c +++ b/drivers/gpu/drm/udl/udl_main.c @@ -187,15 +187,14 @@ static int udl_alloc_urb_list(struct drm_device *dev, int count, size_t size) struct usb_device *udev = udl_to_usb_device(udl); spin_lock_init(&udl->urbs.lock); - -retry: - udl->urbs.size = size; INIT_LIST_HEAD(&udl->urbs.list); - init_waitqueue_head(&udl->urbs.sleep); udl->urbs.count = 0; udl->urbs.available = 0; +retry: + udl->urbs.size = size; + while (udl->urbs.count * size < wanted_size) { unode = kzalloc(sizeof(struct urb_node), GFP_KERNEL); if (!unode) -- 2.35.3
next prev parent reply other threads:[~2022-08-16 15:38 UTC|newest] Thread overview: 51+ messages / expand[flat|nested] mbox.gz Atom feed top 2022-08-16 15:36 [PATCH 00/12] drm/udl: More fixes Takashi Iwai 2022-08-16 15:36 ` Takashi Iwai 2022-08-16 15:36 ` [PATCH 01/12] drm/udl: Restore display mode on resume Takashi Iwai 2022-08-16 15:36 ` Takashi Iwai 2022-09-06 20:06 ` Daniel Vetter 2022-09-06 20:06 ` Daniel Vetter 2022-09-07 5:51 ` Takashi Iwai 2022-09-07 5:51 ` Takashi Iwai 2022-09-07 17:01 ` Daniel Vetter 2022-09-07 17:01 ` Daniel Vetter 2022-08-16 15:36 ` [PATCH 02/12] drm/udl: Add reset_resume Takashi Iwai 2022-08-16 15:36 ` Takashi Iwai 2022-08-16 15:36 ` [PATCH 03/12] drm/udl: Enable damage clipping Takashi Iwai 2022-08-16 15:36 ` Takashi Iwai 2022-08-16 15:36 ` [PATCH 04/12] Revert "drm/udl: Kill pending URBs at suspend and disconnect" Takashi Iwai 2022-08-16 15:36 ` Takashi Iwai 2022-09-05 8:07 ` Thomas Zimmermann 2022-08-16 15:36 ` [PATCH 05/12] drm/udl: Suppress error print for -EPROTO at URB completion Takashi Iwai 2022-08-16 15:36 ` Takashi Iwai 2022-08-16 15:36 ` [PATCH 06/12] drm/udl: Increase the default URB list size to 20 Takashi Iwai 2022-08-16 15:36 ` Takashi Iwai 2022-09-05 8:08 ` Thomas Zimmermann 2022-09-05 8:08 ` Thomas Zimmermann 2022-08-16 15:36 ` [PATCH 07/12] drm/udl: Add parameter to set number of URBs Takashi Iwai 2022-08-16 15:36 ` Takashi Iwai 2022-09-05 8:09 ` Thomas Zimmermann 2022-09-05 8:09 ` Thomas Zimmermann 2022-08-16 15:36 ` [PATCH 08/12] drm/udl: Drop unneeded alignment Takashi Iwai 2022-08-16 15:36 ` Takashi Iwai 2022-09-05 8:40 ` Thomas Zimmermann 2022-09-05 8:40 ` Thomas Zimmermann 2022-09-05 12:50 ` Takashi Iwai 2022-09-05 12:50 ` Takashi Iwai 2022-08-16 15:36 ` [PATCH 09/12] drm/udl: Fix potential URB leaks Takashi Iwai 2022-08-16 15:36 ` Takashi Iwai 2022-09-05 8:16 ` Thomas Zimmermann 2022-08-16 15:36 ` [PATCH 10/12] drm/udl: Fix inconsistent urbs.count value during udl_free_urb_list() Takashi Iwai 2022-08-16 15:36 ` Takashi Iwai 2022-09-05 8:32 ` Thomas Zimmermann 2022-09-05 8:32 ` Thomas Zimmermann 2022-09-05 12:56 ` Takashi Iwai 2022-09-05 12:56 ` Takashi Iwai 2022-08-16 15:36 ` Takashi Iwai [this message] 2022-08-16 15:36 ` [PATCH 11/12] drm/udl: Don't re-initialize stuff at retrying the URB list allocation Takashi Iwai 2022-09-05 8:42 ` Thomas Zimmermann 2022-09-05 8:42 ` Thomas Zimmermann 2022-08-16 15:36 ` [PATCH 12/12] drm/udl: Sync pending URBs at the end of suspend Takashi Iwai 2022-08-16 15:36 ` Takashi Iwai 2022-09-05 8:44 ` Thomas Zimmermann 2022-09-05 13:00 ` Takashi Iwai 2022-09-05 13:00 ` Takashi Iwai
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=20220816153655.27526-12-tiwai@suse.de \ --to=tiwai@suse.de \ --cc=dri-devel@lists.freedesktop.org \ --cc=linux-kernel@vger.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: linkBe 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.