{"id":3698,"url":"https://patchwork.libcamera.org/api/patches/3698/?format=json","web_url":"https://patchwork.libcamera.org/patch/3698/","project":{"id":1,"url":"https://patchwork.libcamera.org/api/projects/1/?format=json","name":"libcamera","link_name":"libcamera","list_id":"libcamera_core","list_email":"libcamera-devel@lists.libcamera.org","web_url":"","scm_url":"","webscm_url":""},"msgid":"<20200507143537.2945672-5-jacopo@jmondi.org>","date":"2020-05-07T14:35:35","name":"[libcamera-devel,v6,4/6] media: v4l2-subdev: Guard whole fops and ioctl hdlr","commit_ref":null,"pull_url":null,"state":"superseded","archived":false,"hash":"213f976a18a57b849ae8000b52225a815f51a8ca","submitter":{"id":3,"url":"https://patchwork.libcamera.org/api/people/3/?format=json","name":"Jacopo Mondi","email":"jacopo@jmondi.org"},"delegate":null,"mbox":"https://patchwork.libcamera.org/patch/3698/mbox/","series":[{"id":883,"url":"https://patchwork.libcamera.org/api/series/883/?format=json","web_url":"https://patchwork.libcamera.org/project/libcamera/list/?series=883","date":"2020-05-07T14:35:31","name":"media: Register read-only sub-dev devnode","version":6,"mbox":"https://patchwork.libcamera.org/series/883/mbox/"}],"comments":"https://patchwork.libcamera.org/api/patches/3698/comments/","check":"pending","checks":"https://patchwork.libcamera.org/api/patches/3698/checks/","tags":{},"headers":{"Return-Path":"","Received":["from relay12.mail.gandi.net (relay12.mail.gandi.net\n\t[217.70.178.232])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id 5FC08603EA\n\tfor ;\n\tThu, 7 May 2020 16:32:54 +0200 (CEST)","from localhost.localdomain (2-224-242-101.ip172.fastwebnet.it\n\t[2.224.242.101]) (Authenticated sender: jacopo@jmondi.org)\n\tby relay12.mail.gandi.net (Postfix) with ESMTPSA id 0B29D200007;\n\tThu, 7 May 2020 14:32:49 +0000 (UTC)"],"From":"Jacopo Mondi ","To":"linux-media@vger.kernel.org,\n\tlibcamera-devel@lists.libcamera.org","Cc":"Jacopo Mondi , mchehab@kernel.org,\n\thverkuil-cisco@xs4all.nl, sakari.ailus@linux.intel.com,\n\tandrey.konovalov@linaro.org, laurent.pinchart@ideasonboard.com","Date":"Thu, 7 May 2020 16:35:35 +0200","Message-Id":"<20200507143537.2945672-5-jacopo@jmondi.org>","X-Mailer":"git-send-email 2.26.1","In-Reply-To":"<20200507143537.2945672-1-jacopo@jmondi.org>","References":"<20200507143537.2945672-1-jacopo@jmondi.org>","MIME-Version":"1.0","Content-Transfer-Encoding":"8bit","Subject":"[libcamera-devel] [PATCH v6 4/6] media: v4l2-subdev: Guard whole\n\tfops and ioctl hdlr","X-BeenThere":"libcamera-devel@lists.libcamera.org","X-Mailman-Version":"2.1.29","Precedence":"list","List-Id":"","List-Unsubscribe":",\n\t","List-Archive":"","List-Post":"","List-Help":"","List-Subscribe":",\n\t","X-List-Received-Date":"Thu, 07 May 2020 14:32:54 -0000"},"content":"A sub-device device node can be registered in user space only if the\nCONFIG_V4L2_SUBDEV_API Kconfig option is selected. Currently the\nopen/close file operations and the ioctl handler have some parts of their\nimplementations guarded by #if defined(CONFIG_V4L2_SUBDEV_API), while\nthey are actually not accessible without a video device node registered\nto user space.\n\nGuard the whole open, close and ioctl handler and provide stubs if the\nV4L2_SUBDEV_API Kconfig option is not selected.\n\nThis slightly reduces the kernel size when the option is not selected\nand simplifies the file ops and ioctl implementations.\n\nSigned-off-by: Jacopo Mondi \n---\n drivers/media/v4l2-core/v4l2-subdev.c | 39 +++++++++++++++++++++------\n 1 file changed, 31 insertions(+), 8 deletions(-)\n\n--\n2.26.1","diff":"diff --git a/drivers/media/v4l2-core/v4l2-subdev.c b/drivers/media/v4l2-core/v4l2-subdev.c\nindex 1dc263c2ca0aa..174778f9c0bc4 100644\n--- a/drivers/media/v4l2-core/v4l2-subdev.c\n+++ b/drivers/media/v4l2-core/v4l2-subdev.c\n@@ -22,24 +22,22 @@\n #include \n #include \n\n+#if defined(CONFIG_VIDEO_V4L2_SUBDEV_API)\n static int subdev_fh_init(struct v4l2_subdev_fh *fh, struct v4l2_subdev *sd)\n {\n-#if defined(CONFIG_VIDEO_V4L2_SUBDEV_API)\n \tif (sd->entity.num_pads) {\n \t\tfh->pad = v4l2_subdev_alloc_pad_config(sd);\n \t\tif (fh->pad == NULL)\n \t\t\treturn -ENOMEM;\n \t}\n-#endif\n+\n \treturn 0;\n }\n\n static void subdev_fh_free(struct v4l2_subdev_fh *fh)\n {\n-#if defined(CONFIG_VIDEO_V4L2_SUBDEV_API)\n \tv4l2_subdev_free_pad_config(fh->pad);\n \tfh->pad = NULL;\n-#endif\n }\n\n static int subdev_open(struct file *file)\n@@ -111,6 +109,17 @@ static int subdev_close(struct file *file)\n\n \treturn 0;\n }\n+#else /* CONFIG_VIDEO_V4L2_SUBDEV_API */\n+static int subdev_open(struct file *file)\n+{\n+\treturn -ENODEV;\n+}\n+\n+static int subdev_close(struct file *file)\n+{\n+\treturn -ENODEV;\n+}\n+#endif /* CONFIG_VIDEO_V4L2_SUBDEV_API */\n\n static inline int check_which(u32 which)\n {\n@@ -324,15 +333,14 @@ const struct v4l2_subdev_ops v4l2_subdev_call_wrappers = {\n };\n EXPORT_SYMBOL(v4l2_subdev_call_wrappers);\n\n+#if defined(CONFIG_VIDEO_V4L2_SUBDEV_API)\n static long subdev_do_ioctl(struct file *file, unsigned int cmd, void *arg)\n {\n \tstruct video_device *vdev = video_devdata(file);\n \tstruct v4l2_subdev *sd = vdev_to_v4l2_subdev(vdev);\n \tstruct v4l2_fh *vfh = file->private_data;\n-#if defined(CONFIG_VIDEO_V4L2_SUBDEV_API)\n \tstruct v4l2_subdev_fh *subdev_fh = to_v4l2_subdev_fh(vfh);\n \tbool ro_subdev = test_bit(V4L2_FL_SUBDEV_RO_DEVNODE, &vdev->flags);\n-#endif\n \tint rval;\n\n \tswitch (cmd) {\n@@ -466,7 +474,6 @@ static long subdev_do_ioctl(struct file *file, unsigned int cmd, void *arg)\n \t\treturn ret;\n \t}\n\n-#if defined(CONFIG_VIDEO_V4L2_SUBDEV_API)\n \tcase VIDIOC_SUBDEV_G_FMT: {\n \t\tstruct v4l2_subdev_format *format = arg;\n\n@@ -646,7 +653,7 @@ static long subdev_do_ioctl(struct file *file, unsigned int cmd, void *arg)\n\n \tcase VIDIOC_SUBDEV_QUERYSTD:\n \t\treturn v4l2_subdev_call(sd, video, querystd, arg);\n-#endif\n+\n \tdefault:\n \t\treturn v4l2_subdev_call(sd, core, ioctl, cmd, arg);\n \t}\n@@ -686,6 +693,22 @@ static long subdev_compat_ioctl32(struct file *file, unsigned int cmd,\n }\n #endif\n\n+#else /* CONFIG_VIDEO_V4L2_SUBDEV_API */\n+static long subdev_ioctl(struct file *file, unsigned int cmd,\n+\t\t\t unsigned long arg)\n+{\n+\treturn -ENODEV;\n+}\n+\n+#ifdef CONFIG_COMPAT\n+static long subdev_compat_ioctl32(struct file *file, unsigned int cmd,\n+\t\t\t\t unsigned long arg)\n+{\n+\treturn -ENODEV;\n+}\n+#endif\n+#endif /* CONFIG_VIDEO_V4L2_SUBDEV_API */\n+\n static __poll_t subdev_poll(struct file *file, poll_table *wait)\n {\n \tstruct video_device *vdev = video_devdata(file);\n","prefixes":["libcamera-devel","v6","4/6"]}