From: Nick Desaulniers <ndesaulniers@google.com>
To: "David S . Miller" <davem@davemloft.net>
Cc: Alexei Starovoitov <ast@kernel.org>,
Daniel Borkmann <daniel@iogearbox.net>,
Martin KaFai Lau <kafai@fb.com>, Song Liu <songliubraving@fb.com>,
Yonghong Song <yhs@fb.com>, Andrii Nakryiko <andriin@fb.com>,
John Fastabend <john.fastabend@gmail.com>,
KP Singh <kpsingh@chromium.org>,
oss-drivers@netronome.com, netdev@vger.kernel.org,
linux-kernel@vger.kernel.org, Jakub Kicinski <kuba@kernel.org>,
Alex Elder <elder@linaro.org>,
Nick Desaulniers <ndesaulniers@google.com>
Subject: [PATCH v2 2/2] bitfield.h: split up __BF_FIELD_CHECK macro
Date: Wed, 8 Jul 2020 16:04:02 -0700 [thread overview]
Message-ID: <20200708230402.1644819-3-ndesaulniers@google.com> (raw)
In-Reply-To: <20200708230402.1644819-1-ndesaulniers@google.com>
This macro has a few expansion sites that pass literal 0s as parameters.
Split these up so that we do the precise checks where we care about
them.
Suggested-by: Alex Elder <elder@linaro.org>
Signed-off-by: Nick Desaulniers <ndesaulniers@google.com>
---
Changes V1-V2:
* New patch in v2.
* Rebased on 0001.
.../netronome/nfp/nfpcore/nfp_nsp_eth.c | 11 ++++----
include/linux/bitfield.h | 26 +++++++++++++------
2 files changed, 24 insertions(+), 13 deletions(-)
diff --git a/drivers/net/ethernet/netronome/nfp/nfpcore/nfp_nsp_eth.c b/drivers/net/ethernet/netronome/nfp/nfpcore/nfp_nsp_eth.c
index 311a5be25acb..938fc733fccb 100644
--- a/drivers/net/ethernet/netronome/nfp/nfpcore/nfp_nsp_eth.c
+++ b/drivers/net/ethernet/netronome/nfp/nfpcore/nfp_nsp_eth.c
@@ -492,11 +492,12 @@ nfp_eth_set_bit_config(struct nfp_nsp *nsp, unsigned int raw_idx,
return 0;
}
-#define NFP_ETH_SET_BIT_CONFIG(nsp, raw_idx, mask, val, ctrl_bit) \
- ({ \
- __BF_FIELD_CHECK(mask, 0ULL, val, "NFP_ETH_SET_BIT_CONFIG: "); \
- nfp_eth_set_bit_config(nsp, raw_idx, mask, __bf_shf(mask), \
- val, ctrl_bit); \
+#define NFP_ETH_SET_BIT_CONFIG(nsp, raw_idx, mask, val, ctrl_bit) \
+ ({ \
+ __BF_FIELD_CHECK_MASK(mask, "NFP_ETH_SET_BIT_CONFIG: "); \
+ __BF_FIELD_CHECK_VAL(mask, val, "NFP_ETH_SET_BIT_CONFIG: "); \
+ nfp_eth_set_bit_config(nsp, raw_idx, mask, __bf_shf(mask), \
+ val, ctrl_bit); \
})
/**
diff --git a/include/linux/bitfield.h b/include/linux/bitfield.h
index 4e035aca6f7e..79651867beb3 100644
--- a/include/linux/bitfield.h
+++ b/include/linux/bitfield.h
@@ -41,18 +41,26 @@
#define __bf_shf(x) (__builtin_ffsll(x) - 1)
-#define __BF_FIELD_CHECK(_mask, _reg, _val, _pfx) \
+#define __BF_FIELD_CHECK_MASK(_mask, _pfx) \
({ \
BUILD_BUG_ON_MSG(!__builtin_constant_p(_mask), \
_pfx "mask is not constant"); \
BUILD_BUG_ON_MSG((_mask) == 0, _pfx "mask is zero"); \
+ __BUILD_BUG_ON_NOT_POWER_OF_2((_mask) + \
+ (1ULL << __bf_shf(_mask))); \
+ })
+
+#define __BF_FIELD_CHECK_VAL(_mask, _val, _pfx) \
+ ({ \
BUILD_BUG_ON_MSG(__builtin_constant_p(_val) ? \
~((_mask) >> __bf_shf(_mask)) & (_val) : 0, \
_pfx "value too large for the field"); \
- BUILD_BUG_ON_MSG((_mask) > (typeof(_reg))~0ull, \
+ })
+
+#define __BF_FIELD_CHECK_REG(_mask, _reg, _pfx) \
+ ({ \
+ BUILD_BUG_ON_MSG((_mask) > (typeof(_reg))~0ULL, \
_pfx "type of reg too small for mask"); \
- __BUILD_BUG_ON_NOT_POWER_OF_2((_mask) + \
- (1ULL << __bf_shf(_mask))); \
})
/**
@@ -64,7 +72,7 @@
*/
#define FIELD_MAX(_mask) \
({ \
- __BF_FIELD_CHECK(_mask, 0ULL, 0ULL, "FIELD_MAX: "); \
+ __BF_FIELD_CHECK_MASK(_mask, "FIELD_MAX: "); \
(typeof(_mask))((_mask) >> __bf_shf(_mask)); \
})
@@ -77,7 +85,7 @@
*/
#define FIELD_FIT(_mask, _val) \
({ \
- __BF_FIELD_CHECK(_mask, 0ULL, 0ULL, "FIELD_FIT: "); \
+ __BF_FIELD_CHECK_MASK(_mask, "FIELD_FIT: "); \
!((((typeof(_mask))_val) << __bf_shf(_mask)) & ~(_mask)); \
})
@@ -91,7 +99,8 @@
*/
#define FIELD_PREP(_mask, _val) \
({ \
- __BF_FIELD_CHECK(_mask, 0ULL, _val, "FIELD_PREP: "); \
+ __BF_FIELD_CHECK_MASK(_mask, "FIELD_PREP: "); \
+ __BF_FIELD_CHECK_VAL(_mask, _val, "FIELD_PREP: "); \
((typeof(_mask))(_val) << __bf_shf(_mask)) & (_mask); \
})
@@ -105,7 +114,8 @@
*/
#define FIELD_GET(_mask, _reg) \
({ \
- __BF_FIELD_CHECK(_mask, _reg, 0U, "FIELD_GET: "); \
+ __BF_FIELD_CHECK_MASK(_mask, "FIELD_GET: "); \
+ __BF_FIELD_CHECK_REG(_mask, _reg, "FIELD_GET: "); \
(typeof(_mask))(((_reg) & (_mask)) >> __bf_shf(_mask)); \
})
--
2.27.0.383.g050319c2ae-goog
next prev parent reply other threads:[~2020-07-08 23:04 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-07-08 23:04 [PATCH v2 0/2 net] bitfield.h cleanups Nick Desaulniers
2020-07-08 23:04 ` [PATCH v2 1/2 net] bitfield.h: don't compile-time validate _val in FIELD_FIT Nick Desaulniers
2020-07-09 1:48 ` Alex Elder
2020-07-08 23:04 ` Nick Desaulniers [this message]
2020-07-09 2:11 ` [PATCH v2 2/2] bitfield.h: split up __BF_FIELD_CHECK macro Alex Elder
2020-07-09 2:11 ` Alex Elder
2020-07-14 18:23 ` [PATCH v2 0/2 net] bitfield.h cleanups Nick Desaulniers
2020-07-20 19:48 ` Nick Desaulniers
2020-07-20 23:34 ` David Miller
2020-07-30 22:37 ` Nick Desaulniers
2020-08-05 17:44 ` Nick Desaulniers
2020-08-06 18:13 ` Jakub Kicinski
2020-08-06 18:15 ` Jakub Kicinski
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20200708230402.1644819-3-ndesaulniers@google.com \
--to=ndesaulniers@google.com \
--cc=andriin@fb.com \
--cc=ast@kernel.org \
--cc=daniel@iogearbox.net \
--cc=davem@davemloft.net \
--cc=elder@linaro.org \
--cc=john.fastabend@gmail.com \
--cc=kafai@fb.com \
--cc=kpsingh@chromium.org \
--cc=kuba@kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=netdev@vger.kernel.org \
--cc=oss-drivers@netronome.com \
--cc=songliubraving@fb.com \
--cc=yhs@fb.com \
--subject='Re: [PATCH v2 2/2] bitfield.h: split up __BF_FIELD_CHECK macro' \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).