Skip to content

Commit

Permalink
.golangci.yml: add codeanalysis build tag
Browse files Browse the repository at this point in the history
Using a build tag to exclude files for golangci-lint
reduces memory consumption (it does not parse them).
The naive attempt with skip-dirs did not work.
So add codeanalysis build tag and use it in auto-generated files.

Update google#977
  • Loading branch information
dvyukov committed May 15, 2019
1 parent 36c1564 commit 69a0dbe
Show file tree
Hide file tree
Showing 26 changed files with 132 additions and 115 deletions.
17 changes: 5 additions & 12 deletions .golangci.yml
Expand Up @@ -5,18 +5,11 @@ run:
deadline: 8m
skip-dirs:
- pkg/kd
- pkg/ifuzz/generated
- sys/akaros/gen
- sys/freebsd/gen
- sys/fuchsia/gen
- sys/linux/gen
- sys/netbsd/gen
- sys/openbsd/gen
- sys/windows/gen
- sys/test/gen
- sys/trusty/gen
skip-files:
- "tools/syz-trace2syz/parser/(lex.go|strace.go|straceLex.rl|yaccpar)"
# Autogenerated files take too much time and memory to load,
# even if we skip them with skip-dirs.
# So we define this tag and use it in the autogenerated files.
build-tags:
- codeanalysis

linters:
enable:
Expand Down
34 changes: 17 additions & 17 deletions executor/defs.h
Expand Up @@ -5,7 +5,7 @@

#if GOARCH_amd64
#define GOARCH "amd64"
#define SYZ_REVISION "33548b018e0972b7e80ce23e422cffc6d583fa02"
#define SYZ_REVISION "9fb99740f068a514f775b2acf8781edb2e641b80"
#define SYZ_EXECUTOR_USES_FORK_SERVER 1
#define SYZ_EXECUTOR_USES_SHMEM 0
#define SYZ_PAGE_SIZE 4096
Expand All @@ -20,7 +20,7 @@

#if GOARCH_amd64
#define GOARCH "amd64"
#define SYZ_REVISION "d470f47aa27b4dcd0523226bda343298284900a0"
#define SYZ_REVISION "ca6564bc504f352632c5026882504be36c390787"
#define SYZ_EXECUTOR_USES_FORK_SERVER 1
#define SYZ_EXECUTOR_USES_SHMEM 1
#define SYZ_PAGE_SIZE 4096
Expand All @@ -35,7 +35,7 @@

#if GOARCH_amd64
#define GOARCH "amd64"
#define SYZ_REVISION "0e2d20173a174d3821ff0c8ef1d25aa9d3ed0e8c"
#define SYZ_REVISION "2765f2a4990fc92d0a4cece168f163730492d608"
#define SYZ_EXECUTOR_USES_FORK_SERVER 0
#define SYZ_EXECUTOR_USES_SHMEM 0
#define SYZ_PAGE_SIZE 4096
Expand All @@ -45,7 +45,7 @@

#if GOARCH_arm64
#define GOARCH "arm64"
#define SYZ_REVISION "e40ae54c0119676748b73d4d3f8b1bc887d9eae8"
#define SYZ_REVISION "516ed03211e25f8b8445cf89c9d805a282358102"
#define SYZ_EXECUTOR_USES_FORK_SERVER 0
#define SYZ_EXECUTOR_USES_SHMEM 0
#define SYZ_PAGE_SIZE 4096
Expand All @@ -60,7 +60,7 @@

#if GOARCH_386
#define GOARCH "386"
#define SYZ_REVISION "c481fc548f8495652321938cc664cda692bb3640"
#define SYZ_REVISION "429178b95a20ca1fa93c7938259b944a42907379"
#define SYZ_EXECUTOR_USES_FORK_SERVER 1
#define SYZ_EXECUTOR_USES_SHMEM 1
#define SYZ_PAGE_SIZE 4096
Expand All @@ -70,7 +70,7 @@

#if GOARCH_amd64
#define GOARCH "amd64"
#define SYZ_REVISION "c3ca596ec5a418716e3ed1df1d9f03f6614fb8c9"
#define SYZ_REVISION "208510224427bc6cd3338d6a96bc5284c6f0c4ca"
#define SYZ_EXECUTOR_USES_FORK_SERVER 1
#define SYZ_EXECUTOR_USES_SHMEM 1
#define SYZ_PAGE_SIZE 4096
Expand All @@ -80,7 +80,7 @@

