Skip to content

Commit 52c52a6

Browse files
lxindavem330
lxin
authored and
davem330
committed
sctp: add sctp_info dump api for sctp_diag
sctp_diag will dump some important details of sctp's assoc or ep, we use sctp_info to describe them, sctp_get_sctp_info to get them, and export it to sctp_diag.ko. v2->v3: - we will not use list_for_each_safe in sctp_get_sctp_info, cause all the callers of it will use lock_sock. - fix the holes in struct sctp_info with __reserved* field. because sctp_diag is a new feature, and sctp_info is just for now, it may be changed in the future. Signed-off-by: Xin Long <lucien.xin@gmail.com> Signed-off-by: David S. Miller <davem@davemloft.net>
1 parent 311b217 commit 52c52a6

File tree

3 files changed

+156
-0
lines changed

3 files changed

+156
-0
lines changed

‎include/linux/sctp.h‎

Lines changed: 67 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -705,4 +705,71 @@ typedef struct sctp_auth_chunk {
705705
sctp_authhdr_t auth_hdr;
706706
} __packed sctp_auth_chunk_t;
707707

708+
struct sctp_info {
709+
__u32 sctpi_tag;
710+
__u32 sctpi_state;
711+
__u32 sctpi_rwnd;
712+
__u16 sctpi_unackdata;
713+
__u16 sctpi_penddata;
714+
__u16 sctpi_instrms;
715+
__u16 sctpi_outstrms;
716+
__u32 sctpi_fragmentation_point;
717+
__u32 sctpi_inqueue;
718+
__u32 sctpi_outqueue;
719+
__u32 sctpi_overall_error;
720+
__u32 sctpi_max_burst;
721+
__u32 sctpi_maxseg;
722+
__u32 sctpi_peer_rwnd;
723+
__u32 sctpi_peer_tag;
724+
__u8 sctpi_peer_capable;
725+
__u8 sctpi_peer_sack;
726+
__u16 __reserved1;
727+
728+
/* assoc status info */
729+
__u64 sctpi_isacks;
730+
__u64 sctpi_osacks;
731+
__u64 sctpi_opackets;
732+
__u64 sctpi_ipackets;
733+
__u64 sctpi_rtxchunks;
734+
__u64 sctpi_outofseqtsns;
735+
__u64 sctpi_idupchunks;
736+
__u64 sctpi_gapcnt;
737+
__u64 sctpi_ouodchunks;
738+
__u64 sctpi_iuodchunks;
739+
__u64 sctpi_oodchunks;
740+
__u64 sctpi_iodchunks;
741+
__u64 sctpi_octrlchunks;
742+
__u64 sctpi_ictrlchunks;
743+
744+
/* primary transport info */
745+
struct sockaddr_storage sctpi_p_address;
746+
__s32 sctpi_p_state;
747+
__u32 sctpi_p_cwnd;
748+
__u32 sctpi_p_srtt;
749+
__u32 sctpi_p_rto;
750+
__u32 sctpi_p_hbinterval;
751+
__u32 sctpi_p_pathmaxrxt;
752+
__u32 sctpi_p_sackdelay;
753+
__u32 sctpi_p_sackfreq;
754+
__u32 sctpi_p_ssthresh;
755+
__u32 sctpi_p_partial_bytes_acked;
756+
__u32 sctpi_p_flight_size;
757+
__u16 sctpi_p_error;
758+
__u16 __reserved2;
759+
760+
/* sctp sock info */
761+
__u32 sctpi_s_autoclose;
762+
__u32 sctpi_s_adaptation_ind;
763+
__u32 sctpi_s_pd_point;
764+
__u8 sctpi_s_nodelay;
765+
__u8 sctpi_s_disable_fragments;
766+
__u8 sctpi_s_v4mapped;
767+
__u8 sctpi_s_frag_interleave;
768+
};
769+
770+
struct sctp_infox {
771+
struct sctp_info *sctpinfo;
772+
struct sctp_association *asoc;
773+
};
774+
708775
#endif /* __LINUX_SCTP_H__ */

‎include/net/sctp/sctp.h‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -116,6 +116,9 @@ extern struct percpu_counter sctp_sockets_allocated;
116116
int sctp_asconf_mgmt(struct sctp_sock *, struct sctp_sockaddr_entry *);
117117
struct sk_buff *sctp_skb_recv_datagram(struct sock *, int, int, int *);
118118

119+
int sctp_get_sctp_info(struct sock *sk, struct sctp_association *asoc,
120+
struct sctp_info *info);
121+
119122
/*
120123
* sctp/primitive.c
121124
*/

‎net/sctp/socket.c‎

Lines changed: 86 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4202,6 +4202,92 @@ static void sctp_shutdown(struct sock *sk, int how)
42024202
}
42034203
}
42044204

