Received-SPF: pass (google.com: domain of linux-kernel+bounces-215759-linux.lists.archive=gmail.com@vger.kernel.org designates 2604:1380:45e3:2400::1 as permitted sender) client-ip=2604:1380:45e3:2400::1;
From: Zheng Yejian <zhengyejian1@huawei.com>
To: <kees@kernel.org>, <song@kernel.org>, <ndesaulniers@google.com>,
	<yonghong.song@linux.dev>, <thunder.leizhen@huawei.com>, <ardb@kernel.org>
CC: <linux-kernel@vger.kernel.org>, <zhengyejian1@huawei.com>
Subject: [PATCH] kallsyms: Simply clean get_symbol_pos()
Date: Sat, 15 Jun 2024 16:06:43 +0800
Message-ID: <20240615080643.3865878-1-zhengyejian1@huawei.com>
Precedence: bulk
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit
Content-Type: text/plain

'symbol_end' is just for calculating 'symbolsize', so if 'symbolsize'
is NULL, there is no need to find 'symbol_end'. Besides, if 'offset'
is also NULL, there is even no need to assign to 'symbol_start'. So
just do cleanup.

Signed-off-by: Zheng Yejian <zhengyejian1@huawei.com>
---
 kernel/kallsyms.c | 43 +++++++++++++++++++++++++------------------
 1 file changed, 25 insertions(+), 18 deletions(-)

diff --git a/kernel/kallsyms.c b/kernel/kallsyms.c
index 22ea19a36e6e..fe6a248d629a 100644
--- a/kernel/kallsyms.c
+++ b/kernel/kallsyms.c
@@ -322,8 +322,8 @@ static unsigned long get_symbol_pos(unsigned long addr,
 				    unsigned long *symbolsize,
 				    unsigned long *offset)
 {
-	unsigned long symbol_start = 0, symbol_end = 0;
-	unsigned long i, low, high, mid;
+	unsigned long symbol_start;
+	unsigned long low, high, mid;
 
 	/* Do a binary search on the sorted kallsyms_addresses array. */
 	low = 0;
@@ -344,28 +344,35 @@ static unsigned long get_symbol_pos(unsigned long addr,
 	while (low && kallsyms_sym_address(low-1) == kallsyms_sym_address(low))
 		--low;
 
+	if (unlikely(!symbolsize && !offset))
+		return low;
+
 	symbol_start = kallsyms_sym_address(low);
 
-	/* Search for next non-aliased symbol. */
-	for (i = low + 1; i < kallsyms_num_syms; i++) {
-		if (kallsyms_sym_address(i) > symbol_start) {
-			symbol_end = kallsyms_sym_address(i);
-			break;
+	if (symbolsize) {
+		unsigned long symbol_end = 0;
+		unsigned long i;
+
+		/* Search for next non-aliased symbol. */
+		for (i = low + 1; i < kallsyms_num_syms; i++) {
+			if (kallsyms_sym_address(i) > symbol_start) {
+				symbol_end = kallsyms_sym_address(i);
+				break;
+			}
 		}
-	}
 
-	/* If we found no next symbol, we use the end of the section. */
-	if (!symbol_end) {
-		if (is_kernel_inittext(addr))
-			symbol_end = (unsigned long)_einittext;
-		else if (IS_ENABLED(CONFIG_KALLSYMS_ALL))
-			symbol_end = (unsigned long)_end;
-		else
-			symbol_end = (unsigned long)_etext;
-	}
+		/* If we found no next symbol, we use the end of the section. */
+		if (!symbol_end) {
+			if (is_kernel_inittext(addr))
+				symbol_end = (unsigned long)_einittext;
+			else if (IS_ENABLED(CONFIG_KALLSYMS_ALL))
+				symbol_end = (unsigned long)_end;
+			else
+				symbol_end = (unsigned long)_etext;
+		}
 
-	if (symbolsize)
 		*symbolsize = symbol_end - symbol_start;
+	}
 	if (offset)
 		*offset = addr - symbol_start;
 
-- 
2.25.1