proxmox-mirrors/mirror_frr
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_frr synced 2025-08-14 00:56:19 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

ospfd: Allow packet reads based upon read/write packet counts

Browse Source 
Read in up to 20(ospf write-multipler X) packets, for handling of data.

This improves performance because we allow ospf to have a bit more data
to work on in one go for spf calculations instead of 1 packet at a time.

Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>
This commit is contained in:
Donald Sharp 2019-11-06 23:04:32 -05:00
parent edca5860cb
commit 4392cc4337
1 changed files with 217 additions and 195 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

118
ospfd/ospf_packet.c
View File

@ -2310,8 +2310,10 @@ static struct stream *ospf_recv_packet(struct ospf *ospf, int fd,
msgh.msg_control = (caddr_t)buff; msgh.msg_control = (caddr_t)buff;
msgh.msg_controllen = sizeof(buff); msgh.msg_controllen = sizeof(buff);
ret = stream_recvmsg(ibuf, fd, &msgh, 0, OSPF_MAX_PACKET_SIZE + 1); ret = stream_recvmsg(ibuf, fd, &msgh, MSG_DONTWAIT,
OSPF_MAX_PACKET_SIZE + 1);
if (ret < 0) { if (ret < 0) {
if (errno != EAGAIN && errno != EWOULDBLOCK)
flog_warn(EC_OSPF_PACKET, "stream_recvmsg failed: %s", flog_warn(EC_OSPF_PACKET, "stream_recvmsg failed: %s",
safe_strerror(errno)); safe_strerror(errno));
return NULL; return NULL;
@ -2947,32 +2949,37 @@ int ospf_read(struct thread *thread)
uint16_t length; uint16_t length;
struct interface *ifp = NULL; struct interface *ifp = NULL;
struct connected *c; struct connected *c;
int32_t count = 0;
/* first of all get interface pointer. */ /* first of all get interface pointer. */
ospf = THREAD_ARG(thread); ospf = THREAD_ARG(thread);
/* prepare for next packet. */ /* prepare for next packet. */
ospf->t_read = NULL;
thread_add_read(master, ospf_read, ospf, ospf->fd, &ospf->t_read); thread_add_read(master, ospf_read, ospf, ospf->fd, &ospf->t_read);
while (count < ospf->write_oi_count) {
count++;
stream_reset(ospf->ibuf); stream_reset(ospf->ibuf);
ibuf = ospf_recv_packet(ospf, ospf->fd, &ifp, ospf->ibuf); ibuf = ospf_recv_packet(ospf, ospf->fd, &ifp, ospf->ibuf);
if (ibuf == NULL) if (ibuf == NULL)
return -1; return -1;
/* This raw packet is known to be at least as big as its IP header. */ /*
* This raw packet is known to be at least as big as its
/* Note that there should not be alignment problems with this assignment * IP header.
because this is at the beginning of the stream data buffer. */ * Note that there should not be alignment problems with
* this assignment because this is at the beginning of the
* stream data buffer.
*/
iph = (struct ip *)STREAM_DATA(ibuf); iph = (struct ip *)STREAM_DATA(ibuf);
/* Note that sockopt_iphdrincl_swab_systoh was called in /* Note that sockopt_iphdrincl_swab_systoh was called in
* ospf_recv_packet. */ * ospf_recv_packet. */
if (ifp == NULL) { if (ifp == NULL) {
/* Handle cases where the platform does not support retrieving /* Handle cases where the platform does not support
the ifindex, * retrieving the ifindex, and also platforms (such
and also platforms (such as Solaris 8) that claim to support * as Solaris 8) that claim to support ifindex
ifindex * retrieval but do not.
retrieval but do not. */ */
c = if_lookup_address((void *)&iph->ip_src, AF_INET, c = if_lookup_address((void *)&iph->ip_src, AF_INET,
ospf->vrf_id); ospf->vrf_id);
if (c) if (c)
@ -2984,7 +2991,7 @@ int ospf_read(struct thread *thread)
__PRETTY_FUNCTION__, __PRETTY_FUNCTION__,
inet_ntoa(iph->ip_src), inet_ntoa(iph->ip_src),
ospf_get_name(ospf)); ospf_get_name(ospf));
return 0; continue;
} }
} }
@ -2995,30 +3002,31 @@ int ospf_read(struct thread *thread)
"ospf_read[%s]: Dropping self-originated packet", "ospf_read[%s]: Dropping self-originated packet",
inet_ntoa(iph->ip_src)); inet_ntoa(iph->ip_src));
} }
return 0; continue;
} }
/* Advance from IP header to OSPF header (iph->ip_hl has been verified /*
by ospf_recv_packet() to be correct). */ * Advance from IP header to OSPF header (iph->ip_hl has
* been verified by ospf_recv_packet() to be correct).
*/
stream_forward_getp(ibuf, iph->ip_hl * 4); stream_forward_getp(ibuf, iph->ip_hl * 4);
ospfh = (struct ospf_header *)stream_pnt(ibuf); ospfh = (struct ospf_header *)stream_pnt(ibuf);
if (MSG_OK if (MSG_OK
!= ospf_packet_examin( != ospf_packet_examin(ospfh,
ospfh, stream_get_endp(ibuf) - stream_get_getp(ibuf))) stream_get_endp(ibuf)
return -1; - stream_get_getp(ibuf)))
continue;
/* Now it is safe to access all fields of OSPF packet header. */ /* Now it is safe to access all fields of OSPF packet header. */
/* associate packet with ospf interface */ /* associate packet with ospf interface */
oi = ospf_if_lookup_recv_if(ospf, iph->ip_src, ifp); oi = ospf_if_lookup_recv_if(ospf, iph->ip_src, ifp);
/* ospf_verify_header() relies on a valid "oi" and thus can be called /* ospf_verify_header() relies on a valid "oi" and thus can
only * be called only after the passive/backbone/other checks
after the passive/backbone/other checks below are passed. These * below are passed. These checks in turn access the fields
checks * of unverified "ospfh" structure for their own purposes and
in turn access the fields of unverified "ospfh" structure for their * must remain very accurate in doing this. */
own
purposes and must remain very accurate in doing this. */
/* If incoming interface is passive one, ignore it. */ /* If incoming interface is passive one, ignore it. */
if (oi && OSPF_IF_PASSIVE_STATUS(oi) == OSPF_IF_PASSIVE) { if (oi && OSPF_IF_PASSIVE_STATUS(oi) == OSPF_IF_PASSIVE) {
@ -3028,11 +3036,12 @@ int ospf_read(struct thread *thread)
zlog_debug( zlog_debug(
"ignoring packet from router %s sent to %s, " "ignoring packet from router %s sent to %s, "
"received on a passive interface, %s", "received on a passive interface, %s",
inet_ntop(AF_INET, &ospfh->router_id, buf[0], inet_ntop(AF_INET, &ospfh->router_id,
sizeof(buf[0])), buf[0], sizeof(buf[0])),
inet_ntop(AF_INET, &iph->ip_dst, buf[1], inet_ntop(AF_INET, &iph->ip_dst, buf[1],
sizeof(buf[1])), sizeof(buf[1])),
inet_ntop(AF_INET, &oi->address->u.prefix4, inet_ntop(AF_INET,
&oi->address->u.prefix4,
buf[2], sizeof(buf[2]))); buf[2], sizeof(buf[2])));
if (iph->ip_dst.s_addr == htonl(OSPF_ALLSPFROUTERS)) { if (iph->ip_dst.s_addr == htonl(OSPF_ALLSPFROUTERS)) {
@ -3043,7 +3052,7 @@ int ospf_read(struct thread *thread)
OI_MEMBER_JOINED(oi, MEMBER_ALLROUTERS); OI_MEMBER_JOINED(oi, MEMBER_ALLROUTERS);
ospf_if_set_multicast(oi); ospf_if_set_multicast(oi);
} }
return 0; continue;
} }
@ -3051,30 +3060,36 @@ int ospf_read(struct thread *thread)
* or header area is backbone but ospf_interface is not * or header area is backbone but ospf_interface is not
* check for VLINK interface * check for VLINK interface
*/ */
if ((oi == NULL) || (OSPF_IS_AREA_ID_BACKBONE(ospfh->area_id) if ((oi == NULL)
|| (OSPF_IS_AREA_ID_BACKBONE(ospfh->area_id)
&& !OSPF_IS_AREA_ID_BACKBONE(oi->area->area_id))) { && !OSPF_IS_AREA_ID_BACKBONE(oi->area->area_id))) {
if ((oi = ospf_associate_packet_vl(ospf, ifp, iph, ospfh)) if ((oi = ospf_associate_packet_vl(ospf, ifp, iph,
ospfh))
== NULL) { == NULL) {
if (!ospf->instance && IS_DEBUG_OSPF_EVENT) if (!ospf->instance && IS_DEBUG_OSPF_EVENT)
zlog_debug( zlog_debug(
"Packet from [%s] received on link %s" "Packet from [%s] received on link %s"
" but no ospf_interface", " but no ospf_interface",
inet_ntoa(iph->ip_src), ifp->name); inet_ntoa(iph->ip_src),
ifp->name);
return 0; return 0;
} }
} }
/* else it must be a local ospf interface, check it was received on /*
* correct link * else it must be a local ospf interface, check it was
* received on correct link
*/ */
else if (oi->ifp != ifp) { else if (oi->ifp != ifp) {
if (IS_DEBUG_OSPF_EVENT) if (IS_DEBUG_OSPF_EVENT)
flog_warn(EC_OSPF_PACKET, flog_warn(
EC_OSPF_PACKET,
"Packet from [%s] received on wrong link %s", "Packet from [%s] received on wrong link %s",
inet_ntoa(iph->ip_src), ifp->name); inet_ntoa(iph->ip_src), ifp->name);
return 0; continue;
} else if (oi->state == ISM_Down) { } else if (oi->state == ISM_Down) {
char buf[2][INET_ADDRSTRLEN]; char buf[2][INET_ADDRSTRLEN];
flog_warn( flog_warn(
EC_OSPF_PACKET, EC_OSPF_PACKET,
"Ignoring packet from %s to %s received on interface that is " "Ignoring packet from %s to %s received on interface that is "
@ -3091,13 +3106,15 @@ int ospf_read(struct thread *thread)
OI_MEMBER_JOINED(oi, MEMBER_DROUTERS); OI_MEMBER_JOINED(oi, MEMBER_DROUTERS);
if (oi->multicast_memberships) if (oi->multicast_memberships)
ospf_if_set_multicast(oi); ospf_if_set_multicast(oi);
return 0; continue;
} }
/* /*
* If the received packet is destined for AllDRouters, the packet * If the received packet is destined for AllDRouters, the
* should be accepted only if the received ospf interface state is * packet should be accepted only if the received ospf
* either DR or Backup -- endo. * interface state is either DR or Backup -- endo.
*
* I wonder who endo is?
*/ */
if (iph->ip_dst.s_addr == htonl(OSPF_ALLDROUTERS) if (iph->ip_dst.s_addr == htonl(OSPF_ALLDROUTERS)
&& (oi->state != ISM_DR && oi->state != ISM_Backup)) { && (oi->state != ISM_DR && oi->state != ISM_Backup)) {
@ -3105,11 +3122,12 @@ int ospf_read(struct thread *thread)
EC_OSPF_PACKET, EC_OSPF_PACKET,
"Dropping packet for AllDRouters from [%s] via [%s] (ISM: %s)", "Dropping packet for AllDRouters from [%s] via [%s] (ISM: %s)",
inet_ntoa(iph->ip_src), IF_NAME(oi), inet_ntoa(iph->ip_src), IF_NAME(oi),
lookup_msg(ospf_ism_state_msg, oi->state, NULL)); lookup_msg(ospf_ism_state_msg, oi->state,
NULL));
/* Try to fix multicast membership. */ /* Try to fix multicast membership. */
SET_FLAG(oi->multicast_memberships, MEMBER_DROUTERS); SET_FLAG(oi->multicast_memberships, MEMBER_DROUTERS);
ospf_if_set_multicast(oi); ospf_if_set_multicast(oi);
return 0; continue;
} }
/* Verify more OSPF header fields. */ /* Verify more OSPF header fields. */
@ -3120,7 +3138,7 @@ int ospf_read(struct thread *thread)
"ospf_read[%s]: Header check failed, " "ospf_read[%s]: Header check failed, "
"dropping.", "dropping.",
inet_ntoa(iph->ip_src)); inet_ntoa(iph->ip_src));
return ret; continue;
} }
/* Show debug receiving packet. */ /* Show debug receiving packet. */
@ -3132,7 +3150,8 @@ int ospf_read(struct thread *thread)
} }
zlog_debug("%s received from [%s] via [%s]", zlog_debug("%s received from [%s] via [%s]",
lookup_msg(ospf_packet_type_str, ospfh->type, NULL), lookup_msg(ospf_packet_type_str, ospfh->type,
NULL),
inet_ntoa(ospfh->router_id), IF_NAME(oi)); inet_ntoa(ospfh->router_id), IF_NAME(oi));
zlog_debug(" src [%s],", inet_ntoa(iph->ip_src)); zlog_debug(" src [%s],", inet_ntoa(iph->ip_src));
zlog_debug(" dst [%s]", inet_ntoa(iph->ip_dst)); zlog_debug(" dst [%s]", inet_ntoa(iph->ip_dst));
@ -3147,7 +3166,8 @@ int ospf_read(struct thread *thread)
/* Adjust size to message length. */ /* Adjust size to message length. */
length = ntohs(ospfh->length) - OSPF_HEADER_SIZE; length = ntohs(ospfh->length) - OSPF_HEADER_SIZE;
/* Read rest of the packet and call each sort of packet routine. */ /* Read rest of the packet and call each sort of packet routine.
*/
switch (ospfh->type) { switch (ospfh->type) {
case OSPF_MSG_HELLO: case OSPF_MSG_HELLO:
ospf_hello(iph, ospfh, ibuf, oi, length); ospf_hello(iph, ospfh, ibuf, oi, length);
@ -3165,11 +3185,13 @@ int ospf_read(struct thread *thread)
ospf_ls_ack(iph, ospfh, ibuf, oi, length); ospf_ls_ack(iph, ospfh, ibuf, oi, length);
break; break;
default: default:
flog_warn(EC_OSPF_PACKET, flog_warn(
"interface %s: OSPF packet header type %d is illegal", EC_OSPF_PACKET,
IF_NAME(oi), ospfh->type); "interface %s(%s): OSPF packet header type %d is illegal",
IF_NAME(oi), ospf_get_name(ospf), ospfh->type);
break; break;
} }
}
return 0; return 0;
} }