From patchwork Tue Mar 26 10:08:27 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Vincent Donnefort X-Patchwork-Id: 13603821 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by smtp.lore.kernel.org (Postfix) with ESMTP id 81D4DCD11DF for ; Tue, 26 Mar 2024 10:08:44 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 0617E6B0098; Tue, 26 Mar 2024 06:08:44 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 011456B0099; Tue, 26 Mar 2024 06:08:43 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id DF3F86B009A; Tue, 26 Mar 2024 06:08:43 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0013.hostedemail.com [216.40.44.13]) by kanga.kvack.org (Postfix) with ESMTP id C819C6B0098 for ; Tue, 26 Mar 2024 06:08:43 -0400 (EDT) Received: from smtpin12.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay08.hostedemail.com (Postfix) with ESMTP id 93A971409D1 for ; Tue, 26 Mar 2024 10:08:43 +0000 (UTC) X-FDA: 81938766126.12.F1E1DF6 Received: from mail-yb1-f202.google.com (mail-yb1-f202.google.com [209.85.219.202]) by imf09.hostedemail.com (Postfix) with ESMTP id AB6DA140006 for ; Tue, 26 Mar 2024 10:08:41 +0000 (UTC) Authentication-Results: imf09.hostedemail.com; dkim=pass header.d=google.com header.s=20230601 header.b=iuAJqxex; dmarc=pass (policy=reject) header.from=google.com; spf=pass (imf09.hostedemail.com: domain of 3qJ4CZgoKCCcYGRQQHIRUWJRRJOH.FRPOLQXa-PPNYDFN.RUJ@flex--vdonnefort.bounces.google.com designates 209.85.219.202 as permitted sender) smtp.mailfrom=3qJ4CZgoKCCcYGRQQHIRUWJRRJOH.FRPOLQXa-PPNYDFN.RUJ@flex--vdonnefort.bounces.google.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1711447721; h=from:from:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type:content-transfer-encoding: in-reply-to:in-reply-to:references:references:dkim-signature; bh=5jIMRt/32GRgE1eetSdAND17lpYq06dNuYebVWRM2Sg=; b=drRf+k2ODPBjCZy6hUiLjwjT6L7jVIrCFxPEbzRdvypzNVkCIAEJReUVIsCOSEq5Dvvkcd w5UgAMcKWKcP4e3PGqzIv5nWcHM39cm+aX1QYdry1ZeF4zb77DTL3R8n02F/Ssm4IDnqM0 s3va//B/Zfit9Kph8J3f7/0CS2GOwIM= ARC-Authentication-Results: i=1; imf09.hostedemail.com; dkim=pass header.d=google.com header.s=20230601 header.b=iuAJqxex; dmarc=pass (policy=reject) header.from=google.com; spf=pass (imf09.hostedemail.com: domain of 3qJ4CZgoKCCcYGRQQHIRUWJRRJOH.FRPOLQXa-PPNYDFN.RUJ@flex--vdonnefort.bounces.google.com designates 209.85.219.202 as permitted sender) smtp.mailfrom=3qJ4CZgoKCCcYGRQQHIRUWJRRJOH.FRPOLQXa-PPNYDFN.RUJ@flex--vdonnefort.bounces.google.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1711447721; a=rsa-sha256; cv=none; b=aEfnU+Sdfbj+qbLf08uJiEvR87ZN0nJH4077E/obx0owXywYy4o4Mvq5dMxy8FPrH01D6v G2ODZ8XtpRU/ocAb58QqufD4xoaHi3kD2lbBkdOG8xXYOwPf9bwS66m7kbC79VikjrD+g+ hV5RiAh7vwHPK8CgPTSgPr0xBsK0dNY= Received: by mail-yb1-f202.google.com with SMTP id 3f1490d57ef6-dcd1779adbeso8844887276.3 for ; Tue, 26 Mar 2024 03:08:41 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1711447720; x=1712052520; darn=kvack.org; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:from:to:cc:subject:date:message-id:reply-to; bh=5jIMRt/32GRgE1eetSdAND17lpYq06dNuYebVWRM2Sg=; b=iuAJqxexZdkFrtnHNyHtw8+AIwnjzqAUUHTfvrK+HhV8RLC9teVK1M5bRt80qFrGbY r7TXMo0CE3Jdg2NV8Jjg17uOeA4gC5r0yfyh2mY+QrBZIW3zqLpOHzGPx7FHGRfO+ucU qUpvLJHCMHxGsIBQoQkhHplcH7VYIkS9CFSYXFvyUxA//sweUXh74qSIgj7aOHmoGe4r luSQaA2qM1b5OBU3ARO6ccOlmLu3yAsnhEf5tXhhFMZedEfU1Wl9NVfR0WW9+hd+boXF Vf4Lc3zBKvOoEekN4w0N4UAR1JX4cOtlFAObPQYkKSnkVy0lgnKAwOeQXO3rC9q4OA5e JfNQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1711447721; x=1712052521; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=5jIMRt/32GRgE1eetSdAND17lpYq06dNuYebVWRM2Sg=; b=rWCn9Vti7a9BMz44fRTLlsuCHmZvQwkbmGUEaGrV7Et0KmRrp417YDXxeC/Fa1tLvP YIJldYZk+qJb6N3H0GVaaP3O20YagE3y3ospBe9xZK07rT1nkHQKfMAzwU4a9ODfNuju noReWkRMEXryWuXHkweVu2nM+wlBvucc75R+q8RkwLJtbgEM5aKArtry0P8i30u+HvBE /HYZOY+bIBrm4h75F7NlU0u91MfaQMw8vj0RVZfn4Almb56X5Er1IJ416aS7FJUuhszw XGcMXyKeF2O/WJ85iwgLoNMdfXd/AdZpACIVNqgm3eiKycPmOmaJ/ujVK2QFTJZWaepE qgXg== X-Forwarded-Encrypted: i=1; AJvYcCXA7MvOD7HTJErbVDVPNdGxbZRlP8LtHnOcK9KwYQggjIGKkPVMjwqIgNWeOJpYf8rw9vjqN5pHM4tiG2ctMmgIIks= X-Gm-Message-State: AOJu0YwB6DGm5ZtZGdyS/vsGxBXjzaVuvm3lHGCBThjM4hHEGPaFSm1n Io4IyytBwmIcVRKlOlsh7Lz+8UGOqQHtLiVLHOAIFHgA7Uu7uwrita0iHJOzvmyxiU9lptFSmmg oG+17ZxOQqKKhUQpGZA== X-Google-Smtp-Source: AGHT+IFwXZZ1Wx4DE4vsbszM9l2ter4BS6DmyHMqF/FJAV0QEj5Ht+N6qtgumOfrgAx7TdKMgokT0D3vnHNcXOKY X-Received: from vdonnefort.c.googlers.com ([fda3:e722:ac3:cc00:28:9cb1:c0a8:2eea]) (user=vdonnefort job=sendgmr) by 2002:a05:6902:100a:b0:dc6:ff2b:7e1b with SMTP id w10-20020a056902100a00b00dc6ff2b7e1bmr2932842ybt.4.1711447720760; Tue, 26 Mar 2024 03:08:40 -0700 (PDT) Date: Tue, 26 Mar 2024 10:08:27 +0000 In-Reply-To: <20240326100830.1326610-1-vdonnefort@google.com> Mime-Version: 1.0 References: <20240326100830.1326610-1-vdonnefort@google.com> X-Mailer: git-send-email 2.44.0.396.g6e790dbe36-goog Message-ID: <20240326100830.1326610-3-vdonnefort@google.com> Subject: [PATCH v19 RESEND 2/5] ring-buffer: Introducing ring-buffer mapping functions From: Vincent Donnefort To: rostedt@goodmis.org, mhiramat@kernel.org, linux-kernel@vger.kernel.org, linux-trace-kernel@vger.kernel.org Cc: mathieu.desnoyers@efficios.com, kernel-team@android.com, Vincent Donnefort , linux-mm@kvack.org X-Rspamd-Queue-Id: AB6DA140006 X-Rspam-User: X-Rspamd-Server: rspam05 X-Stat-Signature: deipm8xjqqhtqt14x3q3dih614mahkjd X-HE-Tag: 1711447721-648595 X-HE-Meta: U2FsdGVkX1/Fy5wH0wtWGfUVYHfg6mrvPBrlafyAjB2qO0PTTSkwZui46otMbnYbOoAvVhbAVW58itc2gGYInM01Un8gqABj/n5Lsqm+5Y38K6ADIhZgoR2RsGbzOpIjljSka7SHs3HbHYBpdv5/J/sFppKaBOHesKxaBEjDq2Eu0HMde1cmLt31hiBJ4hxz9MPyi8fEYqjWSXGB7+bC8bTKMXReLDed+161t6ByRcD/w3ZA1Ni0pFjIB6xmAw174Hxx4kzhQ0cfaP03fOvqrbAbWurhRw+EaBZ7COmrSseRsZQQsGBdvnayG3L8fjvqgLQIOSL9x8BzRvlThXLRfV945MlQmdJpkik0W/HSbpdBnr3zJ6FD4SzIeSQRTr8UiUQT7TomL6zxpTdTbWBBVMGbT0aBggckAjVcrOSG+uAZrGzqAcZfsFkTGjYj3D5FvAf5l5+NvB+zA3dd+IX6VdHbJc0MjVqjPaKa0MuGkgkKPI0zfgRpMOSyAyTvLLNE/MFIv9ZHGnmd10GNHLZwYQ7xoKnuaysMbRvHLMDpURQEERvohi2LXGq9P6BWbgWxglE6nDT+9POAZSW+rEmb1Ta/7NG7++RJn7Bdidgc1C3m5u5xMrnoKzS22eUoALsp+sjgr0JdMRg6niGQTCk1hlkoNTryTBDv3KmKs9LLOWHSRpKHk15VzDYEuZX8GLRXTiElfu+ZZP/UWyruH/6qi0nSZSJOG1C9TBICZrw18Pvq5moDPxuTsO3NIhyg/19IzO/tj0+KfRYDfR9vruZfG2wQoCKOiaVa8lD63nx791V//FALRS7XhoATqNpYFuJ/pgq3ezFMtU2ppU0V/GR+1eEH6oBgKGK2/o2By16j/ZCWg1/J83Md0n82nHSXwU7NSpqLjNggaAe9cx4JMz88ndhBlccNyhTjAtgrPF/d+UxySbc7NYrV0iMZV4xDOGytYPkc6JHXSf+NoTvRx3+ 7eiYcFil 5z7KRXtqeyciKk9Zm+T/F317PgLzptGThRfZGQhoySA25/ikEN93tC3u6eA3N6x1CEkCJ3QLumfdGHEjhfABL7bh16HO59Z/Bxjsbl63bzZuXoG2801LoVcNIzuH3dyP+RhEvb2rsJCu5bZNVwt+sE0dFa0eoELSrE8eBXwFIaYJtsulDvFuRlV+EgQ3tACR1l5EV0Y5IZEYdeieXuodu+Jqz8Te6+HOL2PW4YxfBza6nlgWUvVImETcQzgOQQ7uK+ATbhTdKF5uxyCHzHYOdHcsitDlPuTAVDKWrBCcz+mwtTNd8cdj6U5BQXRDb354tynlp94jJ0QgXrOroV2cpk9vKgOBtVTU1YBxWKquUt6g8AiVQYPYQGLk4RnkUlVNI5EQOZtNPo7Dg8f6FWaQ2JxQOolrS7Ev0DoT94Go5TNoD09iS9RxMr+kOAKYkLQNsFDCrDBvO+4Dl7mHz6Dg56vyq9vefnCDnKQhs23tUhPL8NDijxKAbHF1v5ImlyGOGP22stN00eVl6TTjgNAPAe4B0QpNteJ55/WKXrZzO7EF7X3NBFRjM3UzM9knk98Yr1yWt7jF0OjXIzOLZdYSMsnlTgD56l2nYriTqECCZ8XdZE6cm85HiqWuwOOqGaWu0uf4pgyDhQgwuEvzYQ3KTtsuBcCfvbHzywq3w9NS3tyPf2Qb7OjMySmf6KfW9/IeSrgxR X-Bogosity: Ham, tests=bogofilter, spamicity=0.000000, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: List-Subscribe: List-Unsubscribe: In preparation for allowing the user-space to map a ring-buffer, add a set of mapping functions: ring_buffer_{map,unmap}() And controls on the ring-buffer: ring_buffer_map_get_reader() /* swap reader and head */ Mapping the ring-buffer also involves: A unique ID for each subbuf of the ring-buffer, currently they are only identified through their in-kernel VA. A meta-page, where are stored ring-buffer statistics and a description for the current reader The linear mapping exposes the meta-page, and each subbuf of the ring-buffer, ordered following their unique ID, assigned during the first mapping. Once mapped, no subbuf can get in or out of the ring-buffer: the buffer size will remain unmodified and the splice enabling functions will in reality simply memcpy the data instead of swapping subbufs. CC: Signed-off-by: Vincent Donnefort diff --git a/include/linux/ring_buffer.h b/include/linux/ring_buffer.h index dc5ae4e96aee..96d2140b471e 100644 --- a/include/linux/ring_buffer.h +++ b/include/linux/ring_buffer.h @@ -6,6 +6,8 @@ #include #include +#include + struct trace_buffer; struct ring_buffer_iter; @@ -223,4 +225,8 @@ int trace_rb_cpu_prepare(unsigned int cpu, struct hlist_node *node); #define trace_rb_cpu_prepare NULL #endif +int ring_buffer_map(struct trace_buffer *buffer, int cpu, + struct vm_area_struct *vma); +int ring_buffer_unmap(struct trace_buffer *buffer, int cpu); +int ring_buffer_map_get_reader(struct trace_buffer *buffer, int cpu); #endif /* _LINUX_RING_BUFFER_H */ diff --git a/include/uapi/linux/trace_mmap.h b/include/uapi/linux/trace_mmap.h new file mode 100644 index 000000000000..ffcd8dfcaa4f --- /dev/null +++ b/include/uapi/linux/trace_mmap.h @@ -0,0 +1,46 @@ +/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */ +#ifndef _TRACE_MMAP_H_ +#define _TRACE_MMAP_H_ + +#include + +/** + * struct trace_buffer_meta - Ring-buffer Meta-page description + * @meta_page_size: Size of this meta-page. + * @meta_struct_len: Size of this structure. + * @subbuf_size: Size of each sub-buffer. + * @nr_subbufs: Number of subbfs in the ring-buffer, including the reader. + * @reader.lost_events: Number of events lost at the time of the reader swap. + * @reader.id: subbuf ID of the current reader. ID range [0 : @nr_subbufs - 1] + * @reader.read: Number of bytes read on the reader subbuf. + * @flags: Placeholder for now, 0 until new features are supported. + * @entries: Number of entries in the ring-buffer. + * @overrun: Number of entries lost in the ring-buffer. + * @read: Number of entries that have been read. + * @Reserved1: Reserved for future use. + * @Reserved2: Reserved for future use. + */ +struct trace_buffer_meta { + __u32 meta_page_size; + __u32 meta_struct_len; + + __u32 subbuf_size; + __u32 nr_subbufs; + + struct { + __u64 lost_events; + __u32 id; + __u32 read; + } reader; + + __u64 flags; + + __u64 entries; + __u64 overrun; + __u64 read; + + __u64 Reserved1; + __u64 Reserved2; +}; + +#endif /* _TRACE_MMAP_H_ */ diff --git a/kernel/trace/ring_buffer.c b/kernel/trace/ring_buffer.c index cc9ebe593571..1dc932e7963c 100644 --- a/kernel/trace/ring_buffer.c +++ b/kernel/trace/ring_buffer.c @@ -9,6 +9,7 @@ #include #include #include +#include #include #include #include @@ -338,6 +339,7 @@ struct buffer_page { local_t entries; /* entries on this page */ unsigned long real_end; /* real end of data */ unsigned order; /* order of the page */ + u32 id; /* ID for external mapping */ struct buffer_data_page *page; /* Actual data page */ }; @@ -484,6 +486,12 @@ struct ring_buffer_per_cpu { u64 read_stamp; /* pages removed since last reset */ unsigned long pages_removed; + + unsigned int mapped; + struct mutex mapping_lock; + unsigned long *subbuf_ids; /* ID to subbuf VA */ + struct trace_buffer_meta *meta_page; + /* ring buffer pages to update, > 0 to add, < 0 to remove */ long nr_pages_to_update; struct list_head new_pages; /* new pages to add */ @@ -1599,6 +1607,7 @@ rb_allocate_cpu_buffer(struct trace_buffer *buffer, long nr_pages, int cpu) init_irq_work(&cpu_buffer->irq_work.work, rb_wake_up_waiters); init_waitqueue_head(&cpu_buffer->irq_work.waiters); init_waitqueue_head(&cpu_buffer->irq_work.full_waiters); + mutex_init(&cpu_buffer->mapping_lock); bpage = kzalloc_node(ALIGN(sizeof(*bpage), cache_line_size()), GFP_KERNEL, cpu_to_node(cpu)); @@ -1789,8 +1798,6 @@ bool ring_buffer_time_stamp_abs(struct trace_buffer *buffer) return buffer->time_stamp_abs; } -static void rb_reset_cpu(struct ring_buffer_per_cpu *cpu_buffer); - static inline unsigned long rb_page_entries(struct buffer_page *bpage) { return local_read(&bpage->entries) & RB_WRITE_MASK; @@ -5211,6 +5218,22 @@ static void rb_clear_buffer_page(struct buffer_page *page) page->read = 0; } +static void rb_update_meta_page(struct ring_buffer_per_cpu *cpu_buffer) +{ + struct trace_buffer_meta *meta = cpu_buffer->meta_page; + + meta->reader.read = cpu_buffer->reader_page->read; + meta->reader.id = cpu_buffer->reader_page->id; + meta->reader.lost_events = cpu_buffer->lost_events; + + meta->entries = local_read(&cpu_buffer->entries); + meta->overrun = local_read(&cpu_buffer->overrun); + meta->read = cpu_buffer->read; + + /* Some archs do not have data cache coherency between kernel and user-space */ + flush_dcache_folio(virt_to_folio(cpu_buffer->meta_page)); +} + static void rb_reset_cpu(struct ring_buffer_per_cpu *cpu_buffer) { @@ -5255,6 +5278,9 @@ rb_reset_cpu(struct ring_buffer_per_cpu *cpu_buffer) cpu_buffer->lost_events = 0; cpu_buffer->last_overrun = 0; + if (cpu_buffer->mapped) + rb_update_meta_page(cpu_buffer); + rb_head_page_activate(cpu_buffer); cpu_buffer->pages_removed = 0; } @@ -5469,6 +5495,12 @@ int ring_buffer_swap_cpu(struct trace_buffer *buffer_a, cpu_buffer_a = buffer_a->buffers[cpu]; cpu_buffer_b = buffer_b->buffers[cpu]; + /* It's up to the callers to not try to swap mapped buffers */ + if (WARN_ON_ONCE(cpu_buffer_a->mapped || cpu_buffer_b->mapped)) { + ret = -EBUSY; + goto out; + } + /* At least make sure the two buffers are somewhat the same */ if (cpu_buffer_a->nr_pages != cpu_buffer_b->nr_pages) goto out; @@ -5733,7 +5765,8 @@ int ring_buffer_read_page(struct trace_buffer *buffer, * Otherwise, we can simply swap the page with the one passed in. */ if (read || (len < (commit - read)) || - cpu_buffer->reader_page == cpu_buffer->commit_page) { + cpu_buffer->reader_page == cpu_buffer->commit_page || + cpu_buffer->mapped) { struct buffer_data_page *rpage = cpu_buffer->reader_page->page; unsigned int rpos = read; unsigned int pos = 0; @@ -5956,6 +5989,11 @@ int ring_buffer_subbuf_order_set(struct trace_buffer *buffer, int order) cpu_buffer = buffer->buffers[cpu]; + if (cpu_buffer->mapped) { + err = -EBUSY; + goto error; + } + /* Update the number of pages to match the new size */ nr_pages = old_size * buffer->buffers[cpu]->nr_pages; nr_pages = DIV_ROUND_UP(nr_pages, buffer->subbuf_size); @@ -6057,6 +6095,358 @@ int ring_buffer_subbuf_order_set(struct trace_buffer *buffer, int order) } EXPORT_SYMBOL_GPL(ring_buffer_subbuf_order_set); +static int rb_alloc_meta_page(struct ring_buffer_per_cpu *cpu_buffer) +{ + struct page *page; + + if (cpu_buffer->meta_page) + return 0; + + page = alloc_page(GFP_USER | __GFP_ZERO); + if (!page) + return -ENOMEM; + + cpu_buffer->meta_page = page_to_virt(page); + + return 0; +} + +static void rb_free_meta_page(struct ring_buffer_per_cpu *cpu_buffer) +{ + unsigned long addr = (unsigned long)cpu_buffer->meta_page; + + free_page(addr); + cpu_buffer->meta_page = NULL; +} + +static void rb_setup_ids_meta_page(struct ring_buffer_per_cpu *cpu_buffer, + unsigned long *subbuf_ids) +{ + struct trace_buffer_meta *meta = cpu_buffer->meta_page; + unsigned int nr_subbufs = cpu_buffer->nr_pages + 1; + struct buffer_page *first_subbuf, *subbuf; + int id = 0; + + subbuf_ids[id] = (unsigned long)cpu_buffer->reader_page->page; + cpu_buffer->reader_page->id = id++; + + first_subbuf = subbuf = rb_set_head_page(cpu_buffer); + do { + if (WARN_ON(id >= nr_subbufs)) + break; + + subbuf_ids[id] = (unsigned long)subbuf->page; + subbuf->id = id; + + rb_inc_page(&subbuf); + id++; + } while (subbuf != first_subbuf); + + /* install subbuf ID to kern VA translation */ + cpu_buffer->subbuf_ids = subbuf_ids; + + /* __rb_map_vma() pads the meta-page to align it with the sub-buffers */ + meta->meta_page_size = PAGE_SIZE << cpu_buffer->buffer->subbuf_order; + meta->meta_struct_len = sizeof(*meta); + meta->nr_subbufs = nr_subbufs; + meta->subbuf_size = cpu_buffer->buffer->subbuf_size + BUF_PAGE_HDR_SIZE; + + rb_update_meta_page(cpu_buffer); +} + +static struct ring_buffer_per_cpu * +rb_get_mapped_buffer(struct trace_buffer *buffer, int cpu) +{ + struct ring_buffer_per_cpu *cpu_buffer; + + if (!cpumask_test_cpu(cpu, buffer->cpumask)) + return ERR_PTR(-EINVAL); + + cpu_buffer = buffer->buffers[cpu]; + + mutex_lock(&cpu_buffer->mapping_lock); + + if (!cpu_buffer->mapped) { + mutex_unlock(&cpu_buffer->mapping_lock); + return ERR_PTR(-ENODEV); + } + + return cpu_buffer; +} + +static void rb_put_mapped_buffer(struct ring_buffer_per_cpu *cpu_buffer) +{ + mutex_unlock(&cpu_buffer->mapping_lock); +} + +/* + * Fast-path for rb_buffer_(un)map(). Called whenever the meta-page doesn't need + * to be set-up or torn-down. + */ +static int __rb_inc_dec_mapped(struct ring_buffer_per_cpu *cpu_buffer, + bool inc) +{ + unsigned long flags; + + lockdep_assert_held(&cpu_buffer->mapping_lock); + + if (inc && cpu_buffer->mapped == UINT_MAX) + return -EBUSY; + + if (WARN_ON(!inc && cpu_buffer->mapped == 0)) + return -EINVAL; + + mutex_lock(&cpu_buffer->buffer->mutex); + raw_spin_lock_irqsave(&cpu_buffer->reader_lock, flags); + + if (inc) + cpu_buffer->mapped++; + else + cpu_buffer->mapped--; + + raw_spin_unlock_irqrestore(&cpu_buffer->reader_lock, flags); + mutex_unlock(&cpu_buffer->buffer->mutex); + + return 0; +} + +#define subbuf_page(off, start) \ + virt_to_page((void *)((start) + ((off) << PAGE_SHIFT))) + +#define foreach_subbuf_page(sub_order, start, page) \ + page = subbuf_page(0, (start)); \ + for (int __off = 0; __off < (1 << (sub_order)); \ + __off++, page = subbuf_page(__off, (start))) + +/* + * +--------------+ pgoff == 0 + * | meta page | + * +--------------+ pgoff == 1 + * | 000000000 | + * +--------------+ pgoff == (1 << subbuf_order) + * | subbuffer 0 | + * | | + * +--------------+ pgoff == (2 * (1 << subbuf_order)) + * | subbuffer 1 | + * | | + * ... + */ +static int __rb_map_vma(struct ring_buffer_per_cpu *cpu_buffer, + struct vm_area_struct *vma) +{ + unsigned long nr_subbufs, nr_pages, vma_pages, pgoff = vma->vm_pgoff; + unsigned int subbuf_pages, subbuf_order; + struct page **pages; + int p = 0, s = 0; + int err; + + lockdep_assert_held(&cpu_buffer->mapping_lock); + + subbuf_order = cpu_buffer->buffer->subbuf_order; + subbuf_pages = 1 << subbuf_order; + + if (subbuf_order && pgoff % subbuf_pages) + return -EINVAL; + + nr_subbufs = cpu_buffer->nr_pages + 1; + nr_pages = ((nr_subbufs + 1) << subbuf_order) - pgoff; + + vma_pages = (vma->vm_end - vma->vm_start) >> PAGE_SHIFT; + if (!vma_pages || vma_pages > nr_pages) + return -EINVAL; + + nr_pages = vma_pages; + + pages = kcalloc(nr_pages, sizeof(*pages), GFP_KERNEL); + if (!pages) + return -ENOMEM; + + if (!pgoff) { + unsigned long meta_page_padding; + + pages[p++] = virt_to_page(cpu_buffer->meta_page); + + /* + * Pad with the zero-page to align the meta-page with the + * sub-buffers. + */ + meta_page_padding = subbuf_pages - 1; + while (meta_page_padding-- && p < nr_pages) + pages[p++] = ZERO_PAGE(0); + } else { + /* Skip the meta-page */ + pgoff -= subbuf_pages; + + s += pgoff / subbuf_pages; + } + + while (s < nr_subbufs && p < nr_pages) { + struct page *page; + + foreach_subbuf_page(subbuf_order, cpu_buffer->subbuf_ids[s], page) { + if (p >= nr_pages) + break; + + pages[p++] = page; + } + s++; + } + + err = vm_insert_pages(vma, vma->vm_start, pages, &nr_pages); + + kfree(pages); + + return err; +} + +int ring_buffer_map(struct trace_buffer *buffer, int cpu, + struct vm_area_struct *vma) +{ + struct ring_buffer_per_cpu *cpu_buffer; + unsigned long flags, *subbuf_ids; + int err = 0; + + if (!cpumask_test_cpu(cpu, buffer->cpumask)) + return -EINVAL; + + cpu_buffer = buffer->buffers[cpu]; + + mutex_lock(&cpu_buffer->mapping_lock); + + if (cpu_buffer->mapped) { + err = __rb_map_vma(cpu_buffer, vma); + if (!err) + err = __rb_inc_dec_mapped(cpu_buffer, true); + mutex_unlock(&cpu_buffer->mapping_lock); + return err; + } + + /* prevent another thread from changing buffer/sub-buffer sizes */ + mutex_lock(&buffer->mutex); + + err = rb_alloc_meta_page(cpu_buffer); + if (err) + goto unlock; + + /* subbuf_ids include the reader while nr_pages does not */ + subbuf_ids = kcalloc(cpu_buffer->nr_pages + 1, sizeof(*subbuf_ids), GFP_KERNEL); + if (!subbuf_ids) { + rb_free_meta_page(cpu_buffer); + err = -ENOMEM; + goto unlock; + } + + atomic_inc(&cpu_buffer->resize_disabled); + + /* + * Lock all readers to block any subbuf swap until the subbuf IDs are + * assigned. + */ + raw_spin_lock_irqsave(&cpu_buffer->reader_lock, flags); + rb_setup_ids_meta_page(cpu_buffer, subbuf_ids); + raw_spin_unlock_irqrestore(&cpu_buffer->reader_lock, flags); + + err = __rb_map_vma(cpu_buffer, vma); + if (!err) { + raw_spin_lock_irqsave(&cpu_buffer->reader_lock, flags); + cpu_buffer->mapped = 1; + raw_spin_unlock_irqrestore(&cpu_buffer->reader_lock, flags); + } else { + kfree(cpu_buffer->subbuf_ids); + cpu_buffer->subbuf_ids = NULL; + rb_free_meta_page(cpu_buffer); + } +unlock: + mutex_unlock(&buffer->mutex); + mutex_unlock(&cpu_buffer->mapping_lock); + + return err; +} + +int ring_buffer_unmap(struct trace_buffer *buffer, int cpu) +{ + struct ring_buffer_per_cpu *cpu_buffer; + unsigned long flags; + int err = 0; + + if (!cpumask_test_cpu(cpu, buffer->cpumask)) + return -EINVAL; + + cpu_buffer = buffer->buffers[cpu]; + + mutex_lock(&cpu_buffer->mapping_lock); + + if (!cpu_buffer->mapped) { + err = -ENODEV; + goto out; + } else if (cpu_buffer->mapped > 1) { + __rb_inc_dec_mapped(cpu_buffer, false); + goto out; + } + + mutex_lock(&buffer->mutex); + raw_spin_lock_irqsave(&cpu_buffer->reader_lock, flags); + + cpu_buffer->mapped = 0; + + raw_spin_unlock_irqrestore(&cpu_buffer->reader_lock, flags); + + kfree(cpu_buffer->subbuf_ids); + cpu_buffer->subbuf_ids = NULL; + rb_free_meta_page(cpu_buffer); + atomic_dec(&cpu_buffer->resize_disabled); + + mutex_unlock(&buffer->mutex); +out: + mutex_unlock(&cpu_buffer->mapping_lock); + + return err; +} + +int ring_buffer_map_get_reader(struct trace_buffer *buffer, int cpu) +{ + struct ring_buffer_per_cpu *cpu_buffer; + unsigned long reader_size; + unsigned long flags; + + cpu_buffer = rb_get_mapped_buffer(buffer, cpu); + if (IS_ERR(cpu_buffer)) + return (int)PTR_ERR(cpu_buffer); + + raw_spin_lock_irqsave(&cpu_buffer->reader_lock, flags); +consume: + if (rb_per_cpu_empty(cpu_buffer)) + goto out; + + reader_size = rb_page_size(cpu_buffer->reader_page); + + /* + * There are data to be read on the current reader page, we can + * return to the caller. But before that, we assume the latter will read + * everything. Let's update the kernel reader accordingly. + */ + if (cpu_buffer->reader_page->read < reader_size) { + while (cpu_buffer->reader_page->read < reader_size) + rb_advance_reader(cpu_buffer); + goto out; + } + + if (WARN_ON(!rb_get_reader_page(cpu_buffer))) + goto out; + + goto consume; +out: + /* Some archs do not have data cache coherency between kernel and user-space */ + flush_dcache_folio(virt_to_folio(cpu_buffer->reader_page->page)); + + rb_update_meta_page(cpu_buffer); + + raw_spin_unlock_irqrestore(&cpu_buffer->reader_lock, flags); + rb_put_mapped_buffer(cpu_buffer); + + return 0; +} + /* * We only allocate new buffers, never free them if the CPU goes down. * If we were to free the buffer, then the user would lose any trace that was in From patchwork Tue Mar 26 10:08:28 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Vincent Donnefort X-Patchwork-Id: 13603822 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by smtp.lore.kernel.org (Postfix) with ESMTP id A5F28C6FD1F for ; Tue, 26 Mar 2024 10:08:46 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 348CE6B0099; Tue, 26 Mar 2024 06:08:46 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 2F8366B009A; Tue, 26 Mar 2024 06:08:46 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 0FC3D6B009B; Tue, 26 Mar 2024 06:08:46 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0016.hostedemail.com [216.40.44.16]) by kanga.kvack.org (Postfix) with ESMTP id F26B36B0099 for ; Tue, 26 Mar 2024 06:08:45 -0400 (EDT) Received: from smtpin24.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay08.hostedemail.com (Postfix) with ESMTP id A73CE1409BB for ; Tue, 26 Mar 2024 10:08:45 +0000 (UTC) X-FDA: 81938766210.24.B29351E Received: from mail-yb1-f201.google.com (mail-yb1-f201.google.com [209.85.219.201]) by imf28.hostedemail.com (Postfix) with ESMTP id E5336C0017 for ; Tue, 26 Mar 2024 10:08:43 +0000 (UTC) Authentication-Results: imf28.hostedemail.com; dkim=pass header.d=google.com header.s=20230601 header.b="el/T/K04"; dmarc=pass (policy=reject) header.from=google.com; spf=pass (imf28.hostedemail.com: domain of 3q54CZgoKCCobJUTTKLUXZMUUMRK.IUSROTad-SSQbGIQ.UXM@flex--vdonnefort.bounces.google.com designates 209.85.219.201 as permitted sender) smtp.mailfrom=3q54CZgoKCCobJUTTKLUXZMUUMRK.IUSROTad-SSQbGIQ.UXM@flex--vdonnefort.bounces.google.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1711447723; a=rsa-sha256; cv=none; b=Q7B0pxqwZyJ8JrqZ7DSbX61ZpHbQ7UtEG30DwST7s7LUBjEy9bmrajNWdWfMz0Gn+dQaCz SMPciS9EUaXyA1330LuO2OW/LI1Md52ek3HnfF70BpGBhyqWPgYjD0mH1lRjX2t0IGmDcP YSAEXWVAmR82TyyJ+DiVLADXQyGh3vY= ARC-Authentication-Results: i=1; imf28.hostedemail.com; dkim=pass header.d=google.com header.s=20230601 header.b="el/T/K04"; dmarc=pass (policy=reject) header.from=google.com; spf=pass (imf28.hostedemail.com: domain of 3q54CZgoKCCobJUTTKLUXZMUUMRK.IUSROTad-SSQbGIQ.UXM@flex--vdonnefort.bounces.google.com designates 209.85.219.201 as permitted sender) smtp.mailfrom=3q54CZgoKCCobJUTTKLUXZMUUMRK.IUSROTad-SSQbGIQ.UXM@flex--vdonnefort.bounces.google.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1711447723; h=from:from:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type:content-transfer-encoding: in-reply-to:in-reply-to:references:references:dkim-signature; bh=OyI4CnSC0ToIvIdFLh4rwYAojfcnvHwWob+aFyszGhQ=; b=sSUW3PJ4J73Jfqg5Q3+y7X9TFt8KMc0EyePQcMcboAEGNVCKKCCAbbZLXzs60rX3fL6chX pqDHkUB3mnRmzZm6+8SN4FYkVT0r+QCDwGN9mDU+LXUnvaMWk6jwyy6zma+10hoZSwYGDc asFPxlZhmGJiIQ6y0vd6vIVcUrO/tuo= Received: by mail-yb1-f201.google.com with SMTP id 3f1490d57ef6-dd8e82dd47eso7335640276.2 for ; Tue, 26 Mar 2024 03:08:43 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1711447723; x=1712052523; darn=kvack.org; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:from:to:cc:subject:date:message-id:reply-to; bh=OyI4CnSC0ToIvIdFLh4rwYAojfcnvHwWob+aFyszGhQ=; b=el/T/K04xfeIMUm09/l3dC+y4n7KaKuljyFZi1wSsOU0h5ObtIlnlVW7S7e6fwmC8G +8cxCK/LK0+FsxkgqT9gWB5ZdpJa/rwgsdLMcSM7SkVDpGWqJa7MpJxm8Y/iLRZ+51OY 6UPcLrHySyliyLfZ6SHEWT3IryeJ/H3RVCNubbBjfo8/FuVbAvDCBDNZFmdET/B8lvUi mKE+Be5n1rPOe7sFbvtptGyI+VSj2TZM0qKaqOZQyu7z0DA0zEQ7dW+5vDiEH0GOQGM3 mnxKEdymJbM0hU29ubCqtciryS0XSH5Rdcjwc3v/NH5+W4AbswGO+wzf3BpVxI+pYBwn ZvqA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1711447723; x=1712052523; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=OyI4CnSC0ToIvIdFLh4rwYAojfcnvHwWob+aFyszGhQ=; b=lZKDv983lJCmflyN8rL0ZXnbGl5EMubOxk8zASlhLjYiFdbVnEcojHSC++rA1VIN8H Q0ubnloTIU74n5sbY9h5RFGm84KnSDnysjOqRy63FVxMBBpg25ReKBeK7/OtzCV0qTd8 azGAcoq/sMyIaM7O1+Omw1GzJ2yqAt1JYOBcvstQPH6hgcP4vqdnuYGpe3XbOlfAtY80 t8+TF1U2yPi+dfF10EYv/bKJ3p9Fqr4Ah18a+m23BcsP8p2/zCrbu8bihW8NeY0aFjZp bEV5H7YLkgOyvP4ZvLUWYyLncrwOizrpmu+jPLFDuzxwSkNPK1Idls1GOh+0gT83St0y Fdig== X-Forwarded-Encrypted: i=1; AJvYcCUWMdLLlxQQ3FnS5gac9ZN/5Qt2fpbuFgZO66hSnKAUJbUityJTDbS2U71gJkPXCWQ7y83nPxeyKjZZ/XbFZVXVlHg= X-Gm-Message-State: AOJu0Yyb9gzluZlaczPyb6oDE7mad7Vg8rtpCDqzXEJJyUgMFDZUN1w6 P9K3qwOg64+Jahts6fotUEuWBAtGbFtd3buzZ+vjyyCtbHc6SIBKEAtCi7JBwaRg0poUvTs8aYK 1wa/RrIvMoDlcYxgjmQ== X-Google-Smtp-Source: AGHT+IFLBQXGvzGvl+FqYKWO0kLis/bgrKgWpiHsGKVdG5tD2QW/YzExtK7Ok0IJIsNql7aDOpiZkXeABAKerp4k X-Received: from vdonnefort.c.googlers.com ([fda3:e722:ac3:cc00:28:9cb1:c0a8:2eea]) (user=vdonnefort job=sendgmr) by 2002:a05:6902:160e:b0:dda:d7cf:5c2c with SMTP id bw14-20020a056902160e00b00ddad7cf5c2cmr367269ybb.13.1711447723008; Tue, 26 Mar 2024 03:08:43 -0700 (PDT) Date: Tue, 26 Mar 2024 10:08:28 +0000 In-Reply-To: <20240326100830.1326610-1-vdonnefort@google.com> Mime-Version: 1.0 References: <20240326100830.1326610-1-vdonnefort@google.com> X-Mailer: git-send-email 2.44.0.396.g6e790dbe36-goog Message-ID: <20240326100830.1326610-4-vdonnefort@google.com> Subject: [PATCH v19 RESEND 3/5] tracing: Allow user-space mapping of the ring-buffer From: Vincent Donnefort To: rostedt@goodmis.org, mhiramat@kernel.org, linux-kernel@vger.kernel.org, linux-trace-kernel@vger.kernel.org Cc: mathieu.desnoyers@efficios.com, kernel-team@android.com, Vincent Donnefort , linux-mm@kvack.org X-Rspam-User: X-Rspamd-Server: rspam06 X-Rspamd-Queue-Id: E5336C0017 X-Stat-Signature: xxi79uquogtcuxyo8genq39155o7e9i8 X-HE-Tag: 1711447723-229530 X-HE-Meta: U2FsdGVkX19TUYlDdBZxnDiuj8fPFOOXqzGQTq07YlyrMLv+3YjWnXlSGAFpFs0tqv2rHds/TWAi69o/qSSI/jH6UhTgvrXhv4VGBnHZb0qi2pVrSq4Mdwk/tLbL4xSTaqqAbUsXWtQiZGuOnUwg0PCTs5WqtUsUpVwW7ubfIWMWfWsYT0sctopHuri9R1aHJJ44zitwTofzqnfQ4DNO4gj5KBXoWLLXF3jWacSCp67v7P16WmVeJakxi7IjV90xtd7VvWIFRJ0rywSYM6leNEwKurgeT0qu+LNcWwuIMbHkTwtQ0or7TVQIrsSbznoF9/FwltTV2htClvm3Lmh3tSiJ4o2GR3JN1+JptyuA3fWWsIP5a/7TqjAf3U7Vbn8SFDOgCcOOxxnvg8iE4vpzVK9LX+dk0WBVO2Gz1FDAcUY0KB7joadqWiJevzraMBKSumxwpPKjUImoW2ep7UKLJOzDQbZ+yeMe9Bi8o/xcvuuayJ+d5Lv2vGuhfpn6n4wwmmx5czlEPEiLgMSJKANJBGTPM3l5T/eRLpvHxHopK0ZgxSdchHqs2i4J/aI1nLuXhvFkrDZ7hbN9oQiz5iLoxKhVbC9ITto97f8XIi2EMrJDlsqF7ReV68nH8Kp3M8km/CxU2gTzlR2Foo+MWAutkyGXF0Lo/eGbPefjGi1wLxZfWl05sX32wURE6XH15EMFOLJCpTY+Na/OFN+rRoBwz+862QjvharGhKSNwgRK7CmH9510+f1QDvC+V0YWyauVp8S1L2+sA5ZxvBxLoU6rpewlIve/0iv1LPm/1j+8wMqvpdyBLYbhDIIks9NLJ+Blr5UYNE7zJIplcXkXgRJlTDu92fPSedZy8563rm+NN3pM+Iz4Y3l5tSPt5RQVoF128+dwpQbPOhpAYgrPetl/+g2PPzUgAFqA10YpddPYAMmTbnb2u93etBZ0Oo0D2q1cMIik720m6Xj92p2zK8F 7YpwnIEM PsvTZoWTJBjqnbHAIIxnsewt5+4QdzxwQiD0eyHXkGSeBx8hAB0V/mjpgCDZwYWDHodWde2oDZrOXDHe5mT+/i7lH7I+AGdpOuzK/1zpQmY3qmwThdyVZZSmwebHF1YfTWutylOQD5DooYwRFIuAfbq6/uSx7drZ6VfmlkNM1LSBWEPzYXxczJJj7FNBUNSgkvY1/KF88tSJnu54+t8tIrx+C9eWCMHTN92w0INrJlYgEPxLfM8w3eYAHVnA7q/v6ECVCe6WDz1Yi6fLC5e1EkozTTaFmzr6tZhQO3YKNTNZucm58vvhAGrmFFmkckR9E8Jsu/AkBrcoJD9qllq+V+o3MJPULnfOCuP9KTCi3+ooxSnlj3UcT19mCPlrNLBTk8MLj X-Bogosity: Ham, tests=bogofilter, spamicity=0.000000, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: List-Subscribe: List-Unsubscribe: Currently, user-space extracts data from the ring-buffer via splice, which is handy for storage or network sharing. However, due to splice limitations, it is imposible to do real-time analysis without a copy. A solution for that problem is to let the user-space map the ring-buffer directly. The mapping is exposed via the per-CPU file trace_pipe_raw. The first element of the mapping is the meta-page. It is followed by each subbuffer constituting the ring-buffer, ordered by their unique page ID: * Meta-page -- include/uapi/linux/trace_mmap.h for a description * Subbuf ID 0 * Subbuf ID 1 ... It is therefore easy to translate a subbuf ID into an offset in the mapping: reader_id = meta->reader->id; reader_offset = meta->meta_page_size + reader_id * meta->subbuf_size; When new data is available, the mapper must call a newly introduced ioctl: TRACE_MMAP_IOCTL_GET_READER. This will update the Meta-page reader ID to point to the next reader containing unread data. Mapping will prevent snapshot and buffer size modifications. CC: Signed-off-by: Vincent Donnefort diff --git a/include/uapi/linux/trace_mmap.h b/include/uapi/linux/trace_mmap.h index ffcd8dfcaa4f..d25b9d504a7c 100644 --- a/include/uapi/linux/trace_mmap.h +++ b/include/uapi/linux/trace_mmap.h @@ -43,4 +43,6 @@ struct trace_buffer_meta { __u64 Reserved2; }; +#define TRACE_MMAP_IOCTL_GET_READER _IO('T', 0x1) + #endif /* _TRACE_MMAP_H_ */ diff --git a/kernel/trace/trace.c b/kernel/trace/trace.c index 233d1af39fff..0f37aa9860fd 100644 --- a/kernel/trace/trace.c +++ b/kernel/trace/trace.c @@ -1191,6 +1191,12 @@ static void tracing_snapshot_instance_cond(struct trace_array *tr, return; } + if (tr->mapped) { + trace_array_puts(tr, "*** BUFFER MEMORY MAPPED ***\n"); + trace_array_puts(tr, "*** Can not use snapshot (sorry) ***\n"); + return; + } + local_irq_save(flags); update_max_tr(tr, current, smp_processor_id(), cond_data); local_irq_restore(flags); @@ -1323,7 +1329,7 @@ static int tracing_arm_snapshot_locked(struct trace_array *tr) lockdep_assert_held(&trace_types_lock); spin_lock(&tr->snapshot_trigger_lock); - if (tr->snapshot == UINT_MAX) { + if (tr->snapshot == UINT_MAX || tr->mapped) { spin_unlock(&tr->snapshot_trigger_lock); return -EBUSY; } @@ -6068,7 +6074,7 @@ static void tracing_set_nop(struct trace_array *tr) { if (tr->current_trace == &nop_trace) return; - + tr->current_trace->enabled--; if (tr->current_trace->reset) @@ -8194,15 +8200,32 @@ tracing_buffers_splice_read(struct file *file, loff_t *ppos, return ret; } -/* An ioctl call with cmd 0 to the ring buffer file will wake up all waiters */ static long tracing_buffers_ioctl(struct file *file, unsigned int cmd, unsigned long arg) { struct ftrace_buffer_info *info = file->private_data; struct trace_iterator *iter = &info->iter; + int err; + + if (cmd == TRACE_MMAP_IOCTL_GET_READER) { + if (!(file->f_flags & O_NONBLOCK)) { + err = ring_buffer_wait(iter->array_buffer->buffer, + iter->cpu_file, + iter->tr->buffer_percent, + NULL, NULL); + if (err) + return err; + } - if (cmd) - return -ENOIOCTLCMD; + return ring_buffer_map_get_reader(iter->array_buffer->buffer, + iter->cpu_file); + } else if (cmd) { + return -ENOTTY; + } + /* + * An ioctl call with cmd 0 to the ring buffer file will wake up all + * waiters + */ mutex_lock(&trace_types_lock); /* Make sure the waiters see the new wait_index */ @@ -8214,6 +8237,94 @@ static long tracing_buffers_ioctl(struct file *file, unsigned int cmd, unsigned return 0; } +static vm_fault_t tracing_buffers_mmap_fault(struct vm_fault *vmf) +{ + return VM_FAULT_SIGBUS; +} + +#ifdef CONFIG_TRACER_MAX_TRACE +static int get_snapshot_map(struct trace_array *tr) +{ + int err = 0; + + /* + * Called with mmap_lock held. lockdep would be unhappy if we would now + * take trace_types_lock. Instead use the specific + * snapshot_trigger_lock. + */ + spin_lock(&tr->snapshot_trigger_lock); + + if (tr->snapshot || tr->mapped == UINT_MAX) + err = -EBUSY; + else + tr->mapped++; + + spin_unlock(&tr->snapshot_trigger_lock); + + /* Wait for update_max_tr() to observe iter->tr->mapped */ + if (tr->mapped == 1) + synchronize_rcu(); + + return err; + +} +static void put_snapshot_map(struct trace_array *tr) +{ + spin_lock(&tr->snapshot_trigger_lock); + if (!WARN_ON(!tr->mapped)) + tr->mapped--; + spin_unlock(&tr->snapshot_trigger_lock); +} +#else +static inline int get_snapshot_map(struct trace_array *tr) { return 0; } +static inline void put_snapshot_map(struct trace_array *tr) { } +#endif + +static void tracing_buffers_mmap_close(struct vm_area_struct *vma) +{ + struct ftrace_buffer_info *info = vma->vm_file->private_data; + struct trace_iterator *iter = &info->iter; + + WARN_ON(ring_buffer_unmap(iter->array_buffer->buffer, iter->cpu_file)); + put_snapshot_map(iter->tr); +} + +static void tracing_buffers_mmap_open(struct vm_area_struct *vma) { } + +static const struct vm_operations_struct tracing_buffers_vmops = { + .open = tracing_buffers_mmap_open, + .close = tracing_buffers_mmap_close, + .fault = tracing_buffers_mmap_fault, +}; + +static int tracing_buffers_mmap(struct file *filp, struct vm_area_struct *vma) +{ + struct ftrace_buffer_info *info = filp->private_data; + struct trace_iterator *iter = &info->iter; + int ret = 0; + + if (vma->vm_flags & VM_WRITE || vma->vm_flags & VM_EXEC || + !(vma->vm_flags & VM_MAYSHARE)) + return -EPERM; + + vm_flags_mod(vma, + VM_MIXEDMAP | VM_PFNMAP | + VM_DONTCOPY | VM_DONTDUMP | VM_DONTEXPAND | VM_IO, + VM_MAYWRITE); + + vma->vm_ops = &tracing_buffers_vmops; + + ret = get_snapshot_map(iter->tr); + if (ret) + return ret; + + ret = ring_buffer_map(iter->array_buffer->buffer, iter->cpu_file, vma); + if (ret) + put_snapshot_map(iter->tr); + + return ret; +} + static const struct file_operations tracing_buffers_fops = { .open = tracing_buffers_open, .read = tracing_buffers_read, @@ -8223,6 +8334,7 @@ static const struct file_operations tracing_buffers_fops = { .splice_read = tracing_buffers_splice_read, .unlocked_ioctl = tracing_buffers_ioctl, .llseek = no_llseek, + .mmap = tracing_buffers_mmap, }; static ssize_t diff --git a/kernel/trace/trace.h b/kernel/trace/trace.h index 64450615ca0c..749a182dab48 100644 --- a/kernel/trace/trace.h +++ b/kernel/trace/trace.h @@ -336,6 +336,7 @@ struct trace_array { bool allocated_snapshot; spinlock_t snapshot_trigger_lock; unsigned int snapshot; + unsigned int mapped; unsigned long max_latency; #ifdef CONFIG_FSNOTIFY struct dentry *d_max_latency;