#if GOARCH_arm
#define GOARCH "arm"
#define SYZ_REVISION "755e72f507bfba544c5361f262fc77fb932a5e2d"
#define SYZ_REVISION "d5af6b878ed3f37b02529abf0cd9c899cc4b3cf3"
#define SYZ_EXECUTOR_USES_FORK_SERVER 1
#define SYZ_EXECUTOR_USES_SHMEM 1
#define SYZ_PAGE_SIZE 4096
Expand All @@ -90,7 +90,7 @@

#if GOARCH_arm64
#define GOARCH "arm64"
#define SYZ_REVISION "ac163f5b11f81bf7691ef0b1f6e6be60c286f750"
#define SYZ_REVISION "2ad9682cfcaa80da61b92de0ec6ac412968a2a6f"
#define SYZ_EXECUTOR_USES_FORK_SERVER 1
#define SYZ_EXECUTOR_USES_SHMEM 1
#define SYZ_PAGE_SIZE 4096
Expand All @@ -100,7 +100,7 @@

#if GOARCH_ppc64le
#define GOARCH "ppc64le"
#define SYZ_REVISION "c9b32a0e01f79a400b0dde6e9094c8bde5adc209"
#define SYZ_REVISION "7b8bbbb6add148e7e6ef06f3d050b1c0d3708e9e"
#define SYZ_EXECUTOR_USES_FORK_SERVER 1
#define SYZ_EXECUTOR_USES_SHMEM 1
#define SYZ_PAGE_SIZE 4096
Expand All @@ -115,7 +115,7 @@

#if GOARCH_amd64
#define GOARCH "amd64"
#define SYZ_REVISION "cc25964abdaea89bff562310d8a149aeb2e6514d"
#define SYZ_REVISION "db1d9602f5022150750b100d946feef07e2446c4"
#define SYZ_EXECUTOR_USES_FORK_SERVER 1
#define SYZ_EXECUTOR_USES_SHMEM 1
#define SYZ_PAGE_SIZE 4096
Expand All @@ -130,7 +130,7 @@

#if GOARCH_amd64
#define GOARCH "amd64"
#define SYZ_REVISION "83fc77c2a3d59b3105442938cf3fa8bf6d8d1f43"
#define SYZ_REVISION "1f7a33a955602d488b0c3f964b983c9f8baf75a3"
#define SYZ_EXECUTOR_USES_FORK_SERVER 1
#define SYZ_EXECUTOR_USES_SHMEM 1
#define SYZ_PAGE_SIZE 4096
Expand All @@ -145,7 +145,7 @@

#if GOARCH_32_fork_shmem
#define GOARCH "32_fork_shmem"
#define SYZ_REVISION "4ecb2427856989ae50e90163840803c67a3d5fe3"
#define SYZ_REVISION "c1820da1fd3d10373aa40011a453b7479b078078"
#define SYZ_EXECUTOR_USES_FORK_SERVER 1
#define SYZ_EXECUTOR_USES_SHMEM 1
#define SYZ_PAGE_SIZE 4096
Expand All @@ -155,7 +155,7 @@

#if GOARCH_32_shmem
#define GOARCH "32_shmem"
#define SYZ_REVISION "4e967859e0fb64657ea3197a4db359d3264c66d2"
#define SYZ_REVISION "5c997491edf9b3c7f42853ea0cb2078731b361f2"
#define SYZ_EXECUTOR_USES_FORK_SERVER 0
#define SYZ_EXECUTOR_USES_SHMEM 1
#define SYZ_PAGE_SIZE 8192
Expand All @@ -165,7 +165,7 @@

#if GOARCH_64
#define GOARCH "64"
#define SYZ_REVISION "596ee9bf31191a84ff800056cadc632de17b3b28"
#define SYZ_REVISION "613638e7dbb407c7f6ab73b2c116d763b8311d78"
#define SYZ_EXECUTOR_USES_FORK_SERVER 0
#define SYZ_EXECUTOR_USES_SHMEM 0
#define SYZ_PAGE_SIZE 4096
Expand All @@ -175,7 +175,7 @@

#if GOARCH_64_fork
#define GOARCH "64_fork"
#define SYZ_REVISION "db6d91083a89e591aa3206638e817b2d37759fe5"
#define SYZ_REVISION "7467ae0af7e161054ba46c3c4e2c2a2a9c82ba7f"
#define SYZ_EXECUTOR_USES_FORK_SERVER 1
#define SYZ_EXECUTOR_USES_SHMEM 0
#define SYZ_PAGE_SIZE 8192
Expand All @@ -190,7 +190,7 @@

