From patchwork Fri Dec 10 10:59:31 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Tzvetomir Stoyanov (VMware)" X-Patchwork-Id: 12669327 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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id D44CDC433F5 for ; Fri, 10 Dec 2021 10:59:53 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S240113AbhLJLD2 (ORCPT ); Fri, 10 Dec 2021 06:03:28 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:35612 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S237285AbhLJLD1 (ORCPT ); Fri, 10 Dec 2021 06:03:27 -0500 Received: from mail-ed1-x52e.google.com (mail-ed1-x52e.google.com [IPv6:2a00:1450:4864:20::52e]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 869B2C0617A1 for ; Fri, 10 Dec 2021 02:59:52 -0800 (PST) Received: by mail-ed1-x52e.google.com with SMTP id y13so28282529edd.13 for ; Fri, 10 Dec 2021 02:59:52 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=qAQrCfQ7XX2f+uDKVEsDU5jZpBO8BjHGndI47OL11NA=; b=i1M+NZ8aE50+sm+ZXBD9RRNauH4LA/Mi8Ji2eU3w3kTbBVgJ/DUwMDJM0W5LuNBflD a0GRsVIkXwVkivpHPtFPPzrgS7Yq6ZEPRcQQr+9uh6NU19g1uCL/s4UPPxqVTUG+lC2P er667/s8+YeZYQsLSQFmyhJseAC6L1QQ6vN0xlv1ShjbUVJxTRftWAzjQ37eqOUoC698 DBn4F/wSBzVdxuj/2kBmGxLPKcTAcctNOSAeAcWAaq/+UO4KTwjO/7XlT2soLAaNwCPJ I5f4y/Q2mloJ8UPNKmzGb4dELf8BmNmTfR7oLUGCfB9E060+7ZdadI5OjaLdEmO2Do9g gRFg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=qAQrCfQ7XX2f+uDKVEsDU5jZpBO8BjHGndI47OL11NA=; b=xfth95Y5pmnftCzhL/1k9mMGCWclpMIbFay7ce21THZa6SH8iWbgKC3rp4Tljj+fFE NjMVC2EL9eb1RCfEMwbi/jSPMK3v4vmY3i7Dy95VPGfwrXQZFfS021jzJtZlvvphrtJh VtK1QT/51YuAvtFnjR1l5EKX0ooPWXeXRSna2qV2djc/iAO4tUFluVV95+5LxxP5KUOh NSAQ1CAZMgkn3pwEWb12zj9Gpn362Di/RBLwbLBOXdJWOnvIGChl9xGsykJDBeY+O+8L bHezzC1IvwQO8oTtdS3AzOJLZa/TI9BUHIXfMaK2uDd3XcjDq0/C8aCkkoGLao4l+QTq k0ZQ== X-Gm-Message-State: AOAM530us8HTmAurui18ua0KeaM2S0iKIXLU7Fo6jqQetJy4UvvQo9vU j+6rW0h+twsdwf055H2ZS0D8R40Qz7I= X-Google-Smtp-Source: ABdhPJwaSptISys4ze9oFpcFSppejJNft24jm/0ssb9nXylNCXOGkDTrBdhfdD/DxE8JfPRI+IfUQg== X-Received: by 2002:a17:907:16ac:: with SMTP id hc44mr22182544ejc.363.1639133991091; Fri, 10 Dec 2021 02:59:51 -0800 (PST) Received: from oberon.zico.biz.zico.biz ([83.222.187.186]) by smtp.gmail.com with ESMTPSA id j17sm1320379edj.0.2021.12.10.02.59.50 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 10 Dec 2021 02:59:50 -0800 (PST) From: "Tzvetomir Stoyanov (VMware)" To: rostedt@goodmis.org Cc: linux-trace-devel@vger.kernel.org Subject: [PATCH v6 13/20] trace-cmd library: Initialize CPU data decompression logic Date: Fri, 10 Dec 2021 12:59:31 +0200 Message-Id: <20211210105938.98250-14-tz.stoyanov@gmail.com> X-Mailer: git-send-email 2.33.1 In-Reply-To: <20211210105938.98250-1-tz.stoyanov@gmail.com> References: <20211210105938.98250-1-tz.stoyanov@gmail.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-trace-devel@vger.kernel.org On CPU data initialization stage, initialize decompression context for both in-memory and temporary file decompression logics. Signed-off-by: Tzvetomir Stoyanov (VMware) --- lib/trace-cmd/trace-input.c | 72 +++++++++++++++++++++++++++++++++++-- 1 file changed, 69 insertions(+), 3 deletions(-) diff --git a/lib/trace-cmd/trace-input.c b/lib/trace-cmd/trace-input.c index dbfd881b..7ebf8b20 100644 --- a/lib/trace-cmd/trace-input.c +++ b/lib/trace-cmd/trace-input.c @@ -1264,6 +1264,7 @@ static void *allocate_page_map(struct tracecmd_input *handle, off64_t map_offset; void *map; int ret; + int fd; if (handle->read_page) { map = malloc(handle->page_size); @@ -1303,12 +1304,15 @@ static void *allocate_page_map(struct tracecmd_input *handle, map_size -= map_offset + map_size - (cpu_data->file_offset + cpu_data->file_size); + if (cpu_data->compress.fd >= 0) + fd = cpu_data->compress.fd; + else + fd = handle->fd; again: page_map->size = map_size; page_map->offset = map_offset; - page_map->map = mmap(NULL, map_size, PROT_READ, MAP_PRIVATE, - handle->fd, map_offset); + page_map->map = mmap(NULL, map_size, PROT_READ, MAP_PRIVATE, fd, map_offset); if (page_map->map == MAP_FAILED) { /* Try a smaller map */ @@ -2496,16 +2500,76 @@ tracecmd_read_prev(struct tracecmd_input *handle, struct tep_record *record) /* Not reached */ } -static int init_cpu(struct tracecmd_input *handle, int cpu) +static int init_cpu_zfile(struct tracecmd_input *handle, int cpu) +{ + struct cpu_data *cpu_data; + unsigned long long size; + off64_t offset; + + cpu_data = &handle->cpu_data[cpu]; + offset = lseek64(handle->fd, 0, SEEK_CUR); + if (lseek64(handle->fd, cpu_data->file_offset, SEEK_SET) == (off_t)-1) + return -1; + strcpy(cpu_data->compress.file, COMPR_TEMP_FILE); + cpu_data->compress.fd = mkstemp(cpu_data->compress.file); + if (cpu_data->compress.fd < 0) + return -1; + if (tracecmd_uncompress_copy_to(handle->compress, cpu_data->compress.fd, NULL, &size)) + return -1; + if (lseek64(handle->fd, offset, SEEK_SET) == (off_t)-1) + return -1; + cpu_data->offset = 0; + cpu_data->file_offset = 0; + cpu_data->file_size = size; + cpu_data->size = size; + return 0; +} + +static int init_cpu_zpage(struct tracecmd_input *handle, int cpu) { struct cpu_data *cpu_data = &handle->cpu_data[cpu]; + int count; int i; + if (lseek64(handle->fd, cpu_data->file_offset, SEEK_SET) == (off_t)-1) + return -1; + + count = tracecmd_load_chunks_info(handle->compress, &cpu_data->compress.chunks); + if (count < 0) + return -1; + cpu_data->compress.count = count; + cpu_data->compress.last_chunk = 0; + + cpu_data->file_offset = 0; + cpu_data->file_size = 0; + for (i = 0; i < count; i++) + cpu_data->file_size += cpu_data->compress.chunks[i].size; cpu_data->offset = cpu_data->file_offset; cpu_data->size = cpu_data->file_size; + return 0; +} + +static int init_cpu(struct tracecmd_input *handle, int cpu) +{ + struct cpu_data *cpu_data = &handle->cpu_data[cpu]; + int ret; + int i; + + if (handle->cpu_compressed && cpu_data->file_size > 0) { + if (handle->read_zpage) + ret = init_cpu_zpage(handle, cpu); + else + ret = init_cpu_zfile(handle, cpu); + if (ret) + return ret; + } else { + cpu_data->offset = cpu_data->file_offset; + cpu_data->size = cpu_data->file_size; + } cpu_data->timestamp = 0; list_head_init(&cpu_data->page_maps); + list_head_init(&cpu_data->compress.cache); if (!cpu_data->size) { printf("CPU %d is empty\n", cpu); @@ -3382,6 +3446,8 @@ static int init_buffer_cpu_data(struct tracecmd_input *handle, struct input_buff return -1; if (read_section_header(handle, &id, &flags, NULL, NULL)) return -1; + if (flags & TRACECMD_SEC_FL_COMPRESS) + handle->cpu_compressed = true; if (buffer->latency) { handle->file_state = TRACECMD_FILE_CPU_LATENCY; return init_latency_data(handle) == 0 ? 1 : -1;