From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by smtp.lore.kernel.org (Postfix) with ESMTP id 54C3DE7718B for ; Thu, 19 Dec 2024 13:24:38 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id B70656B0082; Thu, 19 Dec 2024 08:24:37 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id B20776B0083; Thu, 19 Dec 2024 08:24:37 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 99AAA6B0085; Thu, 19 Dec 2024 08:24:37 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0012.hostedemail.com [216.40.44.12]) by kanga.kvack.org (Postfix) with ESMTP id 757636B0082 for ; Thu, 19 Dec 2024 08:24:37 -0500 (EST) Received: from smtpin01.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay10.hostedemail.com (Postfix) with ESMTP id 25E4EC1626 for ; Thu, 19 Dec 2024 13:24:37 +0000 (UTC) X-FDA: 82911776598.01.A793456 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by imf17.hostedemail.com (Postfix) with ESMTP id 4E18C40015 for ; Thu, 19 Dec 2024 13:24:09 +0000 (UTC) Authentication-Results: imf17.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=a2hjhGrn; dmarc=pass (policy=none) header.from=redhat.com; spf=pass (imf17.hostedemail.com: domain of david@redhat.com designates 170.10.129.124 as permitted sender) smtp.mailfrom=david@redhat.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1734614643; a=rsa-sha256; cv=none; b=X3+AT6prUiqIYPedGGg8YdlMQCAD+rRkVzYX5Kv0F4KuF+ApGkw8LyuUhJQVYOpVJhUKfu /vxuWvBa5F4KqPMYzKJ4ujifENrHF/8Wwribh5vc71FougQ9jXPMPekKo79UJPnQ+F6wYA +QuZy6I12U9sIiTGoZ/WEwicwNius4E= ARC-Authentication-Results: i=1; imf17.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=a2hjhGrn; dmarc=pass (policy=none) header.from=redhat.com; spf=pass (imf17.hostedemail.com: domain of david@redhat.com designates 170.10.129.124 as permitted sender) smtp.mailfrom=david@redhat.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1734614643; h=from:from:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:dkim-signature; bh=imkf2dRYQoaEMTFCi04XX8EhEicnbQS9sF4LSAxbuDo=; b=ctvwFH8ekpuOLSvxKxWdRmDjOE5pw3xhLaFO/DeNft2SAgJy2OiC+Vr0h4W6OALg5l8UG4 gsejABpJwm/2BSIJ6Dcqx7/pAa4VgZKAkAPS/po1BIzEG8mhrTjkHEe/F24+v48WGx0BpA Uc/OKVBhkDmy5Wz8JHLaZcozmlLb/Kc= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1734614673; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:autocrypt:autocrypt; bh=imkf2dRYQoaEMTFCi04XX8EhEicnbQS9sF4LSAxbuDo=; b=a2hjhGrn0H7ITKQIO6xdetc4gdDxnALSNBnGfRt0h0ooUxn1tTXbAkehLBATXdMpU55ZYa aAhZgpE6ujmJ4MqhdQf7apbhbwERqYyO7ux18otmLBbtaCfJ+gZlrM80i9UqFf9A6LXHs7 iW5LunL6WXI4jd+ZBi8sCEPG1U3xgR0= Received: from mail-wr1-f69.google.com (mail-wr1-f69.google.com [209.85.221.69]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-439-_uI9mYKzP22aS6TwgEQpTQ-1; Thu, 19 Dec 2024 08:24:32 -0500 X-MC-Unique: _uI9mYKzP22aS6TwgEQpTQ-1 X-Mimecast-MFC-AGG-ID: _uI9mYKzP22aS6TwgEQpTQ Received: by mail-wr1-f69.google.com with SMTP id ffacd0b85a97d-385e49efd59so425286f8f.0 for ; Thu, 19 Dec 2024 05:24:32 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1734614671; x=1735219471; h=content-transfer-encoding:in-reply-to:organization:autocrypt :content-language:from:references:cc:to:subject:user-agent :mime-version:date:message-id:x-gm-message-state:from:to:cc:subject :date:message-id:reply-to; bh=imkf2dRYQoaEMTFCi04XX8EhEicnbQS9sF4LSAxbuDo=; b=gjXSaQ16qfzOqKXqmB1/BigIEEAEW21lMkgECL++RIeGR1GVEWRRkV8d8z5tb/4Pwj AGLg1i6o7T2nBhTBjg94XRqlhMoJx5/LLoDOYhrKyFsT5cp/jc1DLQNaj38ELB5zSVmG 9Zk721rExEUrueGWNR1IdCOgSxpeKBBkMOCvQrWmnJJDVMWTvGGLNDC4Vz6J+TfNzHpZ G0OUlL9htIJUMzQmMO89jAf6KA6X9m/I0typpcz3jmVCgkLEnKdKfHoQry66i5U8uj6X l0np2WxUXoS8rDe0PiCj0U/XbHToBZaVhhke81CWzcRdwa3qLZrnpjSJLBEFKUN3lbvK Ospw== X-Forwarded-Encrypted: i=1; AJvYcCW9ZBnxzX+lt09GIuKzJ6+PkpPJlG/F6faF64Gy/RIjaBJv4xGr+FRTnCJsH0Bg54K+Zu6+wj+BtA==@kvack.org X-Gm-Message-State: AOJu0Yzc2krMYzZG2rspEDqQaZ2Vv26H0cXrEN9fKPnM/sS7aTEaw2FM T1KVdmV/gS39FPUD6XdZS1t9xipaKBySFgfiq5LCn9YXEbPLz6jaB/xkIZJCUk5d97i64dKJp/h QyNNkHbQHHxnwwTYV1fSiYM9GilEw97ZF5deB3P8fYWCUvGTD X-Gm-Gg: ASbGnct4Hd2a95hRkuGnZrczs827YWdnYiUTI4O4qNANJWgI4sZ43AfQaSyLPu21F7C I9FWeTv8Viw6A2EHgp/iWhkUEwfIKH1zDl5ncqmqDNwlqlSXhq7KLnqyZEIbhHYptJEv8OOhPQ3 eLVXtnUvcuIv/rf3CSJOmeHD+ChH3xffb+UqCI4+uXqwRBRZ1j5Sa9jtk5/1VacQFtPOYRCjpOE dq0hA96UAwmx4ZWWeFtQzPq4rBWZcLhOtNI8c/JVCH0FrdXgDyXSVDUNC54qgvOzUDCBT7Fr6P+ REwFv9yEoGUHPXxX0HZluHw7kdabDElbFSmqHoyihusXDas3qfAT5EqncOsmveFZ4kge/pCGAPW SGcTZTw== X-Received: by 2002:a05:6000:3cf:b0:385:f465:12f8 with SMTP id ffacd0b85a97d-38a19b1e7ccmr3096057f8f.47.1734614671433; Thu, 19 Dec 2024 05:24:31 -0800 (PST) X-Google-Smtp-Source: AGHT+IHagKqUaoZynd6kyMe7rp9RxRy59MYXgVFTk1W6zLYA7yWf7zrerLPUFW/zKcsptUSs2wmnJA== X-Received: by 2002:a05:6000:3cf:b0:385:f465:12f8 with SMTP id ffacd0b85a97d-38a19b1e7ccmr3096032f8f.47.1734614671057; Thu, 19 Dec 2024 05:24:31 -0800 (PST) Received: from ?IPV6:2003:cb:c749:6600:b73a:466c:e610:686? (p200300cbc7496600b73a466ce6100686.dip0.t-ipconnect.de. [2003:cb:c749:6600:b73a:466c:e610:686]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-38a1c8471dcsm1564659f8f.48.2024.12.19.05.24.29 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Thu, 19 Dec 2024 05:24:29 -0800 (PST) Message-ID: <9acb98b0-2c6e-4833-96ae-fbefd37854f5@redhat.com> Date: Thu, 19 Dec 2024 14:24:28 +0100 MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Subject: Re: [PATCH 1/2] mm: alloc_pages_bulk_noprof: drop page_list argument To: Luiz Capitulino , linux-mm@kvack.org, mgorman@techsingularity.net, willy@infradead.org Cc: linux-kernel@vger.kernel.org, lcapitulino@gmail.com References: <4d3041315d1032e9acbe50971f952e716e8f4089.1734453061.git.luizcap@redhat.com> From: David Hildenbrand Autocrypt: addr=david@redhat.com; keydata= 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 WNyWQQ== Organization: Red Hat In-Reply-To: <4d3041315d1032e9acbe50971f952e716e8f4089.1734453061.git.luizcap@redhat.com> X-Mimecast-Spam-Score: 0 X-Mimecast-MFC-PROC-ID: fDx5C9GvJ9qbPZuXfjwoGPXSGNie33phFcVROSDfe2w_1734614671 X-Mimecast-Originator: redhat.com Content-Language: en-US Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit X-Rspamd-Server: rspam04 X-Rspamd-Queue-Id: 4E18C40015 X-Stat-Signature: npoe93qsbfqg7pcbexcyh4fcd31e39ou X-Rspam-User: X-HE-Tag: 1734614649-497528 X-HE-Meta: U2FsdGVkX1+43U3l1UnRRs9V2gBE6WY73jfL8Rf0IV1iPGMYdvkkPu2/BmMCZgYgcrJMDCODFhl+Bho79058ROBBt2QgWMFDsBoZRqPpPxxbpwnIP/FPVJiy8N6tUOGERQtv/A/2ShIb/PEtQwdYV6dNuHjfH/FAOuO0o1Zm787yUBzHMyhI7Zfqqe8yMJXXi/ajWbv1iDsmWglM3s3NjFtD47cFm2h8POVRdlgUMvA1BxlDNzQsW54UM1aQhXQAYim/tAz1GJdJnDQxFb+nviFvsJpMxRlt6iXx6/V2xhfzN3250wo1cQQhGp/SBWQ2w9gs2oTTfm/caKY/kAJUX4tqBAZs8d2OwxKRo4csvLZQj+spJ8kJJn0FATXPS2iVZPVN+D3pMPUP4AQjT6ZzMspzkJ6YwzMu1jPnfeZ7N1wTUuwrqKtwgG6c/XtrVlCbo0iECzqIQQVuEnVKS19M7zAwTNVfA5l5xQpvPF6FFOuFWhuwe96ApZzwYsV9Cnu/Y1HGD3t6hzZIgu5wuLZOAHMhkF6UMCGk3VijVHMx2hjLXFJjtqroIlgwpHvJWReYoOKYAKR5UO+DKm2tgt1Um19Gcuks3Zm48ikwPgPdHB4KMTwhw/sfUvrSxy2FZv9yJO+Nls9fKYFKz4SmxiyMLrlW2rXyHa3bCEPh4JE8zs9TqS1zM9HdVfKoZwnIw8xVoCfLp7j6nno2lDVAVDGou7wirXYkyvzyN4AZhC5+cSimGwH8JdyyNfoMJiUGZlfX7Py94rR1n92okQpj2w/hG2Lr04dVSd66YzmrK1jT3VpdylQV7ZF5Wx8nemuItL/uZlsnT79g4qS5jJ4kUF7ATUdTN5aIC8hKmgtmQ0gIBjE52tWzpCIZvWgK/NYcupZ99vPAvHzBKacgUik4BN/NLH+3jbA7uYHIgkaQqeCkDRSNDQGMj3CCtCxUXqTo+VdyPnUoHa1HQ0pVcifCob1 YZe3hKHo PJbpMr/DTlnbmBizicW3NzkbF3Glh8gWvaTkcCsbFRm/sa51EkVX+18KzSbgWomXnMJnEb6Y5zyCE9D+nYdIvhsscWdKPeV/zcm7MVI3HLEHb80JEqmuLk5nzy87ze1l9hxKPe/9Krsmt9SzcY4LWhI39nKOX4tP0CsyOms3uoveSiv6rm63sBqU/OvFTub3gKmCKHqaTAEEgVM/iuPCKAXKqdrNNw9rB1Y4Jpn/aR5h1ABhGMOdpvHvcrqx4ODv5YtMoOtSk8stl2v8e6Ea0n4cURADFwlnm5TUMEhP3dt6xS8q3eL0/ghVWOrDFbR0NDei4ApX3B2WGXlIZfEjlQ9OIfCqMogj1XPkZ2ri0hVLpKTWX3QZg6kaMIvlyYZ3fk1Cm6PZBOG06KLHVOfDYVVYxy+6oXVF4X4aa1fJlR9W4Mb8ZD6SGILGg2JnpTzOT9P9lDTo+dBsyoaEm2KlE1lREGw== X-Bogosity: Ham, tests=bogofilter, spamicity=0.000000, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: List-Subscribe: List-Unsubscribe: On 17.12.24 17:31, Luiz Capitulino wrote: > The commit 387ba26fb1cb added __alloc_pages_bulk() along with the page_list > argument. The next commit 0f87d9d30f21 added the array-based argument. As Nit: Use "commit 387ba26fb1cb ("mm/page_alloc: add a bulk page allocator")" ,same for the other commit (likely scripts/checkpatch.pl should complain) > it turns out, the page_list argument has no users in the current tree (if it > ever had any). Dropping it allows for a slight simplification and eliminates > some unnecessary checks, now that page_array is required. > It's probably a good idea to link to Mel's patch and the discussion from 2023. Quoting what Willy said back then about performance of list vs. arrays might be valuable to have here is well. Acked-by: David Hildenbrand > Signed-off-by: Luiz Capitulino > --- > include/linux/gfp.h | 8 ++------ > mm/mempolicy.c | 14 +++++++------- > mm/page_alloc.c | 39 ++++++++++++--------------------------- > 3 files changed, 21 insertions(+), 40 deletions(-) > > diff --git a/include/linux/gfp.h b/include/linux/gfp.h > index b0fe9f62d15b6..eebed36443b35 100644 > --- a/include/linux/gfp.h > +++ b/include/linux/gfp.h > @@ -212,7 +212,6 @@ struct folio *__folio_alloc_noprof(gfp_t gfp, unsigned int order, int preferred_ > > unsigned long alloc_pages_bulk_noprof(gfp_t gfp, int preferred_nid, > nodemask_t *nodemask, int nr_pages, > - struct list_head *page_list, > struct page **page_array); > #define __alloc_pages_bulk(...) alloc_hooks(alloc_pages_bulk_noprof(__VA_ARGS__)) > > @@ -223,11 +222,8 @@ unsigned long alloc_pages_bulk_array_mempolicy_noprof(gfp_t gfp, > alloc_hooks(alloc_pages_bulk_array_mempolicy_noprof(__VA_ARGS__)) > > /* Bulk allocate order-0 pages */ > -#define alloc_pages_bulk_list(_gfp, _nr_pages, _list) \ > - __alloc_pages_bulk(_gfp, numa_mem_id(), NULL, _nr_pages, _list, NULL) > - > #define alloc_pages_bulk_array(_gfp, _nr_pages, _page_array) \ > - __alloc_pages_bulk(_gfp, numa_mem_id(), NULL, _nr_pages, NULL, _page_array) > + __alloc_pages_bulk(_gfp, numa_mem_id(), NULL, _nr_pages, _page_array) > > static inline unsigned long > alloc_pages_bulk_array_node_noprof(gfp_t gfp, int nid, unsigned long nr_pages, > @@ -236,7 +232,7 @@ alloc_pages_bulk_array_node_noprof(gfp_t gfp, int nid, unsigned long nr_pages, > if (nid == NUMA_NO_NODE) > nid = numa_mem_id(); > > - return alloc_pages_bulk_noprof(gfp, nid, NULL, nr_pages, NULL, page_array); > + return alloc_pages_bulk_noprof(gfp, nid, NULL, nr_pages, page_array); > } > > #define alloc_pages_bulk_array_node(...) \ > diff --git a/mm/mempolicy.c b/mm/mempolicy.c > index 04f35659717ae..42a7b07ccc15a 100644 > --- a/mm/mempolicy.c > +++ b/mm/mempolicy.c > @@ -2375,13 +2375,13 @@ static unsigned long alloc_pages_bulk_array_interleave(gfp_t gfp, > if (delta) { > nr_allocated = alloc_pages_bulk_noprof(gfp, > interleave_nodes(pol), NULL, > - nr_pages_per_node + 1, NULL, > + nr_pages_per_node + 1, > page_array); > delta--; > } else { > nr_allocated = alloc_pages_bulk_noprof(gfp, > interleave_nodes(pol), NULL, > - nr_pages_per_node, NULL, page_array); > + nr_pages_per_node, page_array); > } > > page_array += nr_allocated; > @@ -2430,7 +2430,7 @@ static unsigned long alloc_pages_bulk_array_weighted_interleave(gfp_t gfp, > if (weight && node_isset(node, nodes)) { > node_pages = min(rem_pages, weight); > nr_allocated = __alloc_pages_bulk(gfp, node, NULL, node_pages, > - NULL, page_array); > + page_array); > page_array += nr_allocated; > total_allocated += nr_allocated; > /* if that's all the pages, no need to interleave */ > @@ -2493,7 +2493,7 @@ static unsigned long alloc_pages_bulk_array_weighted_interleave(gfp_t gfp, > if (!node_pages) > break; > nr_allocated = __alloc_pages_bulk(gfp, node, NULL, node_pages, > - NULL, page_array); > + page_array); > page_array += nr_allocated; > total_allocated += nr_allocated; > if (total_allocated == nr_pages) > @@ -2517,11 +2517,11 @@ static unsigned long alloc_pages_bulk_array_preferred_many(gfp_t gfp, int nid, > preferred_gfp &= ~(__GFP_DIRECT_RECLAIM | __GFP_NOFAIL); > > nr_allocated = alloc_pages_bulk_noprof(preferred_gfp, nid, &pol->nodes, > - nr_pages, NULL, page_array); > + nr_pages, page_array); > > if (nr_allocated < nr_pages) > nr_allocated += alloc_pages_bulk_noprof(gfp, numa_node_id(), NULL, > - nr_pages - nr_allocated, NULL, > + nr_pages - nr_allocated, > page_array + nr_allocated); > return nr_allocated; > } > @@ -2557,7 +2557,7 @@ unsigned long alloc_pages_bulk_array_mempolicy_noprof(gfp_t gfp, > nid = numa_node_id(); > nodemask = policy_nodemask(gfp, pol, NO_INTERLEAVE_INDEX, &nid); > return alloc_pages_bulk_noprof(gfp, nid, nodemask, > - nr_pages, NULL, page_array); > + nr_pages, page_array); > } > > int vma_dup_policy(struct vm_area_struct *src, struct vm_area_struct *dst) > diff --git a/mm/page_alloc.c b/mm/page_alloc.c > index 1cb4b8c8886d8..3ef6d902e2fea 100644 > --- a/mm/page_alloc.c > +++ b/mm/page_alloc.c > @@ -4529,28 +4529,23 @@ static inline bool prepare_alloc_pages(gfp_t gfp_mask, unsigned int order, > } > > /* > - * __alloc_pages_bulk - Allocate a number of order-0 pages to a list or array > + * __alloc_pages_bulk - Allocate a number of order-0 pages to an array > * @gfp: GFP flags for the allocation > * @preferred_nid: The preferred NUMA node ID to allocate from > * @nodemask: Set of nodes to allocate from, may be NULL > - * @nr_pages: The number of pages desired on the list or array > - * @page_list: Optional list to store the allocated pages > - * @page_array: Optional array to store the pages > + * @nr_pages: The number of pages desired in the array > + * @page_array: Array to store the pages > * > * This is a batched version of the page allocator that attempts to > - * allocate nr_pages quickly. Pages are added to page_list if page_list > - * is not NULL, otherwise it is assumed that the page_array is valid. > + * allocate nr_pages quickly. Pages are added to the page_array. > * > - * For lists, nr_pages is the number of pages that should be allocated. > - * > - * For arrays, only NULL elements are populated with pages and nr_pages > + * Note that only NULL elements are populated with pages and nr_pages > * is the maximum number of pages that will be stored in the array. > * > - * Returns the number of pages on the list or array. > + * Returns the number of pages in the array. > */ > unsigned long alloc_pages_bulk_noprof(gfp_t gfp, int preferred_nid, > nodemask_t *nodemask, int nr_pages, > - struct list_head *page_list, > struct page **page_array) > { > struct page *page; > @@ -4568,7 +4563,7 @@ unsigned long alloc_pages_bulk_noprof(gfp_t gfp, int preferred_nid, > * Skip populated array elements to determine if any pages need > * to be allocated before disabling IRQs. > */ > - while (page_array && nr_populated < nr_pages && page_array[nr_populated]) > + while (nr_populated < nr_pages && page_array[nr_populated]) > nr_populated++; > > /* No pages requested? */ > @@ -4576,7 +4571,7 @@ unsigned long alloc_pages_bulk_noprof(gfp_t gfp, int preferred_nid, > goto out; > > /* Already populated array? */ > - if (unlikely(page_array && nr_pages - nr_populated == 0)) > + if (unlikely(nr_pages - nr_populated == 0)) > goto out; > > /* Bulk allocator does not support memcg accounting. */ > @@ -4658,7 +4653,7 @@ unsigned long alloc_pages_bulk_noprof(gfp_t gfp, int preferred_nid, > while (nr_populated < nr_pages) { > > /* Skip existing pages */ > - if (page_array && page_array[nr_populated]) { > + if (page_array[nr_populated]) { > nr_populated++; > continue; > } > @@ -4676,11 +4671,7 @@ unsigned long alloc_pages_bulk_noprof(gfp_t gfp, int preferred_nid, > nr_account++; > > prep_new_page(page, 0, gfp, 0); > - if (page_list) > - list_add(&page->lru, page_list); > - else > - page_array[nr_populated] = page; > - nr_populated++; > + page_array[nr_populated++] = page; > } > > pcp_spin_unlock(pcp); > @@ -4697,14 +4688,8 @@ unsigned long alloc_pages_bulk_noprof(gfp_t gfp, int preferred_nid, > > failed: > page = __alloc_pages_noprof(gfp, 0, preferred_nid, nodemask); > - if (page) { > - if (page_list) > - list_add(&page->lru, page_list); > - else > - page_array[nr_populated] = page; > - nr_populated++; > - } > - > + if (page) > + page_array[nr_populated++] = page; > goto out; > } > EXPORT_SYMBOL_GPL(alloc_pages_bulk_noprof); -- Cheers, David / dhildenb