From: "Randy.Dunlap" <rddunlap@osdl.org>
To: netdev <netdev@oss.sgi.com>,
davem@davemloft.net, robert.olsson@its.uu.se
Subject: [PATCH] pktgen: proc_if_write: reduce stack usage
Date: Sun, 30 Jan 2005 19:29:45 -0800 [thread overview]
Message-ID: <41FDA629.5070702@osdl.org> (raw)
[-- Attachment #1: Type: text/plain, Size: 373 bytes --]
Hi,
Are you interested in pktgen stack reduction?
Is this acceptable?
pktgen: proc_if_write: reduce stack usage (on i386)
from 776 to 296 bytes by combining/reusing locals.
Signed-off-by: Randy Dunlap <rddunlap@osdl.org>
diffstat:=
net/core/pktgen.c | 94
++++++++++++++++++++++++------------------------------
1 files changed, 42 insertions(+), 52 deletions(-)
[-- Attachment #2: pktgen_stack.patch --]
[-- Type: text/x-patch, Size: 8040 bytes --]
diff -Naurp ./net/core/pktgen.c~pktgen_stack ./net/core/pktgen.c
--- ./net/core/pktgen.c~pktgen_stack 2005-01-27 16:31:49.000000000 -0800
+++ ./net/core/pktgen.c 2005-01-30 19:07:55.252712936 -0800
@@ -811,6 +811,8 @@ static int proc_if_write(struct file *fi
struct pktgen_dev *pkt_dev = (struct pktgen_dev*)(data);
char* pg_result = NULL;
int tmp = 0;
+ char buf4[IP_NAME_SZ];
+ char buf6[128];
pg_result = &(pkt_dev->result[0]);
@@ -1071,16 +1073,15 @@ static int proc_if_write(struct file *fi
return count;
}
if (!strcmp(name, "dst_min") || !strcmp(name, "dst")) {
- char buf[IP_NAME_SZ];
len = strn_len(&user_buffer[i], sizeof(pkt_dev->dst_min) - 1);
if (len < 0) { return len; }
- if (copy_from_user(buf, &user_buffer[i], len))
+ if (copy_from_user(buf4, &user_buffer[i], len))
return -EFAULT;
- buf[len] = 0;
- if (strcmp(buf, pkt_dev->dst_min) != 0) {
+ buf4[len] = 0;
+ if (strcmp(buf4, pkt_dev->dst_min) != 0) {
memset(pkt_dev->dst_min, 0, sizeof(pkt_dev->dst_min));
- strncpy(pkt_dev->dst_min, buf, len);
+ strncpy(pkt_dev->dst_min, buf4, len);
pkt_dev->daddr_min = in_aton(pkt_dev->dst_min);
pkt_dev->cur_daddr = pkt_dev->daddr_min;
}
@@ -1091,17 +1092,16 @@ static int proc_if_write(struct file *fi
return count;
}
if (!strcmp(name, "dst_max")) {
- char buf[IP_NAME_SZ];
len = strn_len(&user_buffer[i], sizeof(pkt_dev->dst_max) - 1);
if (len < 0) { return len; }
- if (copy_from_user(buf, &user_buffer[i], len))
+ if (copy_from_user(buf4, &user_buffer[i], len))
return -EFAULT;
- buf[len] = 0;
- if (strcmp(buf, pkt_dev->dst_max) != 0) {
+ buf4[len] = 0;
+ if (strcmp(buf4, pkt_dev->dst_max) != 0) {
memset(pkt_dev->dst_max, 0, sizeof(pkt_dev->dst_max));
- strncpy(pkt_dev->dst_max, buf, len);
+ strncpy(pkt_dev->dst_max, buf4, len);
pkt_dev->daddr_max = in_aton(pkt_dev->dst_max);
pkt_dev->cur_daddr = pkt_dev->daddr_max;
}
@@ -1112,108 +1112,99 @@ static int proc_if_write(struct file *fi
return count;
}
if (!strcmp(name, "dst6")) {
- char buf[128];
-
len = strn_len(&user_buffer[i], 128 - 1);
if (len < 0) return len;
pkt_dev->flags |= F_IPV6;
- if (copy_from_user(buf, &user_buffer[i], len))
+ if (copy_from_user(buf6, &user_buffer[i], len))
return -EFAULT;
- buf[len] = 0;
+ buf6[len] = 0;
- scan_ip6(buf, pkt_dev->in6_daddr.s6_addr);
- fmt_ip6(buf, pkt_dev->in6_daddr.s6_addr);
+ scan_ip6(buf6, pkt_dev->in6_daddr.s6_addr);
+ fmt_ip6(buf6, pkt_dev->in6_daddr.s6_addr);
ipv6_addr_copy(&pkt_dev->cur_in6_daddr, &pkt_dev->in6_daddr);
if(debug)
- printk("pktgen: dst6 set to: %s\n", buf);
+ printk("pktgen: dst6 set to: %s\n", buf6);
i += len;
- sprintf(pg_result, "OK: dst6=%s", buf);
+ sprintf(pg_result, "OK: dst6=%s", buf6);
return count;
}
if (!strcmp(name, "dst6_min")) {
- char buf[128];
-
len = strn_len(&user_buffer[i], 128 - 1);
if (len < 0) return len;
pkt_dev->flags |= F_IPV6;
- if (copy_from_user(buf, &user_buffer[i], len))
+ if (copy_from_user(buf6, &user_buffer[i], len))
return -EFAULT;
- buf[len] = 0;
+ buf6[len] = 0;
- scan_ip6(buf, pkt_dev->min_in6_daddr.s6_addr);
- fmt_ip6(buf, pkt_dev->min_in6_daddr.s6_addr);
+ scan_ip6(buf6, pkt_dev->min_in6_daddr.s6_addr);
+ fmt_ip6(buf6, pkt_dev->min_in6_daddr.s6_addr);
ipv6_addr_copy(&pkt_dev->cur_in6_daddr, &pkt_dev->min_in6_daddr);
if(debug)
- printk("pktgen: dst6_min set to: %s\n", buf);
+ printk("pktgen: dst6_min set to: %s\n", buf6);
i += len;
- sprintf(pg_result, "OK: dst6_min=%s", buf);
+ sprintf(pg_result, "OK: dst6_min=%s", buf6);
return count;
}
if (!strcmp(name, "dst6_max")) {
- char buf[128];
-
len = strn_len(&user_buffer[i], 128 - 1);
if (len < 0) return len;
pkt_dev->flags |= F_IPV6;
- if (copy_from_user(buf, &user_buffer[i], len))
+ if (copy_from_user(buf6, &user_buffer[i], len))
return -EFAULT;
- buf[len] = 0;
+ buf6[len] = 0;
- scan_ip6(buf, pkt_dev->max_in6_daddr.s6_addr);
- fmt_ip6(buf, pkt_dev->max_in6_daddr.s6_addr);
+ scan_ip6(buf6, pkt_dev->max_in6_daddr.s6_addr);
+ fmt_ip6(buf6, pkt_dev->max_in6_daddr.s6_addr);
if(debug)
- printk("pktgen: dst6_max set to: %s\n", buf);
+ printk("pktgen: dst6_max set to: %s\n", buf6);
i += len;
- sprintf(pg_result, "OK: dst6_max=%s", buf);
+ sprintf(pg_result, "OK: dst6_max=%s", buf6);
return count;
}
if (!strcmp(name, "src6")) {
- char buf[128];
-
len = strn_len(&user_buffer[i], 128 - 1);
if (len < 0) return len;
pkt_dev->flags |= F_IPV6;
- if (copy_from_user(buf, &user_buffer[i], len))
+ if (copy_from_user(buf6, &user_buffer[i], len))
return -EFAULT;
- buf[len] = 0;
+ buf6[len] = 0;
- scan_ip6(buf, pkt_dev->in6_saddr.s6_addr);
- fmt_ip6(buf, pkt_dev->in6_saddr.s6_addr);
+ scan_ip6(buf6, pkt_dev->in6_saddr.s6_addr);
+ fmt_ip6(buf6, pkt_dev->in6_saddr.s6_addr);
ipv6_addr_copy(&pkt_dev->cur_in6_saddr, &pkt_dev->in6_saddr);
if(debug)
- printk("pktgen: src6 set to: %s\n", buf);
+ printk("pktgen: src6 set to: %s\n", buf6);
i += len;
- sprintf(pg_result, "OK: src6=%s", buf);
+ sprintf(pg_result, "OK: src6=%s", buf6);
return count;
}
if (!strcmp(name, "src_min")) {
- char buf[IP_NAME_SZ];
len = strn_len(&user_buffer[i], sizeof(pkt_dev->src_min) - 1);
if (len < 0) { return len; }
- if (copy_from_user(buf, &user_buffer[i], len))
+ if (copy_from_user(buf4, &user_buffer[i], len))
return -EFAULT;
- buf[len] = 0;
- if (strcmp(buf, pkt_dev->src_min) != 0) {
+ buf4[len] = 0;
+ if (strcmp(buf4, pkt_dev->src_min) != 0) {
memset(pkt_dev->src_min, 0, sizeof(pkt_dev->src_min));
- strncpy(pkt_dev->src_min, buf, len);
+ strncpy(pkt_dev->src_min, buf4, len);
pkt_dev->saddr_min = in_aton(pkt_dev->src_min);
pkt_dev->cur_saddr = pkt_dev->saddr_min;
}
@@ -1224,15 +1215,14 @@ static int proc_if_write(struct file *fi
return count;
}
if (!strcmp(name, "src_max")) {
- char buf[IP_NAME_SZ];
len = strn_len(&user_buffer[i], sizeof(pkt_dev->src_max) - 1);
if (len < 0) { return len; }
- if (copy_from_user(buf, &user_buffer[i], len))
+ if (copy_from_user(buf4, &user_buffer[i], len))
return -EFAULT;
- buf[len] = 0;
- if (strcmp(buf, pkt_dev->src_max) != 0) {
+ buf4[len] = 0;
+ if (strcmp(buf4, pkt_dev->src_max) != 0) {
memset(pkt_dev->src_max, 0, sizeof(pkt_dev->src_max));
- strncpy(pkt_dev->src_max, buf, len);
+ strncpy(pkt_dev->src_max, buf4, len);
pkt_dev->saddr_max = in_aton(pkt_dev->src_max);
pkt_dev->cur_saddr = pkt_dev->saddr_max;
}
reply other threads:[~2005-01-31 3:29 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=41FDA629.5070702@osdl.org \
--to=rddunlap@osdl.org \
--cc=davem@davemloft.net \
--cc=netdev@oss.sgi.com \
--cc=robert.olsson@its.uu.se \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.