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=-9.8 required=3.0 tests=BAYES_00,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 418B1C43467 for ; Mon, 12 Oct 2020 04:19:55 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id D4AEF206FB for ; Mon, 12 Oct 2020 04:19:54 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=canb.auug.org.au header.i=@canb.auug.org.au header.b="LxAznhpn" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727626AbgJLETx (ORCPT ); Mon, 12 Oct 2020 00:19:53 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:57664 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726706AbgJLETx (ORCPT ); Mon, 12 Oct 2020 00:19:53 -0400 Received: from ozlabs.org (bilbo.ozlabs.org [IPv6:2401:3900:2:1::2]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id C7216C0613CE; Sun, 11 Oct 2020 21:19:52 -0700 (PDT) Received: from authenticated.ozlabs.org (localhost [127.0.0.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange ECDHE (P-256) server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by mail.ozlabs.org (Postfix) with ESMTPSA id 4C8lnd1x8Qz9sT6; Mon, 12 Oct 2020 15:19:48 +1100 (AEDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=canb.auug.org.au; s=201702; t=1602476389; bh=6nzOIoDHDbw2mX03lk95gkKSdnAkCM8m8l/dKKO68TE=; h=Date:From:To:Cc:Subject:In-Reply-To:References:From; b=LxAznhpnq8h6/CbKcUBguBKfGG5kU28tZB4xWboaQBB6g3XYA4X23q68Ugz3RgZF9 n3ixW2mLbUlUs6W2OsQXM66A/gLlUgZYlU87+waDCv5TJKoZPg8ILWetFh7nNZTW1j s+JmRDO+Sg7wcdtjEzbKyDqQOdc7Eri7OXmAFmRd9LbdsVORLU0oXyF8CeGnOcTJAZ 7cS3nogYyAHSyMnKusy3a4OJCLpzZ2yicZW490+NCRg1+cjp4za9t55dIEXAx8UQyC xFnWCxS2qjDvbB4UPdDQiWsDesvXTSI9UTtAueq+o+qczx929xTyXJi5wjdce0bbb6 sJyIGtA/rm82A== Date: Mon, 12 Oct 2020 15:19:48 +1100 From: Stephen Rothwell To: Jason Gunthorpe , Dave Airlie , Doug Ledford Cc: DRI , Leon Romanovsky , Maor Gottlieb , Gerd Hoffmann , Linux Kernel Mailing List , Linux Next Mailing List Subject: Re: linux-next: build failure after merge of the hmm tree Message-ID: <20201012151948.3a840c00@canb.auug.org.au> In-Reply-To: <20201006164120.GI4734@nvidia.com> References: <20201006203508.3cb3d0e3@canb.auug.org.au> <20201006164120.GI4734@nvidia.com> MIME-Version: 1.0 Content-Type: multipart/signed; boundary="Sig_/6gb=Pmpxd4aBBoRVlHZ1V50"; protocol="application/pgp-signature"; micalg=pgp-sha256 Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org --Sig_/6gb=Pmpxd4aBBoRVlHZ1V50 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: quoted-printable Hi all, On Tue, 6 Oct 2020 13:41:20 -0300 Jason Gunthorpe wrote: > > On Tue, Oct 06, 2020 at 08:35:08PM +1100, Stephen Rothwell wrote: > > Hi all, > >=20 > > After merging the hmm tree, today's linux-next build (arm > > multi_v7_defconfig) failed like this: > >=20 > >=20 > > Caused by commit > >=20 > > 07da1223ec93 ("lib/scatterlist: Add support in dynamic allocation of = SG table from pages") > >=20 > > interacting with commit > >=20 > > 707d561f77b5 ("drm: allow limiting the scatter list size.") > >=20 > > from the drm tree. > >=20 > > I have added the following merge fix patch > >=20 > > From: Stephen Rothwell > > Date: Tue, 6 Oct 2020 20:22:51 +1100 > > Subject: [PATCH] lib/scatterlist: merge fix for "drm: allow limiting the > > scatter list size." > >=20 > > Signed-off-by: Stephen Rothwell > > drivers/gpu/drm/drm_prime.c | 9 ++++++--- > > 1 file changed, 6 insertions(+), 3 deletions(-) > >=20 > > diff --git a/drivers/gpu/drm/drm_prime.c b/drivers/gpu/drm/drm_prime.c > > index 11fe9ff76fd5..83ac901b65a2 100644 > > +++ b/drivers/gpu/drm/drm_prime.c > > @@ -807,6 +807,7 @@ struct sg_table *drm_prime_pages_to_sg(struct drm_d= evice *dev, > > struct page **pages, unsigned int nr_pages) > > { > > struct sg_table *sg =3D NULL; > > + struct scatterlist *sl; > > size_t max_segment =3D 0; > > int ret; > > =20 > > @@ -820,11 +821,13 @@ struct sg_table *drm_prime_pages_to_sg(struct drm= _device *dev, > > max_segment =3D dma_max_mapping_size(dev->dev); > > if (max_segment =3D=3D 0 || max_segment > SCATTERLIST_MAX_SEGMENT) > > max_segment =3D SCATTERLIST_MAX_SEGMENT; > > - ret =3D __sg_alloc_table_from_pages(sg, pages, nr_pages, 0, > > + sl =3D __sg_alloc_table_from_pages(sg, pages, nr_pages, 0, > > nr_pages << PAGE_SHIFT, > > - max_segment, GFP_KERNEL); > > - if (ret) > > + max_segment, NULL, 0, GFP_KERNEL); > > + if (IS_ERR(sl)) { > > + ret =3D PTR_ERR(sl); > > goto out; > > + } > > =20 > > return sg; > > out: =20 >=20 > This looks OK to me, thanks This merge fix patch is now being applied to the merge of the drm tree since the rdma tree (that is merged before the drm tree) has merged the hmm tree. --=20 Cheers, Stephen Rothwell --Sig_/6gb=Pmpxd4aBBoRVlHZ1V50 Content-Type: application/pgp-signature Content-Description: OpenPGP digital signature -----BEGIN PGP SIGNATURE----- iQEzBAEBCAAdFiEENIC96giZ81tWdLgKAVBC80lX0GwFAl+D2WQACgkQAVBC80lX 0Gxs0Af5AZow+Krg9JnlYrOXglhcOIm9Lf9ArfZa6cwVBTP5GbCoUMdcMuTf7Zo8 XOMNT67+/zn3R6faniiV/VSpKQDibWJWBxFkrNCsIgvU3OmWDYHZ4MOp3r7mn+z6 8zNYjUKGwjnzhcwMij/Huzv+akLOVzrA3kMd+Kx+yd3GumC17Aril3XEACcZRn4n coXu4YhwGVTJcgZ31KvCIZblGlwxyjcE3/U9SjP44uj2T+TjhA4hG4XapGsAFRcK FRLeqavH+tlOLv0DrX33SwtnGLaj/zL4uMsKsLvzmqrd6e5rMhrWXYZiyTLoj+GB SIvnrvdkQRWBc8tBZVPcG4x2b8xsGg== =AlzX -----END PGP SIGNATURE----- --Sig_/6gb=Pmpxd4aBBoRVlHZ1V50--