From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754594AbZCDDgt (ORCPT ); Tue, 3 Mar 2009 22:36:49 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1752069AbZCDDgk (ORCPT ); Tue, 3 Mar 2009 22:36:40 -0500 Received: from smtp1.linux-foundation.org ([140.211.169.13]:57724 "EHLO smtp1.linux-foundation.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752017AbZCDDgj (ORCPT ); Tue, 3 Mar 2009 22:36:39 -0500 Date: Tue, 3 Mar 2009 19:35:01 -0800 From: Andrew Morton To: Steven Rostedt Cc: linux-kernel@vger.kernel.org, Ingo Molnar , Peter Zijlstra , Frederic Weisbecker , Theodore Tso , Arjan van de Ven , Pekka Paalanen , Arnaldo Carvalho de Melo , "H. Peter Anvin" , Mathieu Desnoyers , Martin Bligh , "Frank Ch. Eigler" , Tom Zanussi , Masami Hiramatsu , KOSAKI Motohiro , Jason Baron , Christoph Hellwig , Jiaying Zhang , Eduard - Gabriel Munteanu , mrubin@google.com, md@google.com, Steven Rostedt Subject: Re: [PATCH 5/5] tracing: add binary buffer files for use with splice Message-Id: <20090303193501.0055e329.akpm@linux-foundation.org> In-Reply-To: <20090304025251.015368537@goodmis.org> References: <20090304024921.153061228@goodmis.org> <20090304025251.015368537@goodmis.org> X-Mailer: Sylpheed 2.4.8 (GTK+ 2.12.5; x86_64-redhat-linux-gnu) Mime-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Tue, 03 Mar 2009 21:49:26 -0500 Steven Rostedt wrote: > +static ssize_t > +tracing_buffers_read(struct file *filp, char __user *ubuf, > + size_t count, loff_t *ppos) > +{ > + struct ftrace_buffer_info *info = filp->private_data; > + unsigned int pos; > + ssize_t ret; > + size_t size; > + > + /* Do we have previous read data to read? */ > + if (info->read < PAGE_SIZE) > + goto read; > + > + info->read = 0; > + > + ret = ring_buffer_read_page(info->tr->buffer, > + &info->spare, > + count, > + info->cpu, 0); > + if (ret < 0) > + return 0; > + > + pos = ring_buffer_page_len(info->spare); > + > + if (pos < PAGE_SIZE) > + memset(info->spare + pos, 0, PAGE_SIZE - pos); > + > +read: > + size = PAGE_SIZE - info->read; > + if (size > count) > + size = count; > + > + ret = copy_to_user(ubuf, info->spare + info->read, size); > + if (ret) > + return -EFAULT; Conventionally a read() system call will return the number of bytes copied, and will only return -EFOO if the number of bytes copied was zero. Lots of parts of the kernel break this, but it's usually device drivers and scruffy pseudo files, in which case a partial file read doesn't make much sense. This doesn't make the broken behaviour right, but at least we have a bit of a weaselly excuse in that case. > + *ppos += size; > + info->read += size; > + > + return size; > +}