Paths

Table of Contentst

-
lib/libc/gen/
-
libc/
-
gen/
1
getpagesizes.c

getpagesizes(3): drop support for kernels before 9.0
ClosedPublic
Actions

Authored by brooks on Nov 22 2023, 1:08 AM.

Details

Reviewers

imp
emaste
kevans

Commits

rGdf65c89375e2: getpagesizes(3): drop support for kernels before 9.0

Summary

AT_PAGESIZES and elf_aux_info where added prior to FreeBSD 9.0 in commit
ee235befcb8253fab9beea27b916f1bc46b33147. It's safe to say that a
FreeBSD 15 libc won't work on a 8.x kernel so drop sysctl fallback.

Diff Detail

Repository

rG FreeBSD src repository

Lint

Lint Passed

Unit

No Test Coverage

Build Status

Buildable 54578
Build 51467: arc lint + arc unit

Event Timeline

brooks requested review of this revision.Nov 22 2023, 1:08 AM

brooks created this revision.

Harbormaster completed remote builds in B54555: Diff 130410.Nov 22 2023, 1:08 AM

brooks added a child revision: D42708: getpagesize(3): drop support for non-ELF kernels.Nov 22 2023, 1:08 AM

emaste accepted this revision.Nov 22 2023, 1:21 AM

emaste added inline comments.

lib/libc/gen/getpagesizes.c
59–61	LGTM, but maybe drop error altogether and just `if (_elf_aux_info(AT_PAGESIZES, ps, sizeof(ps) != 0)`?

This revision is now accepted and ready to land.Nov 22 2023, 1:21 AM

imp accepted this revision.Nov 22 2023, 1:46 AM

kevans accepted this revision.Nov 22 2023, 5:43 AM

Remove error variable
On error, fall back to PAGE_SIZE

This revision now requires review to proceed.Nov 22 2023, 8:31 PM

Harbormaster completed remote builds in B54578: Diff 130444.Nov 22 2023, 8:31 PM

emaste accepted this revision.Nov 22 2023, 10:15 PM

This revision is now accepted and ready to land.Nov 22 2023, 10:15 PM

Closed by commit rGdf65c89375e2: getpagesizes(3): drop support for kernels before 9.0 (authored by brooks). · Explain WhyNov 28 2023, 5:16 PM

This revision was automatically updated to reflect the committed changes.

brooks added a commit: rGdf65c89375e2: getpagesizes(3): drop support for kernels before 9.0.

Revision Contents
Changeset List

Path

Size

lib/

libc/

gen/

getpagesizes.c

23 lines

Diff 130444

View Options

lib/libc/gen/getpagesizes.c

	Show All 21 Lines
	* OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)			* OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
	* HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT			* HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
	* LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY			* LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
	* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF			* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
	* SUCH DAMAGE.			* SUCH DAMAGE.
	*/			*/

	#include <sys/param.h>			#include <sys/param.h>
	#include <sys/mman.h>			#include <sys/auxv.h>
	#include <sys/sysctl.h>			#include <sys/errno.h>

	#include <errno.h>
	#include <link.h>

	#include "libc_private.h"			#include "libc_private.h"

	/*			/*
	* Retrieves page size information from the system. Specifically, returns the			* Retrieves page size information from the system. Specifically, returns the
	* number of distinct page sizes that are supported by the system, if			* number of distinct page sizes that are supported by the system, if
	* "pagesize" is NULL and "nelem" is 0. Otherwise, assigns up to "nelem" of			* "pagesize" is NULL and "nelem" is 0. Otherwise, assigns up to "nelem" of
	* the system-supported page sizes to consecutive elements of the array			* the system-supported page sizes to consecutive elements of the array
	* referenced by "pagesize", and returns the number of such page sizes that it			* referenced by "pagesize", and returns the number of such page sizes that it
	* assigned to the array. These page sizes are expressed in bytes.			* assigned to the array. These page sizes are expressed in bytes.
	*			*
	* The implementation of this function does not directly or indirectly call			* The implementation of this function does not directly or indirectly call
	* malloc(3) or any other dynamic memory allocator that may itself call this			* malloc(3) or any other dynamic memory allocator that may itself call this
	* function.			* function.
	*/			*/
	int			int
	getpagesizes(size_t pagesize[], int nelem)			getpagesizes(size_t pagesize[], int nelem)
	{			{
	static u_long ps[MAXPAGESIZES];			static u_long ps[MAXPAGESIZES];
	static int nops;			static int nops;
	size_t size;			int i;
	int error, i;

	if (nelem < 0 \|\| (nelem > 0 && pagesize == NULL)) {			if (nelem < 0 \|\| (nelem > 0 && pagesize == NULL)) {
	errno = EINVAL;			errno = EINVAL;
	return (-1);			return (-1);
	}			}
	/* Cache the result of the sysctl(2). */			/* Cache the result */
	if (nops == 0) {			if (nops == 0) {
	error = _elf_aux_info(AT_PAGESIZES, ps, sizeof(ps));			if (_elf_aux_info(AT_PAGESIZES, ps, sizeof(ps)) != 0)
	size = sizeof(ps);			ps[0] = PAGE_SIZE;
				emasteUnsubmitted Not Done Inline Actions LGTM, but maybe drop error altogether and just `if (_elf_aux_info(AT_PAGESIZES, ps, sizeof(ps) != 0)`? emaste: LGTM, but maybe drop error altogether and just `if (_elf_aux_info(AT_PAGESIZES, ps, sizeof(ps) !
	if (error != 0 \|\| ps[0] == 0) {
	if (sysctlbyname("hw.pagesizes", ps, &size, NULL, 0)
	== -1)
	return (-1);
	}
	/* Count the number of page sizes that are supported. */			/* Count the number of page sizes that are supported. */
	nops = size / sizeof(ps[0]);			nops = nitems(ps);
	while (nops > 0 && ps[nops - 1] == 0)			while (nops > 0 && ps[nops - 1] == 0)
	nops--;			nops--;
	}			}
	if (pagesize == NULL)			if (pagesize == NULL)
	return (nops);			return (nops);
	/* Return up to "nelem" page sizes from the cached result. */			/* Return up to "nelem" page sizes from the cached result. */
	if (nelem > nops)			if (nelem > nops)
	nelem = nops;			nelem = nops;
	for (i = 0; i < nelem; i++)			for (i = 0; i < nelem; i++)
	pagesize[i] = ps[i];			pagesize[i] = ps[i];
	return (nelem);			return (nelem);
	}			}

getpagesizes(3): drop support for kernels before 9.0ClosedPublicActions