Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history 
yaml
---
r: 95339
b: refs/heads/master
c: 17f3458
h: refs/heads/master
i:
  95337: b5e7b51
  95335: 93dd05c
v: v3
  • Loading branch information
Heiko Carstens authored and Martin Schwidefsky committed Apr 30, 2008
1 parent 2194ee9 commit 9bb3274
Show file tree
Hide file tree
Showing 9 changed files with 54 additions and 117 deletions.
2 changes: 1 addition & 1 deletion [refs]
View file
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 53492b1de46a7576170e865062ffcfc93bb5650b
refs/heads/master: 17f345808563d2f425b2b15d60c4a5b00112e9eb
8 changes: 8 additions & 0 deletions trunk/arch/s390/Kconfig
View file
Original file line number Diff line number Diff line change
Expand Up @@ -300,6 +300,14 @@ comment "Kernel preemption"

source "kernel/Kconfig.preempt"

config ARCH_SPARSEMEM_ENABLE
def_bool y
select SPARSEMEM_VMEMMAP_ENABLE
select SPARSEMEM_VMEMMAP

config ARCH_SPARSEMEM_DEFAULT
def_bool y

source "mm/Kconfig"

comment "I/O subsystem configuration"
Expand Down
8 changes: 4 additions & 4 deletions trunk/arch/s390/mm/extmem.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -287,7 +287,7 @@ __segment_load (char *name, int do_nonshared, unsigned long *addr, unsigned long
if (rc < 0)
goto out_free;

rc = add_shared_memory(seg->start_addr, seg->end - seg->start_addr + 1);
rc = vmem_add_mapping(seg->start_addr, seg->end - seg->start_addr + 1);

if (rc)
goto out_free;
Expand Down Expand Up @@ -351,7 +351,7 @@ __segment_load (char *name, int do_nonshared, unsigned long *addr, unsigned long
release_resource(seg->res);
kfree(seg->res);
out_shared:
remove_shared_memory(seg->start_addr, seg->end - seg->start_addr + 1);
vmem_remove_mapping(seg->start_addr, seg->end - seg->start_addr + 1);
out_free:
kfree(seg);
out:
Expand Down Expand Up @@ -474,7 +474,7 @@ segment_modify_shared (char *name, int do_nonshared)
rc = 0;
goto out_unlock;
out_del:
remove_shared_memory(seg->start_addr, seg->end - seg->start_addr + 1);
vmem_remove_mapping(seg->start_addr, seg->end - seg->start_addr + 1);
list_del(&seg->list);
dcss_diag(DCSS_PURGESEG, seg->dcss_name, &dummy, &dummy);
kfree(seg);
Expand Down Expand Up @@ -508,7 +508,7 @@ segment_unload(char *name)
goto out_unlock;
release_resource(seg->res);
kfree(seg->res);
remove_shared_memory(seg->start_addr, seg->end - seg->start_addr + 1);
vmem_remove_mapping(seg->start_addr, seg->end - seg->start_addr + 1);
list_del(&seg->list);
dcss_diag(DCSS_PURGESEG, seg->dcss_name, &dummy, &dummy);
kfree(seg);
Expand Down
2 changes: 2 additions & 0 deletions trunk/arch/s390/mm/init.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -106,6 +106,8 @@ void __init paging_init(void)
__ctl_load(S390_lowcore.kernel_asce, 13, 13);
__raw_local_irq_ssm(ssm_mask);

sparse_memory_present_with_active_regions(MAX_NUMNODES);
sparse_init();
memset(max_zone_pfns, 0, sizeof(max_zone_pfns));
#ifdef CONFIG_ZONE_DMA
max_zone_pfns[ZONE_DMA] = PFN_DOWN(MAX_DMA_ADDRESS);
Expand Down
81 changes: 6 additions & 75 deletions trunk/arch/s390/mm/vmem.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,43 +27,6 @@ struct memory_segment {

static LIST_HEAD(mem_segs);

void __meminit memmap_init(unsigned long size, int nid, unsigned long zone,
unsigned long start_pfn)
{
struct page *start, *end;
struct page *map_start, *map_end;
int i;

start = pfn_to_page(start_pfn);
end = start + size;

for (i = 0; i < MEMORY_CHUNKS && memory_chunk[i].size > 0; i++) {
unsigned long cstart, cend;

cstart = PFN_DOWN(memory_chunk[i].addr);
cend = cstart + PFN_DOWN(memory_chunk[i].size);

map_start = mem_map + cstart;
map_end = mem_map + cend;

if (map_start < start)
map_start = start;
if (map_end > end)
map_end = end;

map_start -= ((unsigned long) map_start & (PAGE_SIZE - 1))
/ sizeof(struct page);
map_end += ((PFN_ALIGN((unsigned long) map_end)
- (unsigned long) map_end)
/ sizeof(struct page));

if (map_start < map_end)
memmap_init_zone((unsigned long)(map_end - map_start),
nid, zone, page_to_pfn(map_start),
MEMMAP_EARLY);
}
}

static void __ref *vmem_alloc_pages(unsigned int order)
{
if (slab_is_available())
Expand Down Expand Up @@ -115,7 +78,7 @@ static pte_t __init_refok *vmem_pte_alloc(void)
/*
* Add a physical memory range to the 1:1 mapping.
*/
static int vmem_add_range(unsigned long start, unsigned long size, int ro)
static int vmem_add_mem(unsigned long start, unsigned long size, int ro)
{
unsigned long address;
pgd_t *pg_dir;
Expand Down Expand Up @@ -209,22 +172,18 @@ static void vmem_remove_range(unsigned long start, unsigned long size)
/*
* Add a backed mem_map array to the virtual mem_map array.
*/
static int vmem_add_mem_map(unsigned long start, unsigned long size)
int __meminit vmemmap_populate(struct page *start, unsigned long nr, int node)
{
unsigned long address, start_addr, end_addr;
struct page *map_start, *map_end;
pgd_t *pg_dir;
pud_t *pu_dir;
pmd_t *pm_dir;
pte_t *pt_dir;
pte_t pte;
int ret = -ENOMEM;

map_start = VMEM_MAP + PFN_DOWN(start);
map_end = VMEM_MAP + PFN_DOWN(start + size);

start_addr = (unsigned long) map_start & PAGE_MASK;
end_addr = PFN_ALIGN((unsigned long) map_end);
start_addr = (unsigned long) start;
end_addr = (unsigned long) (start + nr);

for (address = start_addr; address < end_addr; address += PAGE_SIZE) {
pg_dir = pgd_offset_k(address);
Expand Down Expand Up @@ -268,16 +227,6 @@ static int vmem_add_mem_map(unsigned long start, unsigned long size)
return ret;
}

static int vmem_add_mem(unsigned long start, unsigned long size, int ro)
{
int ret;

ret = vmem_add_mem_map(start, size);
if (ret)
return ret;
return vmem_add_range(start, size, ro);
}

/*
* Add memory segment to the segment list if it doesn't overlap with
* an already present segment.
Expand Down Expand Up @@ -315,7 +264,7 @@ static void __remove_shared_memory(struct memory_segment *seg)
vmem_remove_range(seg->start, seg->size);
}

int remove_shared_memory(unsigned long start, unsigned long size)
int vmem_remove_mapping(unsigned long start, unsigned long size)
{
struct memory_segment *seg;
int ret;
Expand All @@ -339,11 +288,9 @@ int remove_shared_memory(unsigned long start, unsigned long size)
return ret;
}

int add_shared_memory(unsigned long start, unsigned long size)
int vmem_add_mapping(unsigned long start, unsigned long size)
{
struct memory_segment *seg;
struct page *page;
unsigned long pfn, num_pfn, end_pfn;
int ret;

mutex_lock(&vmem_mutex);
Expand All @@ -361,21 +308,6 @@ int add_shared_memory(unsigned long start, unsigned long size)
ret = vmem_add_mem(start, size, 0);
if (ret)
goto out_remove;

pfn = PFN_DOWN(start);
num_pfn = PFN_DOWN(size);
end_pfn = pfn + num_pfn;

page = pfn_to_page(pfn);
memset(page, 0, num_pfn * sizeof(struct page));

for (; pfn < end_pfn; pfn++) {
page = pfn_to_page(pfn);
init_page_count(page);
reset_page_mapcount(page);
SetPageReserved(page);
INIT_LIST_HEAD(&page->lru);
}
goto out;

out_remove:
Expand All @@ -401,7 +333,6 @@ void __init vmem_map_init(void)
INIT_LIST_HEAD(&init_mm.context.crst_list);
INIT_LIST_HEAD(&init_mm.context.pgtable_list);
init_mm.context.noexec = 0;
NODE_DATA(0)->node_mem_map = VMEM_MAP;
ro_start = ((unsigned long)&_stext) & PAGE_MASK;
ro_end = PFN_ALIGN((unsigned long)&_eshared);
for (i = 0; i < MEMORY_CHUNKS && memory_chunk[i].size > 0; i++) {
Expand Down
23 changes: 12 additions & 11 deletions trunk/drivers/s390/kvm/kvm_virtio.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@
#include <linux/virtio_config.h>
#include <linux/interrupt.h>
#include <linux/virtio_ring.h>
#include <linux/pfn.h>
#include <asm/io.h>
#include <asm/kvm_para.h>
#include <asm/kvm_virtio.h>
Expand Down Expand Up @@ -180,11 +181,10 @@ static struct virtqueue *kvm_find_vq(struct virtio_device *vdev,

config = kvm_vq_config(kdev->desc)+index;

if (add_shared_memory(config->address,
vring_size(config->num, PAGE_SIZE))) {
err = -ENOMEM;
err = vmem_add_mapping(config->address,
vring_size(config->num, PAGE_SIZE));
if (err)
goto out;
}

vq = vring_new_virtqueue(config->num, vdev, (void *) config->address,
kvm_notify, callback);
Expand All @@ -202,8 +202,8 @@ static struct virtqueue *kvm_find_vq(struct virtio_device *vdev,
vq->priv = config;
return vq;
unmap:
remove_shared_memory(config->address, vring_size(config->num,
PAGE_SIZE));
vmem_remove_mapping(config->address,
vring_size(config->num, PAGE_SIZE));
out:
return ERR_PTR(err);
}
Expand All @@ -213,8 +213,8 @@ static void kvm_del_vq(struct virtqueue *vq)
struct kvm_vqconfig *config = vq->priv;

vring_del_virtqueue(vq);
remove_shared_memory(config->address,
vring_size(config->num, PAGE_SIZE));
vmem_remove_mapping(config->address,
vring_size(config->num, PAGE_SIZE));
}

/*
Expand Down Expand Up @@ -318,12 +318,13 @@ static int __init kvm_devices_init(void)
return rc;
}

if (add_shared_memory((max_pfn) << PAGE_SHIFT, PAGE_SIZE)) {
rc = vmem_add_mapping(PFN_PHYS(max_pfn), PAGE_SIZE);
if (rc) {
device_unregister(&kvm_root);
return -ENOMEM;
return rc;
}

kvm_devices = (void *) (max_pfn << PAGE_SHIFT);
kvm_devices = (void *) PFN_PHYS(max_pfn);

ctl_set_bit(0, 9);
register_external_interrupt(0x2603, kvm_extint_handler);
Expand Down
20 changes: 0 additions & 20 deletions trunk/include/asm-s390/page.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -125,26 +125,6 @@ page_get_storage_key(unsigned long addr)
return skey;
}

extern unsigned long max_pfn;

static inline int pfn_valid(unsigned long pfn)
{
unsigned long dummy;
int ccode;

if (pfn >= max_pfn)
return 0;

asm volatile(
" lra %0,0(%2)\n"
" ipm %1\n"
" srl %1,28\n"
: "=d" (dummy), "=d" (ccode)
: "a" (pfn << PAGE_SHIFT)
: "cc");
return !ccode;
}

#endif /* !__ASSEMBLY__ */

/* to align the pointer to the (next) page boundary */
Expand Down
9 changes: 3 additions & 6 deletions trunk/include/asm-s390/pgtable.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -129,7 +129,7 @@ extern char empty_zero_page[PAGE_SIZE];
#define VMEM_MAX_PAGES ((VMEM_MAP_END - VMALLOC_END) / sizeof(struct page))
#define VMEM_MAX_PFN min(VMALLOC_START >> PAGE_SHIFT, VMEM_MAX_PAGES)
#define VMEM_MAX_PHYS ((VMEM_MAX_PFN << PAGE_SHIFT) & ~((16 << 20) - 1))
#define VMEM_MAP ((struct page *) VMALLOC_END)
#define vmemmap ((struct page *) VMALLOC_END)

/*
* A 31 bit pagetable entry of S390 has following format:
Expand Down Expand Up @@ -1075,18 +1075,15 @@ static inline pte_t mk_swap_pte(unsigned long type, unsigned long offset)

#define kern_addr_valid(addr) (1)

extern int add_shared_memory(unsigned long start, unsigned long size);
extern int remove_shared_memory(unsigned long start, unsigned long size);
extern int vmem_add_mapping(unsigned long start, unsigned long size);
extern int vmem_remove_mapping(unsigned long start, unsigned long size);
extern int s390_enable_sie(void);

/*
* No page table caches to initialise
*/
#define pgtable_cache_init() do { } while (0)

#define __HAVE_ARCH_MEMMAP_INIT
extern void memmap_init(unsigned long, int, unsigned long, unsigned long);

#include <asm-generic/pgtable.h>

#endif /* _S390_PAGE_H */
18 changes: 18 additions & 0 deletions trunk/include/asm-s390/sparsemem.h
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
#ifndef _ASM_S390_SPARSEMEM_H
#define _ASM_S390_SPARSEMEM_H

#define SECTION_SIZE_BITS 25

#ifdef CONFIG_64BIT

#define MAX_PHYSADDR_BITS 42
#define MAX_PHYSMEM_BITS 42

#else

#define MAX_PHYSADDR_BITS 31
#define MAX_PHYSMEM_BITS 31

#endif /* CONFIG_64BIT */

#endif /* _ASM_S390_SPARSEMEM_H */

0 comments on commit 9bb3274

Please sign in to comment.