forked from projectcalico/calico
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Infra for upgrading map from one version to the other. (projectcalico…
…#6181) * Infra for upgrading map from one version to the other.
- Loading branch information
1 parent
179036c
commit 8144afe
Showing
10 changed files
with
975 additions
and
4 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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,50 @@ | ||
| // Copyright (c) 2022 Tigera, Inc. All rights reserved. | ||
| // | ||
| // 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 upgrade | ||
|
|
||
| import ( | ||
| "reflect" | ||
|
|
||
| "github.com/projectcalico/calico/felix/bpf" | ||
| "github.com/projectcalico/calico/felix/bpf/cachingmap" | ||
| ) | ||
|
|
||
| func UpgradeBPFMap(oldMap, newMap *bpf.PinnedMap) error { | ||
| oldVersion := oldMap.Version | ||
| newVersion := newMap.Version | ||
| oldCachingMap := cachingmap.New(oldMap.MapParameters, oldMap) | ||
| newCachingMap := cachingmap.New(newMap.MapParameters, newMap) | ||
| err := oldCachingMap.LoadCacheFromDataplane() | ||
| if err != nil { | ||
| return err | ||
| } | ||
| err = newCachingMap.LoadCacheFromDataplane() | ||
| if err != nil { | ||
| return err | ||
| } | ||
| oldCachingMap.IterDataplaneCache(func(k, v []byte) { | ||
| tmpK, tmpV := newMap.KVasUpgradable(oldVersion, k, v) | ||
| for i := oldVersion; i < newVersion; i++ { | ||
| tmpK = tmpK.Upgrade() | ||
| tmpV = tmpV.Upgrade() | ||
| } | ||
| val := newCachingMap.GetDataplaneCache(tmpK.AsBytes()) | ||
| if !reflect.DeepEqual(val, tmpV.AsBytes()) { | ||
| newCachingMap.SetDesired(tmpK.AsBytes(), tmpV.AsBytes()) | ||
| } | ||
| }) | ||
| return newCachingMap.ApplyUpdatesOnly() | ||
|
|
||
| } |
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,122 @@ | ||
| // Copyright (c) 2022 Tigera, Inc. All rights reserved. | ||
| // | ||
| // 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 multiversion | ||
|
|
||
| import ( | ||
| "github.com/projectcalico/calico/felix/bpf" | ||
| "github.com/projectcalico/calico/felix/bpf/bpfmap/upgrade" | ||
| v2 "github.com/projectcalico/calico/felix/bpf/mock/multiversion/v2" | ||
| v3 "github.com/projectcalico/calico/felix/bpf/mock/multiversion/v3" | ||
| v4 "github.com/projectcalico/calico/felix/bpf/mock/multiversion/v4" | ||
| v5 "github.com/projectcalico/calico/felix/bpf/mock/multiversion/v5" | ||
| ) | ||
|
|
||
| func GetMapParams(version int) bpf.MapParameters { | ||
| switch version { | ||
| case 2: | ||
| return v2.MockMapParams | ||
| case 3: | ||
| return v3.MockMapParams | ||
| case 4: | ||
| return v4.MockMapParams | ||
| case 5: | ||
| return v5.MockMapParams | ||
| default: | ||
| return v5.MockMapParams | ||
| } | ||
| } | ||
|
|
||
| func GetKeyValueTypeFromVersion(version int, k, v []byte) (bpf.Upgradable, bpf.Upgradable) { | ||
| switch version { | ||
| case 2: | ||
| var key v2.Key | ||
| var val v2.Value | ||
| copy(key[:], k) | ||
| copy(val[:], v) | ||
| return key, val | ||
| case 3: | ||
| var key v3.Key | ||
| var val v3.Value | ||
| copy(key[:], k) | ||
| copy(val[:], v) | ||
| return key, val | ||
| case 4: | ||
| var key v4.Key | ||
| var val v4.Value | ||
| copy(key[:], k) | ||
| copy(val[:], v) | ||
| return key, val | ||
| case 5: | ||
| var key v5.Key | ||
| var val v5.Value | ||
| copy(key[:], k) | ||
| copy(val[:], v) | ||
| return key, val | ||
| default: | ||
| var key v5.Key | ||
| var val v5.Value | ||
| copy(key[:], k) | ||
| copy(val[:], v) | ||
| return key, val | ||
| } | ||
| } | ||
|
|
||
| func MapV2(mc *bpf.MapContext, maxEntries int) bpf.Map { | ||
| mockParams := v2.MockMapParams | ||
| if maxEntries > 0 { | ||
| mockParams.MaxEntries = maxEntries | ||
| } | ||
| b := mc.NewPinnedMap(mockParams) | ||
| b.(*bpf.PinnedMap).UpgradeFn = upgrade.UpgradeBPFMap | ||
| b.(*bpf.PinnedMap).GetMapParams = GetMapParams | ||
| b.(*bpf.PinnedMap).KVasUpgradable = GetKeyValueTypeFromVersion | ||
| return b | ||
| } | ||
|
|
||
| func MapV3(mc *bpf.MapContext, maxEntries int) bpf.Map { | ||
| mockParams := v3.MockMapParams | ||
| if maxEntries > 0 { | ||
| mockParams.MaxEntries = maxEntries | ||
| } | ||
| b := mc.NewPinnedMap(mockParams) | ||
| b.(*bpf.PinnedMap).UpgradeFn = upgrade.UpgradeBPFMap | ||
| b.(*bpf.PinnedMap).GetMapParams = GetMapParams | ||
| b.(*bpf.PinnedMap).KVasUpgradable = GetKeyValueTypeFromVersion | ||
| return b | ||
| } | ||
|
|
||
| func MapV4(mc *bpf.MapContext, maxEntries int) bpf.Map { | ||
| mockParams := v4.MockMapParams | ||
| if maxEntries > 0 { | ||
| mockParams.MaxEntries = maxEntries | ||
| } | ||
| b := mc.NewPinnedMap(mockParams) | ||
| b.(*bpf.PinnedMap).UpgradeFn = upgrade.UpgradeBPFMap | ||
| b.(*bpf.PinnedMap).GetMapParams = GetMapParams | ||
| b.(*bpf.PinnedMap).KVasUpgradable = GetKeyValueTypeFromVersion | ||
| return b | ||
| } | ||
|
|
||
| func MapV5(mc *bpf.MapContext, maxEntries int) bpf.Map { | ||
| mockParams := v5.MockMapParams | ||
| if maxEntries > 0 { | ||
| mockParams.MaxEntries = maxEntries | ||
| } | ||
| b := mc.NewPinnedMap(mockParams) | ||
| b.(*bpf.PinnedMap).UpgradeFn = upgrade.UpgradeBPFMap | ||
| b.(*bpf.PinnedMap).GetMapParams = GetMapParams | ||
| b.(*bpf.PinnedMap).KVasUpgradable = GetKeyValueTypeFromVersion | ||
| return b | ||
| } |
Oops, something went wrong.