sctp: support sctp_diag in kernel
Subsystems (3)
Xin Long
maintainercover sctp: support sctp_diag in kernel
This patchset will add sctp_diag module to implement diag interface on sctp in kernel.
For a listening sctp endpoint, we will just dump it's ep info. For a sctp connection, we will the assoc info and it's ep info.
The ss dump will looks like:
[iproute2]# ./misc/ss --sctp -n -l
State Recv-Q Send-Q Local Address:Port Peer Address:Port LISTEN 0 128 172.16.254.254:8888 *:* LISTEN 0 5 127.0.0.1:1234 *:* LISTEN 0 5 127.0.0.1:1234 *:* - ESTAB 0 0 127.0.0.1%lo:1234 127.0.0.1:4321 LISTEN 0 128 172.16.254.254:8888 *:* - ESTAB 0 0 172.16.254.254%eth1:8888 172.16.253.253:8888 - ESTAB 0 0 172.16.254.254%eth1:8888 172.16.1.1:8888 - ESTAB 0 0 172.16.254.254%eth1:8888 172.16.1.2:8888 - ESTAB 0 0 172.16.254.254%eth1:8888 172.16.2.1:8888 - ESTAB 0 0 172.16.254.254%eth1:8888 172.16.2.2:8888 - ESTAB 0 0 172.16.254.254%eth1:8888 172.16.3.1:8888 - ESTAB 0 0 172.16.254.254%eth1:8888 172.16.3.2:8888 LISTEN 0 0 127.0.0.1:4321 *:* - ESTAB 0 0 127.0.0.1%lo:4321 127.0.0.1:1234
The entries with '- ESTAB' are the assocs, some of them may belong to the same endpoint. So we will dump the parent endpoint first, like the entry with 'LISTEN'. then dump the assocs. ep and assocs entries will be dumped in right order so that ss can show them in tree format easily.
Besides, this patchset also simplifies sctp proc codes, cause it has some similar codes with sctp diag in sctp transport traversal.
Xin Long (7):
sctp: add sctp_info dump api for sctp_diag
sctp: export some apis or variables for sctp_diag
sctp: export some functions for sctp_diag in inet_diag
sctp: add the sctp_diag.c file
sctp: reuse the some transport traversal functions in proc
sctp: merge the seq_start/next/exits in remaddrs and assocs
sctp: fix some rhashtable functions using in sctp proc/diag
include/linux/sctp.h | 65 +++++ include/net/sctp/sctp.h | 16 ++ include/uapi/linux/inet_diag.h | 2 + net/ipv4/inet_diag.c | 9 +- net/sctp/Kconfig | 4 + net/sctp/Makefile | 1 + net/sctp/proc.c | 104 ++------ net/sctp/sctp_diag.c | 581 +++++++++++++++++++++++++++++++++++++++++ net/sctp/socket.c | 215 +++++++++++++++ 9 files changed, 911 insertions(+), 86 deletions(-) create mode 100644 net/sctp/sctp_diag.c
Signature · 1 line
2.1.0
Xin Long
maintainerPATCH 1/7 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.
--- include/linux/sctp.h | 65 +++++++++++++++++++++++++++++++++++++ include/net/sctp/sctp.h | 3 ++ net/sctp/socket.c | 86 +++++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 154 insertions(+)
include/linux/sctp.h +65 -0
@@ -705,4 +705,69 @@ typedef struct sctp_auth_chunk {sctp_authhdr_t auth_hdr; } __packed sctp_auth_chunk_t; +struct sctp_info { +__u32 sctpi_tag; +__u32 sctpi_state; +__u32 sctpi_rwnd; +__u16 sctpi_unackdata; +__u16 sctpi_penddata; +__u16 sctpi_instrms; +__u16 sctpi_outstrms; +__u32 sctpi_fragmentation_point; +__u32 sctpi_inqueue; +__u32 sctpi_outqueue; +__u32 sctpi_overall_error; +__u32 sctpi_max_burst; +__u32 sctpi_maxseg; +__u32 sctpi_peer_rwnd; +__u32 sctpi_peer_tag; +__u8 sctpi_peer_capable; +__u8 sctpi_peer_sack; + +/* assoc status info */ +__u64 sctpi_isacks; +__u64 sctpi_osacks; +__u64 sctpi_opackets; +__u64 sctpi_ipackets; +__u64 sctpi_rtxchunks; +__u64 sctpi_outofseqtsns; +__u64 sctpi_idupchunks; +__u64 sctpi_gapcnt; +__u64 sctpi_ouodchunks; +__u64 sctpi_iuodchunks; +__u64 sctpi_oodchunks; +__u64 sctpi_iodchunks; +__u64 sctpi_octrlchunks; +__u64 sctpi_ictrlchunks; + +/* primary transport info */ +struct sockaddr_storage sctpi_p_address; +__s32 sctpi_p_state; +__u32 sctpi_p_cwnd; +__u32 sctpi_p_srtt; +__u32 sctpi_p_rto; +__u32 sctpi_p_hbinterval; +__u32 sctpi_p_pathmaxrxt; +__u32 sctpi_p_sackdelay; +__u32 sctpi_p_sackfreq; +__u32 sctpi_p_ssthresh; +__u32 sctpi_p_partial_bytes_acked; +__u32 sctpi_p_flight_size; +__u16 sctpi_p_error; + +/* sctp sock info */ +__u32 sctpi_s_autoclose; +__u32 sctpi_s_adaptation_ind; +__u32 sctpi_s_pd_point; +__u8 sctpi_s_nodelay; +__u8 sctpi_s_disable_fragments; +__u8 sctpi_s_v4mapped; +__u8 sctpi_s_frag_interleave; +}; + +struct sctp_infox { +struct sctp_info *sctpinfo; +struct sctp_association *asoc; +}; +#endif /* __LINUX_SCTP_H__ */
include/net/sctp/sctp.h +3 -0
@@ -116,6 +116,9 @@ extern struct percpu_counter sctp_sockets_allocated;int sctp_asconf_mgmt (struct sctp_sock *,struct sctp_sockaddr_entry *);struct sk_buff *sctp_skb_recv_datagram (struct sock *,int ,int ,int *); +int sctp_get_sctp_info (struct sock *sk,struct sctp_association *asoc, +struct sctp_info *info); +/* * sctp/primitive.c */
net/sctp/socket.c +86 -0
92 lines not on this page · raw message
Signature · 1 line
2.1.0
Xin Long
maintainerPATCH 2/7 sctp: export some apis or variables for sctp_diag
For some main variables in sctp.ko, we couldn't export it to other modules, so we have to define some api to access them.
It will include sctp transport and endpoint's traversal.
--- include/net/sctp/sctp.h | 13 +++++ net/sctp/socket.c | 124 ++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 137 insertions(+)
include/net/sctp/sctp.h +13 -0
@@ -116,6 +116,19 @@ extern struct percpu_counter sctp_sockets_allocated;int sctp_asconf_mgmt (struct sctp_sock *,struct sctp_sockaddr_entry *);struct sk_buff *sctp_skb_recv_datagram (struct sock *,int ,int ,int *); +int sctp_transport_walk_start (struct rhashtable_iter *iter); +void sctp_transport_walk_stop (struct rhashtable_iter *iter); +struct sctp_transport *sctp_transport_get_next (struct net *net, +struct rhashtable_iter *iter); +struct sctp_transport *sctp_transport_get_idx (struct net *net, +struct rhashtable_iter *iter,int pos); +int sctp_transport_lookup_process (int (*cb)(struct sctp_transport *,void *), +struct net *net, +const union sctp_addr *laddr, +const union sctp_addr *paddr,void *p); +int sctp_for_each_transport (int (*cb)(struct sctp_transport *,void *), +struct net *net,int pos,void *p); +int sctp_for_each_endpoint (int (*cb)(struct sctp_endpoint *,void *),void *p);int sctp_get_sctp_info (struct sock *sk,struct sctp_association *asoc,struct sctp_info *info);
net/sctp/socket.c +124 -0
130 lines not on this page · raw message
Signature · 1 line
2.1.0
Xin Long
maintainerPATCH 3/7 sctp: export some functions for sctp_diag in inet_diag
inet_diag_msg_common_fill is used to fill the diag msg common info, we need to use it in sctp_diag as well, so export it.
We also add inet_diag_get_handler() to access inet_diag_table in sctp diag.
--- net/ipv4/inet_diag.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-)
net/ipv4/inet_diag.c +8 -1
@@ -66,7 +66,13 @@ static void inet_diag_unlock_handler(const struct inet_diag_handler *handler)mutex_unlock (&inet_diag_table_mutex); } -static void inet_diag_msg_common_fill (struct inet_diag_msg *r,struct sock *sk) +struct inet_diag_handler *inet_diag_get_handler (int proto) +{ +return inet_diag_table[proto]; +} +EXPORT_SYMBOL_GPL (inet_diag_get_handler); + +void inet_diag_msg_common_fill (struct inet_diag_msg *r,struct sock *sk) { r->idiag_family = sk->sk_family;
@@ -89,6 +95,7 @@ static void inet_diag_msg_common_fill(struct inet_diag_msg *r, struct sock *sk) r->id.idiag_dst[0 ] = sk->sk_daddr; } } +EXPORT_SYMBOL_GPL (inet_diag_msg_common_fill);static size_t inet_sk_attr_size (void ) {
Signature · 1 line
2.1.0
Xin Long
maintainerPATCH 4/7 sctp: add the sctp_diag.c file
This one will implement all the interface of inet_diag, inet_diag_handler. which includes sctp_diag_dump, sctp_diag_dump_one and sctp_diag_get_info.
It will work as a modules, and register inet_diag_handler when loading.
--- include/uapi/linux/inet_diag.h | 2 + net/sctp/Kconfig | 4 + net/sctp/Makefile | 1 + net/sctp/sctp_diag.c | 581 +++++++++++++++++++++++++++++++++++++++++ 4 files changed, 588 insertions(+) create mode 100644 net/sctp/sctp_diag.c
include/uapi/linux/inet_diag.h +2 -0
@@ -113,6 +113,8 @@ enum {INET_DIAG_DCTCPINFO ,INET_DIAG_PROTOCOL ,/* response attribute only */ INET_DIAG_SKV6ONLY , +INET_DIAG_LOCALS , + INET_DIAG_PEERS, };#define INET_DIAG_MAX INET_DIAG_SKV6ONLY
net/sctp/Kconfig +4 -0
@@ -99,5 +99,9 @@ config SCTP_COOKIE_HMAC_SHA1 select CRYPTO_HMAC if SCTP_COOKIE_HMAC_SHA1 select CRYPTO_SHA1 if SCTP_COOKIE_HMAC_SHA1 +config INET_SCTP_DIAG + depends on INET_DIAG + def_tristate INET_DIAG + endif # IP_SCTP
net/sctp/Makefile +1 -0
@@ -4,6 +4,7 @@ obj-$(CONFIG_IP_SCTP) += sctp.o obj-$(CONFIG_NET_SCTPPROBE) += sctp_probe.o +obj-$(CONFIG_INET_SCTP_DIAG) += sctp_diag.o sctp-y := sm_statetable.o sm_statefuns.o sm_sideeffect.o \ protocol.o endpointola.o associola.o \
net/sctp/sctp_diag.c new file +579 -0
579 lines not on this page · raw message
Signature · 1 line
2.1.0
Xin Long
maintainerPATCH 5/7 sctp: reuse the some transport traversal functions in proc
There are some transport traversal functions for sctp_diag, we can also use it for sctp_proc. cause they have the similar situation to traversal transport.
--- net/sctp/proc.c | 80 +++++++++++++-------------------------------------------- 1 file changed, 18 insertions(+), 62 deletions(-)
net/sctp/proc.c +18 -62
@@ -282,80 +282,31 @@ struct sctp_ht_iter {struct rhashtable_iter hti; }; -static struct sctp_transport *sctp_transport_get_next (struct seq_file *seq) -{ -struct sctp_ht_iter *iter = seq->private; -struct sctp_transport *t; - - t =rhashtable_walk_next (&iter->hti); -for (; t; t =rhashtable_walk_next (&iter->hti)) { -if (IS_ERR (t)) { -if (PTR_ERR (t) = -EAGAIN ) -continue ; -break ; - } - -if (net_eq (sock_net (t->asoc->base.sk),seq_file_net (seq)) && - t->asoc->peer.primary_path = t) -break ; - } - -return t; -} - -static struct sctp_transport *sctp_transport_get_idx (struct seq_file *seq, -loff_t pos) -{ -void *obj =SEQ_START_TOKEN ; - -while (pos && (obj =sctp_transport_get_next (seq)) && !IS_ERR (obj)) - pos--; - -return obj; -} - -static int sctp_transport_walk_start (struct seq_file *seq) -{ -struct sctp_ht_iter *iter = seq->private; -int err; - - err =rhashtable_walk_init (&sctp_transport_hashtable, &iter->hti); -if (err) -return err; - - err =rhashtable_walk_start (&iter->hti); - -return err = -EAGAIN ?0 : err; -} - -static void sctp_transport_walk_stop (struct seq_file *seq) -{ -struct sctp_ht_iter *iter = seq->private; - -rhashtable_walk_stop (&iter->hti); -rhashtable_walk_exit (&iter->hti); -} -static void *sctp_assocs_seq_start (struct seq_file *seq,loff_t *pos) { -int err =sctp_transport_walk_start (seq); +struct sctp_ht_iter *iter = seq->private; +int err =sctp_transport_walk_start (&iter->hti);if (err)return ERR_PTR (err); -return sctp_transport_get_idx (seq, *pos); +return sctp_transport_get_idx (seq_file_net (seq), &iter->hti, *pos); }static void sctp_assocs_seq_stop (struct seq_file *seq,void *v) { -sctp_transport_walk_stop (seq); +struct sctp_ht_iter *iter = seq->private; + +sctp_transport_walk_stop (&iter->hti); }static void *sctp_assocs_seq_next (struct seq_file *seq,void *v,loff_t *pos) { +struct sctp_ht_iter *iter = seq->private; + ++*pos; -return sctp_transport_get_next (seq); +return sctp_transport_get_next (seq_file_net (seq), &iter->hti); }/* Display sctp associations (/proc/net/sctp/assocs). */
@@ -457,24 +408,29 @@ void sctp_assocs_proc_exit(struct net *net)static void *sctp_remaddr_seq_start (struct seq_file *seq,loff_t *pos) { -int err =sctp_transport_walk_start (seq); +struct sctp_ht_iter *iter = seq->private; +int err =sctp_transport_walk_start (&iter->hti);if (err)return ERR_PTR (err); -return sctp_transport_get_idx (seq, *pos); +return sctp_transport_get_idx (seq_file_net (seq), &iter->hti, *pos); }static void *sctp_remaddr_seq_next (struct seq_file *seq,void *v,loff_t *pos) { +struct sctp_ht_iter *iter = seq->private; + ++*pos; -return sctp_transport_get_next (seq); +return sctp_transport_get_next (seq_file_net (seq), &iter->hti); }static void sctp_remaddr_seq_stop (struct seq_file *seq,void *v) { -sctp_transport_walk_stop (seq); +struct sctp_ht_iter *iter = seq->private; + +sctp_transport_walk_stop (&iter->hti); }static int sctp_remaddr_seq_show (struct seq_file *seq,void *v)
Signature · 1 line
2.1.0
Xin Long
maintainerPATCH 6/7 sctp: merge the seq_start/next/exits in remaddrs and assocs
In sctp proc, these three functions in remaddrs and assocs are the same. we should merge them into one.
--- net/sctp/proc.c | 45 +++++++++------------------------------------ 1 file changed, 9 insertions(+), 36 deletions(-)
net/sctp/proc.c +9 -36
@@ -282,7 +282,7 @@ struct sctp_ht_iter {struct rhashtable_iter hti; }; -static void *sctp_assocs_seq_start (struct seq_file *seq,loff_t *pos) +static void *sctp_transport_seq_start (struct seq_file *seq,loff_t *pos) {struct sctp_ht_iter *iter = seq->private;int err =sctp_transport_walk_start (&iter->hti);
@@ -293,14 +293,14 @@ static void *sctp_assocs_seq_start(struct seq_file *seq, loff_t *pos)return sctp_transport_get_idx (seq_file_net (seq), &iter->hti, *pos); } -static void sctp_assocs_seq_stop (struct seq_file *seq,void *v) +static void sctp_transport_seq_stop (struct seq_file *seq,void *v) {struct sctp_ht_iter *iter = seq->private;sctp_transport_walk_stop (&iter->hti); } -static void *sctp_assocs_seq_next (struct seq_file *seq,void *v,loff_t *pos) +static void *sctp_transport_seq_next (struct seq_file *seq,void *v,loff_t *pos) {struct sctp_ht_iter *iter = seq->private;
@@ -367,9 +367,9 @@ static int sctp_assocs_seq_show(struct seq_file *seq, void *v) }static const struct seq_operations sctp_assoc_ops = { - .start = sctp_assocs_seq_start, - .next = sctp_assocs_seq_next, - .stop = sctp_assocs_seq_stop, + .start = sctp_transport_seq_start, + .next = sctp_transport_seq_next, + .stop = sctp_transport_seq_stop, .show = sctp_assocs_seq_show, };
@@ -406,33 +406,6 @@ void sctp_assocs_proc_exit(struct net *net)remove_proc_entry ("assocs" , net->sctp.proc_net_sctp); } -static void *sctp_remaddr_seq_start (struct seq_file *seq,loff_t *pos) -{ -struct sctp_ht_iter *iter = seq->private; -int err =sctp_transport_walk_start (&iter->hti); - -if (err) -return ERR_PTR (err); - -return sctp_transport_get_idx (seq_file_net (seq), &iter->hti, *pos); -} - -static void *sctp_remaddr_seq_next (struct seq_file *seq,void *v,loff_t *pos) -{ -struct sctp_ht_iter *iter = seq->private; - - ++*pos; - -return sctp_transport_get_next (seq_file_net (seq), &iter->hti); -} - -static void sctp_remaddr_seq_stop (struct seq_file *seq,void *v) -{ -struct sctp_ht_iter *iter = seq->private; - -sctp_transport_walk_stop (&iter->hti); -} -static int sctp_remaddr_seq_show (struct seq_file *seq,void *v) {struct sctp_association *assoc;
@@ -506,9 +479,9 @@ static int sctp_remaddr_seq_show(struct seq_file *seq, void *v) }static const struct seq_operations sctp_remaddr_ops = { - .start = sctp_remaddr_seq_start, - .next = sctp_remaddr_seq_next, - .stop = sctp_remaddr_seq_stop, + .start = sctp_transport_seq_start, + .next = sctp_transport_seq_next, + .stop = sctp_transport_seq_stop, .show = sctp_remaddr_seq_show, };
Signature · 1 line
2.1.0
Xin Long
maintainerPATCH 7/7 sctp: fix some rhashtable functions using in sctp proc/diag
When rhashtable_walk_init return err, no release function should be called, and when rhashtable_walk_start return err, we should only invoke rhashtable_walk_exit to release the source.
But now when sctp_transport_walk_start return err, we just call rhashtable_walk_stop/exit, and never care about if rhashtable_walk_init or start return err, which is so bad.
We will fix it by calling rhashtable_walk_exit if rhashtable_walk_start return err in sctp_transport_walk_start, and if sctp_transport_walk_start return err, we do not need to call sctp_transport_walk_stop any more.
For sctp proc, we will use 'iter->start_fail' to decide if we will call rhashtable_walk_stop/exit.
--- net/sctp/proc.c | 7 ++++++- net/sctp/socket.c | 15 ++++++++++----- 2 files changed, 16 insertions(+), 6 deletions(-)
net/sctp/proc.c +6 -1
@@ -280,6 +280,7 @@ void sctp_eps_proc_exit(struct net *net)struct sctp_ht_iter {struct seq_net_private p;struct rhashtable_iter hti; +int start_fail; };static void *sctp_transport_seq_start (struct seq_file *seq,loff_t *pos)
@@ -287,8 +288,10 @@ static void *sctp_transport_seq_start(struct seq_file *seq, loff_t *pos)struct sctp_ht_iter *iter = seq->private;int err =sctp_transport_walk_start (&iter->hti); -if (err) +if (err) { + iter->start_fail =1 ;return ERR_PTR (err); + }return sctp_transport_get_idx (seq_file_net (seq), &iter->hti, *pos); }
@@ -297,6 +300,8 @@ static void sctp_transport_seq_stop(struct seq_file *seq, void *v) {struct sctp_ht_iter *iter = seq->private; +if (iter->start_fail) +return ;sctp_transport_walk_stop (&iter->hti); }
net/sctp/socket.c +10 -5
@@ -4298,8 +4298,12 @@ int sctp_transport_walk_start(struct rhashtable_iter *iter)return err; err =rhashtable_walk_start (iter); +if (err && err != -EAGAIN ) { +rhashtable_walk_exit (iter); +return err; + } -return err = -EAGAIN ?0 : err; +return 0 ; }void sctp_transport_walk_stop (struct rhashtable_iter *iter)
@@ -4388,11 +4392,12 @@ EXPORT_SYMBOL_GPL(sctp_transport_lookup_process);int sctp_for_each_transport (int (*cb)(struct sctp_transport *,void *),struct net *net,int pos,void *p) {struct rhashtable_iter hti; -int err =0 ;void *obj; +int err; -if (sctp_transport_walk_start (&hti)) - goto out; + err =sctp_transport_walk_start (&hti); +if (err) +return err;sctp_transport_get_idx (net, &hti, pos); obj =sctp_transport_get_next (net, &hti);
@@ -4406,8 +4411,8 @@ int sctp_for_each_transport(int (*cb)(struct sctp_transport *, void *),if (err)break ; } -out:sctp_transport_walk_stop (&hti); +return err; }EXPORT_SYMBOL_GPL (sctp_for_each_transport);
Signature · 1 line
2.1.0
Re: [PATCH net-next 5/7] sctp: reuse the some transport traversal functions in proc
In reply to Xin LongQuoted 28 lines · Xin Long
There are some transport traversal functions for
sctp_diag, we can also use it forsctp_proc. cause they have the similar situation to traversal transport.Signed-off-by Xin Long <[email protected]>--- net/sctp/proc.c | 80 +++++++++++++-------------------------------------------- 1 file changed, 18 insertions(+), 62 deletions(-)net/sctp/proc.c +0
-11@@ -282,80 +282,31 @@ struct sctp_ht_iter {struct rhashtable_iter hti; }; -static struct sctp_transport *sctp_transport_get_next (struct seq_file *seq) -{ -struct sctp_ht_iter *iter = seq->private; -struct sctp_transport *t; - - t =rhashtable_walk_next (&iter->hti); -for (; t; t =rhashtable_walk_next (&iter->hti)) { -if (IS_ERR (t)) { -if (PTR_ERR (t) = -EAGAIN ) -continue ; -break ;
net/sctp/proc.c struct sctp_ht_iter { · line 305
Quoted 10 lines
net/sctp/proc.c +0
-10- } - -if (net_eq (sock_net (t->asoc->base.sk),seq_file_net (seq)) && - t->asoc->peer.primary_path = t) -break ; - } - -return t; -} -
this may just be a nit, but you defined the new sctp_transport_get_next in patch 2 of this series, and didn't remove this private version until here. Is that going to cause some behavioral issue, if someone builds a kernel between patch 2 and 7? Seems like perhaps those two patches should be merged.
Neil
Marcelo Ricardo Leitner
maintainerRe: [PATCH net-next 5/7] sctp: reuse the some transport traversal functions in proc
Quoted 35 lines · Neil Horman
Quoted 34 lines · Xin Long
There are some transport traversal functions for
sctp_diag, we can also use it forsctp_proc. cause they have the similar situation to traversal transport.Signed-off-by Xin Long <[email protected]>--- net/sctp/proc.c | 80 +++++++++++++-------------------------------------------- 1 file changed, 18 insertions(+), 62 deletions(-)net/sctp/proc.c +0
-17@@ -282,80 +282,31 @@ struct sctp_ht_iter {struct rhashtable_iter hti; }; -static struct sctp_transport *sctp_transport_get_next (struct seq_file *seq) -{ -struct sctp_ht_iter *iter = seq->private; -struct sctp_transport *t; - - t =rhashtable_walk_next (&iter->hti); -for (; t; t =rhashtable_walk_next (&iter->hti)) { -if (IS_ERR (t)) { -if (PTR_ERR (t) = -EAGAIN ) -continue ; -break ; - } - -if (net_eq (sock_net (t->asoc->base.sk),seq_file_net (seq)) && - t->asoc->peer.primary_path = t) -break ; - }
Quoted 8 lines
net/sctp/proc.c struct sctp_ht_iter { · line 305
Quoted 4 lines
net/sctp/proc.c +0
-4- -return t; -} -this may just be a nit, but you defined the new
sctp_transport_get_nextin patch 2 of this series, and didn't remove this private version until here. Is that going to cause some behavioral issue, if someone builds a kernel between patch 2
Yes, it causes issues:
...net/sctp/proc.c:285:31: error: conflicting types for ‘sctp_transport_get_next’
static struct sctp_transport *sctp_transport_get_next(struct seq_file *seq)
^
Quoted 1 line
and 7? Seems like perhaps those two patches should be merged.
Agreed.
Marcelo
Marcelo Ricardo Leitner
maintainerRe: [PATCH net-next 3/7] sctp: export some functions for sctp_diag in inet_diag
In reply to Xin LongQuoted 16 lines · Xin Long
inet_diag_msg_common_fillis used to fill the diag msg common info, we need to use it insctp_diagas well, so export it.We also add
inet_diag_get_handler()to accessinet_diag_tablein sctp diag.Signed-off-by Xin Long <[email protected]>--- net/ipv4/inet_diag.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-)net/ipv4/inet_diag.c +0
-0
net/ipv4/inet_diag.c static void inet_diag_unlock_handler(const struct inet_diag_handler *handler) · line 69
Quoted 5 lines
net/ipv4/inet_diag.c +1
-1@@ -66,7 +66,13 @@ static void inet_diag_unlock_handler(const struct inet_diag_handler *handler)mutex_unlock (&inet_diag_table_mutex); } -static void inet_diag_msg_common_fill (struct inet_diag_msg *r,struct sock *sk) +struct inet_diag_handler *inet_diag_get_handler (int proto)
It needs to return it as const, as inet_diag_table is also declared as const, so we don't loose the qualifier.
Quoted 25 lines
net/ipv4/inet_diag.c +7
-0+{ +return inet_diag_table[proto]; +} +EXPORT_SYMBOL_GPL (inet_diag_get_handler); + +void inet_diag_msg_common_fill (struct inet_diag_msg *r,struct sock *sk) { r->idiag_family = sk->sk_family;@@ -89,6 +95,7 @@ static void inet_diag_msg_common_fill(struct inet_diag_msg *r, struct sock *sk) r->id.idiag_dst[0 ] = sk->sk_daddr; } } +EXPORT_SYMBOL_GPL (inet_diag_msg_common_fill);static size_t inet_sk_attr_size (void ) {Signature · 6 lines
2.1.0 -- To unsubscribe from this list: send the line "unsubscribe linux-sctp" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html
David Miller
maintainerFrom: Xin Long <[email protected]>
Date: Tue, 5 Apr 2016 12:06:25 +0800
Quoted 2 lines
This patchset will add
sctp_diagmodule to implement diag interface on sctp in kernel.
...
This series looks generally fine to me, but I'd like to see some review from SCTP experts before I apply this series.
Thanks.
[email protected]
maintainerQuoted 11 lines · David Miller
From: Xin Long <[email protected]>
Date: Tue, 5 Apr 2016 12:06:25 +0800Quoted 2 lines
This patchset will add
sctp_diagmodule to implement diag interface on sctp in kernel....
This series looks generally fine to me, but I'd like to see some review from SCTP experts before I apply this series.
Thanks.
Will finish reviewing it tomorrow. Thanks for reviewing it already
Marcelo Ricardo Leitner
maintainerQuoted 2 lines · Xin Long
This patchset will add
sctp_diagmodule to implement diag interface on sctp in kernel.
...
Other than the const thing and the point noticed by Neil which need to be fixed, patchset looks good to me.
Marcelo