#if GOARCH_arm
#define GOARCH "arm"
#define SYZ_REVISION "8bbbab029fbcf3cb97cc4d5593b2fc094efc666d"
#define SYZ_REVISION "01527fabe7425df1fb63f49a338dacda3035b3a8"
#define SYZ_EXECUTOR_USES_FORK_SERVER 0
#define SYZ_EXECUTOR_USES_SHMEM 0
#define SYZ_PAGE_SIZE 4096
Expand All @@ -205,7 +205,7 @@

#if GOARCH_amd64
#define GOARCH "amd64"
#define SYZ_REVISION "034310d6ce04d3301452f8b1857417b6c9db4825"
#define SYZ_REVISION "75e6a1fa03cbbd34d40cee331e1f7e5f3d26d4ef"
#define SYZ_EXECUTOR_USES_FORK_SERVER 0
#define SYZ_EXECUTOR_USES_SHMEM 0
#define SYZ_PAGE_SIZE 4096
Expand Down
1 change: 1 addition & 0 deletions pkg/ifuzz/gen/gen.go
Expand Up @@ -164,6 +164,7 @@ nextInsn:
insns = deduped

fmt.Printf("// AUTOGENERATED FILE\n\n")
fmt.Printf("// +build !codeanalysis\n\n")
fmt.Printf("package generated\n\n")
fmt.Printf("import . \"github.com/google/syzkaller/pkg/ifuzz\"\n\n")
fmt.Printf("func init() { Insns = insns }\n\n")
Expand Down
2 changes: 2 additions & 0 deletions pkg/ifuzz/generated/insns.go
@@ -1,5 +1,7 @@
// AUTOGENERATED FILE

// +build !codeanalysis

package generated

import . "github.com/google/syzkaller/pkg/ifuzz"
Expand Down
3 changes: 2 additions & 1 deletion sys/akaros/gen/amd64.go
@@ -1,4 +1,5 @@
// AUTOGENERATED FILE
// +build !codeanalysis
// +build !syz_target syz_target,syz_os_akaros,syz_arch_amd64

package gen
Expand Down Expand Up @@ -1529,4 +1530,4 @@ var consts_amd64 = []ConstValue{
{Name: "WUNTRACED", Value: 2},
}

const revision_amd64 = "33548b018e0972b7e80ce23e422cffc6d583fa02"
const revision_amd64 = "9fb99740f068a514f775b2acf8781edb2e641b80"
3 changes: 2 additions & 1 deletion sys/freebsd/gen/amd64.go
@@ -1,4 +1,5 @@
// AUTOGENERATED FILE
// +build !codeanalysis
// +build !syz_target syz_target,syz_os_freebsd,syz_arch_amd64

package gen
Expand Down Expand Up @@ -5704,4 +5705,4 @@ var consts_amd64 = []ConstValue{
{Name: "WUNTRACED", Value: 2},
}

const revision_amd64 = "d470f47aa27b4dcd0523226bda343298284900a0"
const revision_amd64 = "ca6564bc504f352632c5026882504be36c390787"
3 changes: 2 additions & 1 deletion sys/fuchsia/gen/amd64.go
@@ -1,4 +1,5 @@
// AUTOGENERATED FILE
// +build !codeanalysis
// +build !syz_target syz_target,syz_os_fuchsia,syz_arch_amd64

package gen
Expand Down Expand Up @@ -7715,4 +7716,4 @@ var consts_amd64 = []ConstValue{
{Name: "fuchsia_power_Status_OK"},
}

const revision_amd64 = "0e2d20173a174d3821ff0c8ef1d25aa9d3ed0e8c"
const revision_amd64 = "2765f2a4990fc92d0a4cece168f163730492d608"
3 changes: 2 additions & 1 deletion sys/fuchsia/gen/arm64.go
@@ -1,4 +1,5 @@
// AUTOGENERATED FILE
// +build !codeanalysis
// +build !syz_target syz_target,syz_os_fuchsia,syz_arch_arm64

package gen
Expand Down Expand Up @@ -7715,4 +7716,4 @@ var consts_arm64 = []ConstValue{
{Name: "fuchsia_power_Status_OK"},
}

