From patchwork Wed Oct 21 03:02:33 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexei Starovoitov X-Patchwork-Id: 533587 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 164DA140134 for ; Wed, 21 Oct 2015 14:03:51 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753283AbbJUDDf (ORCPT ); Tue, 20 Oct 2015 23:03:35 -0400 Received: from mail-pa0-f47.google.com ([209.85.220.47]:34256 "EHLO mail-pa0-f47.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753325AbbJUDCq (ORCPT ); Tue, 20 Oct 2015 23:02:46 -0400 Received: by padhk11 with SMTP id hk11so40122259pad.1 for ; Tue, 20 Oct 2015 20:02:46 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=fOQd4bbdtj5jlsjgLjACHIF6AnbS4oFOOwjlmGz5c4I=; b=aBoO1pZmFW5sc/K9kT2X5/7i1NJ+Du2PXx0KfcF0wyCS52XjxhWbA+ojWYhCfQ4lPK 29yIwt8i1Koe3IiJQzJXSJ71vFHV4jUlV3GEgcALOJWhy1TgzRN1aeHrWVEN/eaRxdRf dg1Vn+h3uI8uTetHMZam7010WDGIHkMIcUzZ+afXsEVQLEyAj+hynaM1aR0Jd3jAooWh /GlHsF+9GNeE1rCHLwGjYZLXauTBwpTSqAmEaOknf0BElZGPIrQNfK+4aL1fijWSxGtT /llAbke9u5xMfLw506xC/yhIfgi5HzZm6UlDuKu84hUxcVtWlSYXyGbm07uvLtzlqBag nMRw== X-Gm-Message-State: ALoCoQmJUjhY56hQjzjc5wESPucCbV95DL48dBMeUGwCZ/AqsYYHM6JbmmdTVvNgV25Gaas62YXf X-Received: by 10.66.216.101 with SMTP id op5mr7810050pac.51.1445396566418; Tue, 20 Oct 2015 20:02:46 -0700 (PDT) Received: from localhost.localdomain ([12.97.19.195]) by smtp.gmail.com with ESMTPSA id so4sm6219679pbc.72.2015.10.20.20.02.44 (version=TLS1_1 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 20 Oct 2015 20:02:45 -0700 (PDT) From: Alexei Starovoitov X-Google-Original-From: Alexei Starovoitov To: "David S. Miller" Cc: Ingo Molnar , Peter Zijlstra , Wang Nan , He Kuang , Arnaldo Carvalho de Melo , Daniel Borkmann , netdev@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH net-next 1/3] perf: pad raw data samples automatically Date: Tue, 20 Oct 2015 20:02:33 -0700 Message-Id: <1445396556-4854-2-git-send-email-ast@kernel.org> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1445396556-4854-1-git-send-email-ast@kernel.org> References: <1445396556-4854-1-git-send-email-ast@kernel.org> Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Instead of WARN_ON in perf_event_output() on unpaded raw samples, pad them automatically. Signed-off-by: Alexei Starovoitov --- kernel/events/core.c | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/kernel/events/core.c b/kernel/events/core.c index b11756f9b6dc..64754bfecd70 100644 --- a/kernel/events/core.c +++ b/kernel/events/core.c @@ -5286,9 +5286,15 @@ void perf_output_sample(struct perf_output_handle *handle, if (sample_type & PERF_SAMPLE_RAW) { if (data->raw) { - perf_output_put(handle, data->raw->size); - __output_copy(handle, data->raw->data, - data->raw->size); + u32 raw_size = data->raw->size; + u32 real_size = round_up(raw_size + sizeof(u32), + sizeof(u64)) - sizeof(u32); + u64 zero = 0; + + perf_output_put(handle, real_size); + __output_copy(handle, data->raw->data, raw_size); + if (real_size - raw_size) + __output_copy(handle, &zero, real_size - raw_size); } else { struct { u32 size; @@ -5420,8 +5426,7 @@ void perf_prepare_sample(struct perf_event_header *header, else size += sizeof(u32); - WARN_ON_ONCE(size & (sizeof(u64)-1)); - header->size += size; + header->size += round_up(size, sizeof(u64)); } if (sample_type & PERF_SAMPLE_BRANCH_STACK) {