d/freebsd-dev
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Add global mutex tcp_debug_mtx, which will protect global TCP debugging

Browse Source 
state tcp_debug, tcp_debx.  Acquire and drop as required in tcp_trace().

Move to ANSI C function header, correct prototype types so that short TCP
state is no longer promoted to int unnecessarily.

Add comments.

MFC after:	3 weeks
This commit is contained in:
Robert Watson 2007-05-04 23:43:18 +00:00
parent d2b9bc428c
commit 6087c3c29e
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=169272
2 changed files with 32 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
sys/netinet/tcp_debug.c
View File

@ -1,6 +1,7 @@
/*-
* Copyright (c) 1982, 1986, 1993
* The Regents of the University of California. All rights reserved.
* The Regents of the University of California.
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
@ -48,7 +49,10 @@
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/kernel.h>
#include <sys/lock.h>
#include <sys/mbuf.h>
#include <sys/mutex.h>
#include <sys/protosw.h>
#include <sys/socket.h>
@ -67,29 +71,43 @@
#include <netinet/tcp_debug.h>
#ifdef TCPDEBUG
static int tcpconsdebug = 0;
static int tcpconsdebug = 0;
#endif
static struct tcp_debug tcp_debug[TCP_NDEBUG];
static int tcp_debx;
/*
* Global ring buffer of TCP debugging state. Each entry captures a snapshot
* of TCP connection state at any given moment. tcp_debx addresses at the
* next available slot. There is no explicit export of this data structure;
* it will be read via /dev/kmem by debugging tools.
*/
static struct tcp_debug tcp_debug[TCP_NDEBUG];
static int tcp_debx;
/*
* Tcp debug routines
* All global state is protected by tcp_debug_mtx; tcp_trace() is split into
* two parts, one of which saves connection and other state into the global
* array (locked by tcp_debug_mtx).
*/
struct mtx tcp_debug_mtx;
MTX_SYSINIT(tcp_debug_mtx, &tcp_debug_mtx, "tcp_debug_mtx", MTX_DEF);
/*
* Save TCP state at a given moment; optionally, both tcpcb and TCP packet
* header state will be saved.
*/
void
tcp_trace(act, ostate, tp, ipgen, th, req)
short act, ostate;
struct tcpcb *tp;
void *ipgen;
struct tcphdr *th;
int req;
tcp_trace(short act, short ostate, struct tcpcb *tp, void *ipgen,
struct tcphdr *th, int req)
{
#ifdef INET6
int isipv6;
#endif /* INET6 */
tcp_seq seq, ack;
int len, flags;
struct tcp_debug *td = &tcp_debug[tcp_debx++];
struct tcp_debug *td;
mtx_lock(&tcp_debug_mtx);
td = &tcp_debug[tcp_debx++];
#ifdef INET6
isipv6 = (ipgen != NULL && ((struct ip *)ipgen)->ip_v == 6) ? 1 : 0;
@ -158,6 +176,7 @@ tcp_trace(act, ostate, tp, ipgen, th, req)
bzero((caddr_t)&td->td_ti6.th, sizeof(td->td_ti6.th));
}
td->td_req = req;
mtx_unlock(&tcp_debug_mtx);
#ifdef TCPDEBUG
if (tcpconsdebug == 0)
return;

2
sys/netinet/tcp_var.h
View File

@ -535,7 +535,7 @@ struct tcptemp *
void tcpip_fillheaders(struct inpcb *, void *, void *);
void tcp_timer_activate(struct tcpcb *, int, u_int);
int tcp_timer_active(struct tcpcb *, int);
void tcp_trace(int, int, struct tcpcb *, void *, struct tcphdr *, int);
void tcp_trace(short, short, struct tcpcb *, void *, struct tcphdr *, int);
void tcp_xmit_bandwidth_limit(struct tcpcb *tp, tcp_seq ack_seq);
void syncache_init(void);
void syncache_unreach(struct in_conninfo *, struct tcphdr *);