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 X-Spam-Level: X-Spam-Status: No, score=-6.9 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH, MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id ED2DAC47257 for ; Mon, 4 May 2020 18:42:01 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id 97AE12073E for ; Mon, 4 May 2020 18:42:01 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=chromium.org header.i=@chromium.org header.b="ZeNPUEFJ" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 97AE12073E Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=chromium.org Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=owner-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix) id 0F6218E006D; Mon, 4 May 2020 14:42:01 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 0A6DC8E0058; Mon, 4 May 2020 14:42:01 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id EAFE28E006D; Mon, 4 May 2020 14:42:00 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0231.hostedemail.com [216.40.44.231]) by kanga.kvack.org (Postfix) with ESMTP id D06BF8E0058 for ; Mon, 4 May 2020 14:42:00 -0400 (EDT) Received: from smtpin17.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay01.hostedemail.com (Postfix) with ESMTP id 94D99180AD806 for ; Mon, 4 May 2020 18:42:00 +0000 (UTC) X-FDA: 76779906000.17.shade28_68d0a727eba45 X-HE-Tag: shade28_68d0a727eba45 X-Filterd-Recvd-Size: 5357 Received: from mail-pf1-f193.google.com (mail-pf1-f193.google.com [209.85.210.193]) by imf17.hostedemail.com (Postfix) with ESMTP for ; Mon, 4 May 2020 18:42:00 +0000 (UTC) Received: by mail-pf1-f193.google.com with SMTP id z1so5978184pfn.3 for ; Mon, 04 May 2020 11:42:00 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; h=date:from:to:cc:subject:message-id:references:mime-version :content-disposition:in-reply-to; bh=W2tJ5b2t7hczpaAxFKlCfGf3HMAY03e+dltiT1wWRtw=; b=ZeNPUEFJK3Vzqz+6/aS6puuqVk/a8cosOmqzD7wITSt0oXSXn2EHXgOrzGqV7NeV1U tpNtoJ8OFz+o7A+cLKtE7CTdGQP15Cv/jR2PAAT/RkIvE7i4pWJs/yQJ9GoGzWr77iYi GoWITCOXJw3bA0fVyTcdTrgnW0VyEa9wuf8no= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:from:to:cc:subject:message-id:references :mime-version:content-disposition:in-reply-to; bh=W2tJ5b2t7hczpaAxFKlCfGf3HMAY03e+dltiT1wWRtw=; b=PPfPJZw9g4jWJuq1D1ogGB6OmXv4pUpPXsHf+IDnKu8T+AUcNkoZxuNrPqK0WwjqNd hWbNeUgZ2b7nG6jzRvDuswBpnDvb2i7JSxloCmlZMdsKiRgJ6MDCSF+bfZlTujvdvUeY QI/rtFbhLsfevao4Mj/wJdkzFKG7vwTz41HFNZHK2VtvqKt5weOehvGRP1XfE8OjOW5Y InIKPBolCN6m0LijuKC9jcses40WXqNPc5BFr6l0ZuLRw9n5MPP76mZRYyKV2KR+fswr KpaXaY1UNRxXnIubq7T9rm8MEIOPc6ID1exA2HKpuqh13YPFlQOsdAWjeI8SdbIjcTG4 BIHw== X-Gm-Message-State: AGi0PuamsiH3NicIN2vc1/vcGR6d8QvLcS6ilzRYcj9ZZGL/PxbUSl3Y DpIYzByZRi9SnTcLLpun9tpM3Q== X-Google-Smtp-Source: APiQypIZef/BfkRBu20SORWfQDfii5L/7CKWSh4JL4l2QaSNhCzuiGlsdosd5WC0raG1OkKCcKBJ1A== X-Received: by 2002:a62:4ec6:: with SMTP id c189mr19147132pfb.299.1588617719212; Mon, 04 May 2020 11:41:59 -0700 (PDT) Received: from www.outflux.net (smtp.outflux.net. [198.145.64.163]) by smtp.gmail.com with ESMTPSA id q6sm9253995pfh.193.2020.05.04.11.41.58 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 04 May 2020 11:41:58 -0700 (PDT) Date: Mon, 4 May 2020 11:41:57 -0700 From: Kees Cook To: Christoph Hellwig Cc: Iurii Zaikin , Alexei Starovoitov , Daniel Borkmann , linux-kernel@vger.kernel.org, linux-mm@kvack.org, linux-fsdevel@vger.kernel.org, netdev@vger.kernel.org, bpf@vger.kernel.org, David Rientjes Subject: Re: [PATCH 2/5] mm: remove watermark_boost_factor_sysctl_handler Message-ID: <202005041141.DA134ED931@keescook> References: <20200424064338.538313-1-hch@lst.de> <20200424064338.538313-3-hch@lst.de> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20200424064338.538313-3-hch@lst.de> 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: On Fri, Apr 24, 2020 at 08:43:35AM +0200, Christoph Hellwig wrote: > watermark_boost_factor_sysctl_handler is just a pointless wrapper for > proc_dointvec_minmax, so remove it and use proc_dointvec_minmax > directly. > > Signed-off-by: Christoph Hellwig Reviewed-by: Kees Cook -Kees > Acked-by: David Rientjes > --- > include/linux/mmzone.h | 2 -- > kernel/sysctl.c | 2 +- > mm/page_alloc.c | 12 ------------ > 3 files changed, 1 insertion(+), 15 deletions(-) > > diff --git a/include/linux/mmzone.h b/include/linux/mmzone.h > index 1b9de7d220fb7..f37bb8f187fc7 100644 > --- a/include/linux/mmzone.h > +++ b/include/linux/mmzone.h > @@ -911,8 +911,6 @@ static inline int is_highmem(struct zone *zone) > struct ctl_table; > int min_free_kbytes_sysctl_handler(struct ctl_table *, int, > void __user *, size_t *, loff_t *); > -int watermark_boost_factor_sysctl_handler(struct ctl_table *, int, > - void __user *, size_t *, loff_t *); > int watermark_scale_factor_sysctl_handler(struct ctl_table *, int, > void __user *, size_t *, loff_t *); > extern int sysctl_lowmem_reserve_ratio[MAX_NR_ZONES]; > diff --git a/kernel/sysctl.c b/kernel/sysctl.c > index 8a176d8727a3a..99d27acf46465 100644 > --- a/kernel/sysctl.c > +++ b/kernel/sysctl.c > @@ -1491,7 +1491,7 @@ static struct ctl_table vm_table[] = { > .data = &watermark_boost_factor, > .maxlen = sizeof(watermark_boost_factor), > .mode = 0644, > - .proc_handler = watermark_boost_factor_sysctl_handler, > + .proc_handler = proc_dointvec_minmax, > .extra1 = SYSCTL_ZERO, > }, > { > diff --git a/mm/page_alloc.c b/mm/page_alloc.c > index 69827d4fa0527..62c1550cd43ec 100644 > --- a/mm/page_alloc.c > +++ b/mm/page_alloc.c > @@ -7978,18 +7978,6 @@ int min_free_kbytes_sysctl_handler(struct ctl_table *table, int write, > return 0; > } > > -int watermark_boost_factor_sysctl_handler(struct ctl_table *table, int write, > - void __user *buffer, size_t *length, loff_t *ppos) > -{ > - int rc; > - > - rc = proc_dointvec_minmax(table, write, buffer, length, ppos); > - if (rc) > - return rc; > - > - return 0; > -} > - > int watermark_scale_factor_sysctl_handler(struct ctl_table *table, int write, > void __user *buffer, size_t *length, loff_t *ppos) > { > -- > 2.26.1 > -- Kees Cook