From patchwork Fri Feb 9 10:22:00 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Vincent Donnefort X-Patchwork-Id: 198805 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:7300:50ea:b0:106:860b:bbdd with SMTP id r10csp754359dyd; Fri, 9 Feb 2024 02:24:50 -0800 (PST) X-Google-Smtp-Source: AGHT+IGnDRgC8wraE+39eYxkuiL4BYKtceva5yaWyDHsKlVGFHBQbt43w7bgLXVsFlTmGAmXhF5G X-Received: by 2002:aa7:d350:0:b0:55e:aca4:aab2 with SMTP id m16-20020aa7d350000000b0055eaca4aab2mr955656edr.19.1707474290069; Fri, 09 Feb 2024 02:24:50 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1707474290; cv=pass; d=google.com; s=arc-20160816; b=gxe/OVRZ0QDHr6PfXj6wv8bXDsfa5wDzThrIMsJMESaaE5/KKUyc1us2AT7wMyo72R qcZVm1ybxO6++fjBJUDPojZVaEOpx/ygQeliwdsJThR7jaP5U4p10P1IK06cWlpaEQA0 9cjmt8bf0MegNU7BIErOABW0Cva8SHHzgzJSbQIkCVHgZHBptg8j1Panmv6GyHgdqUvY ZzxN6pY9qhQkaGDDwwLZ9wssmHCSsB4Ofn5JWkW2KNousc7S3zVlS5smyEPFfnIlpc04 gsnxAx6fuaoWAsEdONXaspj2G0CP2pf2Ex7i+/JYUVfvq5xlLHZ//iHr6gVeGHR+xHqy taDg== 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=8eG/PuLIoWB8LKFjP4cPEQOG7vgr5hu+n2RMYn2R0is=; fh=Xml0dOB0hcW/obr/TKIXnYC0UxjNQ6bf7aQdIxU3CxQ=; b=R/C2KdtusXsA9DdllHtV15s7pp/jLf057Ghx1Sw8ESzOel3Xjc0bo25LGW2I4CAct+ rPQpLqvWYg4lQjc1Q4Zu8k+aAzW4FNu77FW5jahTtjEmshKsPxgr1uMXfheOES/vQIqV oyRCtPsNDWqig4aL5GFd6WGAq+yDLPwiLWEJosKK/q0n2PoQ9RECBx/qxOAlgQ/CE8dY Fed6uBHBTP2IKerDTt8LJZ6iYBmmpI1Pgq7eefEz9LWK5snytDpLnKcV+D8oL+m1noQY ToAG0QlzGQyLWZSbz2qKdBDb5WXd2Vk8O8j72c7dqcDl1CYAbsI21mEVqE/BKJoHBQuE YWGQ==; dara=google.com ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@google.com header.s=20230601 header.b="sZ/cbE+I"; 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-59217-ouuuleilei=gmail.com@vger.kernel.org designates 147.75.80.249 as permitted sender) smtp.mailfrom="linux-kernel+bounces-59217-ouuuleilei=gmail.com@vger.kernel.org"; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=google.com X-Forwarded-Encrypted: i=2; AJvYcCVtxe07Hmoc5b2nO9HojecZ0craJ0Jz/d4Nx1yPGRCtyY37atMC4NCBPeVkP7JsaIaCbjkqz9TxoAQtAHVJgZNz/vUPbA== Received: from am.mirrors.kernel.org (am.mirrors.kernel.org. [147.75.80.249]) by mx.google.com with ESMTPS id g26-20020a50ee1a000000b00560a8381394si731334eds.324.2024.02.09.02.24.49 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 09 Feb 2024 02:24:50 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel+bounces-59217-ouuuleilei=gmail.com@vger.kernel.org designates 147.75.80.249 as permitted sender) client-ip=147.75.80.249; Authentication-Results: mx.google.com; dkim=pass header.i=@google.com header.s=20230601 header.b="sZ/cbE+I"; 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-59217-ouuuleilei=gmail.com@vger.kernel.org designates 147.75.80.249 as permitted sender) smtp.mailfrom="linux-kernel+bounces-59217-ouuuleilei=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 7F1DB1F22873 for ; Fri, 9 Feb 2024 10:24:49 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 7F44F6995C; Fri, 9 Feb 2024 10:22:27 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b="sZ/cbE+I" Received: from mail-yw1-f202.google.com (mail-yw1-f202.google.com [209.85.128.202]) (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 095F76A017 for ; Fri, 9 Feb 2024 10:22:21 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.128.202 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1707474143; cv=none; b=ipj58UhoPfKe5ORcytbONXM2xC3fPGeOJIW4IMUMu8EPO1iai6VYvkgLayXg2P9423pyOCrv17/EM0B4TJLn5bLhF8ELbhegW1TXY89s5HpIIwH2IFOE1Rj2H0WRqSSSNEV2NK94CKLooXB8C3YJyVUwhuvnhPPRZWlH1gKweKk= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1707474143; c=relaxed/simple; bh=POwIaSakA3P7VN3DoSdTZ1HOoCQpnAoqCCz15gHTKd8=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=JoFislNaHQpSoSLHDBUSwJP0miPGyYMAYkUknIKBjVATrR0YO6JDchLs3IpyxoS35dNjTkE6VonVDXhW3eiLsaKOEJWMOgcWu6jw+ZX7Oerl8IsSE1nsThwNpuG58Uc59C5f5CATyoRxqLVrfrnVFmtsIlElv5y6509k+CT5ykE= 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=sZ/cbE+I; arc=none smtp.client-ip=209.85.128.202 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-yw1-f202.google.com with SMTP id 00721157ae682-60492362802so15361857b3.2 for ; Fri, 09 Feb 2024 02:22:21 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1707474141; x=1708078941; 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=8eG/PuLIoWB8LKFjP4cPEQOG7vgr5hu+n2RMYn2R0is=; b=sZ/cbE+InTmDo/r0pfPufq96F7krecFo6JiAexu7KQA8Sh+2p6irCHw3lfk/RIp4We SHHcEU/ed5yI6bgRNfCG9Yl1HzIYwpaqXQyU/ZkzvgYmHstkGNbNHAT8/2tLMIF9L6L/ 1+BQHh1UgIL6GE6weicHflPebNfZHVFzAVnQSaowTIfiThX/RoDOrztXL9QQAsTP/Pwl 4nd5hqQz2kPayo3lJHkbaGscwtQDINCFQQSw+IwzleNVpfurGtyK8Wh1Q6gFoIb/mfdA b9preLA1CpiemB37dMBiF05ZQrvbyrlu/u5hkbSBoqoaXlO0/Ma6Ia3/FDEMnJxTE7HL ILig== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1707474141; x=1708078941; 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=8eG/PuLIoWB8LKFjP4cPEQOG7vgr5hu+n2RMYn2R0is=; b=cck3vOBfuvhzMc+YwKEdLEnPueAJX8HMuE/OoYPI3t4G6lsjG2fypnWFgnl1yqzSg8 i6DFyiajllqtoaPT/5OQSBo0RhyrLTpjEK1/+n9nWHIWCiVa0kJzyM0oIcSAVWUd/hJg eAcFeufB9zq8+RKjKQexpgowUs2mvkoaebyM3jLAKBRol2+J00Hhx9DVz427vO1VskXN U8zDlMNI9Hrz2nWYsOG3iFXNGgZeu6vZcwhkvNl1hOmUJFBq2O//8TDnRGD+uK2LqGzJ jU0OE28pmoLL2V2+fIHdZFtro+UPs9VMUF7suh6pPfe4YqawmyAXciDd9gzVpNlmDXv1 W94Q== X-Gm-Message-State: AOJu0Yy2GMG8xu/NffKDuKa/oX5+p22BDKxtVmblbLcMzIiNffxjc2fJ CoZvmBUamNyWiPtaB28G/1k1enH3aA4Tp4rNR+gdmkOXxhoUrrjLWhFMS5S1uk7R2pT+rJNAXZ4 p2o6iOJSP8DmdT/Y+tg== X-Received: from vdonnefort.c.googlers.com ([fda3:e722:ac3:cc00:28:9cb1:c0a8:2eea]) (user=vdonnefort job=sendgmr) by 2002:a81:9ad8:0:b0:5f9:990d:78c0 with SMTP id r207-20020a819ad8000000b005f9990d78c0mr247901ywg.4.1707474141044; Fri, 09 Feb 2024 02:22:21 -0800 (PST) Date: Fri, 9 Feb 2024 10:22:00 +0000 In-Reply-To: <20240209102202.649049-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: <20240209102202.649049-1-vdonnefort@google.com> X-Mailer: git-send-email 2.43.0.687.g38aa6559b0-goog Message-ID: <20240209102202.649049-5-vdonnefort@google.com> Subject: [PATCH v15 4/6] 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 X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1790416560988843050 X-GMAIL-MSGID: 1790416560988843050 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. Signed-off-by: Vincent Donnefort diff --git a/include/uapi/linux/trace_mmap.h b/include/uapi/linux/trace_mmap.h index 182e05a3004a..7330249257e7 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 4ebf4d0bd14c..2c0deeedf619 100644 --- a/kernel/trace/trace.c +++ b/kernel/trace/trace.c @@ -1175,6 +1175,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); @@ -1307,7 +1313,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; } @@ -6533,7 +6539,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) @@ -8652,15 +8658,31 @@ 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); + 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); iter->wait_index++; @@ -8673,6 +8695,97 @@ 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) +{ + struct ftrace_buffer_info *info = vmf->vma->vm_file->private_data; + struct trace_iterator *iter = &info->iter; + vm_fault_t ret = VM_FAULT_SIGBUS; + struct page *page; + + page = ring_buffer_map_fault(iter->array_buffer->buffer, iter->cpu_file, + vmf->pgoff); + if (!page) + return ret; + + get_page(page); + vmf->page = page; + vmf->page->mapping = vmf->vma->vm_file->f_mapping; + vmf->page->index = vmf->pgoff; + + return 0; +} + +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; + struct trace_array __maybe_unused *tr = iter->tr; + + ring_buffer_unmap(iter->array_buffer->buffer, iter->cpu_file); + +#ifdef CONFIG_TRACER_MAX_TRACE + spin_lock(&tr->snapshot_trigger_lock); + if (!WARN_ON(!tr->mapped)) + tr->mapped--; + spin_unlock(&tr->snapshot_trigger_lock); +#endif +} + +static void tracing_buffers_mmap_open(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_map(iter->array_buffer->buffer, iter->cpu_file)); +} + +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; + struct trace_array __maybe_unused *tr = iter->tr; + int ret = 0; + + if (vma->vm_flags & VM_WRITE || vma->vm_flags & VM_EXEC) + return -EPERM; + + vm_flags_mod(vma, VM_DONTCOPY | VM_DONTDUMP, VM_MAYWRITE); + vma->vm_ops = &tracing_buffers_vmops; + +#ifdef CONFIG_TRACER_MAX_TRACE + /* + * We hold mmap_lock here. 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) { + spin_unlock(&tr->snapshot_trigger_lock); + return -EBUSY; + } + tr->mapped++; + spin_unlock(&tr->snapshot_trigger_lock); + + /* Wait for update_max_tr() to observe iter->tr->mapped */ + if (tr->mapped == 1) + synchronize_rcu(); +#endif + ret = ring_buffer_map(iter->array_buffer->buffer, iter->cpu_file); +#ifdef CONFIG_TRACER_MAX_TRACE + if (ret) { + spin_lock(&tr->snapshot_trigger_lock); + iter->tr->mapped--; + spin_unlock(&tr->snapshot_trigger_lock); + } +#endif + return ret; +} + static const struct file_operations tracing_buffers_fops = { .open = tracing_buffers_open, .read = tracing_buffers_read, @@ -8681,6 +8794,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 bd312e9afe25..8a96e7a89e6b 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;