Hi Mauro,
Thank you for the patch.
On Friday 04 March 2016 07:43:37 Mauro Carvalho Chehab wrote:
> The media-ctl tool, on versions <= 1.10 relies on detecting the
> media_type to identify V4L2 sub-devices and MEDIA_ENT_T_DEVNODE.
1.10 is the latest version, and the problem is still present in the master
branch of v4l-utils. Furthermore this issue isn't limited to media-ctl, there
are other applications relying on this (I wrote one of them).
> If the device doesn't match the MEDIA_ENT_T_V4L2_SUBDEV range, it
> ignores the major/minor and won't be getting the device name on
> udev or sysfs. It will also ignore the entity when printing the
> graphviz diagram.
>
> As we're now adding devices outside the old range, the legacy ioctl
> needs to map the new entity functions into a type at the old range,
> or otherwise we'll have a regression.
How about phrasing it as
"The legacy media controller userspace API exposes entity types that carry
both type and function information. The new API replaces the type with a
function. It preserves backward compatibility by defining legacy functions for
the existing types and using them in drivers.
This works fine as long as drivers are not modified to use proper functions.
When this happens the legacy API will all of a sudden report new functions
instead of legacy types, breaking userspace applications.
Fix this by deriving the type from the function to emulate the legacy API if
the function isn't in the legacy functions range."
> Reported-by: Laurent Pinchart <laurent.pinchart@xxxxxxxxxxxxxxxx>
> Signed-off-by: Mauro Carvalho Chehab <mchehab@xxxxxxxxxxxxxxx>
> ---
> drivers/media/media-device.c | 23 +++++++++++++++++++++++
> include/uapi/linux/media.h | 6 +++++-
> 2 files changed, 28 insertions(+), 1 deletion(-)
>
> diff --git a/drivers/media/media-device.c b/drivers/media/media-device.c
> index 17cd349e485f..1e82c59abb94 100644
> --- a/drivers/media/media-device.c
> +++ b/drivers/media/media-device.c
> @@ -20,6 +20,9 @@
> * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
> USA */
>
> +/* We need to access legacy defines from linux/media.h */
> +#define __MEDIA_DEVICE_C__
glibc defines macros named __need_* for the same purpose. How about
__need_media_legacy_api instead ?
> +
> #include <linux/compat.h>
> #include <linux/export.h>
> #include <linux/idr.h>
> @@ -121,6 +124,26 @@ static long media_device_enum_entities(struct
> media_device *mdev, u_ent.group_id = 0; /* Unused */
> u_ent.pads = ent->num_pads;
> u_ent.links = ent->num_links - ent->num_backlinks;
> +
> + /*
> + * Workaround for a bug at media-ctl <= v1.10 that makes it to
I wouldn't call it a bug, as the MC API guarantees that subdevices will have a
type within the subdev types range, and media-ctl simply relies on that.
> + * do the wrong thing if the entity function doesn't belong to
> + * either MEDIA_ENT_F_OLD_BASE or MEDIA_ENT_F_OLD_SUBDEV_BASE
> + * Ranges.
> + *
> + * Non-subdevices are expected to be at the MEDIA_ENT_F_OLD_BASE,
> + * or, otherwise, will be silently ignored by media-ctl when
> + * printing the graphviz diagram. So, map them into the devnode
> + * old range.
To match the commit message, how about just
"Emulate legacy types for userspace if the entity uses a non-legacy function."
> + */
> + if (ent->function < MEDIA_ENT_F_OLD_BASE ||
> + ent->function > MEDIA_ENT_T_DEVNODE_UNKNOWN) {
> + if (is_media_entity_v4l2_subdev(ent))
> + u_ent.type = MEDIA_ENT_F_V4L2_SUBDEV_UNKNOWN;
> + else if (ent->function != MEDIA_ENT_F_IO_V4L)
This can't happen as MEDIA_ENT_F_IO_V4L is in the
MEDIA_ENT_F_OLD_BASE..MEDIA_ENT_T_DEVNODE_UNKNOWN range. We can just leave
this out for now, or you can use is_media_entity_v4l2_video_device() if you
want to rebase on top of the pull request I've just sent.
> + u_ent.type = MEDIA_ENT_T_DEVNODE_UNKNOWN;
> + }
> +
> memcpy(&u_ent.raw, &ent->info, sizeof(ent->info));
> if (copy_to_user(uent, &u_ent, sizeof(u_ent)))
> return -EFAULT;
> diff --git a/include/uapi/linux/media.h b/include/uapi/linux/media.h
> index 95e126edb1c3..bc27e34ce3a1 100644
> --- a/include/uapi/linux/media.h
> +++ b/include/uapi/linux/media.h
> @@ -132,7 +132,7 @@ struct media_device_info {
>
> #define MEDIA_ENT_F_V4L2_SUBDEV_UNKNOWN MEDIA_ENT_F_OLD_SUBDEV_BASE
>
> -#ifndef __KERNEL__
> +#if !defined(__KERNEL__) || defined(__MEDIA_DEVICE_C__)
>
> /*
> * Legacy symbols used to avoid userspace compilation breakages
> @@ -145,6 +145,10 @@ struct media_device_info {
> #define MEDIA_ENT_TYPE_MASK 0x00ff0000
> #define MEDIA_ENT_SUBTYPE_MASK 0x0000ffff
>
> +/* End of the old subdev reserved numberspace */
> +#define MEDIA_ENT_T_DEVNODE_UNKNOWN (MEDIA_ENT_T_DEVNODE | \
> + MEDIA_ENT_SUBTYPE_MASK)
Shouldn't we hide it from userpace ? How about moving it to media-device.c as
that's the only user ? I don't expect other source files to need this (and
certainly hope it won't be the case).
I also propose calling the macro MEDIA_ENT_T_DEVNODE_MAX (or possibly
MEDIA_ENT_T_DEVNODE_END, up to you). In practice MEDIA_ENT_T_DEVNODE is what
currently represents a device node of unknown type, I find
MEDIA_ENT_T_DEVNODE_UNKNOWN confusing.
> #define MEDIA_ENT_T_DEVNODE MEDIA_ENT_F_OLD_BASE
> #define MEDIA_ENT_T_DEVNODE_V4L MEDIA_ENT_F_IO_V4L
> #define MEDIA_ENT_T_DEVNODE_FB (MEDIA_ENT_T_DEVNODE + 2)
--
Regards,
Laurent Pinchart
--
To unsubscribe from this list: send the line "unsubscribe linux-media" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
