From mboxrd@z Thu Jan 1 00:00:00 1970 Delivery-date: Mon, 09 Mar 2026 08:22:39 +0100 Received: from metis.whiteo.stw.pengutronix.de ([2a0a:edc0:2:b01:1d::104]) by lore.white.stw.pengutronix.de with esmtps (TLS1.3) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.96) (envelope-from ) id 1vzUwo-009fYc-36 for lore@lore.pengutronix.de; Mon, 09 Mar 2026 08:22:39 +0100 Received: from [127.0.0.1] (helo=metis.whiteo.stw.pengutronix.de) by metis.whiteo.stw.pengutronix.de with esmtp (Exim 4.92) (envelope-from ) id 1vzUwp-0002XY-Jq; Mon, 09 Mar 2026 08:22:39 +0100 Received: from drehscheibe.grey.stw.pengutronix.de ([2a0a:edc0:0:c01:1d::a2]) by metis.whiteo.stw.pengutronix.de with esmtps (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1vzUwW-00029L-JN; Mon, 09 Mar 2026 08:22:20 +0100 Received: from dude05.red.stw.pengutronix.de ([2a0a:edc0:0:1101:1d::54]) by drehscheibe.grey.stw.pengutronix.de with esmtps (TLS1.3) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.96) (envelope-from ) id 1vzUwU-004UbO-2x; Mon, 09 Mar 2026 08:22:20 +0100 Received: from mol by dude05.red.stw.pengutronix.de with local (Exim 4.98.2) (envelope-from ) id 1vzUwW-0000000H9Ty-0tK9; Mon, 09 Mar 2026 08:22:20 +0100 From: Michael Olbrich To: ptxdist@pengutronix.de Date: Mon, 9 Mar 2026 08:22:20 +0100 Message-ID: <20260309072220.4088019-1-m.olbrich@pengutronix.de> X-Mailer: git-send-email 2.47.3 In-Reply-To: References: MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Subject: Re: [ptxdist] [APPLIED] cryptodev: fix compilation with Linux-6.18-rc1 X-BeenThere: ptxdist@pengutronix.de X-Mailman-Version: 2.1.29 Precedence: list List-Id: PTXdist Development Mailing List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: ptxdist@pengutronix.de Cc: Ladislav Michl Sender: "ptxdist" X-SA-Exim-Connect-IP: 127.0.0.1 X-SA-Exim-Mail-From: ptxdist-bounces@pengutronix.de X-SA-Exim-Scanned: No (on metis.whiteo.stw.pengutronix.de); SAEximRunCond expanded to false Thanks, applied as c7808071d1d7eee8f4fd11539e81ff45d24c9801. Michael [sent from post-receive hook] On Mon, 09 Mar 2026 08:22:20 +0100, Ladislav Michl wrote: > Signed-off-by: Ladislav Michl > Message-Id: > Signed-off-by: Michael Olbrich > > diff --git a/patches/cryptodev-linux-1.14/0004-Fix-build-for-Linux-6.18-rc1.patch b/patches/cryptodev-linux-1.14/0004-Fix-build-for-Linux-6.18-rc1.patch > new file mode 100644 > index 000000000000..879f755e585e > --- /dev/null > +++ b/patches/cryptodev-linux-1.14/0004-Fix-build-for-Linux-6.18-rc1.patch > @@ -0,0 +1,50 @@ > +From: =?UTF-8?q?Joan=20Bruguera=20Mic=C3=B3?= > +Date: Sat, 6 Sep 2025 20:36:38 +0000 > +Subject: [PATCH] Fix build for Linux 6.18-rc1 > +MIME-Version: 1.0 > +Content-Type: text/plain; charset=UTF-8 > +Content-Transfer-Encoding: 8bit > + > +It's no longer required to use nth_page() when iterating pages within a > +single scatterlist entry. > + > +Note I believe this code path in `sg_advance` is currently unreachable: > +It is only called from `get_userbuf_srtp`, passing in a scatterlist > +copied from one created by `__get_userbuf`, which only generates > +entries such that `sg->offset + sg->length <= PAGE_SIZE`. > +On the other hand, this code path in `sg_advance` requires that > +`sg->offset + sg->length > sg->offset + consumed >= PAGE_SIZE`. > + > +See also: https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=f8f03eb5f0f91fddc9bb8563c7e82bd7d3ba1dd0 > + https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=ce00897b94bc5c62fab962625efcf1ab824d3688 > + > +Signed-off-by: Joan Bruguera Micó > +--- > + util.c | 5 +++++ > + 1 file changed, 5 insertions(+) > + > +diff --git a/util.c b/util.c > +index 9eba4836ba6a..d42678169b2d 100644 > +--- a/util.c > ++++ b/util.c > +@@ -21,6 +21,7 @@ > + > + #include > + #include > ++#include > + #include "util.h" > + > + /* These were taken from Maxim Levitsky's patch to lkml. > +@@ -44,8 +45,12 @@ struct scatterlist *sg_advance(struct scatterlist *sg, int consumed) > + sg->length -= consumed; > + > + if (sg->offset >= PAGE_SIZE) { > ++#if (LINUX_VERSION_CODE >= KERNEL_VERSION(6, 18, 0)) > ++ struct page *page = sg_page(sg) + (sg->offset / PAGE_SIZE); > ++#else > + struct page *page = > + nth_page(sg_page(sg), sg->offset / PAGE_SIZE); > ++#endif > + sg_set_page(sg, page, sg->length, sg->offset % PAGE_SIZE); > + } > + > diff --git a/patches/cryptodev-linux-1.14/series b/patches/cryptodev-linux-1.14/series > index 12704929ba01..d832ab663f39 100644 > --- a/patches/cryptodev-linux-1.14/series > +++ b/patches/cryptodev-linux-1.14/series > @@ -3,4 +3,5 @@ > 0001-Fix-cryptodev_verbosity-sysctl-for-Linux-6.11-rc1.patch > 0002-Exclude-unused-struct-since-Linux-6.5.patch > 0003-Fix-uninitialized-session-pointers.patch > -# b25ab355176e0ac9ad9433b6a050c0e4 - git-ptx-patches magic > +0004-Fix-build-for-Linux-6.18-rc1.patch > +# 3025afd546f1ec2e0afecd54c87e23d2 - git-ptx-patches magic