Re: [PATCH 6/6 net-2.6.25][RAW] Consolidate proc interface (v2)
From: Pavel Emelyanov <[EMAIL PROTECTED]> Date: Fri, 16 Nov 2007 18:06:16 +0300 > Both ipv6/raw.c and ipv4/raw.c use the seq files to walk > through the raw sockets hash and show them. > > The "walking" code is rather huge, but is identical in both > cases. The difference is the hash table to walk over and > the protocol family to check (this was not in the first > virsion of the patch, which was noticed by YOSHIFUJI) > > Make the ->open store the needed hash table and the family > on the allocated raw_iter_state and make the start/next/stop > callbacks work with it. > > This removes most of the code. > > Signed-off-by: Pavel Emelyanov <[EMAIL PROTECTED]> Also applied, thanks a lot. - To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to [EMAIL PROTECTED] More majordomo info at http://vger.kernel.org/majordomo-info.html
[PATCH 6/6 net-2.6.25][RAW] Consolidate proc interface (v2)
Both ipv6/raw.c and ipv4/raw.c use the seq files to walk
through the raw sockets hash and show them.
The "walking" code is rather huge, but is identical in both
cases. The difference is the hash table to walk over and
the protocol family to check (this was not in the first
virsion of the patch, which was noticed by YOSHIFUJI)
Make the ->open store the needed hash table and the family
on the allocated raw_iter_state and make the start/next/stop
callbacks work with it.
This removes most of the code.
Signed-off-by: Pavel Emelyanov <[EMAIL PROTECTED]>
---
diff --git a/include/net/raw.h b/include/net/raw.h
index 81a1773..4d1aba0 100644
--- a/include/net/raw.h
+++ b/include/net/raw.h
@@ -37,6 +37,20 @@ struct raw_hashinfo {
#ifdef CONFIG_PROC_FS
extern int raw_proc_init(void);
extern void raw_proc_exit(void);
+
+struct raw_iter_state {
+ int bucket;
+ unsigned short family;
+ struct raw_hashinfo *h;
+};
+
+#define raw_seq_private(seq) ((struct raw_iter_state *)(seq)->private)
+void *raw_seq_start(struct seq_file *seq, loff_t *pos);
+void *raw_seq_next(struct seq_file *seq, void *v, loff_t *pos);
+void raw_seq_stop(struct seq_file *seq, void *v);
+int raw_seq_open(struct file *file, struct raw_hashinfo *h,
+ unsigned short family);
+
#endif
void raw_hash_sk(struct sock *sk, struct raw_hashinfo *h);
diff --git a/net/ipv4/raw.c b/net/ipv4/raw.c
index ffd7a4f..f99828e 100644
--- a/net/ipv4/raw.c
+++ b/net/ipv4/raw.c
@@ -843,12 +843,6 @@ struct proto raw_prot = {
};
#ifdef CONFIG_PROC_FS
-struct raw_iter_state {
- int bucket;
-};
-
-#define raw_seq_private(seq) ((struct raw_iter_state *)(seq)->private)
-
static struct sock *raw_get_first(struct seq_file *seq)
{
struct sock *sk;
@@ -858,8 +852,8 @@ static struct sock *raw_get_first(struct seq_file *seq)
++state->bucket) {
struct hlist_node *node;
- sk_for_each(sk, node, &raw_v4_hashinfo.ht[state->bucket])
- if (sk->sk_family == PF_INET)
+ sk_for_each(sk, node, &state->h->ht[state->bucket])
+ if (sk->sk_family == state->family)
goto found;
}
sk = NULL;
@@ -875,10 +869,10 @@ static struct sock *raw_get_next(struct seq_file *seq,
struct sock *sk)
sk = sk_next(sk);
try_again:
;
- } while (sk && sk->sk_family != PF_INET);
+ } while (sk && sk->sk_family != state->family);
if (!sk && ++state->bucket < RAW_HTABLE_SIZE) {
- sk = sk_head(&raw_v4_hashinfo.ht[state->bucket]);
+ sk = sk_head(&state->h->ht[state->bucket]);
goto try_again;
}
return sk;
@@ -894,13 +888,16 @@ static struct sock *raw_get_idx(struct seq_file *seq,
loff_t pos)
return pos ? NULL : sk;
}
-static void *raw_seq_start(struct seq_file *seq, loff_t *pos)
+void *raw_seq_start(struct seq_file *seq, loff_t *pos)
{
- read_lock(&raw_v4_hashinfo.lock);
+ struct raw_iter_state *state = raw_seq_private(seq);
+
+ read_lock(&state->h->lock);
return *pos ? raw_get_idx(seq, *pos - 1) : SEQ_START_TOKEN;
}
+EXPORT_SYMBOL_GPL(raw_seq_start);
-static void *raw_seq_next(struct seq_file *seq, void *v, loff_t *pos)
+void *raw_seq_next(struct seq_file *seq, void *v, loff_t *pos)
{
struct sock *sk;
@@ -911,11 +908,15 @@ static void *raw_seq_next(struct seq_file *seq, void *v,
loff_t *pos)
++*pos;
return sk;
}
+EXPORT_SYMBOL_GPL(raw_seq_next);
-static void raw_seq_stop(struct seq_file *seq, void *v)
+void raw_seq_stop(struct seq_file *seq, void *v)
{
- read_unlock(&raw_v4_hashinfo.lock);
+ struct raw_iter_state *state = raw_seq_private(seq);
+
+ read_unlock(&state->h->lock);
}
+EXPORT_SYMBOL_GPL(raw_seq_stop);
static __inline__ char *get_raw_sock(struct sock *sp, char *tmpbuf, int i)
{
@@ -962,15 +963,30 @@ static const struct seq_operations raw_seq_ops = {
.show = raw_seq_show,
};
-static int raw_seq_open(struct inode *inode, struct file *file)
+int raw_seq_open(struct file *file, struct raw_hashinfo *h,
+ unsigned short family)
{
- return seq_open_private(file, &raw_seq_ops,
+ struct raw_iter_state *i;
+
+ i = __seq_open_private(file, &raw_seq_ops,
sizeof(struct raw_iter_state));
+ if (i == NULL)
+ return -ENOMEM;
+
+ i->h = h;
+ i->family = family;
+ return 0;
+}
+EXPORT_SYMBOL_GPL(raw_seq_open);
+
+static int raw_v4_seq_open(struct inode *inode, struct file *file)
+{
+ return raw_seq_open(file, &raw_v4_hashinfo, PF_INET);
}
static const struct file_operations raw_seq_fops = {
.owner = THIS_MODULE,
- .open= raw_seq_open,
+ .open= raw_v4_seq_open,
.read= seq_read,
.llseek = seq_lseek,
.release = seq_release_private,
diff --gi
Re: [PATCH 6/6 net-2.6.25][RAW] Consolidate proc interface
YOSHIFUJI Hideaki wrote:
> NAK.
>
> In article <[EMAIL PROTECTED]> (at Fri, 16 Nov 2007 17:19:27 +0300), Pavel
> Emelyanov <[EMAIL PROTECTED]> says:
>
>> @@ -858,7 +852,7 @@ static struct sock *raw_get_first(struct seq_file *seq)
>> ++state->bucket) {
>> struct hlist_node *node;
>>
>> -sk_for_each(sk, node, &raw_v4_hashinfo.ht[state->bucket])
>> +sk_for_each(sk, node, &state->h->ht[state->bucket])
>> if (sk->sk_family == PF_INET)
>> goto found;
>> }
>
> This and
>
>> -static struct sock *raw6_get_first(struct seq_file *seq)
>> -{
>> -struct sock *sk;
>> -struct hlist_node *node;
>> -struct raw6_iter_state* state = raw6_seq_private(seq);
>> -
>> -for (state->bucket = 0; state->bucket < RAW_HTABLE_SIZE;
>> -++state->bucket)
>> -sk_for_each(sk, node, &raw_v6_hashinfo.ht[state->bucket])
>> -if (sk->sk_family == PF_INET6)
>> -goto out;
>> -sk = NULL;
>> -out:
>> -return sk;
>> -}
>> -
>
> this are different.
Oops... Indeed. Thanks for noticing. I've overlooked this :(
> --yoshfuji
>
-
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: [PATCH 6/6 net-2.6.25][RAW] Consolidate proc interface
NAK.
In article <[EMAIL PROTECTED]> (at Fri, 16 Nov 2007 17:19:27 +0300), Pavel
Emelyanov <[EMAIL PROTECTED]> says:
> @@ -858,7 +852,7 @@ static struct sock *raw_get_first(struct seq_file *seq)
> ++state->bucket) {
> struct hlist_node *node;
>
> - sk_for_each(sk, node, &raw_v4_hashinfo.ht[state->bucket])
> + sk_for_each(sk, node, &state->h->ht[state->bucket])
> if (sk->sk_family == PF_INET)
> goto found;
> }
This and
> -static struct sock *raw6_get_first(struct seq_file *seq)
> -{
> - struct sock *sk;
> - struct hlist_node *node;
> - struct raw6_iter_state* state = raw6_seq_private(seq);
> -
> - for (state->bucket = 0; state->bucket < RAW_HTABLE_SIZE;
> - ++state->bucket)
> - sk_for_each(sk, node, &raw_v6_hashinfo.ht[state->bucket])
> - if (sk->sk_family == PF_INET6)
> - goto out;
> - sk = NULL;
> -out:
> - return sk;
> -}
> -
this are different.
--yoshfuji
-
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at http://vger.kernel.org/majordomo-info.html
[PATCH 6/6 net-2.6.25][RAW] Consolidate proc interface
Both ipv6/raw.c and ipv4/raw.c use the seq files to
walk through the raw sockets hash and show them.
The "walking" code is rather huge, but is identical
in both cases. The difference is the hash table to
walk over.
Make the ->open store the needed hash table on the
allocated raw_iter_state and make the start/next/stop
callbacks work with it.
This removes most of the code.
Signed-off-by: Pavel Emelyanov <[EMAIL PROTECTED]>
---
diff --git a/include/net/raw.h b/include/net/raw.h
index 81a1773..c55d11e 100644
--- a/include/net/raw.h
+++ b/include/net/raw.h
@@ -37,6 +37,18 @@ struct raw_hashinfo {
#ifdef CONFIG_PROC_FS
extern int raw_proc_init(void);
extern void raw_proc_exit(void);
+
+struct raw_iter_state {
+ int bucket;
+ struct raw_hashinfo *h;
+};
+
+#define raw_seq_private(seq) ((struct raw_iter_state *)(seq)->private)
+void *raw_seq_start(struct seq_file *seq, loff_t *pos);
+void *raw_seq_next(struct seq_file *seq, void *v, loff_t *pos);
+void raw_seq_stop(struct seq_file *seq, void *v);
+int raw_seq_open(struct file *file, struct raw_hashinfo *h);
+
#endif
void raw_hash_sk(struct sock *sk, struct raw_hashinfo *h);
diff --git a/net/ipv4/raw.c b/net/ipv4/raw.c
index ee01811..0483805 100644
--- a/net/ipv4/raw.c
+++ b/net/ipv4/raw.c
@@ -843,12 +843,6 @@ struct proto raw_prot = {
};
#ifdef CONFIG_PROC_FS
-struct raw_iter_state {
- int bucket;
-};
-
-#define raw_seq_private(seq) ((struct raw_iter_state *)(seq)->private)
-
static struct sock *raw_get_first(struct seq_file *seq)
{
struct sock *sk;
@@ -858,7 +852,7 @@ static struct sock *raw_get_first(struct seq_file *seq)
++state->bucket) {
struct hlist_node *node;
- sk_for_each(sk, node, &raw_v4_hashinfo.ht[state->bucket])
+ sk_for_each(sk, node, &state->h->ht[state->bucket])
if (sk->sk_family == PF_INET)
goto found;
}
@@ -878,7 +872,7 @@ try_again:
} while (sk && sk->sk_family != PF_INET);
if (!sk && ++state->bucket < RAW_HTABLE_SIZE) {
- sk = sk_head(&raw_v4_hashinfo.ht[state->bucket]);
+ sk = sk_head(&state->h->ht[state->bucket]);
goto try_again;
}
return sk;
@@ -894,13 +888,16 @@ static struct sock *raw_get_idx(struct seq_file *seq,
loff_t pos)
return pos ? NULL : sk;
}
-static void *raw_seq_start(struct seq_file *seq, loff_t *pos)
+void *raw_seq_start(struct seq_file *seq, loff_t *pos)
{
- read_lock(&raw_v4_hashinfo.lock);
+ struct raw_iter_state *state = raw_seq_private(seq);
+
+ read_lock(&state->h->lock);
return *pos ? raw_get_idx(seq, *pos - 1) : SEQ_START_TOKEN;
}
+EXPORT_SYMBOL_GPL(raw_seq_start);
-static void *raw_seq_next(struct seq_file *seq, void *v, loff_t *pos)
+void *raw_seq_next(struct seq_file *seq, void *v, loff_t *pos)
{
struct sock *sk;
@@ -911,11 +908,15 @@ static void *raw_seq_next(struct seq_file *seq, void *v,
loff_t *pos)
++*pos;
return sk;
}
+EXPORT_SYMBOL_GPL(raw_seq_next);
-static void raw_seq_stop(struct seq_file *seq, void *v)
+void raw_seq_stop(struct seq_file *seq, void *v)
{
- read_unlock(&raw_v4_hashinfo.lock);
+ struct raw_iter_state *state = raw_seq_private(seq);
+
+ read_unlock(&state->h->lock);
}
+EXPORT_SYMBOL_GPL(raw_seq_stop);
static __inline__ char *get_raw_sock(struct sock *sp, char *tmpbuf, int i)
{
@@ -962,15 +963,28 @@ static const struct seq_operations raw_seq_ops = {
.show = raw_seq_show,
};
-static int raw_seq_open(struct inode *inode, struct file *file)
+int raw_seq_open(struct file *file, struct raw_hashinfo *h)
{
- return seq_open_private(file, &raw_seq_ops,
+ struct raw_iter_state *i;
+
+ i = __seq_open_private(file, &raw_seq_ops,
sizeof(struct raw_iter_state));
+ if (i == NULL)
+ return -ENOMEM;
+
+ i->h = h;
+ return 0;
+}
+EXPORT_SYMBOL_GPL(raw_seq_open);
+
+static int raw_v4_seq_open(struct inode *inode, struct file *file)
+{
+ return raw_seq_open(file, &raw_v4_hashinfo);
}
static const struct file_operations raw_seq_fops = {
.owner = THIS_MODULE,
- .open= raw_seq_open,
+ .open= raw_v4_seq_open,
.read= seq_read,
.llseek = seq_lseek,
.release = seq_release_private,
diff --git a/net/ipv6/raw.c b/net/ipv6/raw.c
index 07adfcf..a9cd880 100644
--- a/net/ipv6/raw.c
+++ b/net/ipv6/raw.c
@@ -1200,77 +1200,6 @@ struct proto rawv6_prot = {
};
#ifdef CONFIG_PROC_FS
-struct raw6_iter_state {
- int bucket;
-};
-
-#define raw6_seq_private(seq) ((struct raw6_iter_state *)(seq)->private)
-
-static struct sock *raw6_get_first(struct seq_file *seq)
-{
- struct sock *sk;
- struct hlist_node *node;
- struct raw6_iter_state* state = raw6_seq_private(seq);
-
- for (state->bucket = 0; stat
