change priority from 0 to 6

Signed-off-by: derekwin <[email protected]>

Author: derekwin

bpf/kmesh/workload/include/service.h

@@ -20,9 +20,9 @@ static inline int lb_random_handle(struct kmesh_context *kmesh_ctx, __u32 servic
     int rand_k = 0;
 
     endpoint_k.service_id = service_id;
-    endpoint_k.prio = MAX_PRIO; // for random handle，all endpoints are saved in MAX_PRIO
+    endpoint_k.prio = MIN_PRIO; // for random handle，all endpoints are saved in MIN_PRIO
 
-    rand_k = bpf_get_prandom_u32() % service_v->prio_endpoint_count[MAX_PRIO] + 1;
+    rand_k = bpf_get_prandom_u32() % service_v->prio_endpoint_count[MIN_PRIO] + 1;
     endpoint_k.backend_index = rand_k;
 
     endpoint_v = map_lookup_endpoint(&endpoint_k);
@@ -51,19 +51,19 @@ lb_locality_failover_handle(struct kmesh_context *kmesh_ctx, __u32 service_id, s
     endpoint_k.service_id = service_id;
 
     // #pragma unroll
-    for (int match_rank = MAX_PRIO; match_rank >= 0; match_rank--) {
-        endpoint_k.prio = match_rank; // 6->0
+    for (int match_prio = 0; match_prio < PRIO_COUNT; match_prio++) {
+        endpoint_k.prio = match_prio; // 0->6
         // if we have endpoints in this prio
-        if (service_v->prio_endpoint_count[match_rank] > 0) {
-            rand_k = bpf_get_prandom_u32() % service_v->prio_endpoint_count[match_rank] + 1;
+        if (service_v->prio_endpoint_count[match_prio] > 0) {
+            rand_k = bpf_get_prandom_u32() % service_v->prio_endpoint_count[match_prio] + 1;
             if (rand_k >= MAP_SIZE_OF_BACKEND) {
                 return -ENOENT;
             }
             endpoint_k.backend_index = rand_k;
             endpoint_v = map_lookup_endpoint(&endpoint_k);
             if (!endpoint_v) {
                 BPF_LOG(
-                    ERR, SERVICE, "find endpoint [%u/%u/%u] failed", service_id, match_rank, endpoint_k.backend_index);
+                    ERR, SERVICE, "find endpoint [%u/%u/%u] failed", service_id, match_prio, endpoint_k.backend_index);
                 return -ENOENT;
             }
             ret = endpoint_manager(kmesh_ctx, endpoint_v, service_id, service_v);
@@ -74,7 +74,7 @@ lb_locality_failover_handle(struct kmesh_context *kmesh_ctx, __u32 service_id, s
             }
             return 0; // find the backend successfully
         }
-        if (is_strict && match_rank == service_v->lb_strict_index) { // only match lb strict index
+        if (is_strict && match_prio == service_v->lb_strict_prio) { // only match lb strict index
             return -ENOENT;
         }
     }

bpf/kmesh/workload/include/workload.h

@@ -10,8 +10,8 @@
 #define MAX_PORT_COUNT            10
 #define MAX_SERVICE_COUNT         10
 #define RINGBUF_SIZE              (1 << 12)
-#define MAX_PRIO                  6
-#define MAX_PRIO_COUNT            MAX_PRIO + 1 // 6 means match all scope, 0 means match nothing
+#define MIN_PRIO                  6
+#define PRIO_COUNT                7
 #define MAX_MEMBER_NUM_PER_POLICY 4
 
 #pragma pack(1)
@@ -30,10 +30,10 @@ typedef struct {
 } service_key;
 
 typedef struct {
-    __u32 prio_endpoint_count[MAX_PRIO_COUNT]; // endpoint count of current service with prio, prio from 6->0
-    __u32 lb_policy;       // load balancing algorithm, currently supports random algorithm, locality loadbalance
-                           // Failover/strict mode
-    __u32 lb_strict_index; // for failover strict mode
+    __u32 prio_endpoint_count[PRIO_COUNT]; // endpoint count of current service with prio
+    __u32 lb_policy;      // load balancing algorithm, currently supports random algorithm, locality loadbalance
+                          // Failover/strict mode
+    __u32 lb_strict_prio; // for failover strict mode
     __u32 service_port[MAX_PORT_COUNT]; // service_port[i] and target_port[i] are a pair, i starts from 0 and max value
                                         // is MAX_PORT_COUNT-1
     __u32 target_port[MAX_PORT_COUNT];
@@ -44,7 +44,7 @@ typedef struct {
 // endpoint map
 typedef struct {
     __u32 service_id;    // service id
-    __u32 prio;          // prio means rank, 6 means match all, and 0 means match nothing
+    __u32 prio;          // 0 means heightest prio, match all scope, 6 means lowest prio.
     __u32 backend_index; // if endpoint_count = 3, then backend_index = 0/1/2
 } endpoint_key;
 

pkg/controller/workload/bpfcache/endpoint.go

@@ -22,8 +22,8 @@ import (
 )
 
 const (
-	MaxPrio    = 6
-	MaxPrioNum = 7
+	MinPrio   = 6
+	PrioCount = 7
 )
 
 type EndpointKey struct {

pkg/controller/workload/bpfcache/locality_cache.go

@@ -1,3 +1,19 @@
+/*
+ * Copyright The Kmesh 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 bpfcache
 
 import (
@@ -59,7 +75,7 @@ func (l *localityInfo) IsSet(param uint32) bool {
 type LocalityCache struct {
 	LbPolicy               uint32
 	localityInfo           localityInfo
-	LbStrictIndex          uint32 // for failover strict mode
+	LbStrictPrio           uint32 // for failover strict mode
 	isLocalityInfoSet      bool
 	RoutingPreference      []workloadapi.LoadBalancing_Scope
 	isRoutingPreferenceSet bool
@@ -92,7 +108,7 @@ func (l *LocalityCache) SetRoutingPreference(s []workloadapi.LoadBalancing_Scope
 	// notice: s should set by lb.GetRoutingPreference()
 	if len(s) > 0 {
 		l.RoutingPreference = s
-		l.LbStrictIndex = uint32(len(s))
+		l.LbStrictPrio = uint32(MinPrio - len(s))
 		l.isRoutingPreferenceSet = true
 	}
 }
@@ -138,7 +154,7 @@ func (l *LocalityCache) CalcuLocalityLBPrio(wl *workloadapi.Workload) uint32 {
 			}
 		}
 	}
-	return rank
+	return MinPrio - rank
 }
 
 func (l *LocalityCache) SaveToWaitQueue(wl *workloadapi.Workload) {

pkg/controller/workload/bpfcache/service.go

@@ -32,9 +32,9 @@ type ServicePorts [MaxPortNum]uint32
 type TargetPorts [MaxPortNum]uint32
 
 type ServiceValue struct {
-	EndpointCount [MaxPrioNum]uint32 // endpoint count of current service
-	LbPolicy      uint32             // load balancing algorithm, currently only supports random algorithm
-	LbStrictIndex uint32
+	EndpointCount [PrioCount]uint32 // endpoint count of current service
+	LbPolicy      uint32            // load balancing algorithm, currently only supports random algorithm
+	LbStrictPrio  uint32
 	ServicePort   ServicePorts // ServicePort[i] and TargetPort[i] are a pair, i starts from 0 and max value is MaxPortNum-1
 	TargetPort    TargetPorts
 	WaypointAddr  [16]byte

pkg/controller/workload/workload_processor.go

@@ -278,7 +278,7 @@ func (p *Processor) removeServiceResourceFromBpfMap(svc *workloadapi.Service, na
 		}
 
 		var i uint32
-		for j := 0; j <= bpf.MaxPrio; j++ {
+		for j := 0; j < bpf.PrioCount; j++ {
 			if svDelete.EndpointCount[j] == 0 {
 				continue
 			}
@@ -352,7 +352,7 @@ func (p *Processor) handleWorkloadNewBoundServices(workload *workloadapi.Workloa
 		// the service already stored in map, add endpoint
 		if err = p.bpf.ServiceLookup(&sk, &sv); err == nil {
 			if sv.LbPolicy == LbPolicyRandom { // random mode
-				if err = p.addWorkloadToService(&sk, &sv, workloadId, bpf.MaxPrio); err != nil { // In random mode, we save all workload to maxprio
+				if err = p.addWorkloadToService(&sk, &sv, workloadId, bpf.MinPrio); err != nil { // In random mode, we save all workload to minprio
 					log.Errorf("addWorkloadToService workload %d service %d failed: %v", workloadId, sk.ServiceId, err)
 					return err
 				}
@@ -363,7 +363,7 @@ func (p *Processor) handleWorkloadNewBoundServices(workload *workloadapi.Workloa
 						log.Errorf("addWorkloadToService workload %d service %d failed: %v", workloadId, sk.ServiceId, err)
 						return err
 					}
-				} else { // locality LB mode, but we need to set up all localityCache fields before add endpoint
+				} else { // locality LB mode, but we need to set up all localityCache fields before adding endpoint
 					p.locality.SaveToWaitQueue(workload)
 				}
 			}
@@ -507,8 +507,8 @@ func (p *Processor) storeServiceData(serviceName string, waypoint *workloadapi.G
 	newValue.LbPolicy = uint32(lb.GetMode()) // set loadbalance mode
 	p.locality.SetRoutingPreference(lb.GetRoutingPreference())
 	p.locality.LbPolicy = newValue.LbPolicy
-	log.Debugf("lbPolicy:%v, routingPreference:%v, strictIndex:%v", newValue.LbPolicy, p.locality.RoutingPreference, p.locality.LbStrictIndex)
-	newValue.LbStrictIndex = p.locality.LbStrictIndex
+	log.Debugf("lbPolicy:%v, routingPreference:%v, strictIndex:%v", newValue.LbPolicy, p.locality.RoutingPreference, p.locality.LbStrictPrio)
+	newValue.LbStrictPrio = p.locality.LbStrictPrio
 
 	if waypoint != nil && waypoint.GetAddress() != nil {
 		nets.CopyIpByteFromSlice(&newValue.WaypointAddr, waypoint.GetAddress().Address)

pkg/controller/workload/workload_processor_test.go

@@ -65,7 +65,7 @@ func Test_handleWorkload(t *testing.T) {
 	svcID := checkFrontEndMap(t, fakeSvc.Addresses[0].Address, p)
 
 	// 2.2 check service map contains service
-	checkServiceMap(t, p, svcID, fakeSvc, bpfcache.MaxPrio, 1)
+	checkServiceMap(t, p, svcID, fakeSvc, bpfcache.MinPrio, 1)
 
 	// 2.3 check endpoint map now contains the workloads
 	ek.BackendIndex = 1
@@ -88,7 +88,7 @@ func Test_handleWorkload(t *testing.T) {
 	assert.Equal(t, ev.BackendUid, workload2ID)
 
 	// 3.2 check service map contains service
-	checkServiceMap(t, p, svcID, fakeSvc, bpfcache.MaxPrio, 2)
+	checkServiceMap(t, p, svcID, fakeSvc, bpfcache.MinPrio, 2)
 
 	// 4 modify workload2 attribute not related with services
 	workload2.Waypoint = &workloadapi.GatewayAddress{
@@ -113,7 +113,7 @@ func Test_handleWorkload(t *testing.T) {
 	assert.Equal(t, ev.BackendUid, workload2ID)
 
 	// 4.2 check service map contains service
-	checkServiceMap(t, p, svcID, fakeSvc, bpfcache.MaxPrio, 2)
+	checkServiceMap(t, p, svcID, fakeSvc, bpfcache.MinPrio, 2)
 
 	// 4.3 check backend map contains waypoint
 	checkBackendMap(t, p, workload2ID, workload2)
@@ -125,7 +125,7 @@ func Test_handleWorkload(t *testing.T) {
 	assert.NoError(t, err)
 
 	// 5.1 check service map
-	checkServiceMap(t, p, svcID, fakeSvc, bpfcache.MaxPrio, 1)
+	checkServiceMap(t, p, svcID, fakeSvc, bpfcache.MinPrio, 1)
 
 	// 5.2 check endpoint map
 	ek.BackendIndex = 1
@@ -141,7 +141,7 @@ func Test_handleWorkload(t *testing.T) {
 	// 6.1 check front end map contains service
 	svcID = checkFrontEndMap(t, wpSvc.Addresses[0].Address, p)
 	// 6.2 check service map contains service, but no waypoint address
-	checkServiceMap(t, p, svcID, wpSvc, bpfcache.MaxPrio, 0)
+	checkServiceMap(t, p, svcID, wpSvc, bpfcache.MinPrio, 0)
 
 	// 7. test add unhealthy workload
 	workload3 := createFakeWorkload("1.2.3.7", workloadapi.NetworkMode_STANDARD)
@@ -525,9 +525,9 @@ func TestRestart(t *testing.T) {
 	assert.Equal(t, 6, p.bpf.FrontendCount())
 	// check service map
 	t.Log("1. check service map")
-	checkServiceMap(t, p, p.hashName.Hash(svc1.ResourceName()), svc1, bpfcache.MaxPrio, 1)
-	checkServiceMap(t, p, p.hashName.Hash(svc2.ResourceName()), svc2, bpfcache.MaxPrio, 2)
-	checkServiceMap(t, p, p.hashName.Hash(svc3.ResourceName()), svc3, bpfcache.MaxPrio, 2)
+	checkServiceMap(t, p, p.hashName.Hash(svc1.ResourceName()), svc1, bpfcache.MinPrio, 1)
+	checkServiceMap(t, p, p.hashName.Hash(svc2.ResourceName()), svc2, bpfcache.MinPrio, 2)
+	checkServiceMap(t, p, p.hashName.Hash(svc3.ResourceName()), svc3, bpfcache.MinPrio, 2)
 	assert.Equal(t, 3, p.bpf.ServiceCount())
 	// check endpoint map
 	t.Log("1. check endpoint map")
@@ -603,10 +603,10 @@ func TestRestart(t *testing.T) {
 	assert.Equal(t, 7, p.bpf.FrontendCount())
 
 	// check service map
-	checkServiceMap(t, p, p.hashName.Hash(svc1.ResourceName()), svc1, bpfcache.MaxPrio, 2) // svc1 has 2 wl1, wl2
-	checkServiceMap(t, p, p.hashName.Hash(svc2.ResourceName()), svc2, bpfcache.MaxPrio, 1) // svc2 has 1  wl2
-	checkServiceMap(t, p, p.hashName.Hash(svc3.ResourceName()), svc3, bpfcache.MaxPrio, 1) // svc3 has 1  wl2
-	checkServiceMap(t, p, p.hashName.Hash(svc4.ResourceName()), svc4, bpfcache.MaxPrio, 1) // svc4 has 1  wl4
+	checkServiceMap(t, p, p.hashName.Hash(svc1.ResourceName()), svc1, bpfcache.MinPrio, 2) // svc1 has 2 wl1, wl2
+	checkServiceMap(t, p, p.hashName.Hash(svc2.ResourceName()), svc2, bpfcache.MinPrio, 1) // svc2 has 1  wl2
+	checkServiceMap(t, p, p.hashName.Hash(svc3.ResourceName()), svc3, bpfcache.MinPrio, 1) // svc3 has 1  wl2
+	checkServiceMap(t, p, p.hashName.Hash(svc4.ResourceName()), svc4, bpfcache.MinPrio, 1) // svc4 has 1  wl4
 	assert.Equal(t, 4, p.bpf.ServiceCount())
 	// check endpoint map
 	checkEndpointMap(t, p, svc1, []uint32{p.hashName.Hash(wl1.ResourceName()), p.hashName.Hash(wl2.ResourceName())})