mirror of
				https://github.com/k3s-io/kubernetes.git
				synced 2025-10-31 05:40:42 +00:00 
			
		
		
		
	This updates vendored runc/libcontainer to 1.1.0, and google/cadvisor to a version updated to runc 1.1.0 (google/cadvisor#3048). Changes in vendor are generated by (roughly): ./hack/pin-dependency.sh github.com/google/cadvisor v0.44.0 ./hack/pin-dependency.sh github.com/opencontainers/runc v1.1.0 ./hack/update-vendor.sh ./hack/lint-dependencies.sh # And follow all its recommendations. ./hack/update-vendor.sh ./hack/update-internal-modules.sh ./hack/lint-dependencies.sh # Re-check everything again. Co-Authored-By: Kir Kolyshkin <kolyshkin@gmail.com>
		
			
				
	
	
		
			160 lines
		
	
	
		
			3.7 KiB
		
	
	
	
		
			Go
		
	
	
	
	
	
			
		
		
	
	
			160 lines
		
	
	
		
			3.7 KiB
		
	
	
	
		
			Go
		
	
	
	
	
	
| package ebpf
 | |
| 
 | |
| import (
 | |
| 	"fmt"
 | |
| 
 | |
| 	"github.com/cilium/ebpf/asm"
 | |
| )
 | |
| 
 | |
| // link resolves bpf-to-bpf calls.
 | |
| //
 | |
| // Each library may contain multiple functions / labels, and is only linked
 | |
| // if prog references one of these functions.
 | |
| //
 | |
| // Libraries also linked.
 | |
| func link(prog *ProgramSpec, libs []*ProgramSpec) error {
 | |
| 	var (
 | |
| 		linked  = make(map[*ProgramSpec]bool)
 | |
| 		pending = []asm.Instructions{prog.Instructions}
 | |
| 		insns   asm.Instructions
 | |
| 	)
 | |
| 	for len(pending) > 0 {
 | |
| 		insns, pending = pending[0], pending[1:]
 | |
| 		for _, lib := range libs {
 | |
| 			if linked[lib] {
 | |
| 				continue
 | |
| 			}
 | |
| 
 | |
| 			needed, err := needSection(insns, lib.Instructions)
 | |
| 			if err != nil {
 | |
| 				return fmt.Errorf("linking %s: %w", lib.Name, err)
 | |
| 			}
 | |
| 
 | |
| 			if !needed {
 | |
| 				continue
 | |
| 			}
 | |
| 
 | |
| 			linked[lib] = true
 | |
| 			prog.Instructions = append(prog.Instructions, lib.Instructions...)
 | |
| 			pending = append(pending, lib.Instructions)
 | |
| 
 | |
| 			if prog.BTF != nil && lib.BTF != nil {
 | |
| 				if err := prog.BTF.Append(lib.BTF); err != nil {
 | |
| 					return fmt.Errorf("linking BTF of %s: %w", lib.Name, err)
 | |
| 				}
 | |
| 			}
 | |
| 		}
 | |
| 	}
 | |
| 
 | |
| 	return nil
 | |
| }
 | |
| 
 | |
| func needSection(insns, section asm.Instructions) (bool, error) {
 | |
| 	// A map of symbols to the libraries which contain them.
 | |
| 	symbols, err := section.SymbolOffsets()
 | |
| 	if err != nil {
 | |
| 		return false, err
 | |
| 	}
 | |
| 
 | |
| 	for _, ins := range insns {
 | |
| 		if ins.Reference == "" {
 | |
| 			continue
 | |
| 		}
 | |
| 
 | |
| 		if ins.OpCode.JumpOp() != asm.Call || ins.Src != asm.PseudoCall {
 | |
| 			continue
 | |
| 		}
 | |
| 
 | |
| 		if ins.Constant != -1 {
 | |
| 			// This is already a valid call, no need to link again.
 | |
| 			continue
 | |
| 		}
 | |
| 
 | |
| 		if _, ok := symbols[ins.Reference]; !ok {
 | |
| 			// Symbol isn't available in this section
 | |
| 			continue
 | |
| 		}
 | |
| 
 | |
| 		// At this point we know that at least one function in the
 | |
| 		// library is called from insns, so we have to link it.
 | |
| 		return true, nil
 | |
| 	}
 | |
| 
 | |
| 	// None of the functions in the section are called.
 | |
| 	return false, nil
 | |
| }
 | |
| 
 | |
| func fixupJumpsAndCalls(insns asm.Instructions) error {
 | |
| 	symbolOffsets := make(map[string]asm.RawInstructionOffset)
 | |
| 	iter := insns.Iterate()
 | |
| 	for iter.Next() {
 | |
| 		ins := iter.Ins
 | |
| 
 | |
| 		if ins.Symbol == "" {
 | |
| 			continue
 | |
| 		}
 | |
| 
 | |
| 		if _, ok := symbolOffsets[ins.Symbol]; ok {
 | |
| 			return fmt.Errorf("duplicate symbol %s", ins.Symbol)
 | |
| 		}
 | |
| 
 | |
| 		symbolOffsets[ins.Symbol] = iter.Offset
 | |
| 	}
 | |
| 
 | |
| 	iter = insns.Iterate()
 | |
| 	for iter.Next() {
 | |
| 		i := iter.Index
 | |
| 		offset := iter.Offset
 | |
| 		ins := iter.Ins
 | |
| 
 | |
| 		if ins.Reference == "" {
 | |
| 			continue
 | |
| 		}
 | |
| 
 | |
| 		switch {
 | |
| 		case ins.IsFunctionCall() && ins.Constant == -1:
 | |
| 			// Rewrite bpf to bpf call
 | |
| 			callOffset, ok := symbolOffsets[ins.Reference]
 | |
| 			if !ok {
 | |
| 				return fmt.Errorf("call at %d: reference to missing symbol %q", i, ins.Reference)
 | |
| 			}
 | |
| 
 | |
| 			ins.Constant = int64(callOffset - offset - 1)
 | |
| 
 | |
| 		case ins.OpCode.Class() == asm.JumpClass && ins.Offset == -1:
 | |
| 			// Rewrite jump to label
 | |
| 			jumpOffset, ok := symbolOffsets[ins.Reference]
 | |
| 			if !ok {
 | |
| 				return fmt.Errorf("jump at %d: reference to missing symbol %q", i, ins.Reference)
 | |
| 			}
 | |
| 
 | |
| 			ins.Offset = int16(jumpOffset - offset - 1)
 | |
| 
 | |
| 		case ins.IsLoadFromMap() && ins.MapPtr() == -1:
 | |
| 			return fmt.Errorf("map %s: %w", ins.Reference, errUnsatisfiedReference)
 | |
| 		}
 | |
| 	}
 | |
| 
 | |
| 	// fixupBPFCalls replaces bpf_probe_read_{kernel,user}[_str] with bpf_probe_read[_str] on older kernels
 | |
| 	// https://github.com/libbpf/libbpf/blob/master/src/libbpf.c#L6009
 | |
| 	iter = insns.Iterate()
 | |
| 	for iter.Next() {
 | |
| 		ins := iter.Ins
 | |
| 		if !ins.IsBuiltinCall() {
 | |
| 			continue
 | |
| 		}
 | |
| 		switch asm.BuiltinFunc(ins.Constant) {
 | |
| 		case asm.FnProbeReadKernel, asm.FnProbeReadUser:
 | |
| 			if err := haveProbeReadKernel(); err != nil {
 | |
| 				ins.Constant = int64(asm.FnProbeRead)
 | |
| 			}
 | |
| 		case asm.FnProbeReadKernelStr, asm.FnProbeReadUserStr:
 | |
| 			if err := haveProbeReadKernel(); err != nil {
 | |
| 				ins.Constant = int64(asm.FnProbeReadStr)
 | |
| 			}
 | |
| 		}
 | |
| 	}
 | |
| 
 | |
| 	return nil
 | |
| }
 |