From 67677605d796a120450edcc7d804114115d54519 Mon Sep 17 00:00:00 2001 From: ganchuantao Date: Thu, 5 Sep 2024 20:34:02 +0800 Subject: [PATCH 1/8] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=89=88=E6=9D=83?= =?UTF-8?q?=E5=A3=B0=E6=98=8E?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: ganchuantao Change-Id: I3426f15d9f07ea476d4cae7343aa9e77e3e6c11a --- hiebpf/include/bpf_log_writer.h | 21 ++++++++------------- hiebpf/include/fstrace_progs.h | 22 +++++++++------------- hiebpf/include/hiebpf_types.h | 22 +++++++++------------- hiebpf/src/hiebpf.bpf.c | 22 +++++++++------------- 4 files changed, 35 insertions(+), 52 deletions(-) diff --git a/hiebpf/include/bpf_log_writer.h b/hiebpf/include/bpf_log_writer.h index a2c7398ab..4e8355efe 100644 --- a/hiebpf/include/bpf_log_writer.h +++ b/hiebpf/include/bpf_log_writer.h @@ -1,18 +1,13 @@ /* - * Copyright (c) Huawei Technologies Co., Ltd. 2022. All rights reserved. - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ +* Copyright (c) 2024 Huawei Device Co., Ltd. All rights reserved. +* The hiebpf subdirectories are licensed under Apache License, Version 2.0. +* The bpf_log_write.h is dual licensed: you can use it either under the terms of +* the GPL V2, or the 3-Clause BSD license, at your option. + +* hiebpf is dual licensed: you can use it either under the terms of +* the GPL V2, or the BSD3 license, at your option. +*/ #ifndef BPF_LOG_WRITER_H #define BPF_LOG_WRITER_H diff --git a/hiebpf/include/fstrace_progs.h b/hiebpf/include/fstrace_progs.h index 33f039f6b..f09cae47a 100644 --- a/hiebpf/include/fstrace_progs.h +++ b/hiebpf/include/fstrace_progs.h @@ -1,17 +1,13 @@ /* - * Copyright (c) Huawei Technologies Co., Ltd. 2022. All rights reserved. - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ +* Copyright (c) 2024 Huawei Device Co., Ltd. All rights reserved. + +* The hiebpf subdirectories are licensed under Apache License, Version 2.0. +* The fstrace_progs.h is dual licensed: you can use it either under the terms of +* the GPL V2, or the 3-Clause BSD license, at your option. + +* hiebpf is dual licensed: you can use it either under the terms of +* the GPL V2, or the BSD3 license, at your option. +*/ /* This line is generated to truncate the original file */ /************************** fstrace BPF progs BEGIN *****************************/ diff --git a/hiebpf/include/hiebpf_types.h b/hiebpf/include/hiebpf_types.h index bb1a5a024..03d18a3c4 100644 --- a/hiebpf/include/hiebpf_types.h +++ b/hiebpf/include/hiebpf_types.h @@ -1,17 +1,13 @@ /* - * Copyright (c) Huawei Technologies Co., Ltd. 2022. All rights reserved. - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ +* Copyright (c) 2024 Huawei Device Co., Ltd. All rights reserved. + +* The hiebpf subdirectories are licensed under Apache License, Version 2.0. +* The hiebpf_types.h is dual licensed: you can use it either under the terms of +* the GPL V2, or the 3-Clause BSD license, at your option. + +* hiebpf is dual licensed: you can use it either under the terms of +* the GPL V2, or the BSD3 license, at your option. +*/ #ifndef HIEBPF_EVENT_STRUCTS_H #define HIEBPF_EVENT_STRUCTS_H diff --git a/hiebpf/src/hiebpf.bpf.c b/hiebpf/src/hiebpf.bpf.c index 087b7ae77..f557ba917 100644 --- a/hiebpf/src/hiebpf.bpf.c +++ b/hiebpf/src/hiebpf.bpf.c @@ -1,17 +1,13 @@ /* - * Copyright (c) Huawei Technologies Co., Ltd. 2022. All rights reserved. - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ +* Copyright (c) 2024 Huawei Device Co., Ltd. All rights reserved. + +* The hiebpf subdirectories are licensed under Apache License, Version 2.0. +* The hiebpf.bpf.c is dual licensed: you can use it either under the terms of +* the GPL V2, or the 3-Clause BSD license, at your option. + +* hiebpf is dual licensed: you can use it either under the terms of +* the GPL V2, or the BSD3 license, at your option. +*/ #include #include "vmlinux.h" From 9a248ca31c7467d77e1859fc727f2799ae7c551f Mon Sep 17 00:00:00 2001 From: ganchuantao Date: Thu, 5 Sep 2024 21:03:02 +0800 Subject: [PATCH 2/8] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=89=88=E6=9D=83?= =?UTF-8?q?=E5=A3=B0=E6=98=8E?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: ganchuantao Change-Id: I7c29715ae3e33dc057dc67663ff5eb54155b3d76 --- LICENSE | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/LICENSE b/LICENSE index e454a5258..9dd369095 100644 --- a/LICENSE +++ b/LICENSE @@ -1,3 +1,12 @@ +Copyright (c) 2024 Huawei Device Co., Ltd. All rights reserved. + +The hiebpf subdirectories are licensed under Apache License, Version 2.0. +The hiebpf.bpf.c,bpf_log_write.h,fstrace_progs.h,hiebpf_types.h is dual licensed: you can use it +either under the terms of the GPL V2, or the 3-Clause BSD license, at your option. + +hiebpf is dual licensed: you can use it either under the terms of +the GPL V2, or the BSD3 license, at your option. + Apache License Version 2.0, January 2004 From baaa491716976dfcdd641491fee55519aab713ee Mon Sep 17 00:00:00 2001 From: ganchuantao Date: Sat, 7 Sep 2024 14:25:00 +0800 Subject: [PATCH 3/8] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=89=88=E6=9D=83?= =?UTF-8?q?=E5=A3=B0=E6=98=8E?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: ganchuantao Change-Id: I47b08a09bf1e77bfb2c01ab5e12b842b5a428218 --- hiebpf/include/bpf_log_writer.h | 1 + hiebpf/include/fstrace_progs.h | 1 + hiebpf/include/hiebpf_types.h | 1 + hiebpf/src/hiebpf.bpf.c | 1 + 4 files changed, 4 insertions(+) diff --git a/hiebpf/include/bpf_log_writer.h b/hiebpf/include/bpf_log_writer.h index 4e8355efe..f540b6e71 100644 --- a/hiebpf/include/bpf_log_writer.h +++ b/hiebpf/include/bpf_log_writer.h @@ -7,6 +7,7 @@ * hiebpf is dual licensed: you can use it either under the terms of * the GPL V2, or the BSD3 license, at your option. +* See the LICENSE file in the root of this repository for complete details. */ #ifndef BPF_LOG_WRITER_H #define BPF_LOG_WRITER_H diff --git a/hiebpf/include/fstrace_progs.h b/hiebpf/include/fstrace_progs.h index f09cae47a..6dee7112c 100644 --- a/hiebpf/include/fstrace_progs.h +++ b/hiebpf/include/fstrace_progs.h @@ -7,6 +7,7 @@ * hiebpf is dual licensed: you can use it either under the terms of * the GPL V2, or the BSD3 license, at your option. +* See the LICENSE file in the root of this repository for complete details. */ /* This line is generated to truncate the original file */ diff --git a/hiebpf/include/hiebpf_types.h b/hiebpf/include/hiebpf_types.h index 03d18a3c4..f6eb4a39d 100644 --- a/hiebpf/include/hiebpf_types.h +++ b/hiebpf/include/hiebpf_types.h @@ -7,6 +7,7 @@ * hiebpf is dual licensed: you can use it either under the terms of * the GPL V2, or the BSD3 license, at your option. +* See the LICENSE file in the root of this repository for complete details. */ #ifndef HIEBPF_EVENT_STRUCTS_H diff --git a/hiebpf/src/hiebpf.bpf.c b/hiebpf/src/hiebpf.bpf.c index f557ba917..f8942284e 100644 --- a/hiebpf/src/hiebpf.bpf.c +++ b/hiebpf/src/hiebpf.bpf.c @@ -7,6 +7,7 @@ * hiebpf is dual licensed: you can use it either under the terms of * the GPL V2, or the BSD3 license, at your option. +* See the LICENSE file in the root of this repository for complete details. */ #include From 8f4a619461d4e5050f9b37422e76275081eed547 Mon Sep 17 00:00:00 2001 From: ganchuantao Date: Tue, 10 Sep 2024 14:47:21 +0800 Subject: [PATCH 4/8] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=89=88=E6=9D=83?= =?UTF-8?q?=E5=A3=B0=E6=98=8E?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: ganchuantao Change-Id: I402b7101ee45c8b28862f48546ad0a05235ef858 --- LICENSE | 3 ++- hiebpf/include/bpf_log_writer.h | 3 +-- hiebpf/include/fstrace_progs.h | 3 +-- hiebpf/include/hiebpf_types.h | 3 +-- hiebpf/src/hiebpf.bpf.c | 3 +-- 5 files changed, 6 insertions(+), 9 deletions(-) diff --git a/LICENSE b/LICENSE index 9dd369095..95456ee3e 100644 --- a/LICENSE +++ b/LICENSE @@ -1,6 +1,7 @@ Copyright (c) 2024 Huawei Device Co., Ltd. All rights reserved. -The hiebpf subdirectories are licensed under Apache License, Version 2.0. +Because of hiebpf.bpf.c,bpf_log_write.h,fstrace_progs.h,hiebpf_types.h is run at kernel mode, other files +under hiebpf subdirectories is run at user mode, so other files under hiebpf subdirectories use Apache License. The hiebpf.bpf.c,bpf_log_write.h,fstrace_progs.h,hiebpf_types.h is dual licensed: you can use it either under the terms of the GPL V2, or the 3-Clause BSD license, at your option. diff --git a/hiebpf/include/bpf_log_writer.h b/hiebpf/include/bpf_log_writer.h index f540b6e71..5f19ace58 100644 --- a/hiebpf/include/bpf_log_writer.h +++ b/hiebpf/include/bpf_log_writer.h @@ -1,11 +1,10 @@ /* * Copyright (c) 2024 Huawei Device Co., Ltd. All rights reserved. -* The hiebpf subdirectories are licensed under Apache License, Version 2.0. * The bpf_log_write.h is dual licensed: you can use it either under the terms of * the GPL V2, or the 3-Clause BSD license, at your option. -* hiebpf is dual licensed: you can use it either under the terms of +* bpf_log_write.h is dual licensed: you can use it either under the terms of * the GPL V2, or the BSD3 license, at your option. * See the LICENSE file in the root of this repository for complete details. */ diff --git a/hiebpf/include/fstrace_progs.h b/hiebpf/include/fstrace_progs.h index 6dee7112c..89fb33bfd 100644 --- a/hiebpf/include/fstrace_progs.h +++ b/hiebpf/include/fstrace_progs.h @@ -1,11 +1,10 @@ /* * Copyright (c) 2024 Huawei Device Co., Ltd. All rights reserved. -* The hiebpf subdirectories are licensed under Apache License, Version 2.0. * The fstrace_progs.h is dual licensed: you can use it either under the terms of * the GPL V2, or the 3-Clause BSD license, at your option. -* hiebpf is dual licensed: you can use it either under the terms of +* fstrace_progs.h is dual licensed: you can use it either under the terms of * the GPL V2, or the BSD3 license, at your option. * See the LICENSE file in the root of this repository for complete details. */ diff --git a/hiebpf/include/hiebpf_types.h b/hiebpf/include/hiebpf_types.h index f6eb4a39d..b3e00b63c 100644 --- a/hiebpf/include/hiebpf_types.h +++ b/hiebpf/include/hiebpf_types.h @@ -1,11 +1,10 @@ /* * Copyright (c) 2024 Huawei Device Co., Ltd. All rights reserved. -* The hiebpf subdirectories are licensed under Apache License, Version 2.0. * The hiebpf_types.h is dual licensed: you can use it either under the terms of * the GPL V2, or the 3-Clause BSD license, at your option. -* hiebpf is dual licensed: you can use it either under the terms of +* hiebpf_types.h is dual licensed: you can use it either under the terms of * the GPL V2, or the BSD3 license, at your option. * See the LICENSE file in the root of this repository for complete details. */ diff --git a/hiebpf/src/hiebpf.bpf.c b/hiebpf/src/hiebpf.bpf.c index f8942284e..e8505c67a 100644 --- a/hiebpf/src/hiebpf.bpf.c +++ b/hiebpf/src/hiebpf.bpf.c @@ -1,11 +1,10 @@ /* * Copyright (c) 2024 Huawei Device Co., Ltd. All rights reserved. -* The hiebpf subdirectories are licensed under Apache License, Version 2.0. * The hiebpf.bpf.c is dual licensed: you can use it either under the terms of * the GPL V2, or the 3-Clause BSD license, at your option. -* hiebpf is dual licensed: you can use it either under the terms of +* hiebpf.bpf.c is dual licensed: you can use it either under the terms of * the GPL V2, or the BSD3 license, at your option. * See the LICENSE file in the root of this repository for complete details. */ From 1bd3c61f7423878ce296ce9a20490aaf516c2e0c Mon Sep 17 00:00:00 2001 From: ganchuantao Date: Tue, 10 Sep 2024 14:56:56 +0800 Subject: [PATCH 5/8] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=89=88=E6=9D=83?= =?UTF-8?q?=E5=A3=B0=E6=98=8E2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: ganchuantao Change-Id: I90960f6af14219db26f506995abd9851fbd2599f --- hiebpf/include/bpf_log_writer.h | 3 --- hiebpf/include/fstrace_progs.h | 3 --- hiebpf/include/hiebpf_types.h | 3 --- hiebpf/src/hiebpf.bpf.c | 3 --- 4 files changed, 12 deletions(-) diff --git a/hiebpf/include/bpf_log_writer.h b/hiebpf/include/bpf_log_writer.h index 5f19ace58..a519540ab 100644 --- a/hiebpf/include/bpf_log_writer.h +++ b/hiebpf/include/bpf_log_writer.h @@ -3,9 +3,6 @@ * The bpf_log_write.h is dual licensed: you can use it either under the terms of * the GPL V2, or the 3-Clause BSD license, at your option. - -* bpf_log_write.h is dual licensed: you can use it either under the terms of -* the GPL V2, or the BSD3 license, at your option. * See the LICENSE file in the root of this repository for complete details. */ #ifndef BPF_LOG_WRITER_H diff --git a/hiebpf/include/fstrace_progs.h b/hiebpf/include/fstrace_progs.h index 89fb33bfd..0329a2672 100644 --- a/hiebpf/include/fstrace_progs.h +++ b/hiebpf/include/fstrace_progs.h @@ -3,9 +3,6 @@ * The fstrace_progs.h is dual licensed: you can use it either under the terms of * the GPL V2, or the 3-Clause BSD license, at your option. - -* fstrace_progs.h is dual licensed: you can use it either under the terms of -* the GPL V2, or the BSD3 license, at your option. * See the LICENSE file in the root of this repository for complete details. */ diff --git a/hiebpf/include/hiebpf_types.h b/hiebpf/include/hiebpf_types.h index b3e00b63c..f994ddf42 100644 --- a/hiebpf/include/hiebpf_types.h +++ b/hiebpf/include/hiebpf_types.h @@ -3,9 +3,6 @@ * The hiebpf_types.h is dual licensed: you can use it either under the terms of * the GPL V2, or the 3-Clause BSD license, at your option. - -* hiebpf_types.h is dual licensed: you can use it either under the terms of -* the GPL V2, or the BSD3 license, at your option. * See the LICENSE file in the root of this repository for complete details. */ diff --git a/hiebpf/src/hiebpf.bpf.c b/hiebpf/src/hiebpf.bpf.c index e8505c67a..8858077a8 100644 --- a/hiebpf/src/hiebpf.bpf.c +++ b/hiebpf/src/hiebpf.bpf.c @@ -3,9 +3,6 @@ * The hiebpf.bpf.c is dual licensed: you can use it either under the terms of * the GPL V2, or the 3-Clause BSD license, at your option. - -* hiebpf.bpf.c is dual licensed: you can use it either under the terms of -* the GPL V2, or the BSD3 license, at your option. * See the LICENSE file in the root of this repository for complete details. */ From 8ddf349246db49f5605c8362fd2046a0ab954761 Mon Sep 17 00:00:00 2001 From: ganchuantao Date: Wed, 11 Sep 2024 11:23:25 +0800 Subject: [PATCH 6/8] =?UTF-8?q?ota=E5=91=8A=E8=AD=A6=E6=B8=85=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: ganchuantao Change-Id: I1c41335582ae66a14bc31d40ee6df85e6de5df2e --- OAT.xml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/OAT.xml b/OAT.xml index d8faae580..ba74be125 100644 --- a/OAT.xml +++ b/OAT.xml @@ -59,6 +59,11 @@ Note:If the text contains special characters, please escape them according to th + + + + + From d0b1e2f3a0a86adad5c1f271417843563d5d2e0f Mon Sep 17 00:00:00 2001 From: ganchuantao Date: Wed, 11 Sep 2024 15:42:50 +0800 Subject: [PATCH 7/8] =?UTF-8?q?ota=E5=91=8A=E8=AD=A6=E6=B8=85=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: ganchuantao Change-Id: I8f9ef9dba1d903e649ed6a06aeac26efdd45edbf --- OAT.xml | 10 +++++----- hiebpf/include/bpf_log_writer.h | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/OAT.xml b/OAT.xml index ba74be125..5889619f9 100644 --- a/OAT.xml +++ b/OAT.xml @@ -59,11 +59,6 @@ Note:If the text contains special characters, please escape them according to th - - - - - @@ -101,6 +96,11 @@ Note:If the text contains special characters, please escape them according to th + + + + + diff --git a/hiebpf/include/bpf_log_writer.h b/hiebpf/include/bpf_log_writer.h index a519540ab..194432112 100644 --- a/hiebpf/include/bpf_log_writer.h +++ b/hiebpf/include/bpf_log_writer.h @@ -1,7 +1,7 @@ /* * Copyright (c) 2024 Huawei Device Co., Ltd. All rights reserved. -* The bpf_log_write.h is dual licensed: you can use it either under the terms of +* The bpf_log_writer.h is dual licensed: you can use it either under the terms of * the GPL V2, or the 3-Clause BSD license, at your option. * See the LICENSE file in the root of this repository for complete details. */ From a392816038c04c109325cfbe118b489088c7a4d3 Mon Sep 17 00:00:00 2001 From: ganchuantao Date: Wed, 11 Sep 2024 15:57:04 +0800 Subject: [PATCH 8/8] =?UTF-8?q?ota=E5=91=8A=E8=AD=A6=E6=B8=85=E7=90=862?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: ganchuantao Change-Id: I084bbd2f58349fefa21ddee8c2fc0116c4cf7149 --- OAT.xml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/OAT.xml b/OAT.xml index 5889619f9..7617b6167 100644 --- a/OAT.xml +++ b/OAT.xml @@ -97,10 +97,10 @@ Note:If the text contains special characters, please escape them according to th - - - - + + + +