* [TRIVIAL PATCH next 15/15] net: Convert vmalloc/memset to vzalloc [not found] <cover.1306603968.git.joe@perches.com> @ 2011-05-28 17:36 ` Joe Perches 2011-06-02 14:49 ` Pablo Neira Ayuso 0 siblings, 1 reply; 5+ messages in thread From: Joe Perches @ 2011-05-28 17:36 UTC (permalink / raw) To: Patrick McHardy, Andy Grover, Jiri Kosina Cc: David S. Miller, netfilter-devel, netfilter, coreteam, netdev, linux-kernel, rds-devel Signed-off-by: Joe Perches <joe@perches.com> --- net/netfilter/x_tables.c | 5 ++--- net/rds/ib_cm.c | 6 ++---- 2 files changed, 4 insertions(+), 7 deletions(-) diff --git a/net/netfilter/x_tables.c b/net/netfilter/x_tables.c index b0869fe..71441b9 100644 --- a/net/netfilter/x_tables.c +++ b/net/netfilter/x_tables.c @@ -776,12 +776,11 @@ static int xt_jumpstack_alloc(struct xt_table_info *i) size = sizeof(void **) * nr_cpu_ids; if (size > PAGE_SIZE) - i->jumpstack = vmalloc(size); + i->jumpstack = vzalloc(size); else - i->jumpstack = kmalloc(size, GFP_KERNEL); + i->jumpstack = kzalloc(size, GFP_KERNEL); if (i->jumpstack == NULL) return -ENOMEM; - memset(i->jumpstack, 0, size); i->stacksize *= xt_jumpstack_multiplier; size = sizeof(void *) * i->stacksize; diff --git a/net/rds/ib_cm.c b/net/rds/ib_cm.c index fd453dd..6ecaf78 100644 --- a/net/rds/ib_cm.c +++ b/net/rds/ib_cm.c @@ -374,23 +374,21 @@ static int rds_ib_setup_qp(struct rds_connection *conn) goto out; } - ic->i_sends = vmalloc_node(ic->i_send_ring.w_nr * sizeof(struct rds_ib_send_work), + ic->i_sends = vzalloc_node(ic->i_send_ring.w_nr * sizeof(struct rds_ib_send_work), ibdev_to_node(dev)); if (!ic->i_sends) { ret = -ENOMEM; rdsdebug("send allocation failed\n"); goto out; } - memset(ic->i_sends, 0, ic->i_send_ring.w_nr * sizeof(struct rds_ib_send_work)); - ic->i_recvs = vmalloc_node(ic->i_recv_ring.w_nr * sizeof(struct rds_ib_recv_work), + ic->i_recvs = vzalloc_node(ic->i_recv_ring.w_nr * sizeof(struct rds_ib_recv_work), ibdev_to_node(dev)); if (!ic->i_recvs) { ret = -ENOMEM; rdsdebug("recv allocation failed\n"); goto out; } - memset(ic->i_recvs, 0, ic->i_recv_ring.w_nr * sizeof(struct rds_ib_recv_work)); rds_ib_recv_init_ack(ic); -- 1.7.5.rc3.dirty ^ permalink raw reply related [flat|nested] 5+ messages in thread
* Re: [TRIVIAL PATCH next 15/15] net: Convert vmalloc/memset to vzalloc 2011-05-28 17:36 ` [TRIVIAL PATCH next 15/15] net: Convert vmalloc/memset to vzalloc Joe Perches @ 2011-06-02 14:49 ` Pablo Neira Ayuso 2011-06-02 21:39 ` David Miller 0 siblings, 1 reply; 5+ messages in thread From: Pablo Neira Ayuso @ 2011-06-02 14:49 UTC (permalink / raw) To: Joe Perches Cc: Patrick McHardy, Andy Grover, Jiri Kosina, David S. Miller, netfilter-devel, netfilter, coreteam, netdev, linux-kernel, rds-devel David, Are you going to take this patch? it includes one chunck which is out of netfilter scope. Thanks. On 28/05/11 19:36, Joe Perches wrote: > Signed-off-by: Joe Perches <joe@perches.com> > --- > net/netfilter/x_tables.c | 5 ++--- > net/rds/ib_cm.c | 6 ++---- > 2 files changed, 4 insertions(+), 7 deletions(-) > > diff --git a/net/netfilter/x_tables.c b/net/netfilter/x_tables.c > index b0869fe..71441b9 100644 > --- a/net/netfilter/x_tables.c > +++ b/net/netfilter/x_tables.c > @@ -776,12 +776,11 @@ static int xt_jumpstack_alloc(struct xt_table_info *i) > > size = sizeof(void **) * nr_cpu_ids; > if (size > PAGE_SIZE) > - i->jumpstack = vmalloc(size); > + i->jumpstack = vzalloc(size); > else > - i->jumpstack = kmalloc(size, GFP_KERNEL); > + i->jumpstack = kzalloc(size, GFP_KERNEL); > if (i->jumpstack == NULL) > return -ENOMEM; > - memset(i->jumpstack, 0, size); > > i->stacksize *= xt_jumpstack_multiplier; > size = sizeof(void *) * i->stacksize; > diff --git a/net/rds/ib_cm.c b/net/rds/ib_cm.c > index fd453dd..6ecaf78 100644 > --- a/net/rds/ib_cm.c > +++ b/net/rds/ib_cm.c > @@ -374,23 +374,21 @@ static int rds_ib_setup_qp(struct rds_connection *conn) > goto out; > } > > - ic->i_sends = vmalloc_node(ic->i_send_ring.w_nr * sizeof(struct rds_ib_send_work), > + ic->i_sends = vzalloc_node(ic->i_send_ring.w_nr * sizeof(struct rds_ib_send_work), > ibdev_to_node(dev)); > if (!ic->i_sends) { > ret = -ENOMEM; > rdsdebug("send allocation failed\n"); > goto out; > } > - memset(ic->i_sends, 0, ic->i_send_ring.w_nr * sizeof(struct rds_ib_send_work)); > > - ic->i_recvs = vmalloc_node(ic->i_recv_ring.w_nr * sizeof(struct rds_ib_recv_work), > + ic->i_recvs = vzalloc_node(ic->i_recv_ring.w_nr * sizeof(struct rds_ib_recv_work), > ibdev_to_node(dev)); > if (!ic->i_recvs) { > ret = -ENOMEM; > rdsdebug("recv allocation failed\n"); > goto out; > } > - memset(ic->i_recvs, 0, ic->i_recv_ring.w_nr * sizeof(struct rds_ib_recv_work)); > > rds_ib_recv_init_ack(ic); > ^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [TRIVIAL PATCH next 15/15] net: Convert vmalloc/memset to vzalloc 2011-06-02 14:49 ` Pablo Neira Ayuso @ 2011-06-02 21:39 ` David Miller 2011-06-03 1:35 ` Joe Perches 2011-06-03 9:39 ` Pablo Neira Ayuso 0 siblings, 2 replies; 5+ messages in thread From: David Miller @ 2011-06-02 21:39 UTC (permalink / raw) To: pablo Cc: joe, kaber, andy.grover, trivial, netfilter-devel, netfilter, coreteam, netdev, linux-kernel, rds-devel From: Pablo Neira Ayuso <pablo@netfilter.org> Date: Thu, 02 Jun 2011 16:49:53 +0200 > Are you going to take this patch? it includes one chunck which is out of > netfilter scope. I think the trivial folks submit these things via their own tree and are only looking for ACKs from us. Acked-by: David S. Miller <davem@davemloft.net> ^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [TRIVIAL PATCH next 15/15] net: Convert vmalloc/memset to vzalloc 2011-06-02 21:39 ` David Miller @ 2011-06-03 1:35 ` Joe Perches 2011-06-03 9:39 ` Pablo Neira Ayuso 1 sibling, 0 replies; 5+ messages in thread From: Joe Perches @ 2011-06-03 1:35 UTC (permalink / raw) To: David Miller Cc: pablo, kaber, andy.grover, trivial, netfilter-devel, netfilter, coreteam, netdev, linux-kernel, rds-devel On Thu, 2011-06-02 at 14:39 -0700, David Miller wrote: > From: Pablo Neira Ayuso <pablo@netfilter.org> > Date: Thu, 02 Jun 2011 16:49:53 +0200 > > Are you going to take this patch? it includes one chunk which is out of > > netfilter scope. > I think the trivial folks submit these things via their own tree > and are only looking for ACKs from us. > Acked-by: David S. Miller <davem@davemloft.net> Getting trivial patches applied between the various maintainers and the trivial tree is most often a bit uncoordinated and haphazard. Doing micropatches for each subsystem maintainer does sometimes appear to be detrimental to getting any treewide modification applied. I've experimented with both micropatches and treewide patches to gauge what happens. I'm not sure either approach is better or worse. In any case, it commonly takes several submittals for these sort of trivial patches to get applied either by the subtree maintainer or by Jiri. Jiri often waits a few weeks for patches to get picked up by any subtree maintainer before looking at his trivial emails. Sometimes he acks what's left, sometimes what's left just disappears into the ethervoid waiting for the submitter to try again. No worries, that's just the way it is. ^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [TRIVIAL PATCH next 15/15] net: Convert vmalloc/memset to vzalloc 2011-06-02 21:39 ` David Miller 2011-06-03 1:35 ` Joe Perches @ 2011-06-03 9:39 ` Pablo Neira Ayuso 1 sibling, 0 replies; 5+ messages in thread From: Pablo Neira Ayuso @ 2011-06-03 9:39 UTC (permalink / raw) To: David Miller Cc: joe, kaber, andy.grover, trivial, netfilter-devel, netfilter, coreteam, netdev, linux-kernel, rds-devel On 02/06/11 23:39, David Miller wrote: > From: Pablo Neira Ayuso <pablo@netfilter.org> > Date: Thu, 02 Jun 2011 16:49:53 +0200 > >> Are you going to take this patch? it includes one chunck which is out of >> netfilter scope. > > I think the trivial folks submit these things via their own tree > and are only looking for ACKs from us. > > Acked-by: David S. Miller <davem@davemloft.net> Acked-by: Pablo Neira Ayuso <pablo@netfilter.org> ^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2011-06-03 9:39 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
[not found] <cover.1306603968.git.joe@perches.com>
2011-05-28 17:36 ` [TRIVIAL PATCH next 15/15] net: Convert vmalloc/memset to vzalloc Joe Perches
2011-06-02 14:49 ` Pablo Neira Ayuso
2011-06-02 21:39 ` David Miller
2011-06-03 1:35 ` Joe Perches
2011-06-03 9:39 ` Pablo Neira Ayuso
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox; as well as URLs for NNTP newsgroup(s).