Received: by 2002:a25:6193:0:0:0:0:0 with SMTP id v141csp928690ybb; Wed, 8 Apr 2020 12:43:41 -0700 (PDT) X-Google-Smtp-Source: APiQypLOgNnLi18kHAujSn5MAvmNLoUUbtteiFUXnE4F28lxGtBNLSNHpz2ZJ1fwgFiNb7XdX98j X-Received: by 2002:a05:6830:1bf7:: with SMTP id k23mr4472997otb.260.1586375021707; Wed, 08 Apr 2020 12:43:41 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1586375021; cv=none; d=google.com; s=arc-20160816; b=OU0O2KWRLqEAfnh1w4v782VBgS1cZb69ZN7uwt8hu36zuabkuF/g5v4/8ttxxJtAug WbN6wjXHlUI0M6PinComfbMqC1lX6tGZAMgYom18mUWK+DACzrb3uyc29dBGnDXYJugk yKtIRGNWCp33CrJXDSU/iQi2pQ9JPqWAT6dI1sR1PojkpfQNKyafpW4kcCvStXgSQ3s4 WhTXoik4cpL8D4yMTrsNqrcHLkfDXg3Zc9NrW9+FYaLeu0ye5D596tpnLMWcaNegNqbh EsfX8otMwlAGOOoZ3LsAy3Rmr8brmVxAmiwviDjWIyedpxu/A6vaxrE6ZX8EejWqsUNP VXhA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding :content-language:in-reply-to:mime-version:user-agent:date :message-id:from:references:cc:to:subject:dkim-signature; bh=pWnDGOv9qqH3ETycko6yVzSA1l/fA4wz3CeoPgCd9ng=; b=zlZ25joJP/seDnzR/oleGnjxXrR4vdfqI9l9tr375CcraLfCm9cMZ5vKso4lg1hPN4 8VskgxCPGyivEBZ2buyFl2ytEIsomYOl3ZmKYNFLJKcNspx+Eegt8dkUdNjmG4SBF5jj ANud3J0tUPAe/Kl5nFlM8538X3mpkHEcF87RKOwGjwv171m5nBdFm+Uduiu5Ur8pP5OI tbPcn8O0y6z3o6ynT8KbB6/eMso1AZd8Iq+uuwTajEaLUQxwaw0P6RCrOGQWmZ/uTG0u mLBzlA/kwODW5CtxgKkk8kVB+hGD0h+IxHHzzpSHzeRoLCVm3yN19xDx6o0t82VBDbc+ jlDg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=Lxd7bAnp; 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; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=redhat.com Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id s11si2391181oih.95.2020.04.08.12.43.29; Wed, 08 Apr 2020 12:43:41 -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; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=Lxd7bAnp; 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; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=redhat.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729583AbgDHRHJ (ORCPT + 99 others); Wed, 8 Apr 2020 13:07:09 -0400 Received: from us-smtp-delivery-1.mimecast.com ([207.211.31.120]:36814 "EHLO us-smtp-1.mimecast.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1729558AbgDHRHJ (ORCPT ); Wed, 8 Apr 2020 13:07:09 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1586365627; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=pWnDGOv9qqH3ETycko6yVzSA1l/fA4wz3CeoPgCd9ng=; b=Lxd7bAnpao3QW1BP2blanZm7RT+nbAxhUXV/qYn3npbSZUGXdxZi3S+c1LOdmvhrIaOLPR 3yKfFK6NQ4YaJUhooKIMwQ3ndwyjtEqbt8H5YolcSvl4jY5yCjOTB/TAwVmYUFJyLJBsh/ x46GL8xDvytMNZl220VIcC2ErbnUwHg= Received: from mail-wr1-f70.google.com (mail-wr1-f70.google.com [209.85.221.70]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-323-W5uIElpJP6mkNh1pPGMBDw-1; Wed, 08 Apr 2020 13:07:05 -0400 X-MC-Unique: W5uIElpJP6mkNh1pPGMBDw-1 Received: by mail-wr1-f70.google.com with SMTP id u16so4758658wrp.14 for ; Wed, 08 Apr 2020 10:07:05 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:subject:to:cc:references:from:message-id:date :user-agent:mime-version:in-reply-to:content-language :content-transfer-encoding; bh=pWnDGOv9qqH3ETycko6yVzSA1l/fA4wz3CeoPgCd9ng=; b=MT2Qw7cgLOs2z6o8fmxaaIa4dynxa8tfgNjpd3Z0OjGReSSd5hvjl+4dtUd7dxgj97 8lSDmr43KrzyZmTyeoJybYKE0ODFcno6SGr7QXzx8Nzg+AXdghNiMhZ4JRcha44KXeOv hkad7+cFpPzx/NRZ1nnovGdA4zd1DqJaRwsw4nlbSwOra/0lYvbkKQakEDobHEHs60Pe y4JKDcv9Lj3pJxI73LuBzFBzhG4RF6n1FDaJQpFoPcTAIxlAqI88eUdOlzMWUnXSjmlv kg86Us3ufQWFHcOk3SSeeL7mwUbmSmwrdiM9S8o4bo7gvKQUJk2yqT9QVws9/M5f9OXx uSpw== X-Gm-Message-State: AGi0PuaiHm9Etn9sYjZ9PjiP7LysFkWEm+kyUUcCUr/g/5A+pdhMXrFi oyXVlC1qc+MbK36SvUnVYkkAOKXdtOjvgZUFjDmsmk7ci7snhhzyxwmMtSf6tmy94E3CY7nJXJz 1mA1EybrPtPw5AmkdKAKosEbv X-Received: by 2002:adf:f881:: with SMTP id u1mr5143254wrp.186.1586365624115; Wed, 08 Apr 2020 10:07:04 -0700 (PDT) X-Received: by 2002:adf:f881:: with SMTP id u1mr5143200wrp.186.1586365623451; Wed, 08 Apr 2020 10:07:03 -0700 (PDT) Received: from ?IPv6:2a01:cb14:58d:8400:ecf6:58e2:9c06:a308? ([2a01:cb14:58d:8400:ecf6:58e2:9c06:a308]) by smtp.gmail.com with ESMTPSA id j11sm31597784wro.51.2020.04.08.10.07.01 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Wed, 08 Apr 2020 10:07:01 -0700 (PDT) Subject: Re: [PATCH V2 5/9] objtool: Add support for intra-function calls To: Alexandre Chartre , Peter Zijlstra Cc: x86@kernel.org, linux-kernel@vger.kernel.org, jpoimboe@redhat.com, tglx@linutronix.de References: <20200407073142.20659-1-alexandre.chartre@oracle.com> <20200407073142.20659-6-alexandre.chartre@oracle.com> <20200407130729.GZ20730@hirez.programming.kicks-ass.net> <40b19a8e-ae5e-623e-fb3f-261f9fec2ea5@oracle.com> <7ba6d4c9-c1dc-fa83-2ade-b7d3fba9e7fb@oracle.com> <981d7f79-3429-776f-7356-345adc6332bf@redhat.com> <69cf35b5-8c65-3602-3f03-3eeb42241f33@oracle.com> From: Julien Thierry Message-ID: Date: Wed, 8 Apr 2020 18:07:00 +0100 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:68.0) Gecko/20100101 Thunderbird/68.4.1 MIME-Version: 1.0 In-Reply-To: <69cf35b5-8c65-3602-3f03-3eeb42241f33@oracle.com> Content-Type: text/plain; charset=utf-8; format=flowed Content-Language: en-US Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On 4/8/20 6:06 PM, Alexandre Chartre wrote: > > > On 4/8/20 6:04 PM, Julien Thierry wrote: >> >> >> On 4/8/20 5:03 PM, Alexandre Chartre wrote: >>> >>> >>> On 4/8/20 4:19 PM, Julien Thierry wrote: >>>> >>>> >>>> On 4/8/20 3:06 PM, Alexandre Chartre wrote: >>>>> >>>>> >>>>> On 4/7/20 3:28 PM, Alexandre Chartre wrote: >>>>>> >>>>>> On 4/7/20 3:07 PM, Peter Zijlstra wrote: >>>>>>> On Tue, Apr 07, 2020 at 09:31:38AM +0200, Alexandre Chartre wrote: >>>>>>> >>>>>>>> index a62e032863a8..7ee1561bf7ad 100644 >>>>>>>> --- a/tools/objtool/arch/x86/decode.c >>>>>>>> +++ b/tools/objtool/arch/x86/decode.c >>>>>>>> @@ -497,3 +497,15 @@ void arch_initial_func_cfi_state(struct >>>>>>>> cfi_state *state) >>>>>>>>       state->regs[16].base = CFI_CFA; >>>>>>>>       state->regs[16].offset = -8; >>>>>>>>   } >>>>>>>> + >>>>>>>> + >>>>>>>> +void arch_configure_intra_function_call(struct stack_op *op) >>>>>>>> +{ >>>>>>>> +    /* >>>>>>>> +     * For the impact on the stack, make an intra-function >>>>>>>> +     * call behaves like a push of an immediate value (the >>>>>>>> +     * return address). >>>>>>>> +     */ >>>>>>>> +    op->src.type = OP_SRC_CONST; >>>>>>>> +    op->dest.type = OP_DEST_PUSH; >>>>>>>> +} >>>>>>> >>>>>>> An alternative is to always set up stack ops for CALL/RET on >>>>>>> decode, but >>>>>>> conditionally run update_insn_state() for them. >>>>>>> >>>>>>> Not sure that makes more logical sense, but the patch would be >>>>>>> simpler I >>>>>>> think. >>>>>> >>>>>> Right, this would avoid adding a new arch dependent function and >>>>>> the patch >>>>>> will be simpler. This probably makes sense as the stack impact is >>>>>> the same >>>>>> for all calls (but objtool will use it only for intra-function >>>>>> calls). >>>>>> >>>>> >>>>> Actually the processing of the ret instruction is more complicated >>>>> than I >>>>> anticipated with intra-function calls, and so my implementation is not >>>>> complete at the moment. >>>>> >>>>> The issue is to correctly handle how the ret is going to behave >>>>> depending how >>>>> the stack (or register on arm) is modified before the ret. >>>>> Adjusting the stack >>>>> offset makes the stack state correct, but objtool still needs to >>>>> correctly >>>>> figure out where the ret is going to return and where the code flow >>>>> continues. >>>>> >>>> >>>> A hint indicating the target "jump" address could be useful. It could >>>> be used to add the information on some call/jump dynamic that aren't >>>> associated with jump tables. Currently when objtool finds a jump >>>> dynamic, if no branches were added to it, it will just return. >>>> >>>> Having such a hint could help make additional links (at least on >>>> arm64). I don't know what Peter and Josh would think of that (if that >>>> helps in your case of course). >>>> >>> >>> Yes, I am thinking about tracking intra-function call return address, >>> and having hints to specify a return address changes. For example, >>> on x86, when we push the branch address on the stack we overwrite the >>> last return address (the return address of the last intra-function >>> call). >>> Then the return instruction can figure out where to branch. >> >> I see, I was thinking about a more generic hint, that would just >> indicate "this instruction actually jumps here". So in your case it >> would just point that a certain return instruction causes to branch >> somewhere. > > I thought about doing that but the problem is that on x86 the same > retpoline code can branch differently depending on how it is used. > Basically we have a return instruction that will branch differently > based on what's on the stack. So we can just tell that this ret > instruction will branch/return there. > Oh, I see. Nevermind then! -- Julien Thierry