From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-15.8 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER, INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 0B5AFC2B9F4 for ; Tue, 15 Jun 2021 02:46:03 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id D043F61405 for ; Tue, 15 Jun 2021 02:46:02 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229734AbhFOCsF (ORCPT ); Mon, 14 Jun 2021 22:48:05 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:48678 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229609AbhFOCsF (ORCPT ); Mon, 14 Jun 2021 22:48:05 -0400 Received: from perceval.ideasonboard.com (perceval.ideasonboard.com [IPv6:2001:4b98:dc2:55:216:3eff:fef7:d647]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 9102AC061574 for ; Mon, 14 Jun 2021 19:46:01 -0700 (PDT) Received: from pendragon.ideasonboard.com (62-78-145-57.bb.dnainternet.fi [62.78.145.57]) by perceval.ideasonboard.com (Postfix) with ESMTPSA id F1F731540; Tue, 15 Jun 2021 03:28:23 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com; s=mail; t=1623720504; bh=P+dMPcoOBD7krLYXKhrEzX8PWHBqEj6KChGWf561Og0=; h=Date:From:To:Cc:Subject:References:In-Reply-To:From; b=dv0RIS//uhS7kBkBk2EP2S5V3bcg5dJ6Nf9mmdP4rBvhFmxPBHGirjAg6gbQcY0qn rxul15ivLAkRbuwyYyJNmLD5NasfSuJm5jiD9VBh+DomCreArQ93JU34Mp3fGYj5rF 7/W7frw7u0lK/xahEwguxy9Px7UwYrK8hmZVQqh0= Date: Tue, 15 Jun 2021 04:28:04 +0300 From: Laurent Pinchart To: Michael Grzeschik Cc: linux-usb@vger.kernel.org, caleb.connolly@ideasonboard.com, paul.elder@ideasonboard.com, balbi@kernel.org, kernel@pengutronix.de Subject: Re: [PATCH v2 1/3] usb: gadget: uvc: make uvc_num_requests depend on gadget speed Message-ID: References: <20210530223041.15320-1-m.grzeschik@pengutronix.de> <20210530223041.15320-2-m.grzeschik@pengutronix.de> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline In-Reply-To: <20210530223041.15320-2-m.grzeschik@pengutronix.de> Precedence: bulk List-ID: X-Mailing-List: linux-usb@vger.kernel.org Hi Michael, Thank you for the patch. On Mon, May 31, 2021 at 12:30:39AM +0200, Michael Grzeschik wrote: > While sending bigger images is possible with USB_SPEED_SUPER it is > better to use more isochronous requests in flight. This patch makes the > number uvc_num_requests dynamic by changing it depending on the gadget > speed. > > Signed-off-by: Michael Grzeschik > --- > v1 -> v2: - fixed null pointer dereference in uvc_video_free_requests > > drivers/usb/gadget/function/uvc.h | 11 +++-- > drivers/usb/gadget/function/uvc_queue.c | 7 ++++ > drivers/usb/gadget/function/uvc_video.c | 56 +++++++++++++++---------- > 3 files changed, 48 insertions(+), 26 deletions(-) > > diff --git a/drivers/usb/gadget/function/uvc.h b/drivers/usb/gadget/function/uvc.h > index 23ee25383c1f7..83b9e945944e8 100644 > --- a/drivers/usb/gadget/function/uvc.h > +++ b/drivers/usb/gadget/function/uvc.h > @@ -65,13 +65,17 @@ extern unsigned int uvc_gadget_trace_param; > * Driver specific constants > */ > > -#define UVC_NUM_REQUESTS 4 > #define UVC_MAX_REQUEST_SIZE 64 > #define UVC_MAX_EVENTS 4 > > /* ------------------------------------------------------------------------ > * Structures > */ > +struct uvc_request { > + struct usb_request *req; > + __u8 *req_buffer; While at it, you could s/__u8/u8/ as this header isn't used by userspace. > + struct uvc_video *video; > +}; > > struct uvc_video { > struct uvc_device *uvc; > @@ -87,10 +91,11 @@ struct uvc_video { > unsigned int imagesize; > struct mutex mutex; /* protects frame parameters */ > > + int uvc_num_requests; Never negative, you can make it an unsigned int. > + > /* Requests */ > unsigned int req_size; > - struct usb_request *req[UVC_NUM_REQUESTS]; > - __u8 *req_buffer[UVC_NUM_REQUESTS]; > + struct uvc_request *ureq; > struct list_head req_free; > spinlock_t req_lock; > > diff --git a/drivers/usb/gadget/function/uvc_queue.c b/drivers/usb/gadget/function/uvc_queue.c > index 61e2c94cc0b0c..dcd71304d521c 100644 > --- a/drivers/usb/gadget/function/uvc_queue.c > +++ b/drivers/usb/gadget/function/uvc_queue.c > @@ -43,6 +43,8 @@ static int uvc_queue_setup(struct vb2_queue *vq, > { > struct uvc_video_queue *queue = vb2_get_drv_priv(vq); > struct uvc_video *video = container_of(queue, struct uvc_video, queue); > + struct uvc_device *uvc = video->uvc; > + struct usb_composite_dev *cdev = uvc->func.config->cdev; struct usb_composite_dev *cdev = video->uvc->func.config->cdev; > > if (*nbuffers > UVC_MAX_VIDEO_BUFFERS) > *nbuffers = UVC_MAX_VIDEO_BUFFERS; > @@ -51,6 +53,11 @@ static int uvc_queue_setup(struct vb2_queue *vq, > > sizes[0] = video->imagesize; > > + if (cdev->gadget->speed < USB_SPEED_SUPER) > + video->uvc_num_requests = 4; > + else > + video->uvc_num_requests = 64; > + > return 0; > } > > diff --git a/drivers/usb/gadget/function/uvc_video.c b/drivers/usb/gadget/function/uvc_video.c > index 633e23d58d868..57840083dfdda 100644 > --- a/drivers/usb/gadget/function/uvc_video.c > +++ b/drivers/usb/gadget/function/uvc_video.c > @@ -11,6 +11,7 @@ > #include > #include > #include > +#include Alphabetical order please. > #include > > #include > @@ -145,7 +146,8 @@ static int uvcg_video_ep_queue(struct uvc_video *video, struct usb_request *req) > static void > uvc_video_complete(struct usb_ep *ep, struct usb_request *req) > { > - struct uvc_video *video = req->context; > + struct uvc_request *ureq = req->context; > + struct uvc_video *video = ureq->video; > struct uvc_video_queue *queue = &video->queue; > unsigned long flags; > > @@ -177,16 +179,19 @@ uvc_video_free_requests(struct uvc_video *video) > { > unsigned int i; > > - for (i = 0; i < UVC_NUM_REQUESTS; ++i) { > - if (video->req[i]) { > - usb_ep_free_request(video->ep, video->req[i]); > - video->req[i] = NULL; > - } > - > - if (video->req_buffer[i]) { > - kfree(video->req_buffer[i]); > - video->req_buffer[i] = NULL; > + if (video->ureq) { > + for (i = 0; i < video->uvc_num_requests; ++i) { > + if (video->ureq[i].req) { > + usb_ep_free_request(video->ep, video->ureq[i].req); > + video->ureq[i].req = NULL; > + } Blank line here please. > + if (video->ureq[i].req_buffer) { > + kfree(video->ureq[i].req_buffer); > + video->ureq[i].req_buffer = NULL; > + } > } Here too. > + kfree(video->ureq); > + video->ureq = NULL; > } > > INIT_LIST_HEAD(&video->req_free); > @@ -207,21 +212,26 @@ uvc_video_alloc_requests(struct uvc_video *video) > * max_t(unsigned int, video->ep->maxburst, 1) > * (video->ep->mult); > > - for (i = 0; i < UVC_NUM_REQUESTS; ++i) { > - video->req_buffer[i] = kmalloc(req_size, GFP_KERNEL); > - if (video->req_buffer[i] == NULL) > + video->ureq = kcalloc(video->uvc_num_requests, sizeof(struct uvc_request), GFP_KERNEL); > + if (video->ureq == NULL) > + return ret; return -ENOMEM; would be more readable (I had to check the value of ret to review this patch). Reviewed-by: Laurent Pinchart > + > + for (i = 0; i < video->uvc_num_requests; ++i) { > + video->ureq[i].req_buffer = kmalloc(req_size, GFP_KERNEL); > + if (video->ureq[i].req_buffer == NULL) > goto error; > > - video->req[i] = usb_ep_alloc_request(video->ep, GFP_KERNEL); > - if (video->req[i] == NULL) > + video->ureq[i].req = usb_ep_alloc_request(video->ep, GFP_KERNEL); > + if (video->ureq[i].req == NULL) > goto error; > > - video->req[i]->buf = video->req_buffer[i]; > - video->req[i]->length = 0; > - video->req[i]->complete = uvc_video_complete; > - video->req[i]->context = video; > + video->ureq[i].req->buf = video->ureq[i].req_buffer; > + video->ureq[i].req->length = 0; > + video->ureq[i].req->complete = uvc_video_complete; > + video->ureq[i].req->context = &video->ureq[i]; > + video->ureq[i].video = video; > > - list_add_tail(&video->req[i]->list, &video->req_free); > + list_add_tail(&video->ureq[i].req->list, &video->req_free); > } > > video->req_size = req_size; > @@ -312,9 +322,9 @@ int uvcg_video_enable(struct uvc_video *video, int enable) > cancel_work_sync(&video->pump); > uvcg_queue_cancel(&video->queue, 0); > > - for (i = 0; i < UVC_NUM_REQUESTS; ++i) > - if (video->req[i]) > - usb_ep_dequeue(video->ep, video->req[i]); > + for (i = 0; i < video->uvc_num_requests; ++i) > + if (video->ureq && video->ureq[i].req) > + usb_ep_dequeue(video->ep, video->ureq[i].req); > > uvc_video_free_requests(video); > uvcg_queue_enable(&video->queue, 0); -- Regards, Laurent Pinchart