From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-9.8 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 4712AC433E2 for ; Fri, 19 Jun 2020 16:28:14 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 1E7D521707 for ; Fri, 19 Jun 2020 16:28:14 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1592584094; bh=1CjNh4IAkmtHBplhmUA60VGWBjx2+lXxBppXNT/XFZg=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=mr+FMZz1e9hpnAlWbg0Nu1i8WNCMx0gxa6vh51p1OkanZWC47rSWuY6+w4Xj4DXUS ppUkBEOVp2mNQyBwROZ2AQzrst1F73CGAf59UYlDeOLeIFA/CYDUbwI0vc/2jLKGps IP8bWh5bR9OKLOh/PnX1a56OMucN9qXn6LB2nMoo= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2388902AbgFSOzK (ORCPT ); Fri, 19 Jun 2020 10:55:10 -0400 Received: from mail.kernel.org ([198.145.29.99]:49964 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2389924AbgFSOzK (ORCPT ); Fri, 19 Jun 2020 10:55:10 -0400 Received: from localhost (83-86-89-107.cable.dynamic.v4.ziggo.nl [83.86.89.107]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id C42A521556; Fri, 19 Jun 2020 14:55:09 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1592578510; bh=1CjNh4IAkmtHBplhmUA60VGWBjx2+lXxBppXNT/XFZg=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=ah4FVX37OscSHzUCOFW9IE1qmD8tgRUFksWEAcojAbFE5b/f8ELXddzODotCiAAmW bZSGFeVeS07/dDHqH6Wk3JCWkaNYrfNInzChurVib7q/8vL3y2jELvJdXy1ES1zsdU jbdC1lnF8iRqpev/y8zQnZ3IjAzzOQvFOgG2/ZEk= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Leon Romanovsky , Jason Gunthorpe , Sasha Levin Subject: [PATCH 4.19 022/267] RDMA/uverbs: Make the event_queue fds return POLLERR when disassociated Date: Fri, 19 Jun 2020 16:30:07 +0200 Message-Id: <20200619141649.940260451@linuxfoundation.org> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20200619141648.840376470@linuxfoundation.org> References: <20200619141648.840376470@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Jason Gunthorpe [ Upstream commit eb356e6dc15a30af604f052cd0e170450193c254 ] If is_closed is set, and the event list is empty, then read() will return -EIO without blocking. After setting is_closed in ib_uverbs_free_event_queue(), we do trigger a wake_up on the poll_wait, but the fops->poll() function does not check it, so poll will continue to sleep on an empty list. Fixes: 14e23bd6d221 ("RDMA/core: Fix locking in ib_uverbs_event_read") Link: https://lore.kernel.org/r/0-v1-ace813388969+48859-uverbs_poll_fix%25jgg@mellanox.com Reviewed-by: Leon Romanovsky Signed-off-by: Jason Gunthorpe Signed-off-by: Sasha Levin --- drivers/infiniband/core/uverbs_main.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/drivers/infiniband/core/uverbs_main.c b/drivers/infiniband/core/uverbs_main.c index 5404717998b0..fc4b46258c75 100644 --- a/drivers/infiniband/core/uverbs_main.c +++ b/drivers/infiniband/core/uverbs_main.c @@ -360,6 +360,8 @@ static __poll_t ib_uverbs_event_poll(struct ib_uverbs_event_queue *ev_queue, spin_lock_irq(&ev_queue->lock); if (!list_empty(&ev_queue->event_list)) pollflags = EPOLLIN | EPOLLRDNORM; + else if (ev_queue->is_closed) + pollflags = EPOLLERR; spin_unlock_irq(&ev_queue->lock); return pollflags; -- 2.25.1