packages/oeAware-collector
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix uninitialized PmuAttr attr

Browse Source 
(cherry picked from commit 0f5061e2c5a23efd154ae5b4a8dbd7fe5d47c38d)
This commit is contained in:
zhoukaiqi 2024-07-05 16:52:53 +08:00 committed by openeuler-sync-bot
parent d10ef967b4
commit 4a8ee7c2f7
2 changed files with 127 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

121
0003-fix-uninitialized-PmuAttr-attr.patch Normal file
View File

@ -0,0 +1,121 @@
From 44bdefe0ef52ead10b51333d940d3adc45d60420 Mon Sep 17 00:00:00 2001
From: zhoukaiqi <zhoukaiqi@huawei.com>
Date: Fri, 5 Jul 2024 15:53:36 +0800
Subject: [PATCH] fix uninitialized PmuAttr attr
---
pmu/plugin/plugin_counting.c | 3 +++
pmu/plugin/plugin_netif_rx.c | 3 +++
pmu/plugin/plugin_sampling.c | 3 +++
pmu/plugin/plugin_spe.c | 3 +++
pmu/plugin/plugin_uncore.c | 3 +++
5 files changed, 15 insertions(+)
diff --git a/pmu/plugin/plugin_counting.c b/pmu/plugin/plugin_counting.c
index b0de581..39573fa 100644
--- a/pmu/plugin/plugin_counting.c
+++ b/pmu/plugin/plugin_counting.c
@@ -12,6 +12,7 @@
#include <stdio.h>
#include <stdlib.h>
#include <stdbool.h>
+#include <securec.h>
#include "pmu.h"
#include "pcerrc.h"
#include "interface.h"
@@ -50,6 +51,8 @@ static int counting_open()
char *evtList[1];
int pd;
+ (void)memset_s(&attr, sizeof(struct PmuAttr), 0, sizeof(struct PmuAttr));
+
evtList[0] = "cycles";
attr.evtList = evtList;
diff --git a/pmu/plugin/plugin_netif_rx.c b/pmu/plugin/plugin_netif_rx.c
index 717f091..78f52d2 100644
--- a/pmu/plugin/plugin_netif_rx.c
+++ b/pmu/plugin/plugin_netif_rx.c
@@ -12,6 +12,7 @@
#include <stdio.h>
#include <stdlib.h>
#include <stdbool.h>
+#include <securec.h>
#include "pmu.h"
#include "pcerrc.h"
#include "interface.h"
@@ -49,6 +50,8 @@ static int open()
char *evtList[1];
int pd;
+ (void)memset_s(&attr, sizeof(struct PmuAttr), 0, sizeof(struct PmuAttr));
+
evtList[0] = "net:netif_rx";
attr.evtList = evtList;
diff --git a/pmu/plugin/plugin_sampling.c b/pmu/plugin/plugin_sampling.c
index 2c9fc5c..35e5dfb 100644
--- a/pmu/plugin/plugin_sampling.c
+++ b/pmu/plugin/plugin_sampling.c
@@ -12,6 +12,7 @@
#include <stdio.h>
#include <stdlib.h>
#include <stdbool.h>
+#include <securec.h>
#include "pmu.h"
#include "pcerrc.h"
#include "interface.h"
@@ -50,6 +51,8 @@ static int sampling_open()
char *evtList[1];
int pd;
+ (void)memset_s(&attr, sizeof(struct PmuAttr), 0, sizeof(struct PmuAttr));
+
evtList[0] = "cycles";
attr.evtList = evtList;
diff --git a/pmu/plugin/plugin_spe.c b/pmu/plugin/plugin_spe.c
index da7f926..52c31c3 100644
--- a/pmu/plugin/plugin_spe.c
+++ b/pmu/plugin/plugin_spe.c
@@ -12,6 +12,7 @@
#include <stdio.h>
#include <stdlib.h>
#include <stdbool.h>
+#include <securec.h>
#include "pmu.h"
#include "pcerrc.h"
#include "interface.h"
@@ -49,6 +50,8 @@ static int spe_open()
struct PmuAttr attr;
int pd;
+ (void)memset_s(&attr, sizeof(struct PmuAttr), 0, sizeof(struct PmuAttr));
+
attr.evtList = NULL;
attr.numEvt = 0;
attr.pidList = NULL;
diff --git a/pmu/plugin/plugin_uncore.c b/pmu/plugin/plugin_uncore.c
index 4e4cea5..9b845db 100644
--- a/pmu/plugin/plugin_uncore.c
+++ b/pmu/plugin/plugin_uncore.c
@@ -12,6 +12,7 @@
#include <stdio.h>
#include <stdlib.h>
#include <stdbool.h>
+#include <securec.h>
#include "pmu.h"
#include "pcerrc.h"
#include "interface.h"
@@ -78,6 +79,8 @@ static int uncore_open()
evtList[i + hha_num * RX_OPS_NUM] = rx_ops_num[i].uncore_name;
}
+ (void)memset_s(&attr, sizeof(struct PmuAttr), 0, sizeof(struct PmuAttr));
+
attr.evtList = evtList;
attr.numEvt = hha_num * UNCORE_MAX;
attr.pidList = NULL;
--
2.27.0

8
oeAware-collector.spec
View File

@ -1,12 +1,13 @@
Name: oeAware-collector
Version: v1.0.2
Release: 5
Release: 6
Summary: %{name} provides low-overhead metrics collection capabilities, including microarchitecture, system, and kernel information.
License: MulanPSL2
URL: https://gitee.com/openeuler/%{name}
Source0: %{name}-%{version}.tar.gz
Patch1: 0001-add-netif_rx-counting-pmu-instance.patch
Patch2: 0002-reduce-thread-collector-load.patch
Patch2: 0002-reduce-thread-collector-load.patch
Patch3: 0003-fix-uninitialized-PmuAttr-attr.patch
%global libkperf_name libkperf
%global libkperf_tagver v1.0.4
@ -82,6 +83,9 @@ install -b -m740 ./thread_collector/build/libthread_collector.so ${RPM_BUIL
%attr(0440, root, root) %{_libdir}/oeAware-plugin/libthread_collector.so
%changelog
* Fri Jul 5 2024 zhoukaiqi <zhoukaiqi@huawei.com> - v1.0.2-6
- fix uninitialized PmuAttr attr
* Tue Jul 2 2024 fly_1997 <flylove7@outlook.com> - v1.0.2-5
- reduce thread collector load