Received: by 2002:a05:6358:4e97:b0:b3:742d:4702 with SMTP id ce23csp3808280rwb; Tue, 16 Aug 2022 09:05:29 -0700 (PDT) X-Google-Smtp-Source: AA6agR6SgPoJvNMXAXLrFcw70Zra8GEKO4m3iyABwlDdBhdsujuNYaNB9ymbWSxPuPSBdQZpIZV2 X-Received: by 2002:a17:907:3da2:b0:731:55b2:1c20 with SMTP id he34-20020a1709073da200b0073155b21c20mr13309665ejc.742.1660665929031; Tue, 16 Aug 2022 09:05:29 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1660665929; cv=none; d=google.com; s=arc-20160816; b=ks6COdWb9VcDGjAYbsQhybDpqwZP+XfjWVRyLbkp6azTlaPlyyrXhH3rNlBiJrFVZb C4djUoOQ0vE4RlZ8f4susaUPi3YDN+xVOKDNQQAEDBqwIHFE2S7DvD4fwD1eSfUgBqbk oU9LaVdyxJ+oq8hiBXHTyWdp7erc3PRES6L6Fa5K6J8ecvXVuNPGnDb7bEAJreQIp+gv B48k2SkpGWuTKL7jqk09BGOSfLocmNMk1iy51MN1LCa3yx834Dh73DomGh7WF5NpGbCX E5wWcMroi1lSRW7qR7wuyMvSORBNBFQ3gCEGxTn5odb50pIG7cQNTP/hKa69A3/zQV96 1+Cw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature:dkim-signature; bh=7Hy2VW6BD3DgqN9i/mj4PIZCUAJudVB4+Gl1qLgYS5U=; b=yCLeaGwfsro7nvbWBZpCas4WOse5hngHNfZ1Ed1NQ6Ajj0eoq+RiC2fSCkCDxQ7V+T qpvimwFdIMRcIdoUsaC1WHZZg6AmVFzWI8cmAv8s8ptO7p+v4g4bpuRaZ05YZWdvWVdl I4IBGWsb6+VxwaJ3xmWT7esX7Qbz2Bnt4qsEKH2fHeEdFewBgevHocpDh9NL+jTkNhJb d4MEhrfoKU+NYCZvDY8HUwTFpyK+esoevJVtMj8NdiAMDOoRiOr+J3z8TyEvL2nFKX84 bmco2y9p3WNC7Kxh3V//K5XRSg1283sYZ49DkFOZYdltxmovq5j6zB92ylFYbfx291aN 6qgA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@suse.de header.s=susede2_rsa header.b=F4xOkqUJ; dkim=neutral (no key) header.i=@suse.de header.s=susede2_ed25519 header.b="m99cEjg/"; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=suse.de Return-Path: Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id q19-20020a17090622d300b00730ce1f5a33si8799816eja.483.2022.08.16.09.05.01; Tue, 16 Aug 2022 09:05:29 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@suse.de header.s=susede2_rsa header.b=F4xOkqUJ; dkim=neutral (no key) header.i=@suse.de header.s=susede2_ed25519 header.b="m99cEjg/"; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=suse.de Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S236262AbiHPPjD (ORCPT + 99 others); Tue, 16 Aug 2022 11:39:03 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:50972 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S236140AbiHPPiG (ORCPT ); Tue, 16 Aug 2022 11:38:06 -0400 Received: from smtp-out2.suse.de (smtp-out2.suse.de [195.135.220.29]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 3966885F80 for ; Tue, 16 Aug 2022 08:37:05 -0700 (PDT) Received: from imap2.suse-dmz.suse.de (imap2.suse-dmz.suse.de [192.168.254.74]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-521) server-digest SHA512) (No client certificate requested) by smtp-out2.suse.de (Postfix) with ESMTPS id CD4F81FEA2; Tue, 16 Aug 2022 15:37:03 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1660664223; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=7Hy2VW6BD3DgqN9i/mj4PIZCUAJudVB4+Gl1qLgYS5U=; b=F4xOkqUJVLYGHPUrWIe+iJKlD0NxY2J2md5Eh+5m4TCnZlJkiPj2wiMj/UqA/yV0r3xZjd bvHzrbrIwahJIdLL9/H6QD7pNVv0aZSmFyWQZAufxQlY0b0YcEBKl9jDj07LRixbwpAhsT rXCxOCXgxZEeboh4PKAKDxrnX+luZBI= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1660664223; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=7Hy2VW6BD3DgqN9i/mj4PIZCUAJudVB4+Gl1qLgYS5U=; b=m99cEjg/NX+Q6fXevBbBknH/OF1wVrj1u+lkW8dJnfLKaRZDdfEQ6OJ+DyVjN8UAKvVK+c yZ2TkJrdJAMDA/Bw== Received: from imap2.suse-dmz.suse.de (imap2.suse-dmz.suse.de [192.168.254.74]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-521) server-digest SHA512) (No client certificate requested) by imap2.suse-dmz.suse.de (Postfix) with ESMTPS id B06D6139B7; Tue, 16 Aug 2022 15:37:03 +0000 (UTC) Received: from dovecot-director2.suse.de ([192.168.254.65]) by imap2.suse-dmz.suse.de with ESMTPSA id wHV3Kp+5+2LKJAAAMHmgww (envelope-from ); Tue, 16 Aug 2022 15:37:03 +0000 From: Takashi Iwai To: Thomas Zimmermann 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 Message-Id: <20220816153655.27526-12-tiwai@suse.de> X-Mailer: git-send-email 2.35.3 In-Reply-To: <20220816153655.27526-1-tiwai@suse.de> References: <20220816153655.27526-1-tiwai@suse.de> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-4.4 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_MED,SPF_HELO_NONE, SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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 --- 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