From: Xiu Jianfeng <xiujianfeng@huawei.com>
To: <akpm@linux-foundation.org>, <keescook@chromium.org>,
<laniel_francis@privacyrequired.com>,
<andriy.shevchenko@linux.intel.com>, <adobriyan@gmail.com>,
<linux@roeck-us.net>, <andreyknvl@gmail.com>, <dja@axtens.net>,
<ast@kernel.org>, <daniel@iogearbox.net>, <andrii@kernel.org>,
<kafai@fb.com>, <songliubraving@fb.com>, <yhs@fb.com>,
<john.fastabend@gmail.com>, <kpsingh@kernel.org>
Cc: <linux-kernel@vger.kernel.org>, <netdev@vger.kernel.org>,
<bpf@vger.kernel.org>
Subject: [PATCH -next 1/2] string.h: Introduce memset_range() for wiping members
Date: Wed, 8 Dec 2021 11:04:50 +0800 [thread overview]
Message-ID: <20211208030451.219751-2-xiujianfeng@huawei.com> (raw)
In-Reply-To: <20211208030451.219751-1-xiujianfeng@huawei.com>
Motivated by memset_after() and memset_startat(), introduce a new helper,
memset_range() that takes the target struct instance, the byte to write,
and two member names where zeroing should start and end.
Signed-off-by: Xiu Jianfeng <xiujianfeng@huawei.com>
---
include/linux/string.h | 20 ++++++++++++++++++++
lib/memcpy_kunit.c | 12 ++++++++++++
2 files changed, 32 insertions(+)
diff --git a/include/linux/string.h b/include/linux/string.h
index b6572aeca2f5..7f19863253f2 100644
--- a/include/linux/string.h
+++ b/include/linux/string.h
@@ -291,6 +291,26 @@ void memcpy_and_pad(void *dest, size_t dest_len, const void *src, size_t count,
sizeof(*(obj)) - offsetof(typeof(*(obj)), member)); \
})
+/**
+ * memset_range - Set a value ranging from member1 to member2, boundary included.
+ *
+ * @obj: Address of target struct instance
+ * @v: Byte value to repeatedly write
+ * @member1: struct member to start writing at
+ * @member2: struct member where writing should stop
+ *
+ */
+#define memset_range(obj, v, member_1, member_2) \
+({ \
+ u8 *__ptr = (u8 *)(obj); \
+ typeof(v) __val = (v); \
+ BUILD_BUG_ON(offsetof(typeof(*(obj)), member_1) > \
+ offsetof(typeof(*(obj)), member_2)); \
+ memset(__ptr + offsetof(typeof(*(obj)), member_1), __val, \
+ offsetofend(typeof(*(obj)), member_2) - \
+ offsetof(typeof(*(obj)), member_1)); \
+})
+
/**
* str_has_prefix - Test if a string has a given prefix
* @str: The string to test
diff --git a/lib/memcpy_kunit.c b/lib/memcpy_kunit.c
index 62f8ffcbbaa3..0dd800412455 100644
--- a/lib/memcpy_kunit.c
+++ b/lib/memcpy_kunit.c
@@ -229,6 +229,13 @@ static void memset_test(struct kunit *test)
0x79, 0x79, 0x79, 0x79, 0x79, 0x79, 0x79, 0x79,
},
};
+ struct some_bytes range = {
+ .data = { 0x30, 0x30, 0x30, 0x30, 0x81, 0x81, 0x81, 0x30,
+ 0x30, 0x30, 0x30, 0x30, 0x30, 0x30, 0x30, 0x30,
+ 0x30, 0x30, 0x30, 0x30, 0x30, 0x30, 0x30, 0x30,
+ 0x30, 0x30, 0x30, 0x30, 0x30, 0x30, 0x30, 0x30,
+ },
+ };
struct some_bytes dest = { };
int count, value;
u8 *ptr;
@@ -269,6 +276,11 @@ static void memset_test(struct kunit *test)
dest = control;
memset_startat(&dest, 0x79, four);
compare("memset_startat()", dest, startat);
+
+ /* Verify memset_range() */
+ dest = control;
+ memset_range(&dest, 0x81, two, three);
+ compare("memset_range()", dest, range);
#undef TEST_OP
}
--
2.17.1
next prev parent reply other threads:[~2021-12-08 3:04 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-12-08 3:04 [PATCH -next 0/2] Introduce memset_range() helper for wiping members Xiu Jianfeng
2021-12-08 3:04 ` Xiu Jianfeng [this message]
2021-12-08 4:28 ` [PATCH -next 1/2] string.h: Introduce memset_range() " Andrew Morton
2021-12-08 10:30 ` xiujianfeng
2021-12-08 23:44 ` Andrew Morton
2021-12-09 5:17 ` Kees Cook
2021-12-09 6:29 ` xiujianfeng
2021-12-09 6:29 ` xiujianfeng
2021-12-08 17:12 ` Alexey Dobriyan
2021-12-08 3:04 ` [PATCH -next 2/2] bpf: use memset_range helper in __mark_reg_known Xiu Jianfeng
2021-12-08 5:27 ` [PATCH -next 0/2] Introduce memset_range() helper for wiping members Kees Cook
2021-12-08 10:30 ` xiujianfeng
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=20211208030451.219751-2-xiujianfeng@huawei.com \
--to=xiujianfeng@huawei.com \
--cc=adobriyan@gmail.com \
--cc=akpm@linux-foundation.org \
--cc=andreyknvl@gmail.com \
--cc=andrii@kernel.org \
--cc=andriy.shevchenko@linux.intel.com \
--cc=ast@kernel.org \
--cc=bpf@vger.kernel.org \
--cc=daniel@iogearbox.net \
--cc=dja@axtens.net \
--cc=john.fastabend@gmail.com \
--cc=kafai@fb.com \
--cc=keescook@chromium.org \
--cc=kpsingh@kernel.org \
--cc=laniel_francis@privacyrequired.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux@roeck-us.net \
--cc=netdev@vger.kernel.org \
--cc=songliubraving@fb.com \
--cc=yhs@fb.com \
/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
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
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).