kpatch-build: account for __pfx_-less NOP padding

kpatch-build/create-diff-object.c

@@ -228,6 +228,54 @@ static struct rela *toc_rela(const struct rela *rela)
 				   (unsigned int)rela->addend);
 }
 
+/*
+ * Some x86 kernels have NOP function padding, see upstream commit
+ * bea75b33895f ("x86/Kconfig: Introduce function padding").
+ * Check for any amount of NOPs between the beginning of a function's
+ * section and its offset value within that section.
+ */
+static bool insn_is_nop_pad(struct kpatch_elf *kelf, void *addr, void *end,
+			    unsigned long *insn_len)
+{
+	unsigned char *insn = addr;
+
+	switch(kelf->arch) {
+
+	case X86_64:
+		if (insn[0] == 0x90) {
+			*insn_len = 1;
+			return true;
+		}
+		break;
+
+	case PPC64:
+	case S390:
+		/* kernel feature not present on these arches  */
+		return false;
+
+	default:
+		ERROR("unsupported arch");
+	}
+
+	return false;
+}
+
+bool is_function_nop_padded(struct kpatch_elf *kelf, struct symbol *sym)
+{
+	unsigned long offset, insn_len;
+	void *end = sym->sec->data->d_buf + sym->sym.st_value;
+
+	if (sym->type != STT_FUNC)
+		return false;
+
+	for (offset = 0; offset < sym->sym.st_value; offset += insn_len) {
+		if (!insn_is_nop_pad(kelf, sym->sec->data->d_buf + offset, end, &insn_len))
+			return false;
+	}
+
+	return true;
+}
+
 /*
  * When compiling with -ffunction-sections and -fdata-sections, almost every
  * symbol gets its own dedicated section.  We call such symbols "bundled"
@@ -236,19 +284,21 @@ static struct rela *toc_rela(const struct rela *rela)
 static void kpatch_bundle_symbols(struct kpatch_elf *kelf)
 {
 	struct symbol *sym;
-	unsigned int expected_offset;
+	Elf64_Addr expected_offset;
 
 	list_for_each_entry(sym, &kelf->symbols, list) {
 		if (is_bundleable(sym)) {
 			if (sym->pfx)
 				expected_offset = 16;
 			else if (is_gcc6_localentry_bundled_sym(kelf, sym))
 				expected_offset = 8;
+			else if (is_function_nop_padded(kelf, sym))
+				expected_offset = sym->sym.st_value;
 			else
 				expected_offset = 0;
 
 			if (sym->sym.st_value != expected_offset) {
-				ERROR("symbol %s at offset %lu within section %s, expected %u",
+				ERROR("symbol %s at offset %lu within section %s, expected %lu",
 				      sym->name, sym->sym.st_value,
 				      sym->sec->name, expected_offset);
 			}

kpatch-build/kpatch-elf.c

@@ -399,7 +399,7 @@ static void kpatch_create_section_list(struct kpatch_elf *kelf)
 
 /*
  * Some x86 kernels have NOP function padding [1] for which objtool [2]
- * adds ELF function symbols with prefix "__pfx_" to indicate the start
+ * may add ELF function symbols with prefix "__pfx_" to indicate the start
  * of a function, inclusive of NOP-padding.  Find the prefix symbols and
  * link them to their corresponding function symbols at an expected
  * offset.
@@ -438,7 +438,7 @@ static void kpatch_create_section_list(struct kpatch_elf *kelf)
  * 0000000000000000     0 SECTION LOCAL  DEFAULT   99 .text.unlikely.__mmdrop
  * 0000000000000000    48 FUNC    LOCAL  DEFAULT   99 __mmdrop.cold
  *
- * (kpatch-build generated tmp.ko, multple functions in one section, no __pfx_ symbols)
+ * (kpatch-build generated tmp.ko, multiple functions in one section, no __pfx_ symbols)
  * 0000000000000000     0 SECTION LOCAL  DEFAULT   10 .text.unlikely.callback_info.isra.0
  * 0000000000000010    65 FUNC    LOCAL  DEFAULT   10 callback_info.isra.0
  * 0000000000000061    54 FUNC    LOCAL  DEFAULT   10 callback_info.isra.0