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=-6.8 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham 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 5179BC3A5A8 for ; Wed, 4 Sep 2019 18:03:00 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 2C77822CF5 for ; Wed, 4 Sep 2019 18:03:00 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1567620180; bh=S7xatoxrGILk99eVCvzdkYSlzdr6JTKpzXUvC1KZTXc=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=htD303TqSlnb2YAnzsSa1l4hjriTv50V34X+QfZkJaYlHDoM/+H86H+Jfz3qf301H 64cs2+bRnaTm3EZzLe4t2CcO9e4o+DxnVhSFFJcwBTfJ/OM06calhS7JnuXF+E4v8T vTYU81agO87JAYUcIbW4C0QXxVeEc+YsonfXBr68= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1730312AbfIDSC6 (ORCPT ); Wed, 4 Sep 2019 14:02:58 -0400 Received: from mail.kernel.org ([198.145.29.99]:43180 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2388480AbfIDSC5 (ORCPT ); Wed, 4 Sep 2019 14:02:57 -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 8F5F7206B8; Wed, 4 Sep 2019 18:02:56 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1567620177; bh=S7xatoxrGILk99eVCvzdkYSlzdr6JTKpzXUvC1KZTXc=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Katmvyh/McfW65BQCY/4ra7uAfeB+s+hpjnOb7AHg7BdqWusoAHBI5G06p/JQeFg9 xAGQEgnrGv/zqkJn7H8vwV09pIS9RQZrZ8ZVybLVMQwrOVK3mbwd6Dd2g7sYMlnBsR D72fnbJwX4jcNOikJ4xSPsrvU0Xn0Ghk6d1ATm+o= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Jason Baron , Eric Dumazet , Ursula Braun , Karsten Graul , "David S. Miller" Subject: [PATCH 4.14 19/57] net/smc: make sure EPOLLOUT is raised Date: Wed, 4 Sep 2019 19:53:47 +0200 Message-Id: <20190904175303.768062015@linuxfoundation.org> X-Mailer: git-send-email 2.23.0 In-Reply-To: <20190904175301.777414715@linuxfoundation.org> References: <20190904175301.777414715@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 Baron [ Upstream commit 4651d1802f7063e4d8c0bcad957f46ece0c04024 ] Currently, we are only explicitly setting SOCK_NOSPACE on a write timeout for non-blocking sockets. Epoll() edge-trigger mode relies on SOCK_NOSPACE being set when -EAGAIN is returned to ensure that EPOLLOUT is raised. Expand the setting of SOCK_NOSPACE to non-blocking sockets as well that can use SO_SNDTIMEO to adjust their write timeout. This mirrors the behavior that Eric Dumazet introduced for tcp sockets. Signed-off-by: Jason Baron Cc: Eric Dumazet Cc: Ursula Braun Cc: Karsten Graul Signed-off-by: David S. Miller Signed-off-by: Greg Kroah-Hartman --- net/smc/smc_tx.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) --- a/net/smc/smc_tx.c +++ b/net/smc/smc_tx.c @@ -70,13 +70,11 @@ static int smc_tx_wait_memory(struct smc DEFINE_WAIT_FUNC(wait, woken_wake_function); struct smc_connection *conn = &smc->conn; struct sock *sk = &smc->sk; - bool noblock; long timeo; int rc = 0; /* similar to sk_stream_wait_memory */ timeo = sock_sndtimeo(sk, flags & MSG_DONTWAIT); - noblock = timeo ? false : true; add_wait_queue(sk_sleep(sk), &wait); while (1) { sk_set_bit(SOCKWQ_ASYNC_NOSPACE, sk); @@ -91,8 +89,8 @@ static int smc_tx_wait_memory(struct smc break; } if (!timeo) { - if (noblock) - set_bit(SOCK_NOSPACE, &sk->sk_socket->flags); + /* ensure EPOLLOUT is subsequently generated */ + set_bit(SOCK_NOSPACE, &sk->sk_socket->flags); rc = -EAGAIN; break; }