summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMark Gray <mark.d.gray@redhat.com>2021-07-23 17:24:13 +0300
committerDavid S. Miller <davem@davemloft.net>2021-07-27 13:48:42 +0300
commit784dcfa56e0453bb197601ba0b8196f6f892ebcb (patch)
tree8964e55ef7d1e278d64626f83f45356bb644bf7a
parente4252cb66637b846b916cca7c2cdb4ed22ab2fc3 (diff)
downloadlinux-784dcfa56e0453bb197601ba0b8196f6f892ebcb.tar.xz
openvswitch: fix alignment issues
Signed-off-by: Mark Gray <mark.d.gray@redhat.com> Signed-off-by: David S. Miller <davem@davemloft.net>
-rw-r--r--include/uapi/linux/openvswitch.h4
-rw-r--r--net/openvswitch/actions.c6
-rw-r--r--net/openvswitch/datapath.c16
3 files changed, 16 insertions, 10 deletions
diff --git a/include/uapi/linux/openvswitch.h b/include/uapi/linux/openvswitch.h
index 0e436a3755f1..150bcff49b1c 100644
--- a/include/uapi/linux/openvswitch.h
+++ b/include/uapi/linux/openvswitch.h
@@ -89,8 +89,8 @@ enum ovs_datapath_attr {
OVS_DP_ATTR_USER_FEATURES, /* OVS_DP_F_* */
OVS_DP_ATTR_PAD,
OVS_DP_ATTR_MASKS_CACHE_SIZE,
- OVS_DP_ATTR_PER_CPU_PIDS, /* Netlink PIDS to receive upcalls in per-cpu
- * dispatch mode
+ OVS_DP_ATTR_PER_CPU_PIDS, /* Netlink PIDS to receive upcalls in
+ * per-cpu dispatch mode
*/
__OVS_DP_ATTR_MAX
};
diff --git a/net/openvswitch/actions.c b/net/openvswitch/actions.c
index f79679746c62..076774034bb9 100644
--- a/net/openvswitch/actions.c
+++ b/net/openvswitch/actions.c
@@ -924,9 +924,11 @@ static int output_userspace(struct datapath *dp, struct sk_buff *skb,
break;
case OVS_USERSPACE_ATTR_PID:
- if (dp->user_features & OVS_DP_F_DISPATCH_UPCALL_PER_CPU)
+ if (dp->user_features &
+ OVS_DP_F_DISPATCH_UPCALL_PER_CPU)
upcall.portid =
- ovs_dp_get_upcall_portid(dp, smp_processor_id());
+ ovs_dp_get_upcall_portid(dp,
+ smp_processor_id());
else
upcall.portid = nla_get_u32(a);
break;
diff --git a/net/openvswitch/datapath.c b/net/openvswitch/datapath.c
index 7a4edafdc685..e6f0ae5618dd 100644
--- a/net/openvswitch/datapath.c
+++ b/net/openvswitch/datapath.c
@@ -244,7 +244,8 @@ void ovs_dp_process_packet(struct sk_buff *skb, struct sw_flow_key *key)
upcall.cmd = OVS_PACKET_CMD_MISS;
if (dp->user_features & OVS_DP_F_DISPATCH_UPCALL_PER_CPU)
- upcall.portid = ovs_dp_get_upcall_portid(dp, smp_processor_id());
+ upcall.portid =
+ ovs_dp_get_upcall_portid(dp, smp_processor_id());
else
upcall.portid = ovs_vport_find_upcall_portid(p, skb);
@@ -1636,13 +1637,16 @@ u32 ovs_dp_get_upcall_portid(const struct datapath *dp, uint32_t cpu_id)
if (dp_nlsk_pids) {
if (cpu_id < dp_nlsk_pids->n_pids) {
return dp_nlsk_pids->pids[cpu_id];
- } else if (dp_nlsk_pids->n_pids > 0 && cpu_id >= dp_nlsk_pids->n_pids) {
- /* If the number of netlink PIDs is mismatched with the number of
- * CPUs as seen by the kernel, log this and send the upcall to an
- * arbitrary socket (0) in order to not drop packets
+ } else if (dp_nlsk_pids->n_pids > 0 &&
+ cpu_id >= dp_nlsk_pids->n_pids) {
+ /* If the number of netlink PIDs is mismatched with
+ * the number of CPUs as seen by the kernel, log this
+ * and send the upcall to an arbitrary socket (0) in
+ * order to not drop packets
*/
pr_info_ratelimited("cpu_id mismatch with handler threads");
- return dp_nlsk_pids->pids[cpu_id % dp_nlsk_pids->n_pids];
+ return dp_nlsk_pids->pids[cpu_id %
+ dp_nlsk_pids->n_pids];
} else {
return 0;
}