mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-09-12 13:55:32 +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>
106 lines
2.9 KiB
C
106 lines
2.9 KiB
C
/* Fallback functions when the main IOMMU code is not compiled in. This
|
|
code is roughly equivalent to i386. */
|
|
#include <linux/dma-mapping.h>
|
|
#include <linux/scatterlist.h>
|
|
#include <linux/string.h>
|
|
#include <linux/init.h>
|
|
#include <linux/gfp.h>
|
|
#include <linux/pci.h>
|
|
#include <linux/mm.h>
|
|
|
|
#include <asm/processor.h>
|
|
#include <asm/iommu.h>
|
|
#include <asm/dma.h>
|
|
|
|
static int
|
|
check_addr(char *name, struct device *hwdev, dma_addr_t bus, size_t size)
|
|
{
|
|
if (hwdev && !dma_capable(hwdev, bus, size)) {
|
|
if (*hwdev->dma_mask >= DMA_BIT_MASK(32))
|
|
printk(KERN_ERR
|
|
"nommu_%s: overflow %Lx+%zu of device mask %Lx\n",
|
|
name, (long long)bus, size,
|
|
(long long)*hwdev->dma_mask);
|
|
return 0;
|
|
}
|
|
return 1;
|
|
}
|
|
|
|
static dma_addr_t nommu_map_page(struct device *dev, struct page *page,
|
|
unsigned long offset, size_t size,
|
|
enum dma_data_direction dir,
|
|
struct dma_attrs *attrs)
|
|
{
|
|
dma_addr_t bus = page_to_phys(page) + offset;
|
|
WARN_ON(size == 0);
|
|
if (!check_addr("map_single", dev, bus, size))
|
|
return DMA_ERROR_CODE;
|
|
flush_write_buffers();
|
|
return bus;
|
|
}
|
|
|
|
/* Map a set of buffers described by scatterlist in streaming
|
|
* mode for DMA. This is the scatter-gather version of the
|
|
* above pci_map_single interface. Here the scatter gather list
|
|
* elements are each tagged with the appropriate dma address
|
|
* and length. They are obtained via sg_dma_{address,length}(SG).
|
|
*
|
|
* NOTE: An implementation may be able to use a smaller number of
|
|
* DMA address/length pairs than there are SG table elements.
|
|
* (for example via virtual mapping capabilities)
|
|
* The routine returns the number of addr/length pairs actually
|
|
* used, at most nents.
|
|
*
|
|
* Device ownership issues as mentioned above for pci_map_single are
|
|
* the same here.
|
|
*/
|
|
static int nommu_map_sg(struct device *hwdev, struct scatterlist *sg,
|
|
int nents, enum dma_data_direction dir,
|
|
struct dma_attrs *attrs)
|
|
{
|
|
struct scatterlist *s;
|
|
int i;
|
|
|
|
WARN_ON(nents == 0 || sg[0].length == 0);
|
|
|
|
for_each_sg(sg, s, nents, i) {
|
|
BUG_ON(!sg_page(s));
|
|
s->dma_address = sg_phys(s);
|
|
if (!check_addr("map_sg", hwdev, s->dma_address, s->length))
|
|
return 0;
|
|
s->dma_length = s->length;
|
|
}
|
|
flush_write_buffers();
|
|
return nents;
|
|
}
|
|
|
|
static void nommu_free_coherent(struct device *dev, size_t size, void *vaddr,
|
|
dma_addr_t dma_addr)
|
|
{
|
|
free_pages((unsigned long)vaddr, get_order(size));
|
|
}
|
|
|
|
static void nommu_sync_single_for_device(struct device *dev,
|
|
dma_addr_t addr, size_t size,
|
|
enum dma_data_direction dir)
|
|
{
|
|
flush_write_buffers();
|
|
}
|
|
|
|
|
|
static void nommu_sync_sg_for_device(struct device *dev,
|
|
struct scatterlist *sg, int nelems,
|
|
enum dma_data_direction dir)
|
|
{
|
|
flush_write_buffers();
|
|
}
|
|
|
|
struct dma_map_ops nommu_dma_ops = {
|
|
.alloc_coherent = dma_generic_alloc_coherent,
|
|
.free_coherent = nommu_free_coherent,
|
|
.map_sg = nommu_map_sg,
|
|
.map_page = nommu_map_page,
|
|
.sync_single_for_device = nommu_sync_single_for_device,
|
|
.sync_sg_for_device = nommu_sync_sg_for_device,
|
|
.is_phys = 1,
|
|
};
|