Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20;
From:   Stephen Brennan <stephen.s.brennan@oracle.com>
To:     Baoquan He <bhe@redhat.com>
Cc:     Nick Desaulniers <ndesaulniers@google.com>,
        linux-kernel@vger.kernel.org, kexec@lists.infradead.org,
        Dave Young <dyoung@redhat.com>,
        Kees Cook <keescook@chromium.org>,
        Stephen Brennan <stephen.s.brennan@oracle.com>,
        Jiri Olsa <jolsa@kernel.org>,
        Stephen Boyd <swboyd@chromium.org>,
        Bixuan Cui <cuibixuan@huawei.com>,
        David Vernet <void@manifault.com>,
        Vivek Goyal <vgoyal@redhat.com>,
        Sami Tolvanen <samitolvanen@google.com>
Subject: [PATCH 1/2] kallsyms: Move declarations to internal header
Date:   Mon, 16 May 2022 17:05:07 -0700
Message-Id: <20220517000508.777145-2-stephen.s.brennan@oracle.com>
In-Reply-To: <20220517000508.777145-1-stephen.s.brennan@oracle.com>
References: <20220517000508.777145-1-stephen.s.brennan@oracle.com>
Content-Transfer-Encoding: 8bit
Content-Type: text/plain
MIME-Version: 1.0
X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?FtVwF8dKkzqqsFt9R5QBcYDizRHaDaHpwNfO1BLTT8tCYI1vMCWI7BQ1TbuO?=
 =?us-ascii?Q?7kZ1Eh4vtkNMzM0S5V9WFXmX9WS+yP6HRJsS5nm7bEGQqPCxp6cyTSjRC1n2?=
 =?us-ascii?Q?r3/ZDUHUjEUTum+e8pj0Kng3gBxPoE6XXZ3It7/6rITkV4F3qfhOG0qlOz0+?=
 =?us-ascii?Q?hAUn58I7u06b1jv9BWS9o3jVDwahpUoMQMFgXH9xmgZfauVIZL5bCdXFcNNr?=
 =?us-ascii?Q?eXlrG40RsUTGPWf9eLPXYEB7234ahQq6rifRgBLx/toY+hRtTrEi+zRKwr7L?=
 =?us-ascii?Q?yvs/MUuV22SqmNL4/Mp2NaPczDSRDl0xWO3qj4ibPyiqkRSKzf1dznGvbgaN?=
 =?us-ascii?Q?R7eMiz8fpcgF9WgOK2RDZUEJELv4v/jigrVpQDr8Z9iwKJrWO1+HpoHYjws6?=
 =?us-ascii?Q?xYCioAB74/sc5JLjJssUD7MStYxGanZFFF7pT6hLym/JfTtagSiKN5Uqmmyb?=
 =?us-ascii?Q?0Y5aJ+kY3DtiG7T8hJtcf7ml4SjERUpni/2rftaS7MTNL8cW9AoKKnk1342G?=
 =?us-ascii?Q?yVDfu1IGckzulD4H9xyzahTHQ3LKjBnhr5pLPHS7gZ8EfIlZeWw4kMy0HNnx?=
 =?us-ascii?Q?9kfH0rsAWoIQDaYg4pi+2zpFNN95CEPKwkya0iiVci11Gb4sR1GbjuuoK6VX?=
 =?us-ascii?Q?qK/iyHc18uARgVE0kBj+o/kSAIAwqRXdh2i+pEdI73UeL2NgiQ2gfUiJQTmP?=
 =?us-ascii?Q?Xh7u+thpY5MwO0yAdGdmB/2FboIOtEKLGgTyeTBv4hBmnd7ixNYQws+uPSYS?=
 =?us-ascii?Q?2sAKMF+98CRkg5Jbvz3AC0ABWErW/yVCh44mCGVRQCsMDwJPeH/luuBJvAHR?=
 =?us-ascii?Q?/KtGwyp6MxM93Xj6Xsb8d44DA09FXqrnLK2oPcMt6D2RhzJbPuk2YJu/RueF?=
 =?us-ascii?Q?qbMP8uTuzIudcEx5TrxCyjj01N0HDN1jhubQc5bm3vvcKZAhp2urIXs/Qunn?=
 =?us-ascii?Q?f9MG80a2XMIEQqFLBVqoZVF+/gKWo1ukRUK2dLZs7ZBPEuVZOxj6sg3Wf8eu?=
 =?us-ascii?Q?lbZ2vNpjqfQbtxtY+imWHKU9xfl05vzQHnybqGp6V6QiVPMR6Gndup360F9H?=
 =?us-ascii?Q?2ZqWb/z7UnX/eafMorqJRTnKoin23jDclpmMLvkczCTpKNW5tnVsSYKLuevb?=
 =?us-ascii?Q?yf69kQ09bRet2uONcGCZBItnfvTE9vJdzzP9cEj1POacBOYSDq8xiYLqP9P7?=
 =?us-ascii?Q?ohmPOAKvVNGcgnztSMGSQ1N614tpo9zv8qLQ/PJ3Y2iQJfyAIZ22NKRpVvBA?=
 =?us-ascii?Q?XonDqwyG9n1oNwJZFycm9ncBZIAPWd8TXhlOzg1y84Ax2Dse8AkIrxZ6Lj4X?=
 =?us-ascii?Q?OfUOR6oqTQOg3lnpdOCnRhuoXaDNEVCJw9X3q1fgbe3IQ85eYBq9U+8uIkPL?=
 =?us-ascii?Q?voW1GUPCswkLbmk8qk3LDVy3ZQajs3dinjlGIxOf5lFN6NMeltcijIF/9HXD?=
 =?us-ascii?Q?9ZqAy89zvAmuCswhpp0OsAtXrZASEua9EF0e9oph4arvd1G+NsZSyvLtxxeE?=
 =?us-ascii?Q?rCIkIuPYQFRZmMko9I106Y9FqBjHNw56njGo14YfWxILPNxuXKHOS8qszi7Z?=
 =?us-ascii?Q?kTJMJlLwT+uDNXqoArZOZZAUKcme9IVWxGWM6JhKhRfJhztzMdhe4gEkk+jw?=
 =?us-ascii?Q?ARvYV9VNcel4x8Wne6jhIKrBeIEtThZPJXLI/PLPh2tD9yBxClf+CNZniecY?=
 =?us-ascii?Q?zj6lbVATkc+zO+eGbyNcoFlm20IHRER7Sn3qwxxlbcDg9wGZ96x6hJJRZRqg?=
 =?us-ascii?Q?+zUgrfieA6PiPljPVlHSlM7byukwvrM=3D?=
