From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 2E30E19047F for ; Fri, 10 Jan 2025 02:37:35 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=170.10.133.124 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1736476658; cv=none; b=a11qXYLBvBdmm/LDdLsWy53RTOz5hfC0bF0/Pot0um+L0Rt/bD/JeIVx5tE9D2fvA3MFPZcOKy/lFGilKLjTlQOEn0NYVflrK77akeQO8Ub17liTa5nP4lyA5p4y71T9VJUj4kJusKFaS4xQYoTxOSC/hpCAsTjHzfK+9lhXfNE= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1736476658; c=relaxed/simple; bh=d8JLSt/7x+a4PR4VnKjcXmbryZnd9iBNqirOwP1lxUc=; h=Message-ID:Date:MIME-Version:Subject:To:Cc:References:From: In-Reply-To:Content-Type; b=cYWxt+HQ1IlV5s8pQ8BqxHqxGTmNX/HDui3ABdKtH6JqQq2zobkSN3l83J6pdaqVpxhMgQgYw+dz8SbrVrG3dYr4tgI36DHgyYDFNQRFdwacicUbepA2D29vsfUrtPu3IhhUwEBp2CtlTGREgThlxDtlCWUWhvWlhGDIwWWw69M= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=redhat.com; spf=pass smtp.mailfrom=redhat.com; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b=RcZ1vxZQ; arc=none smtp.client-ip=170.10.133.124 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=redhat.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=redhat.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="RcZ1vxZQ" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1736476655; 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; bh=MGAkIhM+wsGLYMADWWeVmLkjV+10rpZrygLc3FpSM/c=; b=RcZ1vxZQuZEQ/deQyMM6AaAEbj+VA1ks736CbKc5pCnkPdHTkV7Cav8o7DDySFOV3VhPA7 2S9zDdIZ6+x7aqzuelUrtfo6PH15B+PZiEEWvVFY8xTM+bmReWznu3HwNeHVwJNhm+vAAD j80e+9CUEGJVMz87KU7HWp7+dS8LQLE= Received: from mail-qk1-f197.google.com (mail-qk1-f197.google.com [209.85.222.197]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-586-cc3yUHq2MbqjDuT0nrGe-w-1; Thu, 09 Jan 2025 21:37:33 -0500 X-MC-Unique: cc3yUHq2MbqjDuT0nrGe-w-1 X-Mimecast-MFC-AGG-ID: cc3yUHq2MbqjDuT0nrGe-w Received: by mail-qk1-f197.google.com with SMTP id af79cd13be357-7b6ecd22efbso276192085a.0 for ; Thu, 09 Jan 2025 18:37:33 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1736476653; x=1737081453; h=content-transfer-encoding:in-reply-to:from:content-language :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=MGAkIhM+wsGLYMADWWeVmLkjV+10rpZrygLc3FpSM/c=; b=vonnrTrjEuf6D4Lr8lji1xRGdLK5o4PDDDH2NBAUr9kq5Rw8ZvWrM0NagbJ84rR58F Qeh6A5AzU+JxkdppwLOBTO+ySr4s5TXwOVf3Le7uwCFaEq/0JyiFfg67yu+KMdr9Dgxk nRG1p7eadcpQj39gfM6Adaz46+hqRQ9i4bo64L5pKr4YPXWySLFd2rkJ+z3mIu7eobAR ASrOWVAAbTFwOQ/ic9iBg9QXIABE0k/tpBwHhucgWhi6Ky8WPmZ+wwb1wdOC3D0cPijE ff20IGVoBi92DjJLpwKav9zayMUDnZMbr9C69Bwle+PAwoLGfqwtfP11qvNy5kYYXOW6 QOlg== X-Forwarded-Encrypted: i=1; AJvYcCXO0UXNd8f6gTiQWzqE0qoSzx4wG41re4Ac8yPm3W/vhkNjVopzYWAB2jt/Dd1S1ezI3o58IR2UM4KAvkg=@vger.kernel.org X-Gm-Message-State: AOJu0Ywzp17WfyjQ5WReyp6W64WPxZi6lsQCh90VLceNUhAUuzn6dWpq eODDIABmH3G3IaVE7TkfZ1CRku39vZ5sI53c5LbtQjZadbKUjNmb7Sg3lXaFd2bumZxfvsCERoU FHv+XVpyZnA9z7QQ8YNAJZGJXVNohR3solEDZWsXH41YzPUNHFsKeVPgYDVXvgQ== X-Gm-Gg: ASbGncvXVObkk4XiG3bZdy2pryM7b/xOTn/uwHhIOJWg6EGVFi8te1Eps41COyVJElx Q3DB1wXDjqdNHew9hZEXS+VXSgpfLQFF2SmyN6jto2agttOMy6ijteIYF0lDA2I1TAc6bNRt0uN PmFBxp9LoiXEO0AXrfqcr92XnQ3fOWkx60DiDUvBrDfgJUp5QfM/feeBqVT9TiqATQ5HkQWypzJ tvQY1VRA125eOEUO0wwVIl3U3hGrstKi1W9NvyMhwsKykQ3JQDrNq/NbSPP9xtKWMdbDYl0eyoF QmKIGp1H5jut9XzLAAmGtrXLqvrrImJddrzjNTscHw== X-Received: by 2002:a05:620a:1904:b0:7b1:1fdd:d54f with SMTP id af79cd13be357-7bce128b3a5mr956979085a.29.1736476653411; Thu, 09 Jan 2025 18:37:33 -0800 (PST) X-Google-Smtp-Source: AGHT+IFEG1MA/wTZxtZG4sKgfbBjzwXhY4u+xybj3Iv//JeDXViBk2i48CR+t2xiovmpmwKsGJObTg== X-Received: by 2002:a05:620a:1904:b0:7b1:1fdd:d54f with SMTP id af79cd13be357-7bce128b3a5mr956977385a.29.1736476653153; Thu, 09 Jan 2025 18:37:33 -0800 (PST) Received: from [192.168.2.110] (bras-base-aylmpq0104w-grc-14-70-52-22-87.dsl.bell.ca. [70.52.22.87]) by smtp.gmail.com with ESMTPSA id d75a77b69052e-46c8734107esm4899691cf.44.2025.01.09.18.37.32 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Thu, 09 Jan 2025 18:37:32 -0800 (PST) Message-ID: Date: Thu, 9 Jan 2025 21:37:32 -0500 Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Subject: Re: linux-next: build failure after merge of the block tree To: Stephen Rothwell , Jens Axboe , Andrew Morton Cc: Pavel Begunkov , Linux Kernel Mailing List , Linux Next Mailing List References: <20250110124406.17190e3a@canb.auug.org.au> Content-Language: en-US, en-CA From: Luiz Capitulino In-Reply-To: <20250110124406.17190e3a@canb.auug.org.au> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit On 2025-01-09 20:44, Stephen Rothwell wrote: > Hi all, > > After merging the block tree, today's linux-next build (powerpc > ppc64_defconfig) failed like this: > > io_uring/memmap.c: In function 'io_region_allocate_pages': > io_uring/memmap.c:173:24: error: implicit declaration of function 'alloc_pages_bulk_array_node'; did you mean 'alloc_pages_bulk_node'? [-Wimplicit-function-declaration] > 173 | nr_allocated = alloc_pages_bulk_array_node(gfp, NUMA_NO_NODE, > | ^~~~~~~~~~~~~~~~~~~~~~~~~~~ > | alloc_pages_bulk_node > > Caused by commit > > 1e21df691ffa ("io_uring/memmap: implement kernel allocated regions") > > interacting with commit > > 4f6a90a13f78 ("mm: alloc_pages_bulk: rename API") > > from the mm-unstable branch of the mm tree. > > I have applied the following merge fix up patch. > > From: Stephen Rothwell > Date: Fri, 10 Jan 2025 12:40:38 +1100 > Subject: [PATCH] fix up for "io_uring/memmap: implement kernel allocated > regions" > > interacting with "mm: alloc_pages_bulk: rename API" from the mm tree This looks correct to me, thanks for fixing: Reviewed-by: Luiz Capitulino > > Signed-off-by: Stephen Rothwell > --- > io_uring/memmap.c | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > > diff --git a/io_uring/memmap.c b/io_uring/memmap.c > index dda846190fbd..361134544427 100644 > --- a/io_uring/memmap.c > +++ b/io_uring/memmap.c > @@ -170,8 +170,8 @@ static int io_region_allocate_pages(struct io_ring_ctx *ctx, > goto done; > } > > - nr_allocated = alloc_pages_bulk_array_node(gfp, NUMA_NO_NODE, > - mr->nr_pages, pages); > + nr_allocated = alloc_pages_bulk_node(gfp, NUMA_NO_NODE, > + mr->nr_pages, pages); > if (nr_allocated != mr->nr_pages) { > if (nr_allocated) > release_pages(pages, nr_allocated);