From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752508AbaALSpT (ORCPT ); Sun, 12 Jan 2014 13:45:19 -0500 Received: from terminus.zytor.com ([198.137.202.10]:46396 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752012AbaALSpK (ORCPT ); Sun, 12 Jan 2014 13:45:10 -0500 Date: Sun, 12 Jan 2014 10:44:30 -0800 From: tip-bot for Peter Zijlstra Message-ID: Cc: linux-kernel@vger.kernel.org, hpa@zytor.com, mingo@kernel.org, torvalds@linux-foundation.org, arjan@linux.intel.com, peterz@infradead.org, bitbucket@online.de, davem@davemloft.net, eliezer.tamir@linux.intel.com, akpm@linux-foundation.org, tglx@linutronix.de Reply-To: mingo@kernel.org, hpa@zytor.com, linux-kernel@vger.kernel.org, arjan@linux.intel.com, torvalds@linux-foundation.org, peterz@infradead.org, bitbucket@online.de, davem@davemloft.net, eliezer.tamir@linux.intel.com, akpm@linux-foundation.org, tglx@linutronix.de In-Reply-To: <20131119151338.GF3694@twins.programming.kicks-ass.net> References: <20131119151338.GF3694@twins.programming.kicks-ass.net> To: linux-tip-commits@vger.kernel.org Subject: [tip:sched/idle] sched, net: Clean up preempt_enable_no_resched() abuse Git-Commit-ID: 3a5cd0b09443edb2f960497928de047e9c8ab848 X-Mailer: tip-git-log-daemon Robot-ID: Robot-Unsubscribe: Contact to get blacklisted from these emails MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset=UTF-8 Content-Disposition: inline X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.1 (terminus.zytor.com [127.0.0.1]); Sun, 12 Jan 2014 10:44:36 -0800 (PST) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Commit-ID: 3a5cd0b09443edb2f960497928de047e9c8ab848 Gitweb: http://git.kernel.org/tip/3a5cd0b09443edb2f960497928de047e9c8ab848 Author: Peter Zijlstra AuthorDate: Tue, 19 Nov 2013 16:13:38 +0100 Committer: Ingo Molnar CommitDate: Sun, 12 Jan 2014 14:50:35 +0100 sched, net: Clean up preempt_enable_no_resched() abuse The only valid use of preempt_enable_no_resched() is if the very next line is schedule() or if we know preemption cannot actually be enabled by that statement due to known more preempt_count 'refs'. Reviewed-by: Thomas Gleixner Signed-off-by: Peter Zijlstra Cc: rjw@rjwysocki.net Cc: Eliezer Tamir Cc: David S. Miller Cc: rui.zhang@intel.com Cc: jacob.jun.pan@linux.intel.com Cc: Mike Galbraith Cc: hpa@zytor.com Cc: Arjan van de Ven Cc: lenb@kernel.org Cc: Linus Torvalds Cc: Andrew Morton Link: http://lkml.kernel.org/r/20131119151338.GF3694@twins.programming.kicks-ass.net Signed-off-by: Ingo Molnar --- net/ipv4/tcp.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/net/ipv4/tcp.c b/net/ipv4/tcp.c index c4638e6..82de786 100644 --- a/net/ipv4/tcp.c +++ b/net/ipv4/tcp.c @@ -1623,11 +1623,11 @@ int tcp_recvmsg(struct kiocb *iocb, struct sock *sk, struct msghdr *msg, (len > sysctl_tcp_dma_copybreak) && !(flags & MSG_PEEK) && !sysctl_tcp_low_latency && net_dma_find_channel()) { - preempt_enable_no_resched(); + preempt_enable(); tp->ucopy.pinned_list = dma_pin_iovec_pages(msg->msg_iov, len); } else { - preempt_enable_no_resched(); + preempt_enable(); } } #endif