X-OriginatorOrg: oracle.com
X-MS-Exchange-CrossTenant-Network-Message-Id: 1ea105ab-716d-4dfb-dc64-08da3798e9bc
X-MS-Exchange-CrossTenant-AuthSource: CH2PR10MB4166.namprd10.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 17 May 2022 00:05:12.4246
 (UTC)
X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted
X-MS-Exchange-CrossTenant-Id: 4e2c6054-71cb-48f1-bd6c-3a9705aca71b
X-MS-Exchange-CrossTenant-MailboxType: HOSTED
X-MS-Exchange-CrossTenant-UserPrincipalName: 2iZKmM6LN2FaNQnwm612RUi3QTlp1chuAiQsi47MLkpkwnkonrlFzD2a+QySWmlaY8m9z42E3A3JUY4MlBuQYOwkpo6Mliv0occTVxVtStE=
X-MS-Exchange-Transport-CrossTenantHeadersStamped: CO6PR10MB5572
X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10434:6.0.486,18.0.858
 definitions=2022-05-16_16:2022-05-16,2022-05-16 signatures=0
X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 spamscore=0 mlxscore=0 suspectscore=0
 phishscore=0 bulkscore=0 adultscore=0 mlxlogscore=999 malwarescore=0
 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2202240000
 definitions=main-2205160132
