Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1758130AbZD0UyU (ORCPT ); Mon, 27 Apr 2009 16:54:20 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1755167AbZD0UyJ (ORCPT ); Mon, 27 Apr 2009 16:54:09 -0400 Received: from gir.skynet.ie ([193.1.99.77]:38613 "EHLO gir.skynet.ie" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754636AbZD0UyI (ORCPT ); Mon, 27 Apr 2009 16:54:08 -0400 Date: Mon, 27 Apr 2009 21:54:00 +0100 From: Mel Gorman To: David Rientjes Cc: Linux Memory Management List , KOSAKI Motohiro , Dave Hansen , Linux Kernel Mailing List Subject: Re: [RFC] Replace the watermark-related union in struct zone with a watermark[] array Message-ID: <20090427205400.GA23510@csn.ul.ie> References: <1240408407-21848-1-git-send-email-mel@csn.ul.ie> <1240408407-21848-19-git-send-email-mel@csn.ul.ie> <20090427170054.GE912@csn.ul.ie> MIME-Version: 1.0 Content-Type: text/plain; charset=iso-8859-15 Content-Disposition: inline In-Reply-To: User-Agent: Mutt/1.5.17+20080114 (2008-01-14) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 2221 Lines: 71 On Mon, Apr 27, 2009 at 01:48:47PM -0700, David Rientjes wrote: > On Mon, 27 Apr 2009, Mel Gorman wrote: > > > diff --git a/include/linux/mmzone.h b/include/linux/mmzone.h > > index c1fa208..1ff59fd 100644 > > --- a/include/linux/mmzone.h > > +++ b/include/linux/mmzone.h > > @@ -163,6 +163,13 @@ static inline int is_unevictable_lru(enum lru_list l) > > #endif > > } > > > > +enum zone_watermarks { > > + WMARK_MIN, > > + WMARK_LOW, > > + WMARK_HIGH, > > + NR_WMARK > > +}; > > + > > struct per_cpu_pages { > > int count; /* number of pages in the list */ > > int high; /* high watermark, emptying needed */ > > @@ -275,12 +282,9 @@ struct zone_reclaim_stat { > > > > struct zone { > > /* Fields commonly accessed by the page allocator */ > > - union { > > - struct { > > - unsigned long pages_min, pages_low, pages_high; > > - }; > > - unsigned long pages_mark[3]; > > - }; > > + > > + /* zone watermarks, indexed with WMARK_LOW, WMARK_MIN and WMARK_HIGH */ > > + unsigned long watermark[NR_WMARK]; > > > > /* > > * We don't know if the memory that we're going to allocate will be freeable > > I thought the suggestion was for something like > > #define zone_wmark_min(z) (z->pages_mark[WMARK_MIN]) > ... Was it the only suggestion? I thought just replacing the union with an array would be an option as well. The #define approach also requires setter versions like static inline set_zone_wmark_min(struct zone *z, unsigned long val) { z->pages_mark[WMARK_MIN] = val; } and you need one of those for each watermark if you are to avoid weirdness like zone_wmark_min(z) = val; which looks all wrong. I felt this approach would look neater and be closer in appearance to the code that is already there and therefore less surprising. Would people prefer a getter/setter version? -- Mel Gorman Part-time Phd Student Linux Technology Center University of Limerick IBM Dublin Software Lab -- 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/