From nobody Wed Apr 23 16:36:10 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4ZjPqv1vVVz5tbnp; Wed, 23 Apr 2025 16:36:11 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4ZjPqv09Mbz3Jdm; Wed, 23 Apr 2025 16:36:11 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1745426171; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=wN0HMDnb3AXJGUtKnIsD3M/h3w7m6gBns4gcxjL4/34=; b=NxRcatKc+6O6Uo3byzDOqSKrlo+IDPaTl0m7KJx65gKZoJ/WEUtalwoDMQsZz8ZyYcis6A V3nkLvUIMeg1rQ2Fo7ynHn/Hnk4zHuKyqp3kdvzAwCZhAE817SGw+2WHguI5KC5zPW1Ah6 TLUmsemEquO7B1hxjuhB9XIVM066gDQunhTYglh+ND3ioAS6+GsDP2nZdSKb7zW9HZC9Kl rGtyIgskSHNiHOIG0ukApIxZTdZOmzj0KXeWn9kefWRmCPvJ3wCmxQ/yo3zc0LBxRjCPYg q+s4xMk2838zE5yj8ICFiiGUaExyPCM4EbVsz8fYiID1AHxyeSstZOmJ5v+Rmw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1745426171; a=rsa-sha256; cv=none; b=mXQQyCn4OX8NBhmNNDU7hB9DNqI1AJZqg6HBWlVKP+D5SFMPwromdRzkazAZFkkpjky07r xcGX5If6kz/lvDigNUq4CxdnSQQcsXiW9WovZb97YpWzGVrnr6e764Ipq6xipAXCeWZrlE m/VgHSOA/rtdpX8hDX8ueMoOv1q56P8/uM2DFaicrPEip7oDDiKVgnSKxc52bY2N27oO6+ dcgp6xM++KFf1PM61LCCX83/KGOk9ITc0WlAG3PGnywtqaRSposjX25rwTNlifSwwzrHrI pbWPMLn5TGFXxcDV2xXo3taAWQ0QFW7FC88LFEtzepM6iUubr05wuZFm7H2VJQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1745426171; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=wN0HMDnb3AXJGUtKnIsD3M/h3w7m6gBns4gcxjL4/34=; b=nmHNasyW06Uz2khZzU4tuvycC2ZlUrBZHlepJ5yFhAtU0RqMY68AaAU2YgYJ7ztEaJqHqr 74p4EQwVsOYo1OKQY50TG1ffFZdNHqTmFqED4DSjMBc2xsRzyJja8Hue9MwQEsz4tJC4Y9 j0Hx+9DIDFbAKziIMrTa+xIA5MY31LTqz+tE/aZeDEWbZ0GtNi0sbMHHgAPiXDlM2Ypttg n98P7MGS4wgY5pyBsk7wixMcA5oyfAsaZVT2+QaAXCLlko/SSMsosF+zWPKf4ObsFpTRqL syZvN3b2xkEmqLKV7v8PKY0epwIVO4PECPAVcAuhmOk527N88TiKs20Rfqq2Hw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4ZjPqt6qQXz1BFT; Wed, 23 Apr 2025 16:36:10 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 53NGaANP001229; Wed, 23 Apr 2025 16:36:10 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 53NGaANs001226; Wed, 23 Apr 2025 16:36:10 GMT (envelope-from git) Date: Wed, 23 Apr 2025 16:36:10 GMT Message-Id: <202504231636.53NGaANs001226@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: "Bjoern A. Zeeb" Subject: git: cd649cfc7ab2 - main - LinuxKPI: skbuff: re-add __LP64__ check List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bz X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: cd649cfc7ab23a8a36218977c60ed20afe48aea9 Auto-Submitted: auto-generated The branch main has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=cd649cfc7ab23a8a36218977c60ed20afe48aea9 commit cd649cfc7ab23a8a36218977c60ed20afe48aea9 Author: Bjoern A. Zeeb AuthorDate: 2025-04-23 16:31:04 +0000 Commit: Bjoern A. Zeeb CommitDate: 2025-04-23 16:31:04 +0000 LinuxKPI: skbuff: re-add __LP64__ check Re-add one __LP64__ check for case 2 (36bit upper limit to contigmalloc) to fix the build. contigmalloc(9) takes a vm_paddr_t argument but on armv7 and some powerpc we are still at 32bit there so the constant value would be changed from long long to uint (-Wconstant-conversion). Sponsored by: The FreeBSD Foundation MFC after: 3 days Reported by: CI Fixes: e6c91f8e5be66 --- sys/compat/linuxkpi/common/src/linux_skbuff.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/sys/compat/linuxkpi/common/src/linux_skbuff.c b/sys/compat/linuxkpi/common/src/linux_skbuff.c index 2fea4d69b844..abfb642ba708 100644 --- a/sys/compat/linuxkpi/common/src/linux_skbuff.c +++ b/sys/compat/linuxkpi/common/src/linux_skbuff.c @@ -116,9 +116,11 @@ linuxkpi_alloc_skb(size_t size, gfp_t gfp) vm_paddr_t high; switch (linuxkpi_skb_memlimit) { +#ifdef __LP64__ case 2: high = (0xfffffffff); /* 1<<36 really. */ break; +#endif case 1: default: high = (0xffffffff); /* 1<<32 really. */