-
Notifications
You must be signed in to change notification settings - Fork 367
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Fix FD leak and mismatch when batch processing CNI ADD (#933)
GratuitousArpOverIface in github.com/j-keck/arping is not thread-safe as it uses global variables to keep socket and Sockaddr. When batch processing CNI ADD requests, race condition could happen and lead to FD leak and mismatch as the goroutine that sends gratuitous ARPs may close and release others' FDs by accident. This patch implements a thread-safe GratuitousARPOverIface and merges creating veth pair and configuring IP address into one method to avoid creating extra threads.
- Loading branch information
Showing
8 changed files
with
222 additions
and
56 deletions.
There are no files selected for viewing
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
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
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
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,70 @@ | ||
| // Copyright 2020 Antrea Authors | ||
| // | ||
| // Licensed under the Apache License, Version 2.0 (the "License"); | ||
| // you may not use this file except in compliance with the License. | ||
| // You may obtain a copy of the License at | ||
| // | ||
| // http://www.apache.org/licenses/LICENSE-2.0 | ||
| // | ||
| // Unless required by applicable law or agreed to in writing, software | ||
| // distributed under the License is distributed on an "AS IS" BASIS, | ||
| // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| // See the License for the specific language governing permissions and | ||
| // limitations under the License. | ||
|
|
||
| package arping | ||
|
|
||
| import ( | ||
| "bytes" | ||
| "encoding/binary" | ||
| "fmt" | ||
| "net" | ||
| "syscall" | ||
| ) | ||
|
|
||
| const ( | ||
| // 1544 = htons(ETH_P_ARP) | ||
| protoARP = 1544 | ||
| ) | ||
|
|
||
| // GratuitousARPOverIface sends an gratuitous arp over interface 'iface' from 'srcIP'. | ||
| // It refers to "github.com/j-keck/arping" and is simplified and made thread-safe. | ||
| func GratuitousARPOverIface(srcIP net.IP, iface *net.Interface) error { | ||
| ipv4 := srcIP.To4() | ||
| if ipv4 == nil { | ||
| return fmt.Errorf("IPv6 is not supported yet") | ||
| } | ||
|
|
||
| srcMac := iface.HardwareAddr | ||
| broadcastMac := []byte{0xff, 0xff, 0xff, 0xff, 0xff, 0xff} | ||
| request := newARPRequest(srcMac, ipv4, broadcastMac, ipv4) | ||
|
|
||
| toSockaddr := &syscall.SockaddrLinklayer{Ifindex: iface.Index} | ||
|
|
||
| sock, err := syscall.Socket(syscall.AF_PACKET, syscall.SOCK_RAW, protoARP) | ||
| if err != nil { | ||
| return err | ||
| } | ||
| defer syscall.Close(sock) | ||
|
|
||
| return syscall.Sendto(sock, request, 0, toSockaddr) | ||
| } | ||
|
|
||
| func newARPRequest(sha, spa, tha, tpa []byte) []byte { | ||
| frame := bytes.NewBuffer(nil) | ||
| // Ethernet header. | ||
| frame.Write(tha) // Destination MAC address. | ||
| frame.Write(sha) // Source MAC address. | ||
| frame.Write([]byte{0x08, 0x06}) // Ethernet protocol type, 0x0806 for ARP. | ||
| // ARP message. | ||
| binary.Write(frame, binary.BigEndian, uint16(1)) // Hardware Type, Ethernet is 1. | ||
| binary.Write(frame, binary.BigEndian, uint16(0x0800)) // Protocol type, IPv4 is 0x0800. | ||
| binary.Write(frame, binary.BigEndian, uint8(6)) // Hardware length, Ethernet address length is 6. | ||
| binary.Write(frame, binary.BigEndian, uint8(4)) // Protocol length, IPv4 address length is 4. | ||
| binary.Write(frame, binary.BigEndian, uint16(1)) // Operation, request is 1. | ||
| frame.Write(sha) // Sender hardware address. | ||
| frame.Write(spa) // Sender protocol address. | ||
| frame.Write(tha) // Target hardware address. | ||
| frame.Write(tpa) // Target protocol address. | ||
| return frame.Bytes() | ||
| } |
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,55 @@ | ||
| // Copyright 2020 Antrea Authors | ||
| // | ||
| // Licensed under the Apache License, Version 2.0 (the "License"); | ||
| // you may not use this file except in compliance with the License. | ||
| // You may obtain a copy of the License at | ||
| // | ||
| // http://www.apache.org/licenses/LICENSE-2.0 | ||
| // | ||
| // Unless required by applicable law or agreed to in writing, software | ||
| // distributed under the License is distributed on an "AS IS" BASIS, | ||
| // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| // See the License for the specific language governing permissions and | ||
| // limitations under the License. | ||
|
|
||
| package arping | ||
|
|
||
| import ( | ||
| "net" | ||
| "reflect" | ||
| "testing" | ||
| ) | ||
|
|
||
| func TestNewARPRequest(t *testing.T) { | ||
| tests := []struct { | ||
| name string | ||
| sha []byte | ||
| spa []byte | ||
| tha []byte | ||
| tpa []byte | ||
| want []byte | ||
| }{ | ||
| { | ||
| name: "Gratuitous ARP", | ||
| sha: []byte{0x42, 0xaf, 0xb8, 0x14, 0xcb, 0x4e}, | ||
| spa: net.ParseIP("192.168.10.1").To4(), | ||
| tha: []byte{0xff, 0xff, 0xff, 0xff, 0xff, 0xff}, | ||
| tpa: net.ParseIP("192.168.10.1").To4(), | ||
| want: []byte{ | ||
| 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x42, 0xaf, | ||
| 0xb8, 0x14, 0xcb, 0x4e, 0x08, 0x06, 0x00, 0x01, | ||
| 0x08, 0x00, 0x06, 0x04, 0x00, 0x01, 0x42, 0xaf, | ||
| 0xb8, 0x14, 0xcb, 0x4e, 0xc0, 0xa8, 0x0a, 0x01, | ||
| 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xc0, 0xa8, | ||
| 0x0a, 0x01, | ||
| }, | ||
| }, | ||
| } | ||
| for _, tt := range tests { | ||
| t.Run(tt.name, func(t *testing.T) { | ||
| if got := newARPRequest(tt.sha, tt.spa, tt.tha, tt.tpa); !reflect.DeepEqual(got, tt.want) { | ||
| t.Errorf("newARPRequest() = %v, want %v", got, tt.want) | ||
| } | ||
| }) | ||
| } | ||
| } |
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
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,59 @@ | ||
| // Copyright 2020 Antrea Authors | ||
| // | ||
| // Licensed under the Apache License, Version 2.0 (the "License"); | ||
| // you may not use this file except in compliance with the License. | ||
| // You may obtain a copy of the License at | ||
| // | ||
| // http://www.apache.org/licenses/LICENSE-2.0 | ||
| // | ||
| // Unless required by applicable law or agreed to in writing, software | ||
| // distributed under the License is distributed on an "AS IS" BASIS, | ||
| // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| // See the License for the specific language governing permissions and | ||
| // limitations under the License. | ||
|
|
||
| package e2e | ||
|
|
||
| import ( | ||
| "fmt" | ||
| "strings" | ||
| "testing" | ||
|
|
||
| "github.com/stretchr/testify/assert" | ||
| ) | ||
|
|
||
| // TestBatchCreatePods verifies there is no FD leak after batched Pod creation. | ||
| func TestBatchCreatePods(t *testing.T) { | ||
| data, err := setupTest(t) | ||
| if err != nil { | ||
| t.Fatalf("Error when setting up test: %v", err) | ||
| } | ||
| defer teardownTest(t, data) | ||
|
|
||
| batchNum := 20 | ||
|
|
||
| node1 := workerNodeName(1) | ||
| podName, err := data.getAntreaPodOnNode(node1) | ||
| assert.NoError(t, err) | ||
|
|
||
| getFDs := func() string { | ||
| // In case that antrea-agent is not running as Pid 1 in future. | ||
| cmds := []string{"pidof", "antrea-agent"} | ||
| pid, _, err := data.runCommandFromPod(antreaNamespace, podName, "antrea-agent", cmds) | ||
| assert.NoError(t, err) | ||
|
|
||
| // Ignore the difference of modification time by specifying "--time-style +". | ||
| cmds = []string{"ls", "-l", "--time-style", "+", fmt.Sprintf("/proc/%s/fd/", strings.TrimSpace(pid))} | ||
| stdout, _, err := data.runCommandFromPod(antreaNamespace, podName, "antrea-agent", cmds) | ||
| assert.NoError(t, err) | ||
| return stdout | ||
| } | ||
|
|
||
| oldFDs := getFDs() | ||
|
|
||
| _, _, cleanupFn := createTestBusyboxPods(t, data, batchNum, node1) | ||
| defer cleanupFn() | ||
|
|
||
| newFDs := getFDs() | ||
| assert.Equal(t, oldFDs, newFDs, "FDs were changed after batched Pod creation") | ||
| } |
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