From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-ig0-f182.google.com (mail-ig0-f182.google.com [209.85.213.182]) by kanga.kvack.org (Postfix) with ESMTP id 0A43D6B0037 for ; Tue, 8 Jul 2014 18:11:17 -0400 (EDT) Received: by mail-ig0-f182.google.com with SMTP id c1so1194805igq.15 for ; Tue, 08 Jul 2014 15:11:16 -0700 (PDT) Received: from mail.linuxfoundation.org (mail.linuxfoundation.org. [140.211.169.12]) by mx.google.com with ESMTPS id ih4si4946629igb.48.2014.07.08.15.11.15 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 08 Jul 2014 15:11:16 -0700 (PDT) Date: Tue, 8 Jul 2014 15:11:13 -0700 From: Andrew Morton Subject: Re: [patch] mm, hugetlb: generalize writes to nr_hugepages Message-Id: <20140708151113.dd1469faea6177959356620b@linux-foundation.org> In-Reply-To: References: <20140702172529.347f2dd2@redhat.com> Mime-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Sender: owner-linux-mm@kvack.org List-ID: To: David Rientjes Cc: Luiz Capitulino , Joonsoo Kim , Naoya Horiguchi , "Kirill A. Shutemov" , linux-kernel@vger.kernel.org, linux-mm@kvack.org On Wed, 2 Jul 2014 17:44:46 -0700 (PDT) David Rientjes wrote: > > > @@ -2248,36 +2257,18 @@ static int hugetlb_sysctl_handler_common(bool obey_mempolicy, > > > void __user *buffer, size_t *length, loff_t *ppos) > > > { > > > struct hstate *h = &default_hstate; > > > - unsigned long tmp; > > > + unsigned long tmp = h->max_huge_pages; > > > int ret; > > > > > > - if (!hugepages_supported()) > > > - return -ENOTSUPP; > > > > Shouldn't you add this check to __nr_hugepages_store_common()? Otherwise > > looks good to me. > > > > Hmm, I think you're right but I don't think __nr_hugepages_store_common() > is the right place: if we have a legitimate hstate for the sysfs tunables > then we should support hugepages. I think this should be kept in > hugetlb_sysctl_handler_common(). This? --- a/mm/hugetlb.c~mm-hugetlb-generalize-writes-to-nr_hugepages-fix +++ a/mm/hugetlb.c @@ -2260,6 +2260,9 @@ static int hugetlb_sysctl_handler_common unsigned long tmp = h->max_huge_pages; int ret; + if (!hugepages_supported()) + return -ENOTSUPP; + table->data = &tmp; table->maxlen = sizeof(unsigned long); ret = proc_doulongvec_minmax(table, write, buffer, length, ppos); _ -- To unsubscribe, send a message with 'unsubscribe linux-mm' in the body to majordomo@kvack.org. For more info on Linux MM, see: http://www.linux-mm.org/ . Don't email: email@kvack.org