From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id C163522F767; Wed, 6 Aug 2025 12:45:36 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1754484337; cv=none; b=mVw/oRqRCUx/osPnNHzSYfm+m+BiWXCsJKsBJh+dUeeIVK/pyfncyIF9aWa5L1yDrnUJPFR8WG5cmLOdhDlawiTuEUDrnRdNTpIKmfBECzh9QIkC+dV4hWBlG9n4cXZu+47QnjCOwVwGfm3n80Bi9ptgbOfSrG8arp2OykSQV08= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1754484337; c=relaxed/simple; bh=vrDmqWuCtRp3CsCvQLuDwTzU8RUf2CvrKumyU6zb3Ok=; h=Message-ID:Date:MIME-Version:From:Subject:To:Cc:References: In-Reply-To:Content-Type; b=GQt9y32V/YIvM8Tsq38lXlG8gur83roUnDgRAtXyaTHmiP8nbeJ/CmfDkotjsK/UPWMqFhVWyCjVsd2b1oTA4EHudB8R/4MTJYliapOtRYOZWRhZoLQFuXZmK44kSVWRg6PXyBBsFvaXWCPlj+a3oxcG+GLOL1bEGt7SSvzpzrk= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=piY2QrqA; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="piY2QrqA" Received: by smtp.kernel.org (Postfix) with ESMTPSA id BF4AAC4CEE7; Wed, 6 Aug 2025 12:45:15 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1754484336; bh=vrDmqWuCtRp3CsCvQLuDwTzU8RUf2CvrKumyU6zb3Ok=; h=Date:From:Subject:To:Cc:References:In-Reply-To:From; b=piY2QrqAz8Re20EZatq7znUbw5pHCiVHNr0AmhNRPE0MDM10HmfpdWd02d9i8tbdW E75PTNGi/w0FYgFIJnvX/BXnS/SvXPyQ9seXxkOyOZ7zJ0aOfRRVdb4s/IB6OlYGWX eGzXx+834KiDOoCU+8nK8fwVzqTKOTwSyOvq/we5j7dBgmFBvFnhVcaikg4QxsG3Ow eNHI0m7J7krY4D/AW4W0Ic/ki873otG6+qi8XZAxpJKL+nl6ve+/h5UhD3smasksSI 31GfEPq8TJIP3QV/nzR3fqXJ0rFvGtrMjgIfsvva9ewHG8nil9RVHiEcnK1j0r7efu ou/p/iGbORZsA== Message-ID: Date: Wed, 6 Aug 2025 14:45:14 +0200 Precedence: bulk X-Mailing-List: linux-usb@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 User-Agent: Mozilla Thunderbird From: Hans Verkuil Subject: Re: [PATCH 27/65] media: Reset file->private_data to NULL in v4l2_fh_del() To: Jacopo Mondi , Mauro Carvalho Chehab , Devarsh Thakkar , Benoit Parrot , Hans Verkuil , Mike Isely , Laurent Pinchart , Hans de Goede , Parthiban Veerasooran , Christian Gromm , Greg Kroah-Hartman , Alex Shi , Yanteng Si , Dongliang Mu , Jonathan Corbet , Tomasz Figa , Marek Szyprowski , Andy Walls , Michael Tretter , Pengutronix Kernel Team , Bin Liu , Matthias Brugger , AngeloGioacchino Del Regno , Dmitry Osipenko , Thierry Reding , Jonathan Hunter , Mirela Rabulea , Shawn Guo , Sascha Hauer , Fabio Estevam , Kieran Bingham , Michal Simek , Ming Qian , Zhou Peng , Xavier Roumegue , Philipp Zabel , Vikash Garodia , Dikshita Agarwal , Abhinav Kumar , Bryan O'Donoghue , Sylwester Nawrocki , Jernej Skrabec , Chen-Yu Tsai , Samuel Holland , Daniel Almeida , Neil Armstrong , Kevin Hilman , Jerome Brunet , Martin Blumenstingl , Nas Chung , Jackson Lee , Minghsiu Tsai , Houlong Wei , Andrew-CT Chen , Tiffany Lin , Yunfei Dong , Geert Uytterhoeven , Magnus Damm , Mikhail Ulyanov , Jacob Chen , Ezequiel Garcia , Heiko Stuebner , Detlev Casanova , Krzysztof Kozlowski , Alim Akhtar , Sylwester Nawrocki , =?UTF-8?Q?=C5=81ukasz_Stelmach?= , Andrzej Pietrasiewicz , Jacek Anaszewski , Andrzej Hajda , Fabien Dessenne , Hugues Fruchet , Jean-Christophe Trotin , Maxime Coquelin , Alexandre Torgue , Nicolas Dufresne , Benjamin Gaignard , Steve Longerbeam , Maxime Ripard , Paul Kocialkowski , =?UTF-8?Q?Niklas_S=C3=B6derlund?= , Robert Foss , Todor Tomov , Vladimir Zapolskiy , Corentin Labbe , Sakari Ailus , Bingbu Cao , Tianshu Qiu , Stanislaw Gruszka Cc: linux-media@vger.kernel.org, linux-kernel@vger.kernel.org, linux-staging@lists.linux.dev, linux-doc@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-mediatek@lists.infradead.org, linux-tegra@vger.kernel.org, imx@lists.linux.dev, linux-renesas-soc@vger.kernel.org, linux-arm-msm@vger.kernel.org, linux-samsung-soc@vger.kernel.org, linux-sunxi@lists.linux.dev, linux-usb@vger.kernel.org, linux-amlogic@lists.infradead.org, linux-rockchip@lists.infradead.org, linux-stm32@st-md-mailman.stormreply.com, mjpeg-users@lists.sourceforge.net References: <20250802-media-private-data-v1-0-eb140ddd6a9d@ideasonboard.com> <20250802-media-private-data-v1-27-eb140ddd6a9d@ideasonboard.com> Content-Language: en-US, nl In-Reply-To: <20250802-media-private-data-v1-27-eb140ddd6a9d@ideasonboard.com> Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 7bit On 02/08/2025 11:22, Jacopo Mondi wrote: > From: Laurent Pinchart > > Multiple drivers that use v4l2_fh and call v4l2_fh_del() manually reset > the file->private_data pointer to NULL in their video device .release() > file operation handler. Move the code to the v4l2_fh_del() function to > avoid direct access to file->private_data in drivers. This requires > adding a file pointer argument to the function. > > Changes to drivers have been generated with the following coccinelle > semantic patch: > > @@ > expression fh; > identifier filp; > identifier release; > type ret; > @@ > ret release(..., struct file *filp, ...) > { > <... > - filp->private_data = NULL; > ... > - v4l2_fh_del(fh); > + v4l2_fh_del(fh, filp); > ...> > } > > @@ > expression fh; > identifier filp; > identifier release; > type ret; > @@ > ret release(..., struct file *filp, ...) > { > <... > - v4l2_fh_del(fh); > + v4l2_fh_del(fh, filp); > ... > - filp->private_data = NULL; > ...> > } > > @@ > expression fh; > identifier filp; > identifier release; > type ret; > @@ > ret release(..., struct file *filp, ...) > { > <... > - v4l2_fh_del(fh); > + v4l2_fh_del(fh, filp); > ...> > } > > Manual changes have been applied to Documentation/ to update the usage > patterns, to drivers/media/v4l2-core/v4l2-fh.c to update the > v4l2_fh_del() prototype and reset file->private_data, and to > include/media/v4l2-fh.h to update the v4l2_fh_del() function prototype > and its documentation. > > Additionally, white space issues have been fixed manually in > drivers/usb/gadget/function/uvc_v4l2.c > > Signed-off-by: Laurent Pinchart > Signed-off-by: Jacopo Mondi > --- > Documentation/driver-api/media/v4l2-fh.rst | 4 ++-- > Documentation/translations/zh_CN/video4linux/v4l2-framework.txt | 4 ++-- > drivers/media/pci/cx18/cx18-fileops.c | 4 ++-- > drivers/media/pci/ivtv/ivtv-fileops.c | 4 ++-- > drivers/media/pci/saa7164/saa7164-encoder.c | 2 +- > drivers/media/pci/saa7164/saa7164-vbi.c | 2 +- > drivers/media/platform/allegro-dvt/allegro-core.c | 2 +- > drivers/media/platform/amlogic/meson-ge2d/ge2d.c | 2 +- > drivers/media/platform/amphion/vpu_v4l2.c | 4 ++-- > drivers/media/platform/chips-media/coda/coda-common.c | 4 ++-- > drivers/media/platform/chips-media/wave5/wave5-helper.c | 2 +- > drivers/media/platform/imagination/e5010-jpeg-enc.c | 4 ++-- > drivers/media/platform/m2m-deinterlace.c | 2 +- > drivers/media/platform/mediatek/jpeg/mtk_jpeg_core.c | 4 ++-- > drivers/media/platform/mediatek/mdp/mtk_mdp_m2m.c | 4 ++-- > drivers/media/platform/mediatek/mdp3/mtk-mdp3-m2m.c | 4 ++-- > .../media/platform/mediatek/vcodec/decoder/mtk_vcodec_dec_drv.c | 4 ++-- > .../media/platform/mediatek/vcodec/encoder/mtk_vcodec_enc_drv.c | 4 ++-- > drivers/media/platform/nvidia/tegra-vde/v4l2.c | 2 +- > drivers/media/platform/nxp/dw100/dw100.c | 2 +- > drivers/media/platform/nxp/imx-jpeg/mxc-jpeg.c | 4 ++-- > drivers/media/platform/nxp/imx-pxp.c | 2 +- > drivers/media/platform/nxp/imx8-isi/imx8-isi-m2m.c | 2 +- > drivers/media/platform/nxp/mx2_emmaprp.c | 2 +- > drivers/media/platform/qcom/iris/iris_vidc.c | 3 +-- > drivers/media/platform/qcom/venus/core.c | 2 +- > drivers/media/platform/renesas/rcar_fdp1.c | 2 +- > drivers/media/platform/renesas/rcar_jpu.c | 4 ++-- > drivers/media/platform/renesas/vsp1/vsp1_video.c | 2 +- > drivers/media/platform/rockchip/rga/rga.c | 2 +- > drivers/media/platform/rockchip/rkvdec/rkvdec.c | 2 +- > drivers/media/platform/samsung/exynos-gsc/gsc-m2m.c | 4 ++-- > drivers/media/platform/samsung/exynos4-is/fimc-m2m.c | 4 ++-- > drivers/media/platform/samsung/s5p-g2d/g2d.c | 2 +- > drivers/media/platform/samsung/s5p-jpeg/jpeg-core.c | 4 ++-- > drivers/media/platform/samsung/s5p-mfc/s5p_mfc.c | 4 ++-- > drivers/media/platform/st/sti/bdisp/bdisp-v4l2.c | 4 ++-- > drivers/media/platform/st/sti/delta/delta-v4l2.c | 4 ++-- > drivers/media/platform/st/sti/hva/hva-v4l2.c | 4 ++-- > drivers/media/platform/st/stm32/dma2d/dma2d.c | 2 +- > drivers/media/platform/sunxi/sun8i-di/sun8i-di.c | 2 +- > drivers/media/platform/sunxi/sun8i-rotate/sun8i_rotate.c | 2 +- > drivers/media/platform/ti/omap3isp/ispvideo.c | 5 ++--- > drivers/media/platform/ti/vpe/vpe.c | 2 +- > drivers/media/platform/verisilicon/hantro_drv.c | 4 ++-- > drivers/media/test-drivers/vicodec/vicodec-core.c | 2 +- > drivers/media/test-drivers/vim2m.c | 2 +- > drivers/media/test-drivers/visl/visl-core.c | 2 +- > drivers/media/usb/pvrusb2/pvrusb2-v4l2.c | 3 +-- > drivers/media/v4l2-core/v4l2-fh.c | 7 ++++--- > drivers/media/v4l2-core/v4l2-subdev.c | 5 ++--- > drivers/staging/media/imx/imx-media-csc-scaler.c | 4 ++-- > drivers/staging/media/meson/vdec/vdec.c | 2 +- > drivers/staging/media/sunxi/cedrus/cedrus.c | 2 +- > drivers/staging/most/video/video.c | 4 ++-- > drivers/usb/gadget/function/uvc_v4l2.c | 3 +-- > include/media/v4l2-fh.h | 5 ++++- > 57 files changed, 89 insertions(+), 90 deletions(-) > > diff --git a/drivers/media/v4l2-core/v4l2-fh.c b/drivers/media/v4l2-core/v4l2-fh.c > index b59b1084d8cdf1b62da12879e21dbe56c2109648..df3ba9d4674bd25626cfcddc2d0cb28c233e3cc3 100644 > --- a/drivers/media/v4l2-core/v4l2-fh.c > +++ b/drivers/media/v4l2-core/v4l2-fh.c > @@ -67,7 +67,7 @@ int v4l2_fh_open(struct file *filp) > } > EXPORT_SYMBOL_GPL(v4l2_fh_open); > > -void v4l2_fh_del(struct v4l2_fh *fh) > +void v4l2_fh_del(struct v4l2_fh *fh, struct file *filp) Instead of adding a second argument, perhaps it is better to just provide the filp pointer. After all, you can get the v4l2_fh from filp->private_data. It simplifies the code a bit. Regards, Hans > { > unsigned long flags; > > @@ -75,6 +75,8 @@ void v4l2_fh_del(struct v4l2_fh *fh) > list_del_init(&fh->list); > spin_unlock_irqrestore(&fh->vdev->fh_lock, flags); > v4l2_prio_close(fh->vdev->prio, fh->prio); > + > + filp->private_data = NULL; > } > EXPORT_SYMBOL_GPL(v4l2_fh_del); > > @@ -94,10 +96,9 @@ int v4l2_fh_release(struct file *filp) > struct v4l2_fh *fh = file_to_v4l2_fh(filp); > > if (fh) { > - v4l2_fh_del(fh); > + v4l2_fh_del(fh, filp); > v4l2_fh_exit(fh); > kfree(fh); > - filp->private_data = NULL; > } > return 0; > } > diff --git a/include/media/v4l2-fh.h b/include/media/v4l2-fh.h > index d8fcf49f10e09452b73499f4a9bd1285bc2835a5..5e4c761635120608e0b588e0b0daf63e69588d38 100644 > --- a/include/media/v4l2-fh.h > +++ b/include/media/v4l2-fh.h > @@ -114,12 +114,15 @@ int v4l2_fh_open(struct file *filp); > * v4l2_fh_del - Remove file handle from the list of file handles. > * > * @fh: pointer to &struct v4l2_fh > + * @filp: pointer to &struct file associated with @fh > + * > + * The function resets filp->private_data to NULL. > * > * .. note:: > * Must be called in v4l2_file_operations->release\(\) handler if the driver > * uses &struct v4l2_fh. > */ > -void v4l2_fh_del(struct v4l2_fh *fh); > +void v4l2_fh_del(struct v4l2_fh *fh, struct file *filp); > > /** > * v4l2_fh_exit - Release resources related to a file handle. >