From patchwork Wed Nov 14 16:55:53 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Joonsoo Kim X-Patchwork-Id: 1742991 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork2.kernel.org Received: from merlin.infradead.org (merlin.infradead.org [205.233.59.134]) by patchwork2.kernel.org (Postfix) with ESMTP id 29983DF264 for ; Wed, 14 Nov 2012 17:01:21 +0000 (UTC) Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.76 #1 (Red Hat Linux)) id 1TYgIn-00055v-V0; Wed, 14 Nov 2012 16:59:02 +0000 Received: from mail-pb0-f49.google.com ([209.85.160.49]) by merlin.infradead.org with esmtps (Exim 4.76 #1 (Red Hat Linux)) id 1TYgIR-00050Y-EE for linux-arm-kernel@lists.infradead.org; Wed, 14 Nov 2012 16:58:41 +0000 Received: by mail-pb0-f49.google.com with SMTP id un15so467806pbc.36 for ; Wed, 14 Nov 2012 08:58:37 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:x-mailer:in-reply-to:references; bh=UH054mI9uRjT3Aqx2+xCdEQbgPaEukYj596t1mDlweE=; b=XYSDEAB8N2X4BtkbahrtTLkwn8MGYJAej7FTaaF5OpATwR3SzHZb8TMRb6zLXhicym Py6Hr+lwj9CXZ1WETrtAJ+TfVHrnIC7Rwf2tOqLTe11VjCw9GROB6DUiw5iojTuY7cEK AUf8R8P/5+2Gz2VFDZt4iyxOm4+wVfA+V3pMIO7wvqWXLOu8XMraZ05BN4yKEO7Q7zWB C0ORx03dcUHrCnCe1KXFuPdI8XNzDQ0aq3QnBUTAWX/OSCi60PDfq5UdisaKQ1eopkDY z7RrQLF2R5joFcBwRovQmDaSspuh0lwXRT/uSL6sJ/9pXnfg3tz3ghi3Av5yqvpmTIPg Pvdg== Received: by 10.66.78.169 with SMTP id c9mr8463282pax.30.1352912317783; Wed, 14 Nov 2012 08:58:37 -0800 (PST) Received: from localhost.localdomain ([119.69.155.222]) by mx.google.com with ESMTPS id qq4sm1289251pbc.38.2012.11.14.08.58.32 (version=TLSv1/SSLv3 cipher=OTHER); Wed, 14 Nov 2012 08:58:37 -0800 (PST) From: Joonsoo Kim To: Russell King Subject: [RFC PATCH 2/3] ARM: static_vm: introduce an infrastructure for static mapped area Date: Thu, 15 Nov 2012 01:55:53 +0900 Message-Id: <1352912154-16210-3-git-send-email-js1304@gmail.com> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1352912154-16210-1-git-send-email-js1304@gmail.com> References: <1352912154-16210-1-git-send-email-js1304@gmail.com> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20121114_115839_994094_BAF36127 X-CRM114-Status: GOOD ( 18.79 ) X-Spam-Score: -2.5 (--) X-Spam-Report: SpamAssassin version 3.3.2 on merlin.infradead.org summary: Content analysis details: (-2.5 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.7 RCVD_IN_DNSWL_LOW RBL: Sender listed at http://www.dnswl.org/, low trust [209.85.160.49 listed in list.dnswl.org] 0.0 FREEMAIL_FROM Sender email is commonly abused enduser mail provider (js1304[at]gmail.com) -0.0 SPF_PASS SPF: sender matches SPF record 0.2 FREEMAIL_ENVFROM_END_DIGIT Envelope-from freemail username ends in digit (js1304[at]gmail.com) -1.9 BAYES_00 BODY: Bayes spam probability is 0 to 1% [score: 0.0000] -0.1 DKIM_VALID_AU Message has a valid DKIM or DK signature from author's domain 0.1 DKIM_SIGNED Message has a DKIM or DK signature, not necessarily valid -0.1 DKIM_VALID Message has at least one valid DKIM or DK signature Cc: linux-mm@kvack.org, Joonsoo Kim , linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: linux-arm-kernel-bounces@lists.infradead.org Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org In current implementation, we used ARM-specific flag, that is, VM_ARM_STATIC_MAPPING, for distinguishing ARM specific static mapped area. The purpose of static mapped area is to re-use static mapped area when entire physical address range of the ioremap request can be covered by this area. This implementation causes needless overhead for some cases. We unnecessarily iterate vmlist for finding matched area even if there is no static mapped area. And if there are some static mapped areas, iterating whole vmlist is not preferable. In fact, it is not a critical problem, because ioremap is not frequently used. But reducing overhead is better idea. Another reason for doing this work is for removing architecture dependency on vmalloc layer. I think that vmlist and vmlist_lock is internal data structure for vmalloc layer. Some codes for debugging and stat inevitably use vmlist and vmlist_lock. But it is preferable that they are used outside of vmalloc.c as least as possible. Now, I introduce an ARM-specific infrastructure for static mapped area. In the following patch, we will use this and resolve above mentioned problem. Signed-off-by: Joonsoo Kim diff --git a/arch/arm/include/asm/mach/static_vm.h b/arch/arm/include/asm/mach/static_vm.h new file mode 100644 index 0000000..1bb6604 --- /dev/null +++ b/arch/arm/include/asm/mach/static_vm.h @@ -0,0 +1,45 @@ +/* + * arch/arm/include/asm/mach/static_vm.h + * + * Copyright (C) 2012 LG Electronics, Joonsoo Kim + * + * This program 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 program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ + +#ifndef _ASM_MACH_STATIC_VM_H +#define _ASM_MACH_STATIC_VM_H + +#include +#include + +struct static_vm { + struct static_vm *next; + void *vaddr; + unsigned long size; + unsigned long flags; + phys_addr_t paddr; + const void *caller; +}; + +extern struct static_vm *static_vmlist; +extern spinlock_t static_vmlist_lock; + +extern struct static_vm *find_static_vm_paddr(phys_addr_t paddr, + size_t size, unsigned long flags); +extern struct static_vm *find_static_vm_vaddr(void *vaddr, unsigned long flags); +extern void init_static_vm(struct static_vm *static_vm, + struct vm_struct *vm, unsigned long flags); +extern void insert_static_vm(struct static_vm *vm); + +#endif /* _ASM_MACH_STATIC_VM_H */ diff --git a/arch/arm/mm/Makefile b/arch/arm/mm/Makefile index 4e333fa..57b329a 100644 --- a/arch/arm/mm/Makefile +++ b/arch/arm/mm/Makefile @@ -6,7 +6,7 @@ obj-y := dma-mapping.o extable.o fault.o init.o \ iomap.o obj-$(CONFIG_MMU) += fault-armv.o flush.o idmap.o ioremap.o \ - mmap.o pgd.o mmu.o + mmap.o pgd.o mmu.o static_vm.o ifneq ($(CONFIG_MMU),y) obj-y += nommu.o diff --git a/arch/arm/mm/static_vm.c b/arch/arm/mm/static_vm.c new file mode 100644 index 0000000..d7677cf --- /dev/null +++ b/arch/arm/mm/static_vm.c @@ -0,0 +1,97 @@ +/* + * arch/arm/mm/static_vm.c + * + * Copyright (C) 2012 LG Electronics, Joonsoo Kim + * + * This program 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 program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ + +#include + +#include + +struct static_vm *static_vmlist; +DEFINE_SPINLOCK(static_vmlist_lock); + +struct static_vm *find_static_vm_paddr(phys_addr_t paddr, + size_t size, unsigned long flags) +{ + struct static_vm *area; + + spin_lock(&static_vmlist_lock); + for (area = static_vmlist; area; area = area->next) { + if ((area->flags & flags) != flags) + continue; + + if (area->paddr > paddr || + paddr + size - 1 > area->paddr + area->size - 1) + continue; + + spin_unlock(&static_vmlist_lock); + return area; + } + spin_unlock(&static_vmlist_lock); + + return NULL; +} + +struct static_vm *find_static_vm_vaddr(void *vaddr, unsigned long flags) +{ + struct static_vm *area; + + spin_lock(&static_vmlist_lock); + for (area = static_vmlist; area; area = area->next) { + /* static_vmlist is ascending order */ + if (area->vaddr > vaddr) + break; + + if ((area->flags & flags) != flags) + continue; + + if (area->vaddr <= vaddr && area->vaddr + area->size > vaddr) { + spin_unlock(&static_vmlist_lock); + return area; + } + } + spin_unlock(&static_vmlist_lock); + + return NULL; +} + +void init_static_vm(struct static_vm *static_vm, + struct vm_struct *vm, unsigned long flags) +{ + static_vm->vaddr = vm->addr; + static_vm->size = vm->size; + static_vm->paddr = vm->phys_addr; + static_vm->caller = vm->caller; + static_vm->flags = flags; +} + +void insert_static_vm(struct static_vm *vm) +{ + struct static_vm *tmp, **p; + + spin_lock(&static_vmlist_lock); + for (p = &static_vmlist; (tmp = *p) != NULL; p = &tmp->next) { + if (tmp->vaddr >= vm->vaddr) { + BUG_ON(tmp->vaddr < vm->vaddr + vm->size); + break; + } else + BUG_ON(tmp->vaddr + tmp->size > vm->vaddr); + } + vm->next = *p; + *p = vm; + spin_unlock(&static_vmlist_lock); +}