mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-08-28 20:02:17 +00:00
![Tejun Heo](/assets/img/avatar_default.png)
percpu.h is included by sched.h and module.h and thus ends up being included when building most .c files. percpu.h includes slab.h which in turn includes gfp.h making everything defined by the two files universally available and complicating inclusion dependencies. percpu.h -> slab.h dependency is about to be removed. Prepare for this change by updating users of gfp and slab facilities include those headers directly instead of assuming availability. As this conversion needs to touch large number of source files, the following script is used as the basis of conversion. http://userweb.kernel.org/~tj/misc/slabh-sweep.py The script does the followings. * Scan files for gfp and slab usages and update includes such that only the necessary includes are there. ie. if only gfp is used, gfp.h, if slab is used, slab.h. * When the script inserts a new include, it looks at the include blocks and try to put the new include such that its order conforms to its surrounding. It's put in the include block which contains core kernel includes, in the same order that the rest are ordered - alphabetical, Christmas tree, rev-Xmas-tree or at the end if there doesn't seem to be any matching order. * If the script can't find a place to put a new include (mostly because the file doesn't have fitting include block), it prints out an error message indicating which .h file needs to be added to the file. The conversion was done in the following steps. 1. The initial automatic conversion of all .c files updated slightly over 4000 files, deleting around 700 includes and adding ~480 gfp.h and ~3000 slab.h inclusions. The script emitted errors for ~400 files. 2. Each error was manually checked. Some didn't need the inclusion, some needed manual addition while adding it to implementation .h or embedding .c file was more appropriate for others. This step added inclusions to around 150 files. 3. The script was run again and the output was compared to the edits from #2 to make sure no file was left behind. 4. Several build tests were done and a couple of problems were fixed. e.g. lib/decompress_*.c used malloc/free() wrappers around slab APIs requiring slab.h to be added manually. 5. The script was run on all .h files but without automatically editing them as sprinkling gfp.h and slab.h inclusions around .h files could easily lead to inclusion dependency hell. Most gfp.h inclusion directives were ignored as stuff from gfp.h was usually wildly available and often used in preprocessor macros. Each slab.h inclusion directive was examined and added manually as necessary. 6. percpu.h was updated not to include slab.h. 7. Build test were done on the following configurations and failures were fixed. CONFIG_GCOV_KERNEL was turned off for all tests (as my distributed build env didn't work with gcov compiles) and a few more options had to be turned off depending on archs to make things build (like ipr on powerpc/64 which failed due to missing writeq). * x86 and x86_64 UP and SMP allmodconfig and a custom test config. * powerpc and powerpc64 SMP allmodconfig * sparc and sparc64 SMP allmodconfig * ia64 SMP allmodconfig * s390 SMP allmodconfig * alpha SMP allmodconfig * um on x86_64 SMP allmodconfig 8. percpu.h modifications were reverted so that it could be applied as a separate patch and serve as bisection point. Given the fact that I had only a couple of failures from tests on step 6, I'm fairly confident about the coverage of this conversion patch. If there is a breakage, it's likely to be something in one of the arch headers which should be easily discoverable easily on most builds of the specific arch. Signed-off-by: Tejun Heo <tj@kernel.org> Guess-its-ok-by: Christoph Lameter <cl@linux-foundation.org> Cc: Ingo Molnar <mingo@redhat.com> Cc: Lee Schermerhorn <Lee.Schermerhorn@hp.com>
177 lines
5 KiB
C
177 lines
5 KiB
C
/**********************************************************************
|
|
* Author: Cavium Networks
|
|
*
|
|
* Contact: support@caviumnetworks.com
|
|
* This file is part of the OCTEON SDK
|
|
*
|
|
* Copyright (c) 2003-2010 Cavium Networks
|
|
*
|
|
* This file is free software; you can redistribute it and/or modify
|
|
* it under the terms of the GNU General Public License, Version 2, as
|
|
* published by the Free Software Foundation.
|
|
*
|
|
* This file is distributed in the hope that it will be useful, but
|
|
* AS-IS and WITHOUT ANY WARRANTY; without even the implied warranty
|
|
* of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE, TITLE, or
|
|
* NONINFRINGEMENT. See the GNU General Public License for more
|
|
* details.
|
|
*
|
|
* You should have received a copy of the GNU General Public License
|
|
* along with this file; if not, write to the Free Software
|
|
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
|
|
* or visit http://www.gnu.org/licenses/.
|
|
*
|
|
* This file may also be available under a different license from Cavium.
|
|
* Contact Cavium Networks for more information
|
|
**********************************************************************/
|
|
#include <linux/kernel.h>
|
|
#include <linux/netdevice.h>
|
|
#include <linux/slab.h>
|
|
|
|
#include <asm/octeon/octeon.h>
|
|
|
|
#include "ethernet-defines.h"
|
|
|
|
#include "cvmx-fpa.h"
|
|
|
|
/**
|
|
* cvm_oct_fill_hw_skbuff - fill the supplied hardware pool with skbuffs
|
|
* @pool: Pool to allocate an skbuff for
|
|
* @size: Size of the buffer needed for the pool
|
|
* @elements: Number of buffers to allocate
|
|
*
|
|
* Returns the actual number of buffers allocated.
|
|
*/
|
|
static int cvm_oct_fill_hw_skbuff(int pool, int size, int elements)
|
|
{
|
|
int freed = elements;
|
|
while (freed) {
|
|
|
|
struct sk_buff *skb = dev_alloc_skb(size + 256);
|
|
if (unlikely(skb == NULL)) {
|
|
pr_warning
|
|
("Failed to allocate skb for hardware pool %d\n",
|
|
pool);
|
|
break;
|
|
}
|
|
|
|
skb_reserve(skb, 256 - (((unsigned long)skb->data) & 0x7f));
|
|
*(struct sk_buff **)(skb->data - sizeof(void *)) = skb;
|
|
cvmx_fpa_free(skb->data, pool, DONT_WRITEBACK(size / 128));
|
|
freed--;
|
|
}
|
|
return elements - freed;
|
|
}
|
|
|
|
/**
|
|
* cvm_oct_free_hw_skbuff- free hardware pool skbuffs
|
|
* @pool: Pool to allocate an skbuff for
|
|
* @size: Size of the buffer needed for the pool
|
|
* @elements: Number of buffers to allocate
|
|
*/
|
|
static void cvm_oct_free_hw_skbuff(int pool, int size, int elements)
|
|
{
|
|
char *memory;
|
|
|
|
do {
|
|
memory = cvmx_fpa_alloc(pool);
|
|
if (memory) {
|
|
struct sk_buff *skb =
|
|
*(struct sk_buff **)(memory - sizeof(void *));
|
|
elements--;
|
|
dev_kfree_skb(skb);
|
|
}
|
|
} while (memory);
|
|
|
|
if (elements < 0)
|
|
pr_warning("Freeing of pool %u had too many skbuffs (%d)\n",
|
|
pool, elements);
|
|
else if (elements > 0)
|
|
pr_warning("Freeing of pool %u is missing %d skbuffs\n",
|
|
pool, elements);
|
|
}
|
|
|
|
/**
|
|
* cvm_oct_fill_hw_memory - fill a hardware pool with memory.
|
|
* @pool: Pool to populate
|
|
* @size: Size of each buffer in the pool
|
|
* @elements: Number of buffers to allocate
|
|
*
|
|
* Returns the actual number of buffers allocated.
|
|
*/
|
|
static int cvm_oct_fill_hw_memory(int pool, int size, int elements)
|
|
{
|
|
char *memory;
|
|
char *fpa;
|
|
int freed = elements;
|
|
|
|
while (freed) {
|
|
/*
|
|
* FPA memory must be 128 byte aligned. Since we are
|
|
* aligning we need to save the original pointer so we
|
|
* can feed it to kfree when the memory is returned to
|
|
* the kernel.
|
|
*
|
|
* We allocate an extra 256 bytes to allow for
|
|
* alignment and space for the original pointer saved
|
|
* just before the block.
|
|
*/
|
|
memory = kmalloc(size + 256, GFP_ATOMIC);
|
|
if (unlikely(memory == NULL)) {
|
|
pr_warning("Unable to allocate %u bytes for FPA pool %d\n",
|
|
elements * size, pool);
|
|
break;
|
|
}
|
|
fpa = (char *)(((unsigned long)memory + 256) & ~0x7fUL);
|
|
*((char **)fpa - 1) = memory;
|
|
cvmx_fpa_free(fpa, pool, 0);
|
|
freed--;
|
|
}
|
|
return elements - freed;
|
|
}
|
|
|
|
/**
|
|
* cvm_oct_free_hw_memory - Free memory allocated by cvm_oct_fill_hw_memory
|
|
* @pool: FPA pool to free
|
|
* @size: Size of each buffer in the pool
|
|
* @elements: Number of buffers that should be in the pool
|
|
*/
|
|
static void cvm_oct_free_hw_memory(int pool, int size, int elements)
|
|
{
|
|
char *memory;
|
|
char *fpa;
|
|
do {
|
|
fpa = cvmx_fpa_alloc(pool);
|
|
if (fpa) {
|
|
elements--;
|
|
fpa = (char *)phys_to_virt(cvmx_ptr_to_phys(fpa));
|
|
memory = *((char **)fpa - 1);
|
|
kfree(memory);
|
|
}
|
|
} while (fpa);
|
|
|
|
if (elements < 0)
|
|
pr_warning("Freeing of pool %u had too many buffers (%d)\n",
|
|
pool, elements);
|
|
else if (elements > 0)
|
|
pr_warning("Warning: Freeing of pool %u is missing %d buffers\n",
|
|
pool, elements);
|
|
}
|
|
|
|
int cvm_oct_mem_fill_fpa(int pool, int size, int elements)
|
|
{
|
|
int freed;
|
|
if (USE_SKBUFFS_IN_HW && pool == CVMX_FPA_PACKET_POOL)
|
|
freed = cvm_oct_fill_hw_skbuff(pool, size, elements);
|
|
else
|
|
freed = cvm_oct_fill_hw_memory(pool, size, elements);
|
|
return freed;
|
|
}
|
|
|
|
void cvm_oct_mem_empty_fpa(int pool, int size, int elements)
|
|
{
|
|
if (USE_SKBUFFS_IN_HW && pool == CVMX_FPA_PACKET_POOL)
|
|
cvm_oct_free_hw_skbuff(pool, size, elements);
|
|
else
|
|
cvm_oct_free_hw_memory(pool, size, elements);
|
|
}
|