pkg/iptables: reduce calls to iptables
Currently, every time the iptables controller syncs rules, it spawns an an iptables process for every rule it checks. This causes two problems: 1. it creates unnecessary load on the system; and 2. it causes contention on the xtables lock file. This commit creates a lazy cache for iptables rules and chains that avoids spawning iptables processes. This means that each time the iptables rules are reconciled, if no rules need to be changed then at most one iptables process should be spawned to check all of the rules in a chain and at most one process should be spawned to check all of the chains in a table. Note: the success of this reduction in calls to iptables depends on a somewhat fragile comparison of iptables rule text. The text of any rule must match exactly, including the order of the flags. An improvement to come would be to implement an iptables rule parser than can be used to check semantic equivalence betweem iptables rules. Signed-off-by: Lucas Servén Marín <lserven@gmail.com>
This commit is contained in:
Lucas Servén Marín
parent
afea50a388
commit
acfd0bbaec
|
|
@ -16,6 +16,8 @@ package iptables
|
|||
|
||||
import (
|
||||
"fmt"
|
||||
"strings"
|
||||
"sync/atomic"
|
||||
|
||||
"github.com/coreos/go-iptables/iptables"
|
||||
)
|
||||
|
|
@ -38,12 +40,14 @@ func (s statusError) ExitStatus() int {
|
|||
}
|
||||
|
||||
type fakeClient struct {
|
||||
calls uint64
|
||||
storage []Rule
|
||||
}
|
||||
|
||||
var _ Client = &fakeClient{}
|
||||
|
||||
func (f *fakeClient) AppendUnique(table, chain string, spec ...string) error {
|
||||
atomic.AddUint64(&f.calls, 1)
|
||||
exists, err := f.Exists(table, chain, spec...)
|
||||
if err != nil {
|
||||
return err
|
||||
|
|
@ -56,6 +60,7 @@ func (f *fakeClient) AppendUnique(table, chain string, spec ...string) error {
|
|||
}
|
||||
|
||||
func (f *fakeClient) Delete(table, chain string, spec ...string) error {
|
||||
atomic.AddUint64(&f.calls, 1)
|
||||
r := &rule{table: table, chain: chain, spec: spec}
|
||||
for i := range f.storage {
|
||||
if f.storage[i].String() == r.String() {
|
||||
|
|
@ -69,6 +74,7 @@ func (f *fakeClient) Delete(table, chain string, spec ...string) error {
|
|||
}
|
||||
|
||||
func (f *fakeClient) Exists(table, chain string, spec ...string) (bool, error) {
|
||||
atomic.AddUint64(&f.calls, 1)
|
||||
r := &rule{table: table, chain: chain, spec: spec}
|
||||
for i := range f.storage {
|
||||
if f.storage[i].String() == r.String() {
|
||||
|
|
@ -78,7 +84,22 @@ func (f *fakeClient) Exists(table, chain string, spec ...string) (bool, error) {
|
|||
return false, nil
|
||||
}
|
||||
|
||||
func (f *fakeClient) List(table, chain string) ([]string, error) {
|
||||
atomic.AddUint64(&f.calls, 1)
|
||||
var rs []string
|
||||
for i := range f.storage {
|
||||
switch r := f.storage[i].(type) {
|
||||
case *rule:
|
||||
if r.table == table && r.chain == chain {
|
||||
rs = append(rs, strings.TrimSpace(strings.TrimPrefix(r.String(), table)))
|
||||
}
|
||||
}
|
||||
}
|
||||
return rs, nil
|
||||
}
|
||||
|
||||
func (f *fakeClient) ClearChain(table, name string) error {
|
||||
atomic.AddUint64(&f.calls, 1)
|
||||
for i := range f.storage {
|
||||
r, ok := f.storage[i].(*rule)
|
||||
if !ok {
|
||||
|
|
@ -90,10 +111,14 @@ func (f *fakeClient) ClearChain(table, name string) error {
|
|||
}
|
||||
}
|
||||
}
|
||||
return f.DeleteChain(table, name)
|
||||
if err := f.DeleteChain(table, name); err != nil {
|
||||
return err
|
||||
}
|
||||
return f.NewChain(table, name)
|
||||
}
|
||||
|
||||
func (f *fakeClient) DeleteChain(table, name string) error {
|
||||
atomic.AddUint64(&f.calls, 1)
|
||||
for i := range f.storage {
|
||||
r, ok := f.storage[i].(*rule)
|
||||
if !ok {
|
||||
|
|
@ -116,6 +141,7 @@ func (f *fakeClient) DeleteChain(table, name string) error {
|
|||
}
|
||||
|
||||
func (f *fakeClient) NewChain(table, name string) error {
|
||||
atomic.AddUint64(&f.calls, 1)
|
||||
c := &chain{table: table, chain: name}
|
||||
for i := range f.storage {
|
||||
if f.storage[i].String() == c.String() {
|
||||
|
|
@ -125,3 +151,17 @@ func (f *fakeClient) NewChain(table, name string) error {
|
|||
f.storage = append(f.storage, c)
|
||||
return nil
|
||||
}
|
||||
|
||||
func (f *fakeClient) ListChains(table string) ([]string, error) {
|
||||
atomic.AddUint64(&f.calls, 1)
|
||||
var cs []string
|
||||
for i := range f.storage {
|
||||
switch c := f.storage[i].(type) {
|
||||
case *chain:
|
||||
if c.table == table {
|
||||
cs = append(cs, c.chain)
|
||||
}
|
||||
}
|
||||
}
|
||||
return cs, nil
|
||||
}
|
||||
|
|
|
|||
|
|
@ -17,7 +17,6 @@ package iptables
|
|||
import (
|
||||
"fmt"
|
||||
"net"
|
||||
"strings"
|
||||
"sync"
|
||||
"time"
|
||||
|
||||
|
|
@ -47,9 +46,11 @@ type Client interface {
|
|||
AppendUnique(table string, chain string, rule ...string) error
|
||||
Delete(table string, chain string, rule ...string) error
|
||||
Exists(table string, chain string, rule ...string) (bool, error)
|
||||
List(table string, chain string) ([]string, error)
|
||||
ClearChain(table string, chain string) error
|
||||
DeleteChain(table string, chain string) error
|
||||
NewChain(table string, chain string) error
|
||||
ListChains(table string) ([]string, error)
|
||||
}
|
||||
|
||||
// Rule is an interface for interacting with iptables objects.
|
||||
|
|
@ -107,7 +108,17 @@ func (r *rule) String() string {
|
|||
if r == nil {
|
||||
return ""
|
||||
}
|
||||
return fmt.Sprintf("%s_%s_%s", r.table, r.chain, strings.Join(r.spec, "_"))
|
||||
spec := r.table + " -A " + r.chain
|
||||
for i, s := range r.spec {
|
||||
spec += " "
|
||||
// If this is the content of a comment, wrap the value in quotes.
|
||||
if i > 0 && r.spec[i-1] == "--comment" {
|
||||
spec += `"` + s + `"`
|
||||
} else {
|
||||
spec += s
|
||||
}
|
||||
}
|
||||
return spec
|
||||
}
|
||||
|
||||
func (r *rule) Proto() Protocol {
|
||||
|
|
@ -132,6 +143,7 @@ func NewIPv6Chain(table, name string) Rule {
|
|||
}
|
||||
|
||||
func (c *chain) Add(client Client) error {
|
||||
// Note: `ClearChain` creates a chain if it does not exist.
|
||||
if err := client.ClearChain(c.table, c.chain); err != nil {
|
||||
return fmt.Errorf("failed to add iptables chain: %v", err)
|
||||
}
|
||||
|
|
@ -171,13 +183,17 @@ func (c *chain) String() string {
|
|||
if c == nil {
|
||||
return ""
|
||||
}
|
||||
return fmt.Sprintf("%s_%s", c.table, c.chain)
|
||||
return chainToString(c.table, c.chain)
|
||||
}
|
||||
|
||||
func (c *chain) Proto() Protocol {
|
||||
return c.proto
|
||||
}
|
||||
|
||||
func chainToString(table, chain string) string {
|
||||
return fmt.Sprintf("%s -N %s", table, chain)
|
||||
}
|
||||
|
||||
// Controller is able to reconcile a given set of iptables rules.
|
||||
type Controller struct {
|
||||
v4 Client
|
||||
|
|
@ -242,8 +258,9 @@ func (c *Controller) Run(stop <-chan struct{}) (<-chan error, error) {
|
|||
func (c *Controller) reconcile() error {
|
||||
c.Lock()
|
||||
defer c.Unlock()
|
||||
var rc ruleCache
|
||||
for i, r := range c.rules {
|
||||
ok, err := r.Exists(c.client(r.Proto()))
|
||||
ok, err := rc.exists(c.client(r.Proto()), r)
|
||||
if err != nil {
|
||||
return fmt.Errorf("failed to check if rule exists: %v", err)
|
||||
}
|
||||
|
|
|
|||
|
|
@ -0,0 +1,106 @@
|
|||
// Copyright 2021 the Kilo 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 iptables
|
||||
|
||||
import (
|
||||
"fmt"
|
||||
"strings"
|
||||
)
|
||||
|
||||
type ruleCacheFlag byte
|
||||
|
||||
const (
|
||||
exists ruleCacheFlag = 1 << iota
|
||||
populated
|
||||
)
|
||||
|
||||
type isNotExistError interface {
|
||||
error
|
||||
IsNotExist() bool
|
||||
}
|
||||
|
||||
// ruleCache is a lazy cache that can be used to
|
||||
// check if a given rule or chain exists in an iptables
|
||||
// table.
|
||||
type ruleCache [2]map[string]ruleCacheFlag
|
||||
|
||||
func (rc *ruleCache) populateTable(c Client, proto Protocol, table string) error {
|
||||
// If the table already exists in the destination map,
|
||||
// exit early since it has already been populated.
|
||||
if rc[proto][table]&populated != 0 {
|
||||
return nil
|
||||
}
|
||||
cs, err := c.ListChains(table)
|
||||
if err != nil {
|
||||
return fmt.Errorf("failed to populate chains for table %q: %v", table, err)
|
||||
}
|
||||
rc[proto][table] = exists | populated
|
||||
for i := range cs {
|
||||
rc[proto][chainToString(table, cs[i])] |= exists
|
||||
}
|
||||
return nil
|
||||
}
|
||||
|
||||
func (rc *ruleCache) populateChain(c Client, proto Protocol, table, chain string) error {
|
||||
// If the destination chain true, then it has already been populated.
|
||||
if rc[proto][chainToString(table, chain)]&populated != 0 {
|
||||
return nil
|
||||
}
|
||||
rs, err := c.List(table, chain)
|
||||
if err != nil {
|
||||
if existsErr, ok := err.(isNotExistError); ok && existsErr.IsNotExist() {
|
||||
rc[proto][chainToString(table, chain)] = populated
|
||||
return nil
|
||||
}
|
||||
return fmt.Errorf("failed to populate rules in chain %q for table %q: %v", chain, table, err)
|
||||
}
|
||||
for i := range rs {
|
||||
rc[proto][strings.Join([]string{table, rs[i]}, " ")] = exists
|
||||
}
|
||||
// If there are rules on the chain, then the chain exists too.
|
||||
if len(rs) > 0 {
|
||||
rc[proto][chainToString(table, chain)] = exists
|
||||
}
|
||||
rc[proto][chainToString(table, chain)] |= populated
|
||||
return nil
|
||||
}
|
||||
|
||||
func (rc *ruleCache) populateRules(c Client, r Rule) error {
|
||||
// Ensure a map for the proto exists.
|
||||
if rc[r.Proto()] == nil {
|
||||
rc[r.Proto()] = make(map[string]ruleCacheFlag)
|
||||
}
|
||||
|
||||
if ch, ok := r.(*chain); ok {
|
||||
return rc.populateTable(c, r.Proto(), ch.table)
|
||||
}
|
||||
|
||||
ru := r.(*rule)
|
||||
return rc.populateChain(c, r.Proto(), ru.table, ru.chain)
|
||||
}
|
||||
|
||||
func (rc *ruleCache) exists(c Client, r Rule) (bool, error) {
|
||||
// Exit early if the exact rule exists by name.
|
||||
if rc[r.Proto()][r.String()]&exists != 0 {
|
||||
return true, nil
|
||||
}
|
||||
|
||||
// Otherwise, populate the respective rules.
|
||||
if err := rc.populateRules(c, r); err != nil {
|
||||
return false, err
|
||||
}
|
||||
|
||||
return rc[r.Proto()][r.String()]&exists != 0, nil
|
||||
}
|
||||
|
|
@ -0,0 +1,125 @@
|
|||
// Copyright 2021 the Kilo 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 iptables
|
||||
|
||||
import (
|
||||
"testing"
|
||||
)
|
||||
|
||||
func TestRuleCache(t *testing.T) {
|
||||
for _, tc := range []struct {
|
||||
name string
|
||||
rules []Rule
|
||||
check []Rule
|
||||
out []bool
|
||||
calls uint64
|
||||
}{
|
||||
{
|
||||
name: "empty",
|
||||
rules: nil,
|
||||
check: []Rule{rules[0]},
|
||||
out: []bool{false},
|
||||
calls: 1,
|
||||
},
|
||||
{
|
||||
name: "single negative",
|
||||
rules: []Rule{rules[1]},
|
||||
check: []Rule{rules[0]},
|
||||
out: []bool{false},
|
||||
calls: 1,
|
||||
},
|
||||
{
|
||||
name: "single positive",
|
||||
rules: []Rule{rules[1]},
|
||||
check: []Rule{rules[1]},
|
||||
out: []bool{true},
|
||||
calls: 1,
|
||||
},
|
||||
{
|
||||
name: "single chain",
|
||||
rules: []Rule{&chain{"nat", "KILO-NAT", ProtocolIPv4}},
|
||||
check: []Rule{&chain{"nat", "KILO-NAT", ProtocolIPv4}},
|
||||
out: []bool{true},
|
||||
calls: 1,
|
||||
},
|
||||
{
|
||||
name: "rule on chain means chain exists",
|
||||
rules: []Rule{rules[0]},
|
||||
check: []Rule{rules[0], &chain{"filter", "FORWARD", ProtocolIPv4}},
|
||||
out: []bool{true, true},
|
||||
calls: 1,
|
||||
},
|
||||
{
|
||||
name: "rule on chain does not mean table is fully populated",
|
||||
rules: []Rule{rules[0], &chain{"filter", "INPUT", ProtocolIPv4}},
|
||||
check: []Rule{rules[0], &chain{"filter", "OUTPUT", ProtocolIPv4}, &chain{"filter", "INPUT", ProtocolIPv4}},
|
||||
out: []bool{true, false, true},
|
||||
calls: 2,
|
||||
},
|
||||
{
|
||||
name: "multiple rules on chain",
|
||||
rules: []Rule{rules[0], rules[1]},
|
||||
check: []Rule{rules[0], rules[1], &chain{"filter", "FORWARD", ProtocolIPv4}},
|
||||
out: []bool{true, true, true},
|
||||
calls: 1,
|
||||
},
|
||||
{
|
||||
name: "checking rule on chain does not mean chain exists",
|
||||
rules: nil,
|
||||
check: []Rule{rules[0], &chain{"filter", "FORWARD", ProtocolIPv4}},
|
||||
out: []bool{false, false},
|
||||
calls: 2,
|
||||
},
|
||||
{
|
||||
name: "multiple chains on same table",
|
||||
rules: nil,
|
||||
check: []Rule{&chain{"filter", "INPUT", ProtocolIPv4}, &chain{"filter", "FORWARD", ProtocolIPv4}},
|
||||
out: []bool{false, false},
|
||||
calls: 1,
|
||||
},
|
||||
{
|
||||
name: "multiple chains on different table",
|
||||
rules: nil,
|
||||
check: []Rule{&chain{"filter", "INPUT", ProtocolIPv4}, &chain{"nat", "POSTROUTING", ProtocolIPv4}},
|
||||
out: []bool{false, false},
|
||||
calls: 2,
|
||||
},
|
||||
} {
|
||||
controller := &Controller{}
|
||||
client := &fakeClient{}
|
||||
controller.v4 = client
|
||||
controller.v6 = client
|
||||
if err := controller.Set(tc.rules); err != nil {
|
||||
t.Fatalf("test case %q: Set should not fail: %v", tc.name, err)
|
||||
}
|
||||
// Reset the client's calls so we can examine how many times
|
||||
// the rule cache performs operations.
|
||||
client.calls = 0
|
||||
var rc ruleCache
|
||||
for i := range tc.check {
|
||||
ok, err := rc.exists(controller.client(tc.check[i].Proto()), tc.check[i])
|
||||
if err != nil {
|
||||
t.Fatalf("test case %q check %d: check should not fail: %v", tc.name, i, err)
|
||||
}
|
||||
if ok != tc.out[i] {
|
||||
t.Errorf("test case %q check %d: expected %t, got %t", tc.name, i, tc.out[i], ok)
|
||||
}
|
||||
}
|
||||
if client.calls != tc.calls {
|
||||
t.Errorf("test case %q: expected client to be called %d times, got %d", tc.name, tc.calls, client.calls)
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
|
|
@ -225,19 +225,19 @@ func (t *Topology) Rules(cni bool) []iptables.Rule {
|
|||
rules = append(rules, iptables.NewIPv4Chain("nat", "KILO-NAT"))
|
||||
rules = append(rules, iptables.NewIPv6Chain("nat", "KILO-NAT"))
|
||||
if cni {
|
||||
rules = append(rules, iptables.NewRule(iptables.GetProtocol(len(t.subnet.IP)), "nat", "POSTROUTING", "-m", "comment", "--comment", "Kilo: jump to KILO-NAT chain", "-s", t.subnet.String(), "-j", "KILO-NAT"))
|
||||
rules = append(rules, iptables.NewRule(iptables.GetProtocol(len(t.subnet.IP)), "nat", "POSTROUTING", "-s", t.subnet.String(), "-m", "comment", "--comment", "Kilo: jump to KILO-NAT chain", "-j", "KILO-NAT"))
|
||||
}
|
||||
for _, s := range t.segments {
|
||||
rules = append(rules, iptables.NewRule(iptables.GetProtocol(len(s.wireGuardIP)), "nat", "KILO-NAT", "-m", "comment", "--comment", "Kilo: do not NAT packets destined for WireGuared IPs", "-d", s.wireGuardIP.String(), "-j", "RETURN"))
|
||||
rules = append(rules, iptables.NewRule(iptables.GetProtocol(len(s.wireGuardIP)), "nat", "KILO-NAT", "-d", oneAddressCIDR(s.wireGuardIP).String(), "-m", "comment", "--comment", "Kilo: do not NAT packets destined for WireGuared IPs", "-j", "RETURN"))
|
||||
for _, aip := range s.allowedIPs {
|
||||
rules = append(rules, iptables.NewRule(iptables.GetProtocol(len(aip.IP)), "nat", "KILO-NAT", "-m", "comment", "--comment", "Kilo: do not NAT packets destined for known IPs", "-d", aip.String(), "-j", "RETURN"))
|
||||
rules = append(rules, iptables.NewRule(iptables.GetProtocol(len(aip.IP)), "nat", "KILO-NAT", "-d", aip.String(), "-m", "comment", "--comment", "Kilo: do not NAT packets destined for known IPs", "-j", "RETURN"))
|
||||
}
|
||||
}
|
||||
for _, p := range t.peers {
|
||||
for _, aip := range p.AllowedIPs {
|
||||
rules = append(rules,
|
||||
iptables.NewRule(iptables.GetProtocol(len(aip.IP)), "nat", "POSTROUTING", "-m", "comment", "--comment", "Kilo: jump to NAT chain", "-s", aip.String(), "-j", "KILO-NAT"),
|
||||
iptables.NewRule(iptables.GetProtocol(len(aip.IP)), "nat", "KILO-NAT", "-m", "comment", "--comment", "Kilo: do not NAT packets destined for peers", "-d", aip.String(), "-j", "RETURN"),
|
||||
iptables.NewRule(iptables.GetProtocol(len(aip.IP)), "nat", "POSTROUTING", "-s", aip.String(), "-m", "comment", "--comment", "Kilo: jump to NAT chain", "-j", "KILO-NAT"),
|
||||
iptables.NewRule(iptables.GetProtocol(len(aip.IP)), "nat", "KILO-NAT", "-d", aip.String(), "-m", "comment", "--comment", "Kilo: do not NAT packets destined for peers", "-j", "RETURN"),
|
||||
)
|
||||
}
|
||||
}
|
||||
|
|
|
|||
Loading…
Reference in New Issue