ia64/xen-unstable

changeset 2304:a2ba99e7ce71

bitkeeper revision 1.1159.42.7 (4124e09e2XrfLrN-NqhB79T6-OQK4w)

Remove padding between foreign page mappings in the blkdev backend.
This also allows us to remove the forced max allocation order in the
buddy page allocator.
author kaf24@scramble.cl.cam.ac.uk
date Thu Aug 19 17:17:18 2004 +0000 (2004-08-19)
parents 1a4a77d3fdb5
children cbbe40349d37
files linux-2.4.26-xen-sparse/arch/xen/config.in linux-2.4.26-xen-sparse/arch/xen/defconfig-xen0 linux-2.4.26-xen-sparse/arch/xen/defconfig-xenU linux-2.6.7-xen-sparse/arch/xen/Kconfig linux-2.6.7-xen-sparse/arch/xen/configs/xen0_defconfig linux-2.6.7-xen-sparse/arch/xen/configs/xenU_defconfig linux-2.6.7-xen-sparse/drivers/xen/blkback/blkback.c
line diff
     1.1 --- a/linux-2.4.26-xen-sparse/arch/xen/config.in	Thu Aug 19 16:46:49 2004 +0000
     1.2 +++ b/linux-2.4.26-xen-sparse/arch/xen/config.in	Thu Aug 19 17:17:18 2004 +0000
     1.3 @@ -103,8 +103,6 @@ if [ "$CONFIG_HIGHMEM" = "y" ]; then
     1.4     bool 'HIGHMEM I/O support' CONFIG_HIGHIO
     1.5  fi
     1.6  
     1.7 -define_int CONFIG_FORCE_MAX_ZONEORDER 12
     1.8 -
     1.9  #bool 'Symmetric multi-processing support' CONFIG_SMP
    1.10  #if [ "$CONFIG_SMP" = "y" -a "$CONFIG_X86_CMPXCHG" = "y" ]; then
    1.11  #   define_bool CONFIG_HAVE_DEC_LOCK y
     2.1 --- a/linux-2.4.26-xen-sparse/arch/xen/defconfig-xen0	Thu Aug 19 16:46:49 2004 +0000
     2.2 +++ b/linux-2.4.26-xen-sparse/arch/xen/defconfig-xen0	Thu Aug 19 17:17:18 2004 +0000
     2.3 @@ -50,7 +50,6 @@ CONFIG_X86_TSC=y
     2.4  CONFIG_X86_L1_CACHE_SHIFT=5
     2.5  CONFIG_NOHIGHMEM=y
     2.6  # CONFIG_HIGHMEM4G is not set
     2.7 -CONFIG_FORCE_MAX_ZONEORDER=12
     2.8  
     2.9  #
    2.10  # General setup
     3.1 --- a/linux-2.4.26-xen-sparse/arch/xen/defconfig-xenU	Thu Aug 19 16:46:49 2004 +0000
     3.2 +++ b/linux-2.4.26-xen-sparse/arch/xen/defconfig-xenU	Thu Aug 19 17:17:18 2004 +0000
     3.3 @@ -52,7 +52,6 @@ CONFIG_X86_TSC=y
     3.4  CONFIG_X86_L1_CACHE_SHIFT=5
     3.5  CONFIG_NOHIGHMEM=y
     3.6  # CONFIG_HIGHMEM4G is not set
     3.7 -CONFIG_FORCE_MAX_ZONEORDER=12
     3.8  
     3.9  #
    3.10  # General setup
     4.1 --- a/linux-2.6.7-xen-sparse/arch/xen/Kconfig	Thu Aug 19 16:46:49 2004 +0000
     4.2 +++ b/linux-2.6.7-xen-sparse/arch/xen/Kconfig	Thu Aug 19 17:17:18 2004 +0000
     4.3 @@ -44,12 +44,6 @@ config XEN_WRITABLE_PAGETABLES
     4.4  
     4.5  endmenu
     4.6  
     4.7 -# Xen's block device backend driver needs 2^12 pages
     4.8 -config FORCE_MAX_ZONEORDER
     4.9 -        int
    4.10 -        default "12" if XEN_PHYSDEV_ACCESS
    4.11 -        default "11" if !XEN_PHYSDEV_ACCESS
    4.12 -
    4.13  #config VT
    4.14  #	bool
    4.15  #	default y
     5.1 --- a/linux-2.6.7-xen-sparse/arch/xen/configs/xen0_defconfig	Thu Aug 19 16:46:49 2004 +0000
     5.2 +++ b/linux-2.6.7-xen-sparse/arch/xen/configs/xen0_defconfig	Thu Aug 19 17:17:18 2004 +0000
     5.3 @@ -10,7 +10,6 @@ CONFIG_NO_IDLE_HZ=y
     5.4  #
     5.5  CONFIG_XEN_PRIVILEGED_GUEST=y
     5.6  CONFIG_XEN_PHYSDEV_ACCESS=y
     5.7 -CONFIG_FORCE_MAX_ZONEORDER=12
     5.8  CONFIG_X86=y
     5.9  # CONFIG_X86_64 is not set
    5.10  
     6.1 --- a/linux-2.6.7-xen-sparse/arch/xen/configs/xenU_defconfig	Thu Aug 19 16:46:49 2004 +0000
     6.2 +++ b/linux-2.6.7-xen-sparse/arch/xen/configs/xenU_defconfig	Thu Aug 19 17:17:18 2004 +0000
     6.3 @@ -10,7 +10,6 @@ CONFIG_NO_IDLE_HZ=y
     6.4  #
     6.5  # CONFIG_XEN_PRIVILEGED_GUEST is not set
     6.6  # CONFIG_XEN_PHYSDEV_ACCESS is not set
     6.7 -CONFIG_FORCE_MAX_ZONEORDER=11
     6.8  CONFIG_X86=y
     6.9  # CONFIG_X86_64 is not set
    6.10  
     7.1 --- a/linux-2.6.7-xen-sparse/drivers/xen/blkback/blkback.c	Thu Aug 19 16:46:49 2004 +0000
     7.2 +++ b/linux-2.6.7-xen-sparse/drivers/xen/blkback/blkback.c	Thu Aug 19 17:17:18 2004 +0000
     7.3 @@ -24,22 +24,15 @@
     7.4  #define MAX_PENDING_REQS 64
     7.5  #define BATCH_PER_DOMAIN 16
     7.6  
     7.7 -/*
     7.8 - * NB. We place a page of padding between each buffer page to avoid incorrect
     7.9 - * merging of requests by the IDE and SCSI merging routines. Otherwise, two
    7.10 - * adjacent buffers in a scatter-gather request would have adjacent page
    7.11 - * numbers: since the merge routines don't realise that this is in *pseudophys*
    7.12 - * space, not real space, they may collapse the s-g elements!
    7.13 - */
    7.14  static unsigned long mmap_vstart;
    7.15  #define MMAP_PAGES_PER_REQUEST \
    7.16 -    (2 * (BLKIF_MAX_SEGMENTS_PER_REQUEST + 1))
    7.17 +    (BLKIF_MAX_SEGMENTS_PER_REQUEST + 1)
    7.18  #define MMAP_PAGES             \
    7.19      (MAX_PENDING_REQS * MMAP_PAGES_PER_REQUEST)
    7.20  #define MMAP_VADDR(_req,_seg)                        \
    7.21      (mmap_vstart +                                   \
    7.22       ((_req) * MMAP_PAGES_PER_REQUEST * PAGE_SIZE) + \
    7.23 -     ((_seg) * 2 * PAGE_SIZE))
    7.24 +     ((_seg) * PAGE_SIZE))
    7.25  
    7.26  /*
    7.27   * Each outstanding request that we've passed to the lower device layers has a