From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S263161AbVFWIT0 (ORCPT ); Thu, 23 Jun 2005 04:19:26 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S262894AbVFWIQx (ORCPT ); Thu, 23 Jun 2005 04:16:53 -0400 Received: from smtp201.mail.sc5.yahoo.com ([216.136.129.91]:10870 "HELO smtp201.mail.sc5.yahoo.com") by vger.kernel.org with SMTP id S262550AbVFWHGt (ORCPT ); Thu, 23 Jun 2005 03:06:49 -0400 Message-ID: <42BA5F7B.30904@yahoo.com.au> Date: Thu, 23 Jun 2005 17:06:35 +1000 From: Nick Piggin User-Agent: Mozilla/5.0 (X11; U; Linux i686; en-US; rv:1.7.6) Gecko/20050324 Debian/1.7.6-1 X-Accept-Language: en MIME-Version: 1.0 To: linux-kernel , Linux Memory Management CC: Hugh Dickins , Badari Pulavarty Subject: [patch][rfc] 2/5: micro optimisation for mm/rmap.c References: <42BA5F37.6070405@yahoo.com.au> <42BA5F5C.3080101@yahoo.com.au> In-Reply-To: <42BA5F5C.3080101@yahoo.com.au> Content-Type: multipart/mixed; boundary="------------060707040302090207070309" Sender: linux-kernel-owner@vger.kernel.org X-Mailing-List: linux-kernel@vger.kernel.org This is a multi-part message in MIME format. --------------060707040302090207070309 Content-Type: text/plain; charset=us-ascii; format=flowed Content-Transfer-Encoding: 7bit 2/5 --------------060707040302090207070309 Content-Type: text/plain; name="mm-microopt-rmap.patch" Content-Transfer-Encoding: 7bit Content-Disposition: inline; filename="mm-microopt-rmap.patch" Microoptimise page_add_anon_rmap. Although these expressions are used only in the taken branch of the if() statement, the compiler can't reorder them inside because atomic_inc_and_test is a barrier. Signed-off-by: Nick Piggin Index: linux-2.6/mm/rmap.c =================================================================== --- linux-2.6.orig/mm/rmap.c +++ linux-2.6/mm/rmap.c @@ -442,22 +442,23 @@ int page_referenced(struct page *page, i void page_add_anon_rmap(struct page *page, struct vm_area_struct *vma, unsigned long address) { - struct anon_vma *anon_vma = vma->anon_vma; - pgoff_t index; - BUG_ON(PageReserved(page)); - BUG_ON(!anon_vma); inc_mm_counter(vma->vm_mm, anon_rss); - anon_vma = (void *) anon_vma + PAGE_MAPPING_ANON; - index = (address - vma->vm_start) >> PAGE_SHIFT; - index += vma->vm_pgoff; - index >>= PAGE_CACHE_SHIFT - PAGE_SHIFT; - if (atomic_inc_and_test(&page->_mapcount)) { - page->index = index; + struct anon_vma *anon_vma = vma->anon_vma; + pgoff_t index; + + BUG_ON(!anon_vma); + anon_vma = (void *) anon_vma + PAGE_MAPPING_ANON; page->mapping = (struct address_space *) anon_vma; + + index = (address - vma->vm_start) >> PAGE_SHIFT; + index += vma->vm_pgoff; + index >>= PAGE_CACHE_SHIFT - PAGE_SHIFT; + page->index = index; + inc_page_state(nr_mapped); } /* else checking page index and mapping is racy */ --------------060707040302090207070309-- Send instant messages to your online friends http://au.messenger.yahoo.com