From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from perceval.ideasonboard.com (perceval.ideasonboard.com [213.167.242.64]) (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 355781FBE80; Wed, 6 Aug 2025 09:48:40 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=213.167.242.64 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1754473724; cv=none; b=s3lz4ELO/egHrc1IpPcRoVpnXILNW9o8ys3A7eWKRWUPy5CGcJNmTeMXrAcwLfYcv79gRTjAqVfvP4MLbCQXiYriVX2ZHmH8Ejrq5jWB+rr7wFu6DrfJTep0/gQwnVX6FYNWCzpkKPZFaqxKhYsYKASeykAqHUkpJNDuGg4i+GI= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1754473724; c=relaxed/simple; bh=dBB2uil8xdYuqq7KSR4GUD8VnaNZFEk4RwnSQxJK8VA=; h=Date:From:To:Cc:Subject:Message-ID:References:MIME-Version: Content-Type:Content-Disposition:In-Reply-To; b=bXxfF5fO+ywVUFyJ9npAQjlMi1axc/aUcVzBJ5zfHplN6TyXxZU54dpJncL4fqjoue2Gx0BX4DUaDWmg+FzeI4zGItryNy/BG5rcG4nhJ5xMoh4Hb1fu1ogry3JFmphoNWmRYbFipU6zO01xJR1lOWBFe7/Q1ymdTAJwMr/53aU= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=ideasonboard.com; spf=pass smtp.mailfrom=ideasonboard.com; dkim=pass (1024-bit key) header.d=ideasonboard.com header.i=@ideasonboard.com header.b=BVgd+rZs; arc=none smtp.client-ip=213.167.242.64 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=ideasonboard.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=ideasonboard.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=ideasonboard.com header.i=@ideasonboard.com header.b="BVgd+rZs" Received: from pendragon.ideasonboard.com (91-158-51-183.elisa-laajakaista.fi [91.158.51.183]) by perceval.ideasonboard.com (Postfix) with UTF8SMTPSA id AD44511EB; Wed, 6 Aug 2025 11:47:48 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com; s=mail; t=1754473669; bh=dBB2uil8xdYuqq7KSR4GUD8VnaNZFEk4RwnSQxJK8VA=; h=Date:From:To:Cc:Subject:References:In-Reply-To:From; b=BVgd+rZsh/ZxoGPA94UhjQapWLxk+gRiwJX2O0VIWWSiN8SZXjLCSOE6MZ8Brh1lv 8XpLo+euerZ1zpRgloZxPxWGh/ChUK6DJKXc9a9m4Y+VmYiVxNuicDSagQBdkuQpE4 LSv8nzfk6MdHfJRD3zCZIOhReZsK2sp0LHv5o6aI= Date: Wed, 6 Aug 2025 12:48:22 +0300 From: Laurent Pinchart To: Hans Verkuil Cc: Jacopo Mondi , Mauro Carvalho Chehab , Devarsh Thakkar , Benoit Parrot , Hans Verkuil , Mike Isely , 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 , Niklas =?utf-8?Q?S=C3=B6derlund?= , Robert Foss , Todor Tomov , Vladimir Zapolskiy , Corentin Labbe , Sakari Ailus , Bingbu Cao , Tianshu Qiu , Stanislaw Gruszka , 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 Subject: Re: [PATCH 11/65] media: Replace file->private_data access with custom functions Message-ID: <20250806094822.GA24768@pendragon.ideasonboard.com> References: <20250802-media-private-data-v1-0-eb140ddd6a9d@ideasonboard.com> <20250802-media-private-data-v1-11-eb140ddd6a9d@ideasonboard.com> <49e753f4-f626-49ae-bf23-d2aecfcc6282@kernel.org> Precedence: bulk X-Mailing-List: linux-media@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline In-Reply-To: <49e753f4-f626-49ae-bf23-d2aecfcc6282@kernel.org> Hi Hans, On Wed, Aug 06, 2025 at 10:16:37AM +0200, Hans Verkuil wrote: > On 02/08/2025 11:22, Jacopo Mondi wrote: > > From: Laurent Pinchart > > > > Accessing file->private_data manually to retrieve the v4l2_fh pointer is > > error-prone, as the field is a void * and will happily cast implicitly > > to any pointer type. > > > > Replace all remaining locations that read the v4l2_fh pointer directly > > from file->private_data and cast it to driver-specific file handle > > structures with driver-specific functions that use file_to_v4l2_fh() and > > perform the same cast. > > > > No functional change is intended, this only paves the way to remove > > direct accesses to file->private_data and make V4L2 drivers safer. > > Other accesses to the field will be addressed separately. > > > > Signed-off-by: Laurent Pinchart > > Signed-off-by: Jacopo Mondi > > --- > > drivers/media/pci/ivtv/ivtv-driver.h | 5 ++++ > > drivers/media/pci/ivtv/ivtv-fileops.c | 10 +++---- > > drivers/media/pci/ivtv/ivtv-ioctl.c | 8 +++--- > > drivers/media/platform/allegro-dvt/allegro-core.c | 7 ++++- > > drivers/media/platform/amlogic/meson-ge2d/ge2d.c | 8 ++++-- > > .../media/platform/chips-media/coda/coda-common.c | 7 ++++- > > .../platform/chips-media/wave5/wave5-helper.c | 2 +- > > .../media/platform/chips-media/wave5/wave5-vpu.h | 5 ++++ > > drivers/media/platform/m2m-deinterlace.c | 7 ++++- > > .../media/platform/mediatek/jpeg/mtk_jpeg_core.c | 7 ++++- > > drivers/media/platform/mediatek/mdp/mtk_mdp_m2m.c | 7 ++++- > > .../media/platform/mediatek/mdp3/mtk-mdp3-m2m.c | 7 ++++- > > .../mediatek/vcodec/decoder/mtk_vcodec_dec_drv.c | 2 +- > > .../mediatek/vcodec/decoder/mtk_vcodec_dec_drv.h | 5 ++++ > > .../mediatek/vcodec/encoder/mtk_vcodec_enc_drv.c | 2 +- > > .../mediatek/vcodec/encoder/mtk_vcodec_enc_drv.h | 5 ++++ > > drivers/media/platform/nxp/imx-jpeg/mxc-jpeg.c | 7 ++++- > > drivers/media/platform/nxp/imx8-isi/imx8-isi-m2m.c | 7 ++++- > > drivers/media/platform/nxp/mx2_emmaprp.c | 7 ++++- > > drivers/media/platform/renesas/rcar_fdp1.c | 7 ++++- > > drivers/media/platform/renesas/rcar_jpu.c | 7 ++++- > > drivers/media/platform/rockchip/rga/rga.c | 3 +-- > > drivers/media/platform/rockchip/rga/rga.h | 5 ++++ > > drivers/media/platform/rockchip/rkvdec/rkvdec.c | 2 +- > > drivers/media/platform/rockchip/rkvdec/rkvdec.h | 5 ++++ > > .../media/platform/samsung/exynos-gsc/gsc-core.h | 6 +++++ > > .../media/platform/samsung/exynos-gsc/gsc-m2m.c | 6 ++--- > > .../media/platform/samsung/exynos4-is/fimc-core.h | 5 ++++ > > .../media/platform/samsung/exynos4-is/fimc-m2m.c | 2 +- > > drivers/media/platform/samsung/s5p-g2d/g2d.c | 7 +++-- > > .../media/platform/samsung/s5p-jpeg/jpeg-core.c | 9 +++++-- > > drivers/media/platform/samsung/s5p-mfc/s5p_mfc.c | 6 ++--- > > .../platform/samsung/s5p-mfc/s5p_mfc_common.h | 6 +++++ > > drivers/media/platform/st/sti/bdisp/bdisp-v4l2.c | 7 ++++- > > drivers/media/platform/st/sti/delta/delta-v4l2.c | 26 +++++++++++------- > > drivers/media/platform/st/sti/hva/hva-v4l2.c | 31 ++++++++++++---------- > > drivers/media/platform/st/sti/hva/hva.h | 2 -- > > drivers/media/platform/st/stm32/dma2d/dma2d.c | 7 +++-- > > drivers/media/platform/sunxi/sun8i-di/sun8i-di.c | 3 +-- > > .../platform/sunxi/sun8i-rotate/sun8i_rotate.c | 3 +-- > > drivers/media/platform/ti/omap3isp/ispvideo.c | 4 +-- > > drivers/media/platform/ti/omap3isp/ispvideo.h | 6 +++++ > > drivers/media/platform/verisilicon/hantro.h | 5 ++++ > > drivers/media/platform/verisilicon/hantro_drv.c | 3 +-- > > drivers/staging/media/imx/imx-media-csc-scaler.c | 7 ++++- > > drivers/staging/media/meson/vdec/vdec.c | 24 ++++++----------- > > drivers/staging/media/meson/vdec/vdec.h | 5 ++++ > > drivers/staging/media/sunxi/cedrus/cedrus.c | 3 +-- > > drivers/staging/media/sunxi/cedrus/cedrus.h | 5 ++++ > > drivers/staging/media/sunxi/cedrus/cedrus_video.c | 5 ---- > > 50 files changed, 237 insertions(+), 100 deletions(-) > > > > diff --git a/drivers/media/pci/ivtv/ivtv-driver.h b/drivers/media/pci/ivtv/ivtv-driver.h > > index a6ffa99e16bc64a5b7d3e48c1ab32b49a7989242..cad548b28e360ecfe2bcb9fcb5d12cd8823c3727 100644 > > --- a/drivers/media/pci/ivtv/ivtv-driver.h > > +++ b/drivers/media/pci/ivtv/ivtv-driver.h > > @@ -388,6 +388,11 @@ static inline struct ivtv_open_id *fh2id(struct v4l2_fh *fh) > > return container_of(fh, struct ivtv_open_id, fh); > > } > > > > +static inline struct ivtv_open_id *file2id(struct file *filp) > > +{ > > + return container_of(file_to_v4l2_fh(filp), struct ivtv_open_id, fh); > > Why not write: > > return fh2id(file_to_v4l2_fh(filp)); > > Same for all other drivers that do this. I prefer to have the contained_of() > in just one place. Because fh2id gets removed in "[PATCH 57/65] media: ivtv: Access v4l2_fh from file". I can use it in this patch and drop it later, would you prefer that ? > > +} > > + > > struct yuv_frame_info > > { > > u32 update; > > > > > diff --git a/drivers/media/platform/allegro-dvt/allegro-core.c b/drivers/media/platform/allegro-dvt/allegro-core.c > > index 1f134e08923a528cc676f825da68951c97ac2f25..74977f3ae4844022c04de877f31b4fc6aaac0749 100644 > > --- a/drivers/media/platform/allegro-dvt/allegro-core.c > > +++ b/drivers/media/platform/allegro-dvt/allegro-core.c > > @@ -302,6 +302,11 @@ struct allegro_channel { > > unsigned int error; > > }; > > > > +static inline struct allegro_channel *file_to_channel(struct file *filp) > > +{ > > + return container_of(file_to_v4l2_fh(filp), struct allegro_channel, fh); > > +} > > + > > static inline int > > allegro_channel_get_i_frame_qp(struct allegro_channel *channel) > > { > > @@ -3229,7 +3234,7 @@ static int allegro_open(struct file *file) > > > > static int allegro_release(struct file *file) > > { > > - struct allegro_channel *channel = fh_to_channel(file->private_data); > > + struct allegro_channel *channel = file_to_channel(file); > > So a file_to_channel inline function was added, but it is used in just one > place. > > I would prefer to just drop the inline function and instead write: > > struct allegro_channel *channel = fh_to_channel(file_to_v4l2_fh(file)); > > If this is needed in two or more places, then the extra inline makes sense, > but it is a fairly common pattern that it is only needed in the release function. > > Adding a new inline just for that seems overkill to me. file_to_channel() gets used in more places in "[PATCH 29/65] media: allegro: Access v4l2_fh from file", where fh_to_channel() is dropped. I'd rather keep it in this patch instead of having to modify the allegro_release() function in patch 29/65. > > > > v4l2_m2m_ctx_release(channel->fh.m2m_ctx); > > -- Regards, Laurent Pinchart