From patchwork Tue Nov 30 13:57:37 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Changli Gao X-Patchwork-Id: 73605 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 7EF391007D1 for ; Wed, 1 Dec 2010 00:58:22 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752512Ab0K3N6S (ORCPT ); Tue, 30 Nov 2010 08:58:18 -0500 Received: from mail-gy0-f174.google.com ([209.85.160.174]:55387 "EHLO mail-gy0-f174.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751991Ab0K3N6R (ORCPT ); Tue, 30 Nov 2010 08:58:17 -0500 Received: by gyb11 with SMTP id 11so2693861gyb.19 for ; Tue, 30 Nov 2010 05:58:16 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:received:received:from:to:cc:subject:date :message-id:x-mailer; bh=RVDZ+QMAtlrXkKNDhvMbj2/bKnZ1vJaRfCsbcolZ8ms=; b=gj5pQfBQmI3N94vF3I/QQLInaiilZG1DgEin6Ugo7t9vNITGJ5J4Iah6Nb9dJ8yTB4 lhQu08Gg9mBiOOk1eAU/2NTX1dLDT5Ly4l/UouyCui7i6I6qlC+t2g7pJbb4uragsl6+ LQ9z44btAEqulBepHSffpLpvNC5hcKnKhyLJU= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=from:to:cc:subject:date:message-id:x-mailer; b=CoiXTcgWbppkEzgyDPf4IsJlWcXFVwkKu0jBb3J/nfVBQs/kx7O2fHgZl8XVfTNqQk VasYaI1QYCLGpoZ5Y1Hhurs6e1QcfAQa8+PSyWFBfWrKp6UDjVIsDUp4rsbj1AO+9pYO w+eFrqfsx/0nRaMAgW0kAlOhuWaXDsCSGN5V8= Received: by 10.150.186.1 with SMTP id j1mr1629293ybf.242.1291125496492; Tue, 30 Nov 2010 05:58:16 -0800 (PST) Received: from localhost.localdomain ([221.239.34.230]) by mx.google.com with ESMTPS id i2sm242390yha.25.2010.11.30.05.58.06 (version=TLSv1/SSLv3 cipher=RC4-MD5); Tue, 30 Nov 2010 05:58:15 -0800 (PST) From: Changli Gao To: "David S. Miller" Cc: Eric Dumazet , Jiri Pirko , Neil Horman , netdev@vger.kernel.org, Changli Gao Subject: [PATCH 2/2] af_packet: replace struct pgv with char ** Date: Tue, 30 Nov 2010 21:57:37 +0800 Message-Id: <1291125457-14427-1-git-send-email-xiaosuo@gmail.com> X-Mailer: git-send-email 1.7.1 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org As we can check if an address is vmalloc address with is_vmalloc_addr(), we can replace struct pgv with char **. Then we may get more pg_vecs. Signed-off-by: Changli Gao --- net/packet/af_packet.c | 50 ++++++++++++++++--------------------------------- 1 file changed, 17 insertions(+), 33 deletions(-) -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html diff --git a/net/packet/af_packet.c b/net/packet/af_packet.c index 0171b20..a26f981 100644 --- a/net/packet/af_packet.c +++ b/net/packet/af_packet.c @@ -164,14 +164,8 @@ struct packet_mreq_max { static int packet_set_ring(struct sock *sk, struct tpacket_req *req, int closing, int tx_ring); -#define PGV_FROM_VMALLOC 1 -struct pgv { - char *buffer; - unsigned char flags; -}; - struct packet_ring_buffer { - struct pgv *pg_vec; + char **pg_vec; unsigned int head; unsigned int frames_per_block; unsigned int frame_size; @@ -297,8 +291,7 @@ static void *packet_lookup_frame(struct packet_sock *po, pg_vec_pos = position / rb->frames_per_block; frame_offset = position % rb->frames_per_block; - h.raw = rb->pg_vec[pg_vec_pos].buffer + - (frame_offset * rb->frame_size); + h.raw = rb->pg_vec[pg_vec_pos] + (frame_offset * rb->frame_size); if (status != __packet_get_status(po, h.raw)) return NULL; @@ -2340,26 +2333,24 @@ static const struct vm_operations_struct packet_mmap_ops = { .close = packet_mm_close, }; -static void free_pg_vec(struct pgv *pg_vec, unsigned int order, - unsigned int len) +static void free_pg_vec(char **pg_vec, unsigned int order, unsigned int len) { int i; for (i = 0; i < len; i++) { - if (likely(pg_vec[i].buffer)) { - if (pg_vec[i].flags & PGV_FROM_VMALLOC) - vfree(pg_vec[i].buffer); + if (likely(pg_vec[i])) { + if (is_vmalloc_addr(pg_vec[i])) + vfree(pg_vec[i]); else - free_pages((unsigned long)pg_vec[i].buffer, + free_pages((unsigned long)pg_vec[i], order); - pg_vec[i].buffer = NULL; + pg_vec[i] = NULL; } } kfree(pg_vec); } -static inline char *alloc_one_pg_vec_page(unsigned long order, - unsigned char *flags) +static inline char *alloc_one_pg_vec_page(unsigned long order) { char *buffer = NULL; gfp_t gfp_flags = GFP_KERNEL | __GFP_COMP | @@ -2373,7 +2364,6 @@ static inline char *alloc_one_pg_vec_page(unsigned long order, /* * __get_free_pages failed, fall back to vmalloc */ - *flags |= PGV_FROM_VMALLOC; buffer = vzalloc((1 << order) * PAGE_SIZE); if (buffer) @@ -2382,7 +2372,6 @@ static inline char *alloc_one_pg_vec_page(unsigned long order, /* * vmalloc failed, lets dig into swap here */ - *flags = 0; gfp_flags &= ~__GFP_NORETRY; buffer = (char *)__get_free_pages(gfp_flags, order); if (buffer) @@ -2394,20 +2383,19 @@ static inline char *alloc_one_pg_vec_page(unsigned long order, return NULL; } -static struct pgv *alloc_pg_vec(struct tpacket_req *req, int order) +static char **alloc_pg_vec(struct tpacket_req *req, int order) { unsigned int block_nr = req->tp_block_nr; - struct pgv *pg_vec; + char **pg_vec; int i; - pg_vec = kcalloc(block_nr, sizeof(struct pgv), GFP_KERNEL); + pg_vec = kcalloc(block_nr, sizeof(char *), GFP_KERNEL); if (unlikely(!pg_vec)) goto out; for (i = 0; i < block_nr; i++) { - pg_vec[i].buffer = alloc_one_pg_vec_page(order, - &pg_vec[i].flags); - if (unlikely(!pg_vec[i].buffer)) + pg_vec[i] = alloc_one_pg_vec_page(order); + if (unlikely(!pg_vec[i])) goto out_free_pgvec; } @@ -2424,7 +2412,7 @@ out_free_pgvec: static int packet_set_ring(struct sock *sk, struct tpacket_req *req, int closing, int tx_ring) { - struct pgv *pg_vec = NULL; + char **pg_vec = NULL; struct packet_sock *po = pkt_sk(sk); int was_running, order = 0; struct packet_ring_buffer *rb; @@ -2587,16 +2575,12 @@ static int packet_mmap(struct file *file, struct socket *sock, for (i = 0; i < rb->pg_vec_len; i++) { struct page *page; - void *kaddr = rb->pg_vec[i].buffer; + void *kaddr = rb->pg_vec[i]; int pg_num; for (pg_num = 0; pg_num < rb->pg_vec_pages; pg_num++) { - if (rb->pg_vec[i].flags & PGV_FROM_VMALLOC) - page = vmalloc_to_page(kaddr); - else - page = virt_to_page(kaddr); - + page = pgv_to_page(kaddr); err = vm_insert_page(vma, start, page); if (unlikely(err)) goto out;