Date: Fri, 10 Jul 2020 11:27:55 +0000 (UTC) From: Hans Petter Selasky <hselasky@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r363077 - in head/sys: compat/linuxkpi/common/include/linux sys Message-ID: <202007101127.06ABRtZu086788@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: hselasky Date: Fri Jul 10 11:27:54 2020 New Revision: 363077 URL: https://svnweb.freebsd.org/changeset/base/363077 Log: Implement the array_size() function in the LinuxKPI. This function basically multiplies its two arguments and returns SIZE_MAX if the result overflows the size_t type. Else the product of the two arguments is returned. Bump the FreeBSD_version to mitigate issues with existing implementation of array_size() in drm-devel-kmod. Discussed with: manu@ MFC after: 1 week Sponsored by: Mellanox Technologies Modified: head/sys/compat/linuxkpi/common/include/linux/overflow.h head/sys/sys/param.h Modified: head/sys/compat/linuxkpi/common/include/linux/overflow.h ============================================================================== --- head/sys/compat/linuxkpi/common/include/linux/overflow.h Fri Jul 10 11:15:10 2020 (r363076) +++ head/sys/compat/linuxkpi/common/include/linux/overflow.h Fri Jul 10 11:27:54 2020 (r363077) @@ -31,6 +31,9 @@ #ifndef __LINUX_OVERFLOW_H__ #define __LINUX_OVERFLOW_H__ +#include <sys/stdint.h> +#include <sys/types.h> + #ifndef __has_builtin #define __has_builtin(x) 0 #endif @@ -45,6 +48,16 @@ #if __has_builtin(__builtin_mul_overflow) #define check_mul_overflow(a, b, c) \ __builtin_mul_overflow(a, b, c) + +static inline size_t +array_size(size_t x, size_t y) +{ + size_t retval; + + if (__builtin_mul_overflow(x, y, &retval)) + retval = SIZE_MAX; + return (retval); +} #else #error "Compiler does not support __builtin_mul_overflow" #endif Modified: head/sys/sys/param.h ============================================================================== --- head/sys/sys/param.h Fri Jul 10 11:15:10 2020 (r363076) +++ head/sys/sys/param.h Fri Jul 10 11:27:54 2020 (r363077) @@ -60,7 +60,7 @@ * in the range 5 to 9. */ #undef __FreeBSD_version -#define __FreeBSD_version 1300100 /* Master, propagated to newvers */ +#define __FreeBSD_version 1300101 /* Master, propagated to newvers */ /* * __FreeBSD_kernel__ indicates that this system uses the kernel of FreeBSD,
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202007101127.06ABRtZu086788>