mir/ovs
2
0
Fork 0
mirror of https://github.com/openvswitch/ovs synced 2025-09-01 14:55:18 +00:00
Code Issues Releases Wiki Activity

netdev-offload-tc: Reserve lower tc prios for ip ethertypes

Browse Source 
Currently ethertype to prio hmap is static and the first ethertype
being used gets a lower priority. Usually there is an arp request
before the ip traffic and the arp ethertype gets a lower tc priority
while the ip traffic proto gets a higher priority.
In this case ip traffic will go through more hops in tc and HW.
Instead, reserve lower priorities for ip ethertypes.

Signed-off-by: Paul Blakey <paulb@nvidia.com>
Reviewed-by: Roi Dayan <roid@nvidia.com>
Acked-by: Eelco Chaudron <echaudro@redhat.com>
Signed-off-by: Simon Horman <simon.horman@corigine.com>
This commit is contained in:
Paul Blakey
2022-11-02 14:46:00 +02:00
committed by Simon Horman
parent 48a0adefae
commit c230c7579c
2 changed files with 30 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
lib/netdev-offload-tc.c
View File

@@ -325,6 +325,28 @@ struct prio_map_data {
uint16_t prio;
};
static uint16_t
get_next_available_prio(ovs_be16 protocol)
{
static uint16_t last_prio = TC_RESERVED_PRIORITY_MAX;
if (multi_mask_per_prio) {
if (protocol == htons(ETH_P_IP)) {
return TC_RESERVED_PRIORITY_IPV4;
} else if (protocol == htons(ETH_P_IPV6)) {
return TC_RESERVED_PRIORITY_IPV6;
}
}
/* last_prio can overflow if there will be many different kinds of
* flows which shouldn't happen organically. */
if (last_prio == UINT16_MAX) {
return TC_RESERVED_PRIORITY_NONE;
}
return ++last_prio;
}
/* Get free prio for tc flower
* If prio is already allocated for mask/eth_type combination then return it.
* If not assign new prio.
@@ -336,11 +358,11 @@ get_prio_for_tc_flower(struct tc_flower *flower)
{
static struct hmap prios = HMAP_INITIALIZER(&prios);
static struct ovs_mutex prios_lock = OVS_MUTEX_INITIALIZER;
static uint16_t last_prio = TC_RESERVED_PRIORITY_MAX;
size_t key_len = sizeof(struct tc_flower_key);
size_t hash = hash_int((OVS_FORCE uint32_t) flower->key.eth_type, 0);
struct prio_map_data *data;
struct prio_map_data *new_data;
uint16_t prio;
if (!multi_mask_per_prio) {
hash = hash_bytes(&flower->mask, key_len, hash);
@@ -359,21 +381,20 @@ get_prio_for_tc_flower(struct tc_flower *flower)
}
}
if (last_prio == UINT16_MAX) {
/* last_prio can overflow if there will be many different kinds of
* flows which shouldn't happen organically. */
prio = get_next_available_prio(flower->key.eth_type);
if (prio == TC_RESERVED_PRIORITY_NONE) {
ovs_mutex_unlock(&prios_lock);
return 0;
return prio;
}
new_data = xzalloc(sizeof *new_data);
memcpy(&new_data->mask, &flower->mask, key_len);
new_data->prio = ++last_prio;
new_data->prio = prio;
new_data->protocol = flower->key.eth_type;
hmap_insert(&prios, &new_data->node, hash);
ovs_mutex_unlock(&prios_lock);
return new_data->prio;
return prio;
}
static uint32_t

2
lib/tc.h
View File

@@ -49,6 +49,8 @@
enum tc_flower_reserved_prio {
TC_RESERVED_PRIORITY_NONE,
TC_RESERVED_PRIORITY_POLICE,
TC_RESERVED_PRIORITY_IPV4,
TC_RESERVED_PRIORITY_IPV6,
__TC_RESERVED_PRIORITY_MAX
};
#define TC_RESERVED_PRIORITY_MAX (__TC_RESERVED_PRIORITY_MAX -1)