Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1758190Ab2BMVPR (ORCPT ); Mon, 13 Feb 2012 16:15:17 -0500 Received: from mail-we0-f174.google.com ([74.125.82.174]:48339 "EHLO mail-we0-f174.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755923Ab2BMVPP convert rfc822-to-8bit (ORCPT ); Mon, 13 Feb 2012 16:15:15 -0500 MIME-Version: 1.0 In-Reply-To: References: <1328895151-5196-1-git-send-email-m.szyprowski@samsung.com> <1328895151-5196-13-git-send-email-m.szyprowski@samsung.com> Date: Mon, 13 Feb 2012 15:15:13 -0600 Message-ID: Subject: Re: [Linaro-mm-sig] [PATCHv21 12/16] mm: trigger page reclaim in alloc_contig_range() to stabilise watermarks From: Robert Nelson To: Michal Nazarewicz Cc: Marek Szyprowski , linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-media@vger.kernel.org, linux-mm@kvack.org, linaro-mm-sig@lists.linaro.org, Ohad Ben-Cohen , Daniel Walker , Russell King , Arnd Bergmann , Jonathan Corbet , Mel Gorman , Dave Hansen , Jesse Barker , Kyungmin Park , Andrew Morton , Rob Clark , KAMEZAWA Hiroyuki Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 8BIT Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 2147 Lines: 65 2012/2/13 Michal Nazarewicz : >> On Fri, Feb 10, 2012 at 11:32 AM, Marek Szyprowski >> wrote: >>> >>> @@ -5637,6 +5642,56 @@ static int __alloc_contig_migrate_range(unsigned >>> long start, unsigned long end) >>> ? ? ? return ret > 0 ? 0 : ret; >>> ?} >>> >>> +/* >>> + * Update zone's cma pages counter used for watermark level calculation. >>> + */ >>> +static inline void __update_cma_wmark_pages(struct zone *zone, int >>> count) >>> +{ >>> + ? ? ? unsigned long flags; >>> + ? ? ? spin_lock_irqsave(&zone->lock, flags); >>> + ? ? ? zone->min_cma_pages += count; >>> + ? ? ? spin_unlock_irqrestore(&zone->lock, flags); >>> + ? ? ? setup_per_zone_wmarks(); >>> +} >>> + >>> +/* >>> + * Trigger memory pressure bump to reclaim some pages in order to be >>> able to >>> + * allocate 'count' pages in single page units. Does similar work as >>> + *__alloc_pages_slowpath() function. >>> + */ >>> +static int __reclaim_pages(struct zone *zone, gfp_t gfp_mask, int count) >>> +{ >>> + ? ? ? enum zone_type high_zoneidx = gfp_zone(gfp_mask); >>> + ? ? ? struct zonelist *zonelist = node_zonelist(0, gfp_mask); >>> + ? ? ? int did_some_progress = 0; >>> + ? ? ? int order = 1; >>> + ? ? ? unsigned long watermark; >>> + >>> + ? ? ? /* >>> + ? ? ? ?* Increase level of watermarks to force kswapd do his job >>> + ? ? ? ?* to stabilise at new watermark level. >>> + ? ? ? ?*/ >>> + ? ? ? __modify_min_cma_pages(zone, count); > > > On Mon, 13 Feb 2012 10:57:58 -0800, Robert Nelson > wrote: >> >> Hi Marek, ? This ^^^ function doesn't seem to exist in this patchset, >> is it in another set posted to lkml? > > > This should read __update_cma_wmark_pages(). ?Sorry for the incorrect patch. Thanks Michal, that fixed it.. cma-v21 with Rob Clark's omapdrm works great on the Beagle xM.. Regards -- Robert Nelson http://www.rcn-ee.com/ -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/