const revision_arm64 = "e40ae54c0119676748b73d4d3f8b1bc887d9eae8"
const revision_arm64 = "516ed03211e25f8b8445cf89c9d805a282358102"
3 changes: 2 additions & 1 deletion sys/linux/gen/386.go
@@ -1,4 +1,5 @@
// AUTOGENERATED FILE
// +build !codeanalysis
// +build !syz_target syz_target,syz_os_linux,syz_arch_386 syz_target,syz_os_linux,syz_arch_amd64

package gen
Expand Down Expand Up @@ -51065,4 +51066,4 @@ var consts_386 = []ConstValue{
{Name: "bpf_insn_load_imm_dw", Value: 24},
}

const revision_386 = "c481fc548f8495652321938cc664cda692bb3640"
const revision_386 = "429178b95a20ca1fa93c7938259b944a42907379"
3 changes: 2 additions & 1 deletion sys/linux/gen/amd64.go
@@ -1,4 +1,5 @@
// AUTOGENERATED FILE
// +build !codeanalysis
// +build !syz_target syz_target,syz_os_linux,syz_arch_amd64

package gen
Expand Down Expand Up @@ -51587,4 +51588,4 @@ var consts_amd64 = []ConstValue{
{Name: "bpf_insn_load_imm_dw", Value: 24},
}

const revision_amd64 = "c3ca596ec5a418716e3ed1df1d9f03f6614fb8c9"
const revision_amd64 = "208510224427bc6cd3338d6a96bc5284c6f0c4ca"
3 changes: 2 additions & 1 deletion sys/linux/gen/arm.go
@@ -1,4 +1,5 @@
// AUTOGENERATED FILE
// +build !codeanalysis
// +build !syz_target syz_target,syz_os_linux,syz_arch_arm syz_target,syz_os_linux,syz_arch_arm64

package gen
Expand Down Expand Up @@ -50552,4 +50553,4 @@ var consts_arm = []ConstValue{
{Name: "bpf_insn_load_imm_dw", Value: 24},
}

const revision_arm = "755e72f507bfba544c5361f262fc77fb932a5e2d"
const revision_arm = "d5af6b878ed3f37b02529abf0cd9c899cc4b3cf3"
3 changes: 2 additions & 1 deletion sys/linux/gen/arm64.go
@@ -1,4 +1,5 @@
// AUTOGENERATED FILE
// +build !codeanalysis
// +build !syz_target syz_target,syz_os_linux,syz_arch_arm64

package gen
Expand Down Expand Up @@ -50847,4 +50848,4 @@ var consts_arm64 = []ConstValue{
{Name: "bpf_insn_load_imm_dw", Value: 24},
}

const revision_arm64 = "ac163f5b11f81bf7691ef0b1f6e6be60c286f750"
const revision_arm64 = "2ad9682cfcaa80da61b92de0ec6ac412968a2a6f"
3 changes: 2 additions & 1 deletion sys/linux/gen/ppc64le.go
@@ -1,4 +1,5 @@
// AUTOGENERATED FILE
// +build !codeanalysis
// +build !syz_target syz_target,syz_os_linux,syz_arch_ppc64le

package gen
Expand Down Expand Up @@ -50814,4 +50815,4 @@ var consts_ppc64le = []ConstValue{
{Name: "bpf_insn_load_imm_dw", Value: 24},
}

const revision_ppc64le = "c9b32a0e01f79a400b0dde6e9094c8bde5adc209"
const revision_ppc64le = "7b8bbbb6add148e7e6ef06f3d050b1c0d3708e9e"
3 changes: 2 additions & 1 deletion sys/netbsd/gen/amd64.go
@@ -1,4 +1,5 @@
// AUTOGENERATED FILE
// +build !codeanalysis
// +build !syz_target syz_target,syz_os_netbsd,syz_arch_amd64

package gen
Expand Down Expand Up @@ -1640,4 +1641,4 @@ var consts_amd64 = []ConstValue{
{Name: "WUNTRACED", Value: 2},
}

const revision_amd64 = "cc25964abdaea89bff562310d8a149aeb2e6514d"
const revision_amd64 = "db1d9602f5022150750b100d946feef07e2446c4"
3 changes: 2 additions & 1 deletion sys/openbsd/gen/amd64.go
@@ -1,4 +1,5 @@
// AUTOGENERATED FILE
// +build !codeanalysis
// +build !syz_target syz_target,syz_os_openbsd,syz_arch_amd64

package gen
Expand Down Expand Up @@ -2874,4 +2875,4 @@ var consts_amd64 = []ConstValue{
{Name: "__MAP_NOREPLACE", Value: 2048},
}

const revision_amd64 = "83fc77c2a3d59b3105442938cf3fa8bf6d8d1f43"
const revision_amd64 = "1f7a33a955602d488b0c3f964b983c9f8baf75a3"
1 change: 1 addition & 0 deletions sys/syz-sysgen/sysgen.go
Expand Up @@ -166,6 +166,7 @@ func generate(target *targets.Target, prg *compiler.Prog, consts map[string]uint
tag += fmt.Sprintf(" syz_target,syz_os_%v,syz_arch_%v", target.OS, target.VMArch)
}
fmt.Fprintf(out, "// AUTOGENERATED FILE\n")
fmt.Fprintf(out, "// +build !codeanalysis\n")
fmt.Fprintf(out, "// +build !syz_target %v\n\n", tag)
fmt.Fprintf(out, "package gen\n\n")
fmt.Fprintf(out, "import . \"github.com/google/syzkaller/prog\"\n")
Expand Down
3 changes: 2 additions & 1 deletion sys/test/gen/32_fork_shmem.go
@@ -1,4 +1,5 @@
// AUTOGENERATED FILE
// +build !codeanalysis
// +build !syz_target syz_target,syz_os_test,syz_arch_32_fork_shmem

package gen
Expand Down Expand Up @@ -119,4 +120,4 @@ var consts_32_fork_shmem = []ConstValue{
{Name: "ONLY_32BITS_CONST", Value: 1},
}

const revision_32_fork_shmem = "4ecb2427856989ae50e90163840803c67a3d5fe3"
const revision_32_fork_shmem = "c1820da1fd3d10373aa40011a453b7479b078078"
3 changes: 2 additions & 1 deletion sys/test/gen/32_shmem.go
@@ -1,4 +1,5 @@
// AUTOGENERATED FILE
// +build !codeanalysis
// +build !syz_target syz_target,syz_os_test,syz_arch_32_shmem

package gen
Expand Down Expand Up @@ -119,4 +120,4 @@ var consts_32_shmem = []ConstValue{
{Name: "ONLY_32BITS_CONST", Value: 1},
}

const revision_32_shmem = "4e967859e0fb64657ea3197a4db359d3264c66d2"
const revision_32_shmem = "5c997491edf9b3c7f42853ea0cb2078731b361f2"
3 changes: 2 additions & 1 deletion sys/test/gen/64.go
@@ -1,4 +1,5 @@
// AUTOGENERATED FILE
// +build !codeanalysis
// +build !syz_target syz_target,syz_os_test,syz_arch_64

package gen
Expand Down Expand Up @@ -1005,4 +1006,4 @@ var consts_64 = []ConstValue{
{Name: "SYS_unsupported"},
}

const revision_64 = "596ee9bf31191a84ff800056cadc632de17b3b28"
const revision_64 = "613638e7dbb407c7f6ab73b2c116d763b8311d78"
3 changes: 2 additions & 1 deletion sys/test/gen/64_fork.go
@@ -1,4 +1,5 @@
// AUTOGENERATED FILE
// +build !codeanalysis
// +build !syz_target syz_target,syz_os_test,syz_arch_64_fork

package gen
Expand Down Expand Up @@ -118,4 +119,4 @@ var consts_64_fork = []ConstValue{
{Name: "IPPROTO_UDP", Value: 17},
}

const revision_64_fork = "db6d91083a89e591aa3206638e817b2d37759fe5"
const revision_64_fork = "7467ae0af7e161054ba46c3c4e2c2a2a9c82ba7f"
3 changes: 2 additions & 1 deletion sys/trusty/gen/arm.go
@@ -1,4 +1,5 @@
// AUTOGENERATED FILE
// +build !codeanalysis
// +build !syz_target syz_target,syz_os_trusty,syz_arch_arm

package gen
Expand Down Expand Up @@ -173,4 +174,4 @@ var consts_arm = []ConstValue{
{Name: "__NR_write", Value: 1},
}

const revision_arm = "8bbbab029fbcf3cb97cc4d5593b2fc094efc666d"
const revision_arm = "01527fabe7425df1fb63f49a338dacda3035b3a8"

0 comments on commit 69a0dbe

Please sign in to comment.