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,URIBL_BLOCKED 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 649D6C47095 for ; Tue, 6 Oct 2020 09:35:14 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id B27FA2137B for ; Tue, 6 Oct 2020 09:35:13 +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="j6alsdsA" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726068AbgJFJfM (ORCPT ); Tue, 6 Oct 2020 05:35:12 -0400 Received: from bilbo.ozlabs.org ([203.11.71.1]:42795 "EHLO ozlabs.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1725981AbgJFJfM (ORCPT ); Tue, 6 Oct 2020 05:35:12 -0400 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 4C5C4F28Gxz9sS8; Tue, 6 Oct 2020 20:35:09 +1100 (AEDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=canb.auug.org.au; s=201702; t=1601976910; bh=a12/UVDR6zr+BYph3qJOSxMnY7GGVoasy0f3LxNxy2g=; h=Date:From:To:Cc:Subject:From; b=j6alsdsA3Uln7mQ1aTXbEIv6ck8MLWm+kik2fXDXlCvb1+f5H7f5GshceE8MR1Ntd 6dygfzpZ/zjhz59ckiWYO/mmODHqDg3qmrKSUT5819V0CG7rmYC2Cc84A6Hrnd58EC PJd4Wy2miyf/MU0oD0gxTXBCBtJ30t86Vq5rLliMFzRxrsbHFvsaHAiXHeB6CLdUjp ZVq9+lD5A0DZ1J/vHMnVoC3xNh70XqMNtzN0Pq0grjEjcb9RTHzbCpcXc8YRZnSGOy IzHqdU69tALbls1TGgJWHE6ik/jSJCycjZvOOQZTq3ebf9lUJdSKztYO2W7rKDaG0V +5Qwdr1Lz1wFw== Date: Tue, 6 Oct 2020 20:35:08 +1100 From: Stephen Rothwell To: Jason Gunthorpe , Dave Airlie , DRI Cc: Leon Romanovsky , Maor Gottlieb , Gerd Hoffmann , Linux Kernel Mailing List , Linux Next Mailing List Subject: linux-next: build failure after merge of the hmm tree Message-ID: <20201006203508.3cb3d0e3@canb.auug.org.au> MIME-Version: 1.0 Content-Type: multipart/signed; boundary="Sig_/6sFO0+9XXkLgtCyzVp9ZubH"; protocol="application/pgp-signature"; micalg=pgp-sha256 Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org --Sig_/6sFO0+9XXkLgtCyzVp9ZubH Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: quoted-printable Hi all, After merging the hmm tree, today's linux-next build (arm multi_v7_defconfig) failed like this: Caused by commit 07da1223ec93 ("lib/scatterlist: Add support in dynamic allocation of SG t= able from pages") interacting with commit 707d561f77b5 ("drm: allow limiting the scatter list size.") from the drm tree. I have added the following merge fix patch 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." Signed-off-by: Stephen Rothwell --- drivers/gpu/drm/drm_prime.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/drivers/gpu/drm/drm_prime.c b/drivers/gpu/drm/drm_prime.c index 11fe9ff76fd5..83ac901b65a2 100644 --- a/drivers/gpu/drm/drm_prime.c +++ b/drivers/gpu/drm/drm_prime.c @@ -807,6 +807,7 @@ struct sg_table *drm_prime_pages_to_sg(struct drm_devic= e *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_dev= ice *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 2.28.0 I assume that there may be more needed. --=20 Cheers, Stephen Rothwell --Sig_/6sFO0+9XXkLgtCyzVp9ZubH Content-Type: application/pgp-signature Content-Description: OpenPGP digital signature -----BEGIN PGP SIGNATURE----- iQEzBAEBCAAdFiEENIC96giZ81tWdLgKAVBC80lX0GwFAl98OkwACgkQAVBC80lX 0GzOCQf+PBJgkIRZDEm5TYTOzNpFmT0Pl/eg915A/wCde0kLoswfxghraZDnlMwp AAU+CjSrdnnvYLX+AbU7+Vo281UYkyNaWhpv4DV/UZwO7xhog2EkOvZQoYuJRWdv fvcMIWyZ+Dyz61RmpluVOEmKapF8qRASCBlWwJc3YwQFrfiRk4Re/TDufFtlK9TE rTYmN7ZYW21kVHXyBRX69KhbMl2a4jTyReBFUEOB+BYytYB8CSQqEOrd1Gjs3BoB 79gG0uh2rQhJ/ajjg+EGQBTF/YwjlB1Vqmy5gpc8q1IWZVBiWE8m6fdXUtccXSqX /GUbtuKVBF/MzdmMsdppRZHDIwywCw== =8ADh -----END PGP SIGNATURE----- --Sig_/6sFO0+9XXkLgtCyzVp9ZubH--