X-Proofpoint-ORIG-GUID: -qJW2X2mFHIJFqAUFQZ55Iv02m1eOPgn
X-Proofpoint-GUID: -qJW2X2mFHIJFqAUFQZ55Iv02m1eOPgn
X-Spam-Status: No, score=-2.8 required=5.0 tests=BAYES_00,DKIM_SIGNED,
        DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_LOW,SPF_HELO_NONE,
        SPF_NONE,T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no
        version=3.4.6
X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on
        lindbergh.monkeyblade.net
Precedence: bulk
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

To include kallsyms data in the vmcoreinfo note, we must make the symbol
declarations visible outside of kallsyms.c. Move these to a new internal
header file.

Signed-off-by: Stephen Brennan <stephen.s.brennan@oracle.com>
---
 kernel/kallsyms.c          | 23 +----------------------
 kernel/kallsyms_internal.h | 30 ++++++++++++++++++++++++++++++
 2 files changed, 31 insertions(+), 22 deletions(-)
 create mode 100644 kernel/kallsyms_internal.h

diff --git a/kernel/kallsyms.c b/kernel/kallsyms.c
index 79f2eb617a62..42373ff69cac 100644
--- a/kernel/kallsyms.c
+++ b/kernel/kallsyms.c
@@ -30,28 +30,7 @@
 #include <linux/module.h>
 #include <linux/kernel.h>
 
-/*
- * These will be re-linked against their real values
- * during the second link stage.
- */
-extern const unsigned long kallsyms_addresses[] __weak;
-extern const int kallsyms_offsets[] __weak;
-extern const u8 kallsyms_names[] __weak;
-
-/*
- * Tell the compiler that the count isn't in the small data section if the arch
- * has one (eg: FRV).
- */
-extern const unsigned int kallsyms_num_syms
-__section(".rodata") __attribute__((weak));
-
-extern const unsigned long kallsyms_relative_base
-__section(".rodata") __attribute__((weak));
-
-extern const char kallsyms_token_table[] __weak;
-extern const u16 kallsyms_token_index[] __weak;
-
-extern const unsigned int kallsyms_markers[] __weak;
+#include "kallsyms_internal.h"
 
 /*
  * Expand a compressed symbol data into the resulting uncompressed string,
diff --git a/kernel/kallsyms_internal.h b/kernel/kallsyms_internal.h
new file mode 100644
index 000000000000..2d0c6f2f0243
--- /dev/null
+++ b/kernel/kallsyms_internal.h
@@ -0,0 +1,30 @@
+/* SPDX-License-Identifier: GPL-2.0-only */
+#ifndef LINUX_KALLSYMS_INTERNAL_H_
+#define LINUX_KALLSYMS_INTERNAL_H_
+
+#include <linux/types.h>
+
+/*
+ * These will be re-linked against their real values
+ * during the second link stage.
+ */
+extern const unsigned long kallsyms_addresses[] __weak;
+extern const int kallsyms_offsets[] __weak;
+extern const u8 kallsyms_names[] __weak;
+
+/*
+ * Tell the compiler that the count isn't in the small data section if the arch
+ * has one (eg: FRV).
+ */
+extern const unsigned int kallsyms_num_syms
+__section(".rodata") __attribute__((weak));
+
+extern const unsigned long kallsyms_relative_base
+__section(".rodata") __attribute__((weak));
+
+extern const char kallsyms_token_table[] __weak;
+extern const u16 kallsyms_token_index[] __weak;
+
+extern const unsigned int kallsyms_markers[] __weak;
+
+#endif // LINUX_KALLSYMS_INTERNAL_H_
-- 
2.30.2