From patchwork Wed Dec 1 12:52:57 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Changli Gao X-Patchwork-Id: 73814 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 00D51B7080 for ; Wed, 1 Dec 2010 23:53:34 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755151Ab0LAMx2 (ORCPT ); Wed, 1 Dec 2010 07:53:28 -0500 Received: from mail-gw0-f46.google.com ([74.125.83.46]:38686 "EHLO mail-gw0-f46.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755084Ab0LAMx1 (ORCPT ); Wed, 1 Dec 2010 07:53:27 -0500 Received: by gwj20 with SMTP id 20so3351878gwj.19 for ; Wed, 01 Dec 2010 04:53:26 -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=AXgC4x9rdKk5+sNWSJCB9W8Pp28ZUnhBIReH6/ijl5o=; b=fe6uXB4ZTjvco/CjTewivti7nOSVedFAi2tQXU5Vuav81SEqWUr1cijF9UjCnOIv76 uqCXaKQyPLcAOLaKHx50RZCGE5oQavnJ3nDUGRCb473gusFjGBh1m6F4cb3xbhxIZYoV a1pC3vlXje+BPIYD0jK9bFIA7rrvMQJMt/eBo= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=from:to:cc:subject:date:message-id:x-mailer; b=ryKeTWlC6oINExvu7i80O6lzIXoKK/iXIPJr3PYxzECK7xHLTUuHcB1F/QVCgQ+Io1 iuY9OMYeFDQoNCvPVCcak+ze50wfi2lg9dE7EMQ5EkZj0OkzPGMWI6/Aqew4ug3D58lf 3Qa9+9EHhgCy6wRXEF0I7E5lqyfArH5tx9n7s= Received: by 10.150.140.16 with SMTP id n16mr5438109ybd.443.1291208006080; Wed, 01 Dec 2010 04:53:26 -0800 (PST) Received: from localhost.localdomain ([221.239.34.230]) by mx.google.com with ESMTPS id v12sm4798263ybk.23.2010.12.01.04.53.16 (version=TLSv1/SSLv3 cipher=RC4-MD5); Wed, 01 Dec 2010 04:53:24 -0800 (PST) From: Changli Gao To: "David S. Miller" Cc: Eric Dumazet , Jiri Pirko , Neil Horman , netdev@vger.kernel.org, Changli Gao Subject: [PATCH v2 2/2] af_packet: remove pgv.flags Date: Wed, 1 Dec 2010 20:52:57 +0800 Message-Id: <1291207977-17176-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 remove pgv.flags. Then we may get more pg_vecs. Signed-off-by: Changli Gao --- v2: keep struct pgv net/packet/af_packet.c | 20 +++++--------------- 1 file changed, 5 insertions(+), 15 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 26fbeb1..a11c731 100644 --- a/net/packet/af_packet.c +++ b/net/packet/af_packet.c @@ -167,7 +167,6 @@ static int packet_set_ring(struct sock *sk, struct tpacket_req *req, #define PGV_FROM_VMALLOC 1 struct pgv { char *buffer; - unsigned char flags; }; struct packet_ring_buffer { @@ -2342,7 +2341,7 @@ static void free_pg_vec(struct pgv *pg_vec, unsigned int order, for (i = 0; i < len; i++) { if (likely(pg_vec[i].buffer)) { - if (pg_vec[i].flags & PGV_FROM_VMALLOC) + if (is_vmalloc_addr(pg_vec[i].buffer)) vfree(pg_vec[i].buffer); else free_pages((unsigned long)pg_vec[i].buffer, @@ -2353,8 +2352,7 @@ static void free_pg_vec(struct pgv *pg_vec, unsigned int order, 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 | @@ -2368,7 +2366,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) @@ -2377,7 +2374,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) @@ -2400,8 +2396,7 @@ static struct pgv *alloc_pg_vec(struct tpacket_req *req, int order) goto out; for (i = 0; i < block_nr; i++) { - pg_vec[i].buffer = alloc_one_pg_vec_page(order, - &pg_vec[i].flags); + pg_vec[i].buffer = alloc_one_pg_vec_page(order); if (unlikely(!pg_vec[i].buffer)) goto out_free_pgvec; } @@ -2585,13 +2580,8 @@ static int packet_mmap(struct file *file, struct socket *sock, void *kaddr = rb->pg_vec[i].buffer; 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); - + for (pg_num = 0; pg_num < rb->pg_vec_pages; pg_num++) { + page = pgv_to_page(kaddr); err = vm_insert_page(vma, start, page); if (unlikely(err)) goto out;