4205+
int sctp_get_sctp_info(struct sock *sk, struct sctp_association *asoc,
4206+
struct sctp_info *info)
4207+
{
4208+
struct sctp_transport *prim;
4209+
struct list_head *pos;
4210+
int mask;
4211+
4212+
memset(info, 0, sizeof(*info));
4213+
if (!asoc) {
4214+
struct sctp_sock *sp = sctp_sk(sk);
4215+
4216+
info->sctpi_s_autoclose = sp->autoclose;
4217+
info->sctpi_s_adaptation_ind = sp->adaptation_ind;
4218+
info->sctpi_s_pd_point = sp->pd_point;
4219+
info->sctpi_s_nodelay = sp->nodelay;
4220+
info->sctpi_s_disable_fragments = sp->disable_fragments;
4221+
info->sctpi_s_v4mapped = sp->v4mapped;
4222+
info->sctpi_s_frag_interleave = sp->frag_interleave;
4223+
4224+
return 0;
4225+
}
4226+
4227+
info->sctpi_tag = asoc->c.my_vtag;
4228+
info->sctpi_state = asoc->state;
4229+
info->sctpi_rwnd = asoc->a_rwnd;
4230+
info->sctpi_unackdata = asoc->unack_data;
4231+
info->sctpi_penddata = sctp_tsnmap_pending(&asoc->peer.tsn_map);
4232+
info->sctpi_instrms = asoc->c.sinit_max_instreams;
4233+
info->sctpi_outstrms = asoc->c.sinit_num_ostreams;
4234+
list_for_each(pos, &asoc->base.inqueue.in_chunk_list)
4235+
info->sctpi_inqueue++;
4236+
list_for_each(pos, &asoc->outqueue.out_chunk_list)
4237+
info->sctpi_outqueue++;
4238+
info->sctpi_overall_error = asoc->overall_error_count;
4239+
info->sctpi_max_burst = asoc->max_burst;
4240+
info->sctpi_maxseg = asoc->frag_point;
4241+
info->sctpi_peer_rwnd = asoc->peer.rwnd;
4242+
info->sctpi_peer_tag = asoc->c.peer_vtag;
4243+
4244+
mask = asoc->peer.ecn_capable << 1;
4245+
mask = (mask | asoc->peer.ipv4_address) << 1;
4246+
mask = (mask | asoc->peer.ipv6_address) << 1;
4247+
mask = (mask | asoc->peer.hostname_address) << 1;
4248+
mask = (mask | asoc->peer.asconf_capable) << 1;
4249+
mask = (mask | asoc->peer.prsctp_capable) << 1;
4250+
mask = (mask | asoc->peer.auth_capable);
4251+
info->sctpi_peer_capable = mask;
4252+
mask = asoc->peer.sack_needed << 1;
4253+
mask = (mask | asoc->peer.sack_generation) << 1;
4254+
mask = (mask | asoc->peer.zero_window_announced);
4255+
info->sctpi_peer_sack = mask;
4256+
4257+
info->sctpi_isacks = asoc->stats.isacks;
4258+
info->sctpi_osacks = asoc->stats.osacks;
4259+
info->sctpi_opackets = asoc->stats.opackets;
4260+
info->sctpi_ipackets = asoc->stats.ipackets;
4261+
info->sctpi_rtxchunks = asoc->stats.rtxchunks;
4262+
info->sctpi_outofseqtsns = asoc->stats.outofseqtsns;
4263+
info->sctpi_idupchunks = asoc->stats.idupchunks;
4264+
info->sctpi_gapcnt = asoc->stats.gapcnt;
4265+
info->sctpi_ouodchunks = asoc->stats.ouodchunks;
4266+
info->sctpi_iuodchunks = asoc->stats.iuodchunks;
4267+
info->sctpi_oodchunks = asoc->stats.oodchunks;
4268+
info->sctpi_iodchunks = asoc->stats.iodchunks;
4269+
info->sctpi_octrlchunks = asoc->stats.octrlchunks;
4270+
info->sctpi_ictrlchunks = asoc->stats.ictrlchunks;
4271+
4272+
prim = asoc->peer.primary_path;
4273+
memcpy(&info->sctpi_p_address, &prim->ipaddr,
4274+
sizeof(struct sockaddr_storage));
4275+
info->sctpi_p_state = prim->state;
4276+
info->sctpi_p_cwnd = prim->cwnd;
4277+
info->sctpi_p_srtt = prim->srtt;
4278+
info->sctpi_p_rto = jiffies_to_msecs(prim->rto);
4279+
info->sctpi_p_hbinterval = prim->hbinterval;
4280+
info->sctpi_p_pathmaxrxt = prim->pathmaxrxt;
4281+
info->sctpi_p_sackdelay = jiffies_to_msecs(prim->sackdelay);
4282+
info->sctpi_p_ssthresh = prim->ssthresh;
4283+
info->sctpi_p_partial_bytes_acked = prim->partial_bytes_acked;
4284+
info->sctpi_p_flight_size = prim->flight_size;
4285+
info->sctpi_p_error = prim->error_count;
4286+
4287+
return 0;
4288+
}
4289+
EXPORT_SYMBOL_GPL(sctp_get_sctp_info);
4290+
42054291
/* 7.2.1 Association Status (SCTP_STATUS)
42064292
42074293
* Applications can retrieve current status information about an

0 commit comments

Comments
 (0)