From nobody Tue Dec 16 22:10:39 2025 Received: from mail-pf1-f201.google.com (mail-pf1-f201.google.com [209.85.210.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 91E013214 for ; Sat, 31 May 2025 00:50:45 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.210.201 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1748652647; cv=none; b=YnjtWinf4FUO2xxHlal9cBGYodf0s8AwTuNBT6iEWtyfXVRZRczR5iEtJ/LTg4RCefYvF81chuUNgeB9fUOq8Moz8bSDeptU0AIToOTdpX4CskZ5ZScLhZ6S1ERP+r/vcRsvmK1BqogcAvY814NwmWXKOW1Wl267IxjSkuGkhh4= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1748652647; c=relaxed/simple; bh=lLYeITLsiJEZfamTcf7rUgj08C4wzbXAgz9f6amIYwY=; h=Date:Mime-Version:Message-ID:Subject:From:To:Cc:Content-Type; b=coigkj49yN90EQ7xaitq6YeZ3TifbygV9OaGK41/5Su9+ln/cB5taJNL6s5R7f6P22ZgPKuk1MkJm2HKqaYBe9Wi9bg+OAsKuFyhgPPpzxZtHAsau/adEt+sUuBO7XVZQIJqGMANKnW4s6rE7WYBqHK12qmH+BCbeoyFJFkfHVo= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com; spf=pass smtp.mailfrom=flex--dylanbhatch.bounces.google.com; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b=DFMVAr8e; arc=none smtp.client-ip=209.85.210.201 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=flex--dylanbhatch.bounces.google.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b="DFMVAr8e" Received: by mail-pf1-f201.google.com with SMTP id d2e1a72fcca58-7377139d8b1so2175271b3a.0 for ; Fri, 30 May 2025 17:50:45 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1748652645; x=1749257445; darn=vger.kernel.org; h=cc:to:from:subject:message-id:mime-version:date:from:to:cc:subject :date:message-id:reply-to; bh=TSkccxQJyPBTeulTuTiETCwXsKbLhBcWM3wPWtnLY8U=; b=DFMVAr8eC1YC2XDJ9W1Mjc33CHH8M1EKZspZux0Xk0FYttrMLPKiDdXuFSKe5S3Ej+ KDOxdzQxxvxvG3OBxC/DaXW6/oPFikJh48oz6BNDLW08oAKHzZgmL7o3lFeNVmXRunX/ CxUMNFo5yszu85w+HbF/QwPWJ41IW/llbD3/NBRsUjBKu6CYazlpwmQWnLOhhPNBSFYk H9POoyN59VeDF1px/QaUIVS2d52HddfvxXmb2JR5yI9P0EEIXI3sbDD/H5b0j+ItxxaS xyJXD7A1oc50aFqQe2MAgokLH/yGgFeRAxCfgbLLBqvQvSLA8j7zl0f0CoZN7MDAahpx 8qLQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1748652645; x=1749257445; h=cc:to:from:subject:message-id:mime-version:date:x-gm-message-state :from:to:cc:subject:date:message-id:reply-to; bh=TSkccxQJyPBTeulTuTiETCwXsKbLhBcWM3wPWtnLY8U=; b=hvpoOzpp/e/ZhvFoXF6A+YjdeZiXAAQKd2IXCWQhE/YiBpu56jaFHFbFfNoaFZeqDc 76Jv6Om0GdrmDAg0m10NxW/5cHdb85Jl5/6O+hR8l2HSXGHJCTP+6GXM8nVeuNSeP+iL FolT1WpGoW9pwCMYDI5Qs45ZuXRuxYjo1vEuB/xlf/C+vibQYm6tvcDkr4kdQnEPZuIL SlBjp1mlqm+CEydXaqSaJc8jmqrB9R9ho25j2zny9ma+5g+fkTbbyeevdGksOh7vfJo7 SIkRBakcHyD7B3IQDq5ou2uv3g0uosoNQpStAp6f1kI1Os5cUiO+HWUT2KERMvH/OXoa Zr9A== X-Forwarded-Encrypted: i=1; AJvYcCXlEVl1DN3qR955OErXofNezLx+E2UAQc+JMdeDnNTwFwrB/o8foiwO3FQ1Y6g9xh9JuO75cAHo2M2dN+4=@vger.kernel.org X-Gm-Message-State: AOJu0YwZMX123cN2W3P4jgcqCQ+PDv/kx496kvrjHbpM/vsjSw7MU5Cu aU4VDRLacn0evbvFEAePd8qo714K7njncQodkTKn8l61UKTTYs6v1YMdlqu2S/2hFf3AE7nmz2U NMkK4B6GXSvsfELQAbZzo88cSaQ== X-Google-Smtp-Source: AGHT+IE6IJa1RG94dsyK59ObFUYWG3ikzXtO5FeZ3ZagvGmSKHUDVu3iu1nBqkQJvGQX5Pvaf2CfmSWgk82ftyglOA== X-Received: from pfbgc4.prod.google.com ([2002:a05:6a00:62c4:b0:747:a8e8:603e]) (user=dylanbhatch job=prod-delivery.src-stubby-dispatcher) by 2002:a05:6a00:3c89:b0:740:afda:a742 with SMTP id d2e1a72fcca58-747d156608emr751484b3a.0.1748652644826; Fri, 30 May 2025 17:50:44 -0700 (PDT) Date: Sat, 31 May 2025 00:50:38 +0000 Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: Mime-Version: 1.0 X-Mailer: git-send-email 2.49.0.1204.g71687c7c1d-goog Message-ID: <20250531005038.1118215-1-dylanbhatch@google.com> Subject: [PATCH v6] arm64/module: Use text-poke API for late relocations. From: Dylan Hatch To: Catalin Marinas , Will Deacon , Ard Biesheuvel , Sami Tolvanen , Geert Uytterhoeven , Song Liu Cc: linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, Dylan Hatch , Roman Gushchin , Toshiyuki Sato Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" To enable late module patching, livepatch modules need to be able to apply some of their relocations well after being loaded. In this scenario however, the livepatch module text and data is already RX-only, so special treatment is needed to make the late relocations possible. To do this, use the text-poking API for these late relocations. This patch is partially based off commit 88fc078a7a8f6 ("x86/module: Use text_poke() for late relocations"). Signed-off-by: Dylan Hatch Acked-by: Song Liu --- arch/arm64/kernel/module.c | 105 +++++++++++++++++++++---------------- 1 file changed, 61 insertions(+), 44 deletions(-) diff --git a/arch/arm64/kernel/module.c b/arch/arm64/kernel/module.c index 06bb680bfe975..fdfb71c8fc929 100644 --- a/arch/arm64/kernel/module.c +++ b/arch/arm64/kernel/module.c @@ -23,6 +23,7 @@ #include #include #include +#include =20 enum aarch64_reloc_op { RELOC_OP_NONE, @@ -48,7 +49,15 @@ static u64 do_reloc(enum aarch64_reloc_op reloc_op, __le= 32 *place, u64 val) return 0; } =20 -static int reloc_data(enum aarch64_reloc_op op, void *place, u64 val, int = len) +#define WRITE_PLACE(place, val, mod) do { \ + if (mod->state =3D=3D MODULE_STATE_UNFORMED) \ + *(place) =3D val; \ + else \ + aarch64_insn_copy(place, &(val), sizeof(*place)); \ +} while (0) + +static int reloc_data(enum aarch64_reloc_op op, void *place, u64 val, int = len, + struct module *me) { s64 sval =3D do_reloc(op, place, val); =20 @@ -66,7 +75,7 @@ static int reloc_data(enum aarch64_reloc_op op, void *pla= ce, u64 val, int len) =20 switch (len) { case 16: - *(s16 *)place =3D sval; + WRITE_PLACE((s16 *)place, sval, me); switch (op) { case RELOC_OP_ABS: if (sval < 0 || sval > U16_MAX) @@ -82,7 +91,7 @@ static int reloc_data(enum aarch64_reloc_op op, void *pla= ce, u64 val, int len) } break; case 32: - *(s32 *)place =3D sval; + WRITE_PLACE((s32 *)place, sval, me); switch (op) { case RELOC_OP_ABS: if (sval < 0 || sval > U32_MAX) @@ -98,7 +107,7 @@ static int reloc_data(enum aarch64_reloc_op op, void *pl= ace, u64 val, int len) } break; case 64: - *(s64 *)place =3D sval; + WRITE_PLACE((s64 *)place, sval, me); break; default: pr_err("Invalid length (%d) for data relocation\n", len); @@ -113,11 +122,13 @@ enum aarch64_insn_movw_imm_type { }; =20 static int reloc_insn_movw(enum aarch64_reloc_op op, __le32 *place, u64 va= l, - int lsb, enum aarch64_insn_movw_imm_type imm_type) + int lsb, enum aarch64_insn_movw_imm_type imm_type, + struct module *me) { u64 imm; s64 sval; u32 insn =3D le32_to_cpu(*place); + __le32 le_insn; =20 sval =3D do_reloc(op, place, val); imm =3D sval >> lsb; @@ -145,7 +156,8 @@ static int reloc_insn_movw(enum aarch64_reloc_op op, __= le32 *place, u64 val, =20 /* Update the instruction with the new encoding. */ insn =3D aarch64_insn_encode_immediate(AARCH64_INSN_IMM_16, insn, imm); - *place =3D cpu_to_le32(insn); + le_insn =3D cpu_to_le32(insn); + WRITE_PLACE(place, le_insn, me); =20 if (imm > U16_MAX) return -ERANGE; @@ -154,11 +166,13 @@ static int reloc_insn_movw(enum aarch64_reloc_op op, = __le32 *place, u64 val, } =20 static int reloc_insn_imm(enum aarch64_reloc_op op, __le32 *place, u64 val, - int lsb, int len, enum aarch64_insn_imm_type imm_type) + int lsb, int len, enum aarch64_insn_imm_type imm_type, + struct module *me) { u64 imm, imm_mask; s64 sval; u32 insn =3D le32_to_cpu(*place); + __le32 le_insn; =20 /* Calculate the relocation value. */ sval =3D do_reloc(op, place, val); @@ -170,7 +184,8 @@ static int reloc_insn_imm(enum aarch64_reloc_op op, __l= e32 *place, u64 val, =20 /* Update the instruction's immediate field. */ insn =3D aarch64_insn_encode_immediate(imm_type, insn, imm); - *place =3D cpu_to_le32(insn); + le_insn =3D cpu_to_le32(insn); + WRITE_PLACE(place, le_insn, me); =20 /* * Extract the upper value bits (including the sign bit) and @@ -189,17 +204,18 @@ static int reloc_insn_imm(enum aarch64_reloc_op op, _= _le32 *place, u64 val, } =20 static int reloc_insn_adrp(struct module *mod, Elf64_Shdr *sechdrs, - __le32 *place, u64 val) + __le32 *place, u64 val, struct module *me) { u32 insn; + __le32 le_insn; =20 if (!is_forbidden_offset_for_adrp(place)) return reloc_insn_imm(RELOC_OP_PAGE, place, val, 12, 21, - AARCH64_INSN_IMM_ADR); + AARCH64_INSN_IMM_ADR, me); =20 /* patch ADRP to ADR if it is in range */ if (!reloc_insn_imm(RELOC_OP_PREL, place, val & ~0xfff, 0, 21, - AARCH64_INSN_IMM_ADR)) { + AARCH64_INSN_IMM_ADR, me)) { insn =3D le32_to_cpu(*place); insn &=3D ~BIT(31); } else { @@ -211,7 +227,8 @@ static int reloc_insn_adrp(struct module *mod, Elf64_Sh= dr *sechdrs, AARCH64_INSN_BRANCH_NOLINK); } =20 - *place =3D cpu_to_le32(insn); + le_insn =3D cpu_to_le32(insn); + WRITE_PLACE(place, le_insn, me); return 0; } =20 @@ -255,23 +272,23 @@ int apply_relocate_add(Elf64_Shdr *sechdrs, /* Data relocations. */ case R_AARCH64_ABS64: overflow_check =3D false; - ovf =3D reloc_data(RELOC_OP_ABS, loc, val, 64); + ovf =3D reloc_data(RELOC_OP_ABS, loc, val, 64, me); break; case R_AARCH64_ABS32: - ovf =3D reloc_data(RELOC_OP_ABS, loc, val, 32); + ovf =3D reloc_data(RELOC_OP_ABS, loc, val, 32, me); break; case R_AARCH64_ABS16: - ovf =3D reloc_data(RELOC_OP_ABS, loc, val, 16); + ovf =3D reloc_data(RELOC_OP_ABS, loc, val, 16, me); break; case R_AARCH64_PREL64: overflow_check =3D false; - ovf =3D reloc_data(RELOC_OP_PREL, loc, val, 64); + ovf =3D reloc_data(RELOC_OP_PREL, loc, val, 64, me); break; case R_AARCH64_PREL32: - ovf =3D reloc_data(RELOC_OP_PREL, loc, val, 32); + ovf =3D reloc_data(RELOC_OP_PREL, loc, val, 32, me); break; case R_AARCH64_PREL16: - ovf =3D reloc_data(RELOC_OP_PREL, loc, val, 16); + ovf =3D reloc_data(RELOC_OP_PREL, loc, val, 16, me); break; =20 /* MOVW instruction relocations. */ @@ -280,88 +297,88 @@ int apply_relocate_add(Elf64_Shdr *sechdrs, fallthrough; case R_AARCH64_MOVW_UABS_G0: ovf =3D reloc_insn_movw(RELOC_OP_ABS, loc, val, 0, - AARCH64_INSN_IMM_MOVKZ); + AARCH64_INSN_IMM_MOVKZ, me); break; case R_AARCH64_MOVW_UABS_G1_NC: overflow_check =3D false; fallthrough; case R_AARCH64_MOVW_UABS_G1: ovf =3D reloc_insn_movw(RELOC_OP_ABS, loc, val, 16, - AARCH64_INSN_IMM_MOVKZ); + AARCH64_INSN_IMM_MOVKZ, me); break; case R_AARCH64_MOVW_UABS_G2_NC: overflow_check =3D false; fallthrough; case R_AARCH64_MOVW_UABS_G2: ovf =3D reloc_insn_movw(RELOC_OP_ABS, loc, val, 32, - AARCH64_INSN_IMM_MOVKZ); + AARCH64_INSN_IMM_MOVKZ, me); break; case R_AARCH64_MOVW_UABS_G3: /* We're using the top bits so we can't overflow. */ overflow_check =3D false; ovf =3D reloc_insn_movw(RELOC_OP_ABS, loc, val, 48, - AARCH64_INSN_IMM_MOVKZ); + AARCH64_INSN_IMM_MOVKZ, me); break; case R_AARCH64_MOVW_SABS_G0: ovf =3D reloc_insn_movw(RELOC_OP_ABS, loc, val, 0, - AARCH64_INSN_IMM_MOVNZ); + AARCH64_INSN_IMM_MOVNZ, me); break; case R_AARCH64_MOVW_SABS_G1: ovf =3D reloc_insn_movw(RELOC_OP_ABS, loc, val, 16, - AARCH64_INSN_IMM_MOVNZ); + AARCH64_INSN_IMM_MOVNZ, me); break; case R_AARCH64_MOVW_SABS_G2: ovf =3D reloc_insn_movw(RELOC_OP_ABS, loc, val, 32, - AARCH64_INSN_IMM_MOVNZ); + AARCH64_INSN_IMM_MOVNZ, me); break; case R_AARCH64_MOVW_PREL_G0_NC: overflow_check =3D false; ovf =3D reloc_insn_movw(RELOC_OP_PREL, loc, val, 0, - AARCH64_INSN_IMM_MOVKZ); + AARCH64_INSN_IMM_MOVKZ, me); break; case R_AARCH64_MOVW_PREL_G0: ovf =3D reloc_insn_movw(RELOC_OP_PREL, loc, val, 0, - AARCH64_INSN_IMM_MOVNZ); + AARCH64_INSN_IMM_MOVNZ, me); break; case R_AARCH64_MOVW_PREL_G1_NC: overflow_check =3D false; ovf =3D reloc_insn_movw(RELOC_OP_PREL, loc, val, 16, - AARCH64_INSN_IMM_MOVKZ); + AARCH64_INSN_IMM_MOVKZ, me); break; case R_AARCH64_MOVW_PREL_G1: ovf =3D reloc_insn_movw(RELOC_OP_PREL, loc, val, 16, - AARCH64_INSN_IMM_MOVNZ); + AARCH64_INSN_IMM_MOVNZ, me); break; case R_AARCH64_MOVW_PREL_G2_NC: overflow_check =3D false; ovf =3D reloc_insn_movw(RELOC_OP_PREL, loc, val, 32, - AARCH64_INSN_IMM_MOVKZ); + AARCH64_INSN_IMM_MOVKZ, me); break; case R_AARCH64_MOVW_PREL_G2: ovf =3D reloc_insn_movw(RELOC_OP_PREL, loc, val, 32, - AARCH64_INSN_IMM_MOVNZ); + AARCH64_INSN_IMM_MOVNZ, me); break; case R_AARCH64_MOVW_PREL_G3: /* We're using the top bits so we can't overflow. */ overflow_check =3D false; ovf =3D reloc_insn_movw(RELOC_OP_PREL, loc, val, 48, - AARCH64_INSN_IMM_MOVNZ); + AARCH64_INSN_IMM_MOVNZ, me); break; =20 /* Immediate instruction relocations. */ case R_AARCH64_LD_PREL_LO19: ovf =3D reloc_insn_imm(RELOC_OP_PREL, loc, val, 2, 19, - AARCH64_INSN_IMM_19); + AARCH64_INSN_IMM_19, me); break; case R_AARCH64_ADR_PREL_LO21: ovf =3D reloc_insn_imm(RELOC_OP_PREL, loc, val, 0, 21, - AARCH64_INSN_IMM_ADR); + AARCH64_INSN_IMM_ADR, me); break; case R_AARCH64_ADR_PREL_PG_HI21_NC: overflow_check =3D false; fallthrough; case R_AARCH64_ADR_PREL_PG_HI21: - ovf =3D reloc_insn_adrp(me, sechdrs, loc, val); + ovf =3D reloc_insn_adrp(me, sechdrs, loc, val, me); if (ovf && ovf !=3D -ERANGE) return ovf; break; @@ -369,46 +386,46 @@ int apply_relocate_add(Elf64_Shdr *sechdrs, case R_AARCH64_LDST8_ABS_LO12_NC: overflow_check =3D false; ovf =3D reloc_insn_imm(RELOC_OP_ABS, loc, val, 0, 12, - AARCH64_INSN_IMM_12); + AARCH64_INSN_IMM_12, me); break; case R_AARCH64_LDST16_ABS_LO12_NC: overflow_check =3D false; ovf =3D reloc_insn_imm(RELOC_OP_ABS, loc, val, 1, 11, - AARCH64_INSN_IMM_12); + AARCH64_INSN_IMM_12, me); break; case R_AARCH64_LDST32_ABS_LO12_NC: overflow_check =3D false; ovf =3D reloc_insn_imm(RELOC_OP_ABS, loc, val, 2, 10, - AARCH64_INSN_IMM_12); + AARCH64_INSN_IMM_12, me); break; case R_AARCH64_LDST64_ABS_LO12_NC: overflow_check =3D false; ovf =3D reloc_insn_imm(RELOC_OP_ABS, loc, val, 3, 9, - AARCH64_INSN_IMM_12); + AARCH64_INSN_IMM_12, me); break; case R_AARCH64_LDST128_ABS_LO12_NC: overflow_check =3D false; ovf =3D reloc_insn_imm(RELOC_OP_ABS, loc, val, 4, 8, - AARCH64_INSN_IMM_12); + AARCH64_INSN_IMM_12, me); break; case R_AARCH64_TSTBR14: ovf =3D reloc_insn_imm(RELOC_OP_PREL, loc, val, 2, 14, - AARCH64_INSN_IMM_14); + AARCH64_INSN_IMM_14, me); break; case R_AARCH64_CONDBR19: ovf =3D reloc_insn_imm(RELOC_OP_PREL, loc, val, 2, 19, - AARCH64_INSN_IMM_19); + AARCH64_INSN_IMM_19, me); break; case R_AARCH64_JUMP26: case R_AARCH64_CALL26: ovf =3D reloc_insn_imm(RELOC_OP_PREL, loc, val, 2, 26, - AARCH64_INSN_IMM_26); + AARCH64_INSN_IMM_26, me); if (ovf =3D=3D -ERANGE) { val =3D module_emit_plt_entry(me, sechdrs, loc, &rel[i], sym); if (!val) return -ENOEXEC; ovf =3D reloc_insn_imm(RELOC_OP_PREL, loc, val, 2, - 26, AARCH64_INSN_IMM_26); + 26, AARCH64_INSN_IMM_26, me); } break; =20 --=20 2.49.0.1204.g71687c7c1d-goog