From nobody Thu Feb 16 11:56:31 2023 X-Original-To: dev-commits-src-branches@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 4PHYM42YtWz3q5b2; Thu, 16 Feb 2023 11:56:32 +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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4PHYM36ngrz4BFY; Thu, 16 Feb 2023 11:56:31 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1676548592; 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=g4enAOA1NFegUZVC86+LeKlnFEQlKozW0JoyuiOTGy4=; b=XEWwLipUtO4SA2fdHYGNAFCvzqCFrV0tKLw9ORJGjbUqYkSmpUcZQD30NN0VU9ak6ZQZHy HbKMltH4xW6CCzI4E0BQ8MXThF5TUNGivh9Vosgp4xzdPZLwJBXpQf+9y2Kyhxw8XmdI1V WosB83HpiDuFpYGzvXTXU1WIbF11sBpYf/Y2bLA4s6u9fYnViCYidndrte1MLrIlXRV5mb SQNnlbRFwtON05mu65QsV5V/0VLRtmNdBFJ/I3XuH+U1slK4enD+vJMwqQBP7yvLFR1UEC F2PQBOZxXHxDF7NY7yygNqnDQY5swYyIJzP28rQ1vcfFSfuKm4AHojuTBs39ug== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1676548592; 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=g4enAOA1NFegUZVC86+LeKlnFEQlKozW0JoyuiOTGy4=; b=pJWNe2NrBFeMp41jtW56+Ge1aeXd9YBpCccyE+PlruorKX2yyljT7bio+THZasCCzzxon9 RsLgFIgwivnypn79nV/Jo8VT2ulRIpgl+nFfJlkQKdSlU2fK01tCQEqCsz3Ut4BkaWQLpN sHR26TKYfAqyJiVHArGdCTnTJr9XjJKyUH50BFThNb+nDT52HHijm31VN/fwpZYjPGhpdS uNvtPQuvf0i0S51ufxcVA8+MQ6IFu1GfJ+ljl4HK7HRoLI1FhabvmT8g8YueX/S6sC43N7 Tn35VBse9cZ94cBFc3KN3Fw3O7P7pD2zynPpyEoM2tsU0UofJoN/Ls7nn1cFtA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1676548592; a=rsa-sha256; cv=none; b=bGpzWYKpFd0aGUEp5ipx/qNVzCkHHyv4UhHLylxapFwZPsw5HGyTD1wECx++Cbx2PwyDVS QFOd8pYyLIdJzzsmdFHjeY6m0QBq1sr53IIajj3EMUUwQ+0MjuN8DmaRa9+63v2MOfwufv FFYIvftgssrFXrFsnFDW0ePR6FoU1HYPzH7z2rbRQFLcwz+MJr7X9H73PYItGP/eJcw/Lk XIzEUaSDv4rTdwfaqCaP0qHRlSUCLXh+jEidQVcsEUzMSi4OFaoeiQRNKzKBH3myMYjfhK mo7ByJjcLU2RQMJmxbABAXJkNy4zJY6hBESNX7i0Q0dU78QCVlhbH64APkk7KQ== 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 4PHYM35lq1z1355; Thu, 16 Feb 2023 11:56:31 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 31GBuVto056303; Thu, 16 Feb 2023 11:56:31 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 31GBuVTt056302; Thu, 16 Feb 2023 11:56:31 GMT (envelope-from git) Date: Thu, 16 Feb 2023 11:56:31 GMT Message-Id: <202302161156.31GBuVTt056302@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: =?utf-8?Q?Jean-S=C3=A9bastien=20P=C3=A9dron?= Subject: git: 1d5100d9be2d - stable/13 - linuxkpi: Add `sg_alloc_table_from_pages_segment()` List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: dumbbell X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 1d5100d9be2d97d2c74fe15f29a7a42cbada144b Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by dumbbell (ports committer): URL: https://cgit.FreeBSD.org/src/commit/?id=1d5100d9be2d97d2c74fe15f29a7a42cbada144b commit 1d5100d9be2d97d2c74fe15f29a7a42cbada144b Author: Jean-Sébastien Pédron AuthorDate: 2023-02-10 15:37:31 +0000 Commit: Jean-Sébastien Pédron CommitDate: 2023-02-16 11:55:20 +0000 linuxkpi: Add `sg_alloc_table_from_pages_segment()` Reviewed by: manu Approved by: manu Differential Revision: https://reviews.freebsd.org/D38541 (cherry picked from commit f3490083b731700f2aa7c17ac6fe159826dc59a5) --- sys/compat/linuxkpi/common/include/linux/scatterlist.h | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/sys/compat/linuxkpi/common/include/linux/scatterlist.h b/sys/compat/linuxkpi/common/include/linux/scatterlist.h index d1a71258c27d..fe4bce06819d 100644 --- a/sys/compat/linuxkpi/common/include/linux/scatterlist.h +++ b/sys/compat/linuxkpi/common/include/linux/scatterlist.h @@ -427,6 +427,20 @@ sg_alloc_table_from_pages(struct sg_table *sgt, #endif } +static inline int +sg_alloc_table_from_pages_segment(struct sg_table *sgt, + struct page **pages, unsigned int count, unsigned int off, + unsigned long size, unsigned int max_segment, gfp_t gfp_mask) +{ +#if defined(LINUXKPI_VERSION) && LINUXKPI_VERSION >= 51300 + return (PTR_ERR_OR_ZERO(__sg_alloc_table_from_pages(sgt, pages, count, off, size, + max_segment, NULL, 0, gfp_mask))); +#else + return (__sg_alloc_table_from_pages(sgt, pages, count, off, size, + max_segment, gfp_mask)); +#endif +} + static inline int sg_nents(struct scatterlist *sg) {