Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67;
Date:   Fri, 27 Mar 2020 07:41:55 -0700
From:   Roman Gushchin <guro@fb.com>
To:     Michal Hocko <mhocko@kernel.org>
CC:     Aslan Bakirov <aslan@fb.com>, <akpm@linux-foundation.org>,
        <linux-kernel@vger.kernel.org>, <linux-mm@kvack.org>,
        <kernel-team@fb.com>, <riel@surriel.com>, <hannes@cmpxchg.org>
Subject: Re: [PATCH 2/2] mm: hugetlb: Use node interface of cma
Message-ID: <20200327144155.GA194089@carbon.DHCP.thefacebook.com>
References: <20200326212718.3798742-1-aslan@fb.com>
 <20200326212718.3798742-2-aslan@fb.com>
 <20200327080610.GV27965@dhcp22.suse.cz>
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
In-Reply-To: <20200327080610.GV27965@dhcp22.suse.cz>
MIME-Version: 1.0
X-MS-Exchange-MessageSentRepresentingType: 1
Received: from carbon.DHCP.thefacebook.com (2620:10d:c090:400::5:56f3) by MWHPR03CA0013.namprd03.prod.outlook.com (2603:10b6:300:117::23) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.2856.20 via Frontend Transport; Fri, 27 Mar 2020 14:41:59 +0000
X-Originating-IP: [2620:10d:c090:400::5:56f3]
X-MS-PublicTrafficType: Email
X-MS-Office365-Filtering-Correlation-Id: 825c2b90-7074-4df3-1664-08d7d25d01b1
X-MS-TrafficTypeDiagnostic: BYAPR15MB2600:
X-MS-Exchange-Transport-Forked: True
X-Microsoft-Antispam-PRVS: <BYAPR15MB260029AF1B6971F608FAF3EBBECC0@BYAPR15MB2600.namprd15.prod.outlook.com>
X-FB-Source: Internal
X-MS-Oob-TLC-OOBClassifiers: OLM:2803;
X-Forefront-PRVS: 0355F3A3AE
X-Forefront-Antispam-Report: SFV:NSPM;SFS:(10019020)(39860400002)(376002)(346002)(366004)(136003)(396003)(1076003)(66476007)(66556008)(66946007)(186003)(16526019)(4326008)(33656002)(5660300002)(55016002)(7696005)(52116002)(2906002)(478600001)(316002)(8676002)(6916009)(8936002)(9686003)(6506007)(6666004)(81166006)(86362001)(81156014);DIR:OUT;SFP:1102;SCL:1;SRVR:BYAPR15MB2600;H:BYAPR15MB4136.namprd15.prod.outlook.com;FPR:;SPF:None;LANG:en;PTR:InfoNoRecords;
Received-SPF: None (protection.outlook.com: fb.com does not designate
 permitted sender hosts)
X-MS-Exchange-SenderADCheck: 1
X-Microsoft-Antispam: BCL:0;
X-Microsoft-Antispam-Message-Info: x06egVOX/Zq2BKEEvuGqQr6ISxmdf7s9sNgdMocqboOvke+JQjd5SMZ+EJRGA1E04TNsAyV4iOIU629HmhEEW9ce9nX4/4DsRRhwAf6s8qoy7U5L084aAtUbs/3ab0aJXfchblXI5uUb3ECy2IpjrlxM/M5+sgidqsvetU/pVIEnfLZExXd1xXCugHDoCcxFKqNRufUhOmZ/GpdGvWVc1qS5S753CUQVgzkEwHEkLlnxvzMeeerupyC+/3Zo6fwtL0pJpS1qI78K0Kj177XKA+AS3hOnSyWGxpJ9UK5fEVuF3HRgbqBntsxCndA6FtSxEP+nh4pOfjjZuo1wYLFHKaaoeLTuwp271wUB2yM4yn+n9eEYVrzBRSVm9XfRRxxp0nBcemtaIucuPtxwnmmf46ZRc/hSSa3qvS07zmoD4SwWwxil1MuWvcjm3c4ygGOQ
X-MS-Exchange-AntiSpam-MessageData: 1wQRyrMD4ZPTvoAPA/isksdg5b/hMlclhtSRBRJZIwVAWLlZgL8qq42kby7ndT0VZ2lFCw35sMLnnKOmGk2YbYbOXi/VkUkgbtB8Krgsr8HQRGd0jVQEYeWA+BA/qHQJMmJ6GC75wAbjLb+uX2o3SG9QZyu4FI142hFFPsyH7epaMdZcAYeb7EFMxyJuin7T
X-MS-Exchange-CrossTenant-Network-Message-Id: 825c2b90-7074-4df3-1664-08d7d25d01b1
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 27 Mar 2020 14:42:00.0947
 (UTC)
X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted
X-MS-Exchange-CrossTenant-Id: 8ae927fe-1255-47a7-a2af-5f3a069daaa2
X-MS-Exchange-CrossTenant-MailboxType: HOSTED
X-MS-Exchange-CrossTenant-UserPrincipalName: wieQkKK1l7khvSj30wDdZjNTPQxANH+1jEgjJKyFqfCC1s5BeHQKg1X6W6cac6Cm
X-MS-Exchange-Transport-CrossTenantHeadersStamped: BYAPR15MB2600
X-OriginatorOrg: fb.com
X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10434:6.0.138,18.0.645
 definitions=2020-03-27_05:2020-03-27,2020-03-27 signatures=0
X-Proofpoint-Spam-Details: rule=fb_default_notspam policy=fb_default score=0 lowpriorityscore=0
 clxscore=1015 spamscore=0 suspectscore=1 bulkscore=0 priorityscore=1501
 phishscore=0 malwarescore=0 impostorscore=0 mlxscore=0 mlxlogscore=999
 adultscore=0 classifier=spam adjust=0 reason=mlx scancount=1
 engine=8.12.0-2003020000 definitions=main-2003270135
X-FB-Internal: deliver
Sender: linux-kernel-owner@vger.kernel.org
Precedence: bulk
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

On Fri, Mar 27, 2020 at 09:06:10AM +0100, Michal Hocko wrote:
> On Thu 26-03-20 14:27:18, Aslan Bakirov wrote:
> > With introduction of numa node interface for CMA, this patch is for using that
> > interface for allocating memory on numa nodes if NUMA is configured.
> > This will be more efficient  and cleaner because first, instead of iterating
> > mem range of each numa node, cma_declare_contigueous_nid() will do
> > its own address finding if we pass 0 for  both min_pfn and max_pfn,
> > second, it can also handle caseswhere NUMA is not configured
> > by passing NUMA_NO_NODE as an argument.
> > 
> > In addition, checking if desired size of memory is available or not,
> > is happening in cma_declare_contiguous_nid()  because base and
> > limit will be determined there, since 0(any) for  base and
> > 0(any) for limit is passed as argument to the function.
> 
> This looks much better than the original patch. Can we simply squash
> your and Roman's patch in the mmotm tree and post it for the review in
> one piece? It would be slightly easier to review that way.

I'm glad you liked it! I agree, it's much nicer now, thanks to Aslan!

I think it's simpler to keep it as a separate patch, because there was
already a fix by Randy Dunlap on top of my original version.

> 
> > Signed-off-by: Aslan Bakirov <aslan@fb.com>

Acked-by: Roman Gushchin <guro@fb.com>

Thanks!

> 
> Thanks!
> 
> > ---
> >  mm/hugetlb.c | 40 +++++++++++-----------------------------
> >  1 file changed, 11 insertions(+), 29 deletions(-)
> > 
> > diff --git a/mm/hugetlb.c b/mm/hugetlb.c
> > index b9f0c903c4cf..62989220c4ff 100644
> > --- a/mm/hugetlb.c
> > +++ b/mm/hugetlb.c
> > @@ -5573,42 +5573,24 @@ void __init hugetlb_cma_reserve(int order)
> >  
> >  	reserved = 0;
> >  	for_each_node_state(nid, N_ONLINE) {
> > -		unsigned long min_pfn = 0, max_pfn = 0;
> >  		int res;
> > -#ifdef CONFIG_NUMA
> > -		unsigned long start_pfn, end_pfn;
> > -		int i;
> >  
> > -		for_each_mem_pfn_range(i, nid, &start_pfn, &end_pfn, NULL) {
> > -			if (!min_pfn)
> > -				min_pfn = start_pfn;
> > -			max_pfn = end_pfn;
> > -		}
> > -#else
> > -		min_pfn = min_low_pfn;
> > -		max_pfn = max_low_pfn;
> > -#endif
> >  		size = min(per_node, hugetlb_cma_size - reserved);
> >  		size = round_up(size, PAGE_SIZE << order);
> > -
> > -		if (size > ((max_pfn - min_pfn) << PAGE_SHIFT) / 2) {
> > -			pr_warn("hugetlb_cma: cma_area is too big, please try less than %lu MiB\n",
> > -				round_down(((max_pfn - min_pfn) << PAGE_SHIFT) *
> > -					   nr_online_nodes / 2 / SZ_1M,
> > -					   PAGE_SIZE << order));
> > -			break;
> > -		}
> > -
> > -		res = cma_declare_contiguous(PFN_PHYS(min_pfn), size,
> > -					     PFN_PHYS(max_pfn),
> > +		
> > +		
> > +#ifndef CONFIG_NUMA
> > +		nid = NUMA_NO_NODE
> > +#endif		
> > +		res = cma_declare_contiguous_nid(0, size,
> > +					     0, 
> >  					     PAGE_SIZE << order,
> >  					     0, false,
> > -					     "hugetlb", &hugetlb_cma[nid]);
> > +					     "hugetlb", &hugetlb_cma[nid], nid);		
> > +
> >  		if (res) {
> > -			phys_addr_t begpa = PFN_PHYS(min_pfn);
> > -			phys_addr_t endpa = PFN_PHYS(max_pfn);
> > -			pr_warn("%s: reservation failed: err %d, node %d, [%pap, %pap)\n",
> > -				__func__, res, nid, &begpa, &endpa);
> > +			pr_warn("%s: reservation failed: err %d, node %d\n",
> > +				__func__, res, nid);
> >  			break;
> >  		}
> >  
> > -- 
> > 2.17.1
> 
> -- 
> Michal Hocko
> SUSE Labs