Received: by 10.213.65.68 with SMTP id h4csp1751064imn; Mon, 19 Mar 2018 12:15:01 -0700 (PDT) X-Google-Smtp-Source: AG47ELsuYmg/l8m0rYn7qHUKmerOvUXJSIbhLGVz7HkEVwcVLJwFfi3O2wib3/+EGJL74eF/vc8P X-Received: by 2002:a17:902:8bc1:: with SMTP id r1-v6mr3832841plo.310.1521486901177; Mon, 19 Mar 2018 12:15:01 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1521486901; cv=none; d=google.com; s=arc-20160816; b=iDKbUlX3t4tPfqlwgzJpt4HlKA+xeHiI1VIzMLsahkHT42P6M4n0UjF4k2tihQ86TS mUH9LoRRNgHwU8h7Yh1paYRr0xUMUSgsh4sb1G6LvoDQ9WWUCf6yIH6KGlHTijZ5rAFt xplaiAR1DCGlRI3xSwJk4vJZhGyzseWjdkQDGKgDhC7oM2yO64ZDB5eT180ZRCCEbutq 5B+meBC946dnXoU3QMAO2I4YRhQAOOACQFHXjMDr975xxxrmPi2EyhiretIVrCUI+VrR YRjVrD1ISp6RhrHcm3EnJQvrSROAAs/KDT2W8I4RlwUIPvsFKhUXkZhlRvLPWuU7ShpK XnRg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:mime-version:user-agent:references :in-reply-to:message-id:date:subject:cc:to:from :arc-authentication-results; bh=Z0UzZ5f8qH4TrSdNis7AXNzMMu7IdaZPv0vS8xnPW3I=; b=S6DJiQ2bZBLm19S7oVBWgWHb0V7Y2QXN7tAvwQSJHDmJSPruE8eHkPH2yrrfWn0jL7 I64AdHW5iTX47Gh1+JDfW4v5Slrp2HfrAIs/n9Cnnmm5iUPlAvEx/H037Jg70COh1v9G igwbBlvdA/xOfIbGUxQkK7WMYFH3RsFs4VUOW4aHXEjP55tO8F7zuPIWpjsE0hmBjRF0 +B2jucsRHpaJ2QtiX5oI4LHSbXmjf8CkxTZlyppgWLEsbZr/Z/9hHPp5eZCkyVoFhhzE QcuI+lo+9jafa+68tc6aF1fVwou8ECYG1rUpDwYtyreIbSNb8goT2QsUUwr4xoAIMAVo Q1gg== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id 3-v6si420694plr.440.2018.03.19.12.14.46; Mon, 19 Mar 2018 12:15:01 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1031664AbeCSS1E (ORCPT + 99 others); Mon, 19 Mar 2018 14:27:04 -0400 Received: from mail.linuxfoundation.org ([140.211.169.12]:51032 "EHLO mail.linuxfoundation.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S969937AbeCSS06 (ORCPT ); Mon, 19 Mar 2018 14:26:58 -0400 Received: from localhost (LFbn-1-12247-202.w90-92.abo.wanadoo.fr [90.92.61.202]) by mail.linuxfoundation.org (Postfix) with ESMTPSA id 3A7171240; Mon, 19 Mar 2018 18:26:57 +0000 (UTC) From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Josh Poimboeuf , "Naveen N. Rao" , Michael Ellerman , Sasha Levin Subject: [PATCH 4.9 201/241] powerpc/modules: Dont try to restore r2 after a sibling call Date: Mon, 19 Mar 2018 19:07:46 +0100 Message-Id: <20180319180759.506954903@linuxfoundation.org> X-Mailer: git-send-email 2.16.2 In-Reply-To: <20180319180751.172155436@linuxfoundation.org> References: <20180319180751.172155436@linuxfoundation.org> User-Agent: quilt/0.65 X-stable: review MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 4.9-stable review patch. If anyone has any objections, please let me know. ------------------ From: Josh Poimboeuf [ Upstream commit b9eab08d012fa093947b230f9a87257c27fb829b ] When attempting to load a livepatch module, I got the following error: module_64: patch_module: Expect noop after relocate, got 3c820000 The error was triggered by the following code in unregister_netdevice_queue(): 14c: 00 00 00 48 b 14c 14c: R_PPC64_REL24 net_set_todo 150: 00 00 82 3c addis r4,r2,0 GCC didn't insert a nop after the branch to net_set_todo() because it's a sibling call, so it never returns. The nop isn't needed after the branch in that case. Signed-off-by: Josh Poimboeuf Acked-by: Naveen N. Rao Reviewed-and-tested-by: Kamalesh Babulal Signed-off-by: Michael Ellerman Signed-off-by: Sasha Levin Signed-off-by: Greg Kroah-Hartman --- arch/powerpc/include/asm/code-patching.h | 1 + arch/powerpc/kernel/module_64.c | 12 +++++++++++- arch/powerpc/lib/code-patching.c | 5 +++++ 3 files changed, 17 insertions(+), 1 deletion(-) --- a/arch/powerpc/include/asm/code-patching.h +++ b/arch/powerpc/include/asm/code-patching.h @@ -30,6 +30,7 @@ int patch_branch(unsigned int *addr, uns int patch_instruction(unsigned int *addr, unsigned int instr); int instr_is_relative_branch(unsigned int instr); +int instr_is_relative_link_branch(unsigned int instr); int instr_is_branch_to_addr(const unsigned int *instr, unsigned long addr); unsigned long branch_target(const unsigned int *instr); unsigned int translate_branch(const unsigned int *dest, --- a/arch/powerpc/kernel/module_64.c +++ b/arch/powerpc/kernel/module_64.c @@ -494,7 +494,17 @@ static bool is_early_mcount_callsite(u32 restore r2. */ static int restore_r2(u32 *instruction, struct module *me) { - if (is_early_mcount_callsite(instruction - 1)) + u32 *prev_insn = instruction - 1; + + if (is_early_mcount_callsite(prev_insn)) + return 1; + + /* + * Make sure the branch isn't a sibling call. Sibling calls aren't + * "link" branches and they don't return, so they don't need the r2 + * restore afterwards. + */ + if (!instr_is_relative_link_branch(*prev_insn)) return 1; if (*instruction != PPC_INST_NOP) { --- a/arch/powerpc/lib/code-patching.c +++ b/arch/powerpc/lib/code-patching.c @@ -95,6 +95,11 @@ int instr_is_relative_branch(unsigned in return instr_is_branch_iform(instr) || instr_is_branch_bform(instr); } +int instr_is_relative_link_branch(unsigned int instr) +{ + return instr_is_relative_branch(instr) && (instr & BRANCH_SET_LINK); +} + static unsigned long branch_iform_target(const unsigned int *instr) { signed long imm;