Received: by 2002:ab2:3350:0:b0:1f4:6588:b3a7 with SMTP id o16csp517882lqe; Sat, 6 Apr 2024 10:38:06 -0700 (PDT) X-Forwarded-Encrypted: i=3; AJvYcCUPPx0wSijel7Z5And1NLRKSnwOntCJHbfVtifJ6oEX/uoBTLssePpAR/4QvSW9n7I2nH91DeDLyxOPptGTg4FEffr5hZWOCaUNeRgxpg== X-Google-Smtp-Source: AGHT+IFyf3CbdmIk5IKZ/6ES9R0Yf5jsHsh1NEtwgc49LiJX9WXQJuGSRX7Wwjh5bC3Rvh2lXWzJ X-Received: by 2002:a05:6512:67:b0:515:c07a:87ff with SMTP id i7-20020a056512006700b00515c07a87ffmr3689277lfo.30.1712425086757; Sat, 06 Apr 2024 10:38:06 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1712425086; cv=pass; d=google.com; s=arc-20160816; b=kSmwBOV6AhNvoBIoPXOomIXyJlpM+989NDFUfntnyferlhjGXYpLdCSqwh8yGo1yAG ZmE0ePhVgEuah1d5TkqGq0AZfkDLs9A9q7e2Jt8Seh+2IxYkVNdYjAff8GskU60QqKxq BeXz3wyPbojH5OCSczIIWHqXIr8dimVDIFqF6LftTpY2q1q/RYjLjxObvhje1oI7oc6U LqDGT0VBpTFWtlbvg4nPu0XdQfxcwIfCgelX9UjHqH+k2Xen/7FGCgyql3PrWnpbh7Di RgzN+qMWgjUH94ZCNK3C6y4NfRSzhe8ZA4CA2Jmv5R054Q8MdiAkYmuQGX/25viaHFir HnnA== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=cc:to:from:subject:message-id:references:mime-version :list-unsubscribe:list-subscribe:list-id:precedence:in-reply-to:date :dkim-signature; bh=72Zhe8jfvgxef0iyuPAsGeg/MBc9zR+e0H1uunA/IEs=; fh=fBxc0mj0TL+H+oTBZg5ueO6zbscylwTAz6UrODaMjsE=; b=mEXKpkl5y0R2lhzfWkxVhwpOxOKiY7h80vLolM1fb7eYK6ULRyiMmhFdoxB8kaBQx+ 26Yllla28kPaRbQwY+N32Efk1A+rfSdB3+Ps65KIyZIw28zrmJ/ifxJb1+6a5ZNNpi6f WOOFTcf+aDb+UNwGIooyQ7Y71iAn+15FD1P92FKd1zr5epzlNsvbgpnWMn/sfqbyUKIY n/PFq/6RmHENP7tBoId4H9BlhzN1M8hOCOEb8p6axMtrjEBlAg+oRmJwYqg0HgelhP9I h0QIyAbObv2UVCq2Om78WMtsgsZANC2h72kwW5ipVRzXVoUGhw79nWy522Lu1deRCoS1 DNgQ==; dara=google.com ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@google.com header.s=20230601 header.b=3G2bkiry; arc=pass (i=1 spf=pass spfdomain=flex--vdonnefort.bounces.google.com dkim=pass dkdomain=google.com dmarc=pass fromdomain=google.com); spf=pass (google.com: domain of linux-kernel+bounces-134047-linux.lists.archive=gmail.com@vger.kernel.org designates 2604:1380:4601:e00::3 as permitted sender) smtp.mailfrom="linux-kernel+bounces-134047-linux.lists.archive=gmail.com@vger.kernel.org"; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=google.com Return-Path: Received: from am.mirrors.kernel.org (am.mirrors.kernel.org. [2604:1380:4601:e00::3]) by mx.google.com with ESMTPS id jx17-20020a170906ca5100b00a518244d359si1890885ejb.440.2024.04.06.10.38.06 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 06 Apr 2024 10:38:06 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel+bounces-134047-linux.lists.archive=gmail.com@vger.kernel.org designates 2604:1380:4601:e00::3 as permitted sender) client-ip=2604:1380:4601:e00::3; Authentication-Results: mx.google.com; dkim=pass header.i=@google.com header.s=20230601 header.b=3G2bkiry; arc=pass (i=1 spf=pass spfdomain=flex--vdonnefort.bounces.google.com dkim=pass dkdomain=google.com dmarc=pass fromdomain=google.com); spf=pass (google.com: domain of linux-kernel+bounces-134047-linux.lists.archive=gmail.com@vger.kernel.org designates 2604:1380:4601:e00::3 as permitted sender) smtp.mailfrom="linux-kernel+bounces-134047-linux.lists.archive=gmail.com@vger.kernel.org"; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=google.com Received: from smtp.subspace.kernel.org (wormhole.subspace.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by am.mirrors.kernel.org (Postfix) with ESMTPS id 81C951F21DDE for ; Sat, 6 Apr 2024 17:37:56 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id B13714CDEB; Sat, 6 Apr 2024 17:37:19 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b="3G2bkiry" Received: from mail-wr1-f74.google.com (mail-wr1-f74.google.com [209.85.221.74]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id D77F440853 for ; Sat, 6 Apr 2024 17:37:16 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.221.74 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1712425038; cv=none; b=lV2WMjQnqBGUheYgiVHPKNJNo58kIl11f0Nz+1Xw9bpK85AXMqi55M+zzJ3tqWshdUgB1XYe8e5BufN/bal+hOLztzk+kra0KV/JTldSuxb76wdiHnthYfUIk6RKrF4uUYVq/v3LR4Haa5/3IO1ASHBHACHOPmTLiZMOMTkWmWU= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1712425038; c=relaxed/simple; bh=Lvoqrrw6aRBYXRrzMVyPphgJZjVxj5geYg2eQwwuYcM=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=nI47Kdjuipyd2pOW9enrtz/W9cvFCnKfhVlWdu3/MDPK15m6WfnpNUU6BEvPtRbIH7spnFu7Y375Qb2w4YuiV9bK2YGOCKMG1ALe8BFt9JQMOO8T45UUg32R4fpdQtxUxTwopOEftMdf7ZAvkLlAU5EWmJrirTCnL+T9twksiJw= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com; spf=pass smtp.mailfrom=flex--vdonnefort.bounces.google.com; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b=3G2bkiry; arc=none smtp.client-ip=209.85.221.74 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=flex--vdonnefort.bounces.google.com Received: by mail-wr1-f74.google.com with SMTP id ffacd0b85a97d-3418f237c0bso1865975f8f.3 for ; Sat, 06 Apr 2024 10:37:16 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1712425035; x=1713029835; darn=vger.kernel.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=72Zhe8jfvgxef0iyuPAsGeg/MBc9zR+e0H1uunA/IEs=; b=3G2bkiry3EMo6luTVYfEc7Mh8rZP/Od+4/Kb0FrdsGC4UPrpN5l+8ZLUMKwLZ8T+23 hVPYRnFF+4gsq81Jk9U3oSRQKM9CFY5aADxnVXJVd6uIUFOKh54z4mOLc8b70I/0kIGb iRR3TnXIheHQsV3yEDe0IZMo1Y6/VUx0vmHqwpgU0lka+JA/8RaflfCO1PCbVSrNaGcu 3CSxeBaSr7sMjDhaILeqtox0pVSd6SIdWo6cZWrevGAUi5aCpBHclU125IwtxQ4zgw4W lq6b3Op55eb2jYE5+7Cr5s+nEVqe2ZtiRggK8laPob1Yrj9KKmDmiILE6bj365k2CHG6 yezA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1712425035; x=1713029835; 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=72Zhe8jfvgxef0iyuPAsGeg/MBc9zR+e0H1uunA/IEs=; b=bDW3KG9t5IkbndiJ10/fEV7J+S5F4+n4ERB/BquLjYFGJZH1RQI/4ALbaSmXWyBVNR TTK29n9W90+JuMtngtCHuMQwz3z2qYROvf/VxZXDmO2OqNjXT0b57nw9YpoZQ1nTJwMl uimamwjWvT15F9WP4R0AneYZVBr2UoKJFxkpBWG/x7+XU9ADuY6bllxRa0YlpJ9aQqdX Ai5KWFNe51Dr5j4zz4DASiVstRl0Zr1cleSjTVp1aXFSmwdMajx2+bFc1W6qbmD1PL7b iFljRsQwh7H/9mL3j8JWLSbJgxYHOgL/Y7xY2jU74jsCu3CJ7gs8FCIvslyw42IaTBZM NLzg== X-Forwarded-Encrypted: i=1; AJvYcCU8yWIvwaGZTMXCSbAFAzNLyEJ/qNL6CAsefLS21/6KdWfBAwSfy4JA4BDzy/s+IK0FogxkybZMP2oFKOztNZ5ol2w9Xa8IbQF11Ir7 X-Gm-Message-State: AOJu0Yyn3oIprv9gghHxeMSaJcXv1sWalMjLWYzkap+/rCA45aIEaxkx CViHYt2Jle3110/V0WuYLR3Mnl+TEkT5ufgzktdc+GWXjbFQ4pHYWe5cKkeS/JDcxPXxS5UbIIB EPrNAasegi1T9i2YfnA== X-Received: from vdonnefort.c.googlers.com ([fda3:e722:ac3:cc00:28:9cb1:c0a8:2eea]) (user=vdonnefort job=sendgmr) by 2002:adf:f04a:0:b0:343:ebd3:c444 with SMTP id t10-20020adff04a000000b00343ebd3c444mr8807wro.5.1712425035369; Sat, 06 Apr 2024 10:37:15 -0700 (PDT) Date: Sat, 6 Apr 2024 18:36:47 +0100 In-Reply-To: <20240406173649.3210836-1-vdonnefort@google.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: Mime-Version: 1.0 References: <20240406173649.3210836-1-vdonnefort@google.com> X-Mailer: git-send-email 2.44.0.478.gd926399ef9-goog Message-ID: <20240406173649.3210836-4-vdonnefort@google.com> Subject: [PATCH v20 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, rdunlap@infradead.org, Vincent Donnefort , linux-mm@kvack.org Content-Type: text/plain; charset="UTF-8" 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..83194bf7b1df 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) - return -ENOIOCTLCMD; + 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; + } + 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,85 @@ static long tracing_buffers_ioctl(struct file *file, unsigned int cmd, unsigned return 0; } +#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 const struct vm_operations_struct tracing_buffers_vmops = { + .close = tracing_buffers_mmap_close, +}; + +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 +8325,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; -- 2.44.0.478.gd926399ef9-goog