From patchwork Wed Dec 16 20:09:25 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Rainer Weikusat X-Patchwork-Id: 557745 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 07F5D1402D2 for ; Thu, 17 Dec 2015 07:09:56 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755268AbbLPUJi (ORCPT ); Wed, 16 Dec 2015 15:09:38 -0500 Received: from tiger.mobileactivedefense.com ([217.174.251.109]:36174 "EHLO tiger.mobileactivedefense.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751320AbbLPUJh (ORCPT ); Wed, 16 Dec 2015 15:09:37 -0500 Received: from doppelsaurus.mobileactivedefense.com (host-2-97-232-207.as13285.net [2.97.232.207]) (authenticated bits=0) by tiger.mobileactivedefense.com (8.13.5.20060308/8.13.5/Debian-3ubuntu1.1) with ESMTP id tBGK9VcF015974 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO); Wed, 16 Dec 2015 20:09:33 GMT Received: from doppelsaurus.mobileactivedefense.com (localhost [127.0.0.1]) by doppelsaurus.mobileactivedefense.com (8.14.4/8.14.4/Debian-4) with ESMTP id tBGK9Qr3004079; Wed, 16 Dec 2015 20:09:26 GMT Received: (from rw@localhost) by doppelsaurus.mobileactivedefense.com (8.14.4/8.14.3/Submit) id tBGK9Pvc004077; Wed, 16 Dec 2015 20:09:25 GMT From: Rainer Weikusat To: David Miller Cc: netdev@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH] af_unix: Revert 'lock_interruptible' in stream receive code User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/23.4 (gnu/linux) Date: Wed, 16 Dec 2015 20:09:25 +0000 Message-ID: <877fke6tqi.fsf@doppelsaurus.mobileactivedefense.com> MIME-Version: 1.0 X-Greylist: Sender succeeded SMTP AUTH, not delayed by milter-greylist-4.4.3 (tiger.mobileactivedefense.com [217.174.251.109]); Wed, 16 Dec 2015 20:09:33 +0000 (GMT) Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org With b3ca9b02b00704053a38bfe4c31dbbb9c13595d0, the AF_UNIX SOCK_STREAM receive code was changed from using mutex_lock(&u->readlock) to mutex_lock_interruptible(&u->readlock) to prevent signals from being delayed for an indefinite time if a thread sleeping on the mutex happened to be selected for handling the signal. But this was never a problem with the stream receive code (as opposed to its datagram counterpart) as that never went to sleep waiting for new messages with the mutex held and thus, wouldn't cause secondary readers to block on the mutex waiting for the sleeping primary reader. As the interruptible locking makes the code more complicated in exchange for no benefit, change it back to using mutex_lock. Signed-off-by: Rainer Weikusat Acked-by: Hannes Frederic Sowa --- Considering that the datagram receive routine also doesn't go the sleep with the mutex held anymore, the 37ab4fa7844a044dc21fde45e2a0fc2f3c3b6490 change to unix_autobind is now similarly purposeless. -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html diff --git a/net/unix/af_unix.c b/net/unix/af_unix.c index 1c3c1f3..b1314c0 100644 --- a/net/unix/af_unix.c +++ b/net/unix/af_unix.c @@ -2263,14 +2263,7 @@ static int unix_stream_read_generic(struct unix_stream_read_state *state) /* Lock the socket to prevent queue disordering * while sleeps in memcpy_tomsg */ - err = mutex_lock_interruptible(&u->readlock); - if (unlikely(err)) { - /* recvmsg() in non blocking mode is supposed to return -EAGAIN - * sk_rcvtimeo is not honored by mutex_lock_interruptible() - */ - err = noblock ? -EAGAIN : -ERESTARTSYS; - goto out; - } + mutex_lock(&u->readlock); if (flags & MSG_PEEK) skip = sk_peek_offset(sk, flags); @@ -2314,12 +2307,12 @@ again: timeo = unix_stream_data_wait(sk, timeo, last, last_len); - if (signal_pending(current) || - mutex_lock_interruptible(&u->readlock)) { + if (signal_pending(current)) { err = sock_intr_errno(timeo); goto out; } + mutex_lock(&u->readlock); continue; unlock: unix_state_unlock(sk);