proc: adds pointer pinning to call injection #3787
Open
+565
−156
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
aarzilli
force-pushed
the
fncallpinner2
branch
from
dc74e97
to
93bdc6d
Compare
derekparker
requested changes
Sep 18, 2024
aarzilli
force-pushed
the
fncallpinner2
branch
from
93bdc6d
to
ebad15c
Compare
derekparker
requested changes
Sep 30, 2024
pkg/proc/evalop/evalcompile.go
Outdated
|
|
||
| // compileFunctionCallOld compiles a function call when runtime.debugPinner is | ||
| // not available in the target. | ||
| func (ctx *compileCtx) compileFunctionCallOld(node *ast.CallExpr, id int) error { |
There was a problem hiding this comment.
Replace the Old suffix with NoPinning.
pkg/proc/evalop/evalcompile.go
Outdated
| @@ -570,6 +634,61 @@ func (ctx *compileCtx) compileFunctionCall(node *ast.CallExpr) error { | |||
| return nil | |||
| } | |||
|
|
|||
| // compileFunctionCallNew compiles a function call when runtime.debugPinner | |||
| // is available in the target. | |||
| func (ctx *compileCtx) compileFunctionCallNew(node *ast.CallExpr, id int) error { | |||
There was a problem hiding this comment.
Replace New suffix with WithPinning.
pkg/proc/eval.go
Outdated
| } | ||
|
|
||
| func (s *evalStack) push(v *Variable) { | ||
| if v == nil { | ||
| panic(fmt.Errorf("internal debugger error, nil pushed onto variables stack")) |
There was a problem hiding this comment.
There's no formatting here, why wrap in fmt.Errorf?
| } | ||
|
|
||
| type evalLookup interface { | ||
| FindTypeExpr(ast.Expr) (godwarf.Type, error) | ||
| HasBuiltin(string) bool | ||
| } | ||
|
|
||
| type Flags uint8 |
| @@ -30,3 +31,14 @@ func NewCompositeMemory(p *Target, pieces []op.Piece, base uint64) (*compositeMe | |||
| func IsJNZ(inst archInst) bool { | |||
| return inst.(*x86Inst).Op == x86asm.JNE | |||
| } | |||
|
|
|||
| // HasDebugPinner returns true if the target has runtime.debugPinner. | |||
| func (bi *BinaryInfo) HasDebugPinner() bool { | |||
There was a problem hiding this comment.
Maybe this should be promoted outside of test cases since it's used elsewhere.
pkg/proc/fncall.go
Outdated
| stack.callInjectionContinue = false | ||
| for _, v := range fncall.retvars { | ||
| saveVariable(v) | ||
| //fmt.Printf("addr %#v %s %s %#v\n", v.Addr, v.Name, v.DwarfType.String(), v.mem) |
pkg/proc/fncall.go
Outdated
| } | ||
| sort.Slice(fncall.addrsToPin, func(i, j int) bool { return fncall.addrsToPin[i] < fncall.addrsToPin[j] }) |
There was a problem hiding this comment.
Can you use slices.Sort here.
pkg/proc/fncall.go
Outdated
| } | ||
| sort.Slice(fncall.addrsToPin, func(i, j int) bool { return fncall.addrsToPin[i] < fncall.addrsToPin[j] }) | ||
| fncall.addrsToPin = uniqUint64(fncall.addrsToPin) |
There was a problem hiding this comment.
Can use slices.Compact here.
This commit adds a new mode to call injection. If the runtime.debugPinner function is available in the target executable it obtains a pinner by calling it and then uses it to pin the pointers in the results of call injection. This allows the code for call injection to be refactored to execute the calls in the normal order, since it doesn't need to be concerned with having space on the target's memory to store intermediate values. Updates go-delve#3310
aarzilli
force-pushed
the
fncallpinner2
branch
from
ebad15c
to
5cec6dc
Compare
|
There's a rare failure that seems to be happening with this changeset and windows, I want to investigate it before merging. |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This commit adds a new mode to call injection. If the runtime.debugPinner
function is available in the target executable it obtains a pinner by
calling it and then uses it to pin the pointers in the results of call
injection.
This allows the code for call injection to be refactored to execute the
calls in the normal order, since it doesn't need to be concerned with having
space on the target's memory to store intermediate values.
Updates #3310