Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20;
From:   Ming Qian <ming.qian@nxp.com>
To:     mchehab@kernel.org, hverkuil-cisco@xs4all.nl
Cc:     shawnguo@kernel.org, robh+dt@kernel.org, s.hauer@pengutronix.de,
        kernel@pengutronix.de, festevam@gmail.com, linux-imx@nxp.com,
        linux-media@vger.kernel.org, linux-kernel@vger.kernel.org,
        linux-arm-kernel@lists.infradead.org
Subject: [PATCH] media: v4l2-mem2mem: prevent pollerr when last_buffer_dequeued is set
Date:   Wed, 15 Jun 2022 11:19:20 +0800
Message-Id: <20220615031920.16118-1-ming.qian@nxp.com>
Content-Transfer-Encoding: 8bit
Content-Type: text/plain
MIME-Version: 1.0
X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?/NrMQ4iG0FrwA3Y0dG9PzhSwm7bL978k5mUXERHSSyIgH9Ee6Zkil9R21Og0?=
 =?us-ascii?Q?oE2T5AWVVAEe8mMs8ZfiSY3VAdPjxTqpjhjz0OEbMRP1uZHyKxMrJhJ6cDr+?=
 =?us-ascii?Q?6dF31pQ6UUHjcS/8EVA4u4sBet7dtJGIZmnxrnX+Z6zadzr7tLpcG8+aIbF9?=
 =?us-ascii?Q?dubjIJrJC3j3YjkHupymg4DZIRvEqUxN92HvCdxotaTIQl1qS3qOLWyPOdPG?=
 =?us-ascii?Q?EBSAHBTK9d5HS8DqOXo/3py5IZoptQav1mUEGd3YvET7qVQ6T+5fcp2xDrgd?=
 =?us-ascii?Q?mJ7XIln5o/V6F4rWlr2GlZ84KSz+NJA2xBWtEBZvWOdlyeugHXsd24sIy7Wp?=
 =?us-ascii?Q?DRLe2Ss+wI0YED6236uGmGo+UIGMj8wTnk7nLmCzam8+DafQpvMRU7Wo9Rpf?=
 =?us-ascii?Q?hlyXMWlxkCSJdiuc71Mv9Jtg9iMXA1BSe+ib3Trl1T35TWkuDT9iQz+oSXRt?=
 =?us-ascii?Q?wiKGJM3ptsM4b1UqQZCdr5TYm5yDimmalNRGxcRud/w5gs73as+QlvBR/0qy?=
 =?us-ascii?Q?zPOkeeFp+g8NbonRWON5C16e4C2DMelEa7qElZyMnfo2ORVHLVS5kxieHH8X?=
 =?us-ascii?Q?pdWYVXhZeWHvIYNgZ5UWZ6C0ABkxNKC9K0LItt2+xag8cH65Ob4TFRnLLMhs?=
 =?us-ascii?Q?/nOWFTANB7Cd9F7BnZvI17lXruGxpF/z7nr/14HTzcfe3WljWyOpEJoerEqg?=
 =?us-ascii?Q?jEyPPdv3y/6cJsJ5jnGAbGk93jxz9uHuBGyFe2W23kk9cldXzBoC3ROhekhD?=
 =?us-ascii?Q?KFe1H6QLipujqrohC2DH9yGuRVl9xtz84OG25tRhjC+xv/fXFWu+c2+N5tXt?=
 =?us-ascii?Q?2gXFb870OfJnovVZ44PxGjNPVsaqME/C+VeS6iVK5BJLT1Js1bFGxuu4TqrV?=
 =?us-ascii?Q?NFOpha1earvxCewiL580fchcQR6txxpHw1EiNvmjvfP0U6L4NXqG6AKFBw8D?=
 =?us-ascii?Q?YdF8Eit9L4KOpSL5ySjAHEdUvOJ40fKZ9ktHZFLz5bL7lqF9GU5ZoQ48APW9?=
 =?us-ascii?Q?f/MTTnDvEPEJ/nvag0no67vOhTMrZyXMVI2Nf12eTs/5dYFFMLYkDU7uv4Qo?=
 =?us-ascii?Q?A2oK6QMjxqQrNOMEX+F0+5RP9Yw7PeHkhN7X4d/5tZ+q3Qt6SL2ECIQW5oXz?=
 =?us-ascii?Q?7Cvawb0cD/z8iq1T2So/teefyeGMFlRPOKfBa0ZIjLVEXPLctrP09s5m0um/?=
 =?us-ascii?Q?a9hDc9TZANcRwpq6JpY3/YyAuNtBmHrd2L+KbciltWdyPzKAjXaFWuC501ip?=
 =?us-ascii?Q?bcGocZWijT5MlLwePyxf5485OBie7ng9OFGn6L5lRdvu/Aq0LQz5PF7uQfjB?=
 =?us-ascii?Q?yEbDRB8HQffDgzgi3Qj5BkrNPBfLkNce+L9OxTZ3cqnDVcY6CFKdzE/Wqhz5?=
 =?us-ascii?Q?sSjTtZ0N5J09jKoMMhvmXK7Fysd+wNT6Z3tNMlzm4Dt+nqoc+/MOngo/IlkZ?=
 =?us-ascii?Q?pUMeKIIkdG5WQmYo4Bq52RZjW+WndEsqr/Qn3P/5H+n225IJjFdMrUTN40dx?=
 =?us-ascii?Q?vrcYpf1gVhX6JfJ1haKwar0PJxKCwHQiGnSm9b1b4JQ1gBg9RvCE7/m+/9BA?=
 =?us-ascii?Q?9X+zARPkFTbI8sA52LEMgUSRkbzwRBQIHvAUD/uT9tIUGm4aa1EF2IyvIiTW?=
 =?us-ascii?Q?n+smKz8BMxIXKyMumQh2IxAuAj5Omp5pA/nZToxHw2IgiiZYSjjZuuXfditn?=
 =?us-ascii?Q?pPJX986B/Eehc5ULdhpFnUcPCKgF3Ai1WLAvwIIDNcSkVZqYqmQu2tZdpc3c?=
 =?us-ascii?Q?FaVc8W6abw=3D=3D?=
X-OriginatorOrg: nxp.com
X-MS-Exchange-CrossTenant-Network-Message-Id: 4b6b5b3b-c7a0-4977-de32-08da4e7dee51
X-MS-Exchange-CrossTenant-AuthSource: AM6PR04MB6341.eurprd04.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 15 Jun 2022 03:20:00.5536
 (UTC)
X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted
X-MS-Exchange-CrossTenant-Id: 686ea1d3-bc2b-4c6f-a92c-d99c5c301635
X-MS-Exchange-CrossTenant-MailboxType: HOSTED
X-MS-Exchange-CrossTenant-UserPrincipalName: fJo50EfOJ43zOwnz8fDUX8ynvH/pubsR21STMUZ4QyloWyuDOa6Vctay14m9itz/8BlMwPmLGMeRzzDCBBxXqA==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: PAXPR04MB8958
X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED,
        DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_NONE,
        RCVD_IN_MSPIKE_H2,SPF_HELO_PASS,SPF_PASS,T_SCC_BODY_TEXT_LINE
        autolearn=ham autolearn_force=no version=3.4.6
X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on
        lindbergh.monkeyblade.net
Precedence: bulk
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

If the last buffer was dequeued from the capture queue,
signal userspace. DQBUF(CAPTURE) will return -EPIPE.

But if output queue is empty and capture queue is empty,
v4l2_m2m_poll_for_data will return EPOLLERR,
This is very easy to happen in drain.

When last_buffer_dequeued is set, we shouldn't return EPOLLERR,
but return EPOLLIN | EPOLLRDNORM.

Fixes: 1698a7f151126 ("media: v4l2-mem2mem: simplify poll logic")
Signed-off-by: Ming Qian <ming.qian@nxp.com>
---
 drivers/media/v4l2-core/v4l2-mem2mem.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/media/v4l2-core/v4l2-mem2mem.c b/drivers/media/v4l2-core/v4l2-mem2mem.c
index 6469f9a25a4e..837e1855f94b 100644
--- a/drivers/media/v4l2-core/v4l2-mem2mem.c
+++ b/drivers/media/v4l2-core/v4l2-mem2mem.c
@@ -925,7 +925,7 @@ static __poll_t v4l2_m2m_poll_for_data(struct file *file,
 	if ((!src_q->streaming || src_q->error ||
 	     list_empty(&src_q->queued_list)) &&
 	    (!dst_q->streaming || dst_q->error ||
-	     list_empty(&dst_q->queued_list)))
+	     (list_empty(&dst_q->queued_list) && !dst_q->last_buffer_dequeued)))
 		return EPOLLERR;
 
 	spin_lock_irqsave(&src_q->done_lock, flags);
-- 
2.36.1