Commitc2024e8

committed

kexec,linux,arm64: test empty memmap

Signed-off-by: Chris Koch <chrisko@google.com>

1 parent597d657 commitc2024e8Copy full SHA for c2024e8

File tree

+36

-4

lines changed

+36

-4

lines changed

Lines changed: 6 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -52,6 +52,8 @@ func sanitizeFDT(fdt dt.FDT) (dt.Node, error) {`
`52`	`52`	`returnchosen,nil`
`53`	`53`	`}`
`54`	`54`
	`55`	`+varErrMemmapEmpty=errors.New("memory map is empty or contains no information about system RAM")`
	`56`	`+`
`55`	`57`	`funckexecLoadImage(kernel,ramfsos.File,cmdlinestring,dtb io.ReaderAt) (kimage,error) {`
`56`	`58`	`fdt,err:=dt.LoadFDT(dtb)`
`57`	`59`	`iferr!=nil {`
`@@ -63,9 +65,12 @@ func kexecLoadImage(kernel, ramfs os.File, cmdline string, dtb io.ReaderAt) (k`
`63`	`65`	`Debug("Try parsing memory map...")`
`64`	`66`	`mm,err:=kexec.MemoryMapFromFDT(fdt)`
`65`	`67`	`iferr!=nil {`
`66`		`-returnnil,fmt.Errorf("MemoryMapFromFDT(%v): %v",fdt,err)`
	`68`	`+returnnil,fmt.Errorf("MemoryMapFromFDT(%v): %w",fdt,err)`
`67`	`69`	`}`
`68`	`70`	`Debug("Mem map:\n%+v",mm)`
	`71`	`+iflen(mm.RAM())==0 {`
	`72`	`+returnnil,ErrMemmapEmpty`
	`73`	`+}`
`69`	`74`	`returnkexecLoadImageMM(mm,kernel,ramfs,fdt,cmdline)`
`70`	`75`	`}`
`71`	`76`

Lines changed: 27 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -314,6 +314,33 @@ func TestKexecLoadImage(t *testing.T) {`
`314`	`314`	`fdt:closedFile(t),`
`315`	`315`	`errs: []error{dt.ErrNoValidReaders},`
`316`	`316`	`},`
	`317`	`+{`
	`318`	`+name:"invalid-memmap",`
	`319`	`+kernel:openFile(t,"../image/testdata/Image"),`
	`320`	`+ramfs:createFile(t, []byte("ramfs")),`
	`321`	`+fdt:fdtReader(t,&dt.FDT{RootNode:dt.NewNode("/",dt.WithChildren(`
	`322`	`+dt.NewNode("chosen"),`
	`323`	`+dt.NewNode("test memory",dt.WithProperty(`
	`324`	`+dt.PropertyString("device_type","memory"),`
	`325`	`+// Too short.`
	`326`	`+dt.Property{Name:"reg",Value: []byte{0x0}},`
	`327`	`+)),`
	`328`	`+))}),`
	`329`	`+errs: []error{dt.ErrPropertyRegionInvalid},`
	`330`	`+},`
	`331`	`+{`
	`332`	`+name:"no-memmap",`
	`333`	`+kernel:openFile(t,"../image/testdata/Image"),`
	`334`	`+fdt:fdtReader(t,&dt.FDT{RootNode:dt.NewNode("/",`
	`335`	`+dt.WithChildren(`
	`336`	`+dt.NewNode("chosen",dt.WithProperty(`
	`337`	`+dt.PropertyU64("linux,initrd-start",500),`
	`338`	`+dt.PropertyU64("linux,initrd-end",500),`
	`339`	`+)),`
	`340`	`+),`
	`341`	`+)}),`
	`342`	`+errs: []error{ErrMemmapEmpty},`
	`343`	`+},`
`317`	`344`	`} {`
`318`	`345`	`t.Run(tt.name,func(t*testing.T) {`
`319`	`346`	`got,err:=kexecLoadImage(tt.kernel,tt.ramfs,tt.cmdline,tt.fdt)`

Lines changed: 2 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -50,7 +50,7 @@ var StandardPropertyTypes = map[string]PropertyType{`
`50`	`50`
`51`	`51`	`var (`
`52`	`52`	`errInvalidChildIndex=errors.New("invalid child index")`
`53`		`-errPropertyRegionInvalid=errors.New("property value is not <u64x2>")`
	`53`	`+ErrPropertyRegionInvalid=errors.New("property value is not <u64x2>")`
`54`	`54`	`)`
`55`	`55`
`56`	`56`	`// Node is one Node in the Device Tree.`
`@@ -357,7 +357,7 @@ type Region struct {`
`357`	`357`	`// AsRegion converts the property to a Region.`
`358`	`358`	`func (pProperty)AsRegion() (Region,error) {`
`359`	`359`	`iflen(p.Value)!=16 {`
`360`		`-returnnil,errPropertyRegionInvalid`
	`360`	`+returnnil,ErrPropertyRegionInvalid`
`361`	`361`	`}`
`362`	`362`	`varstart,sizeuint64`
`363`	`363`	`b:=bytes.NewBuffer(p.Value)`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -433,7 +433,7 @@ func TestAsRegion(t *testing.T) {`
`433`	`433`	`Value: []byte{},`
`434`	`434`	`},`
`435`	`435`	`want:&Region{},`
`436`		`-wantErr:errPropertyRegionInvalid,`
	`436`	`+wantErr:ErrPropertyRegionInvalid,`
`437`	`437`	`},`
`438`	`438`	`{`
`439`	`439`	`name:"read start and size, success",`

Comments

(0)