mir/ovs
2
0
Fork 0
mirror of https://github.com/openvswitch/ovs synced 2025-08-31 06:15:47 +00:00
Code Issues Releases Wiki Activity

dpif-netdev-avx512: Fix ubsan shift error in bitmasks.

Browse Source 
The code changes here are to handle (1 << i) shifts where 'i' is the
packet index in the batch, and 1 << 31 is an overflow of the signed '1'.

Fixed by adding UINT32_C() around the 1 character, ensuring compiler knows
the 1 is unsigned (and 32-bits). Undefined Behaviour sanitizer is now happy
with the bit-shifts at runtime.

Suggested-by: Ilya Maximets <i.maximets@ovn.org>
Signed-off-by: Harry van Haaren <harry.van.haaren@intel.com>
Acked-by: Eelco Chaudron <echaudro@redhat.com>
Signed-off-by: Ilya Maximets <i.maximets@ovn.org>
This commit is contained in:
Harry van Haaren
2022-04-22 13:45:29 +00:00
committed by Ilya Maximets
parent 4e3966e64b
commit 5db8aa39d9
2 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
lib/dpif-netdev-avx512.c
View File

@@ -159,7 +159,7 @@ dp_netdev_input_outer_avx512(struct dp_netdev_pmd_thread *pmd,
mf_mask = mfex_func(packets, keys, batch_size, in_port, pmd);
}
uint32_t lookup_pkts_bitmask = (1ULL << batch_size) - 1;
uint32_t lookup_pkts_bitmask = (UINT32_C(1) << batch_size) - 1;
uint32_t iter = lookup_pkts_bitmask;
while (iter) {
uint32_t i = raw_ctz(iter);
@@ -183,7 +183,7 @@ dp_netdev_input_outer_avx512(struct dp_netdev_pmd_thread *pmd,
* classifed by vector mfex else do a scalar miniflow extract
* for that packet.
*/
bool mfex_hit = !!(mf_mask & (1 << i));
bool mfex_hit = !!(mf_mask & (UINT32_C(1) << i));
/* Check for a partial hardware offload match. */
if (hwol_enabled) {
@@ -204,7 +204,7 @@ dp_netdev_input_outer_avx512(struct dp_netdev_pmd_thread *pmd,
pkt_meta[i].bytes = dp_packet_size(packet);
phwol_hits++;
hwol_emc_smc_hitmask |= (1 << i);
hwol_emc_smc_hitmask |= (UINT32_C(1) << i);
continue;
}
}
@@ -227,7 +227,7 @@ dp_netdev_input_outer_avx512(struct dp_netdev_pmd_thread *pmd,
if (f) {
rules[i] = &f->cr;
emc_hits++;
hwol_emc_smc_hitmask |= (1 << i);
hwol_emc_smc_hitmask |= (UINT32_C(1) << i);
continue;
}
}
@@ -237,7 +237,7 @@ dp_netdev_input_outer_avx512(struct dp_netdev_pmd_thread *pmd,
if (f) {
rules[i] = &f->cr;
smc_hits++;
smc_hitmask |= (1 << i);
smc_hitmask |= (UINT32_C(1) << i);
continue;
}
}