From: Jakub Kicinski <kuba@kernel.org>
To: Kees Cook <keescook@chromium.org>
Cc: linux-wireless@vger.kernel.org,
"Nick Desaulniers" <ndesaulniers@google.com>,
llvm@lists.linux.dev, dri-devel@lists.freedesktop.org,
linux-mm@kvack.org, "Eric Dumazet" <edumazet@google.com>,
linux-hardening@vger.kernel.org,
"Sumit Semwal" <sumit.semwal@linaro.org>,
dev@openvswitch.org, x86@kernel.org,
intel-wired-lan@lists.osuosl.org,
"David Rientjes" <rientjes@google.com>,
"Miguel Ojeda" <ojeda@kernel.org>, "Yonghong Song" <yhs@fb.com>,
"Paolo Abeni" <pabeni@redhat.com>,
linux-media@vger.kernel.org, "Marco Elver" <elver@google.com>,
"Josef Bacik" <josef@toxicpanda.com>,
linaro-mm-sig@lists.linaro.org, "David Sterba" <dsterba@suse.com>,
"Joonsoo Kim" <iamjoonsoo.kim@lge.com>,
"Vlastimil Babka" <vbabka@suse.cz>,
"Alex Elder" <elder@kernel.org>,
netdev@vger.kernel.org, "Jacob Shin" <jacob.shin@amd.com>,
linux-kernel@vger.kernel.org,
"David S. Miller" <davem@davemloft.net>,
"Pekka Enberg" <penberg@kernel.org>,
"Daniel Micay" <danielmicay@gmail.com>,
"Greg Kroah-Hartman" <gregkh@linuxfoundation.org>,
linux-fsdevel@vger.kernel.org,
"Andrew Morton" <akpm@linux-foundation.org>,
"Christian König" <christian.koenig@amd.com>,
linux-btrfs@vger.kernel.org
Subject: Re: [Intel-wired-lan] [PATCH 02/12] skbuff: Proactively round up to kmalloc bucket size
Date: Thu, 22 Sep 2022 12:40:39 -0700 [thread overview]
Message-ID: <20220922124039.688be0b8@kernel.org> (raw)
In-Reply-To: <20220922031013.2150682-3-keescook@chromium.org>
On Wed, 21 Sep 2022 20:10:03 -0700 Kees Cook wrote:
> diff --git a/net/core/skbuff.c b/net/core/skbuff.c
> index 974bbbbe7138..4fe4c7544c1d 100644
> --- a/net/core/skbuff.c
> +++ b/net/core/skbuff.c
> @@ -427,14 +427,15 @@ struct sk_buff *__alloc_skb(unsigned int size, gfp_t gfp_mask,
> */
> size = SKB_DATA_ALIGN(size);
> size += SKB_DATA_ALIGN(sizeof(struct skb_shared_info));
> - data = kmalloc_reserve(size, gfp_mask, node, &pfmemalloc);
> - if (unlikely(!data))
> - goto nodata;
> - /* kmalloc(size) might give us more room than requested.
> + /* kmalloc(size) might give us more room than requested, so
> + * allocate the true bucket size up front.
> * Put skb_shared_info exactly at the end of allocated zone,
> * to allow max possible filling before reallocation.
> */
> - osize = ksize(data);
> + osize = kmalloc_size_roundup(size);
> + data = kmalloc_reserve(osize, gfp_mask, node, &pfmemalloc);
> + if (unlikely(!data))
> + goto nodata;
> size = SKB_WITH_OVERHEAD(osize);
> prefetchw(data + size);
I'd rename osize here to alloc_size for consistency but one could
argue either way :)
Acked-by: Jakub Kicinski <kuba@kernel.org>
_______________________________________________
Intel-wired-lan mailing list
Intel-wired-lan@osuosl.org
https://lists.osuosl.org/mailman/listinfo/intel-wired-lan
WARNING: multiple messages have this Message-ID (diff)
From: Jakub Kicinski <kuba@kernel.org>
To: Kees Cook <keescook@chromium.org>
Cc: "Vlastimil Babka" <vbabka@suse.cz>,
"David S. Miller" <davem@davemloft.net>,
"Eric Dumazet" <edumazet@google.com>,
"Paolo Abeni" <pabeni@redhat.com>,
netdev@vger.kernel.org,
"Greg Kroah-Hartman" <gregkh@linuxfoundation.org>,
"Nick Desaulniers" <ndesaulniers@google.com>,
"David Rientjes" <rientjes@google.com>,
"Pekka Enberg" <penberg@kernel.org>,
"Joonsoo Kim" <iamjoonsoo.kim@lge.com>,
"Andrew Morton" <akpm@linux-foundation.org>,
"Alex Elder" <elder@kernel.org>,
"Josef Bacik" <josef@toxicpanda.com>,
"David Sterba" <dsterba@suse.com>,
"Sumit Semwal" <sumit.semwal@linaro.org>,
"Christian König" <christian.koenig@amd.com>,
"Jesse Brandeburg" <jesse.brandeburg@intel.com>,
"Daniel Micay" <danielmicay@gmail.com>,
"Yonghong Song" <yhs@fb.com>, "Marco Elver" <elver@google.com>,
"Miguel Ojeda" <ojeda@kernel.org>,
"Jacob Shin" <jacob.shin@amd.com>,
linux-kernel@vger.kernel.org, linux-mm@kvack.org,
linux-btrfs@vger.kernel.org, linux-media@vger.kernel.org,
dri-devel@lists.freedesktop.org, linaro-mm-sig@lists.linaro.org,
linux-fsdevel@vger.kernel.org, intel-wired-lan@lists.osuosl.org,
dev@openvswitch.org, x86@kernel.org,
linux-wireless@vger.kernel.org, llvm@lists.linux.dev,
linux-hardening@vger.kernel.org
Subject: Re: [PATCH 02/12] skbuff: Proactively round up to kmalloc bucket size
Date: Thu, 22 Sep 2022 12:40:39 -0700 [thread overview]
Message-ID: <20220922124039.688be0b8@kernel.org> (raw)
In-Reply-To: <20220922031013.2150682-3-keescook@chromium.org>
On Wed, 21 Sep 2022 20:10:03 -0700 Kees Cook wrote:
> diff --git a/net/core/skbuff.c b/net/core/skbuff.c
> index 974bbbbe7138..4fe4c7544c1d 100644
> --- a/net/core/skbuff.c
> +++ b/net/core/skbuff.c
> @@ -427,14 +427,15 @@ struct sk_buff *__alloc_skb(unsigned int size, gfp_t gfp_mask,
> */
> size = SKB_DATA_ALIGN(size);
> size += SKB_DATA_ALIGN(sizeof(struct skb_shared_info));
> - data = kmalloc_reserve(size, gfp_mask, node, &pfmemalloc);
> - if (unlikely(!data))
> - goto nodata;
> - /* kmalloc(size) might give us more room than requested.
> + /* kmalloc(size) might give us more room than requested, so
> + * allocate the true bucket size up front.
> * Put skb_shared_info exactly at the end of allocated zone,
> * to allow max possible filling before reallocation.
> */
> - osize = ksize(data);
> + osize = kmalloc_size_roundup(size);
> + data = kmalloc_reserve(osize, gfp_mask, node, &pfmemalloc);
> + if (unlikely(!data))
> + goto nodata;
> size = SKB_WITH_OVERHEAD(osize);
> prefetchw(data + size);
I'd rename osize here to alloc_size for consistency but one could
argue either way :)
Acked-by: Jakub Kicinski <kuba@kernel.org>
WARNING: multiple messages have this Message-ID (diff)
From: Jakub Kicinski <kuba@kernel.org>
To: Kees Cook <keescook@chromium.org>
Cc: linux-wireless@vger.kernel.org, "Jacob Shin" <jacob.shin@amd.com>,
llvm@lists.linux.dev, dri-devel@lists.freedesktop.org,
linux-mm@kvack.org, "Eric Dumazet" <edumazet@google.com>,
linux-hardening@vger.kernel.org,
"Sumit Semwal" <sumit.semwal@linaro.org>,
dev@openvswitch.org, x86@kernel.org,
"Jesse Brandeburg" <jesse.brandeburg@intel.com>,
intel-wired-lan@lists.osuosl.org,
"David Rientjes" <rientjes@google.com>,
"Miguel Ojeda" <ojeda@kernel.org>, "Yonghong Song" <yhs@fb.com>,
"Paolo Abeni" <pabeni@redhat.com>,
linux-media@vger.kernel.org, "Marco Elver" <elver@google.com>,
"Josef Bacik" <josef@toxicpanda.com>,
linaro-mm-sig@lists.linaro.org, "David Sterba" <dsterba@suse.com>,
"Joonsoo Kim" <iamjoonsoo.kim@lge.com>,
"Vlastimil Babka" <vbabka@suse.cz>,
"Alex Elder" <elder@kernel.org>,
netdev@vger.kernel.org,
"Nick Desaulniers" <ndesaulniers@google.com>,
linux-kernel@vger.kernel.org,
"David S. Miller" <davem@davemloft.net>,
"Pekka Enberg" <penberg@kernel.org>,
"Daniel Micay" <danielmicay@gmail.com>,
"Greg Kroah-Hartman" <gregkh@linuxfoundation.org>,
linux-fsdevel@vger.kernel.org,
"Andrew Morton" <akpm@linux-foundation.org>,
"Christian König" <christian.koenig@amd.com>,
linux-btrfs@vger.kernel.org
Subject: Re: [PATCH 02/12] skbuff: Proactively round up to kmalloc bucket size
Date: Thu, 22 Sep 2022 12:40:39 -0700 [thread overview]
Message-ID: <20220922124039.688be0b8@kernel.org> (raw)
In-Reply-To: <20220922031013.2150682-3-keescook@chromium.org>
On Wed, 21 Sep 2022 20:10:03 -0700 Kees Cook wrote:
> diff --git a/net/core/skbuff.c b/net/core/skbuff.c
> index 974bbbbe7138..4fe4c7544c1d 100644
> --- a/net/core/skbuff.c
> +++ b/net/core/skbuff.c
> @@ -427,14 +427,15 @@ struct sk_buff *__alloc_skb(unsigned int size, gfp_t gfp_mask,
> */
> size = SKB_DATA_ALIGN(size);
> size += SKB_DATA_ALIGN(sizeof(struct skb_shared_info));
> - data = kmalloc_reserve(size, gfp_mask, node, &pfmemalloc);
> - if (unlikely(!data))
> - goto nodata;
> - /* kmalloc(size) might give us more room than requested.
> + /* kmalloc(size) might give us more room than requested, so
> + * allocate the true bucket size up front.
> * Put skb_shared_info exactly at the end of allocated zone,
> * to allow max possible filling before reallocation.
> */
> - osize = ksize(data);
> + osize = kmalloc_size_roundup(size);
> + data = kmalloc_reserve(osize, gfp_mask, node, &pfmemalloc);
> + if (unlikely(!data))
> + goto nodata;
> size = SKB_WITH_OVERHEAD(osize);
> prefetchw(data + size);
I'd rename osize here to alloc_size for consistency but one could
argue either way :)
Acked-by: Jakub Kicinski <kuba@kernel.org>
next prev parent reply other threads:[~2022-09-22 19:40 UTC|newest]
Thread overview: 96+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-09-22 3:10 [Intel-wired-lan] [PATCH 00/12] slab: Introduce kmalloc_size_roundup() Kees Cook
2022-09-22 3:10 ` Kees Cook
2022-09-22 3:10 ` Kees Cook
2022-09-22 3:10 ` [Intel-wired-lan] [PATCH 01/12] " Kees Cook
2022-09-22 3:10 ` Kees Cook
2022-09-22 3:10 ` Kees Cook
2022-09-22 11:12 ` [Intel-wired-lan] " Hyeonggon Yoo
2022-09-22 11:12 ` Hyeonggon Yoo
2022-09-22 11:12 ` Hyeonggon Yoo
2022-09-23 1:17 ` [Intel-wired-lan] " Feng Tang
2022-09-23 1:17 ` Feng Tang
2022-09-23 1:17 ` Feng Tang
2022-09-23 18:50 ` [Intel-wired-lan] " Kees Cook
2022-09-23 18:50 ` Kees Cook
2022-09-23 18:50 ` Kees Cook
2022-09-22 3:10 ` [Intel-wired-lan] [PATCH 02/12] skbuff: Proactively round up to kmalloc bucket size Kees Cook
2022-09-22 3:10 ` Kees Cook
2022-09-22 3:10 ` Kees Cook
2022-09-22 19:40 ` Jakub Kicinski [this message]
2022-09-22 19:40 ` Jakub Kicinski
2022-09-22 19:40 ` Jakub Kicinski
2022-09-22 3:10 ` [Intel-wired-lan] [PATCH 03/12] net: ipa: " Kees Cook
2022-09-22 3:10 ` Kees Cook
2022-09-22 3:10 ` Kees Cook
2022-09-22 13:45 ` [Intel-wired-lan] " Alex Elder
2022-09-22 13:45 ` Alex Elder
2022-09-22 13:45 ` Alex Elder
2022-09-22 15:57 ` [Intel-wired-lan] " Kees Cook
2022-09-22 15:57 ` Kees Cook
2022-09-22 15:57 ` Kees Cook
2022-09-22 3:10 ` [Intel-wired-lan] [PATCH 04/12] btrfs: send: " Kees Cook
2022-09-22 3:10 ` Kees Cook
2022-09-22 3:10 ` Kees Cook
2022-09-22 13:30 ` [Intel-wired-lan] " David Sterba
2022-09-22 13:30 ` David Sterba
2022-09-22 13:30 ` David Sterba
2022-09-22 3:10 ` [Intel-wired-lan] [PATCH 05/12] dma-buf: " Kees Cook
2022-09-22 3:10 ` Kees Cook
2022-09-22 3:10 ` Kees Cook
2022-09-22 3:10 ` [Intel-wired-lan] [PATCH 06/12] coredump: " Kees Cook
2022-09-22 3:10 ` Kees Cook
2022-09-22 3:10 ` Kees Cook
2022-09-22 3:10 ` [Intel-wired-lan] [PATCH 07/12] igb: " Kees Cook
2022-09-22 3:10 ` Kees Cook
2022-09-22 3:10 ` Kees Cook
2022-09-22 15:56 ` [Intel-wired-lan] " Ruhl, Michael J
2022-09-22 15:56 ` Ruhl, Michael J
2022-09-22 15:56 ` Ruhl, Michael J
2022-09-22 16:00 ` [Intel-wired-lan] " Kees Cook
2022-09-22 16:00 ` Kees Cook
2022-09-22 16:00 ` Kees Cook
2022-09-22 3:10 ` [Intel-wired-lan] [PATCH 08/12] openvswitch: " Kees Cook
2022-09-22 3:10 ` Kees Cook
2022-09-22 3:10 ` Kees Cook
2022-09-22 3:10 ` [Intel-wired-lan] [PATCH 09/12] x86/microcode/AMD: Track patch allocation size explicitly Kees Cook
2022-09-22 3:10 ` Kees Cook
2022-09-22 3:10 ` Kees Cook
2022-09-22 3:10 ` [Intel-wired-lan] [PATCH 10/12] iwlwifi: Track scan_cmd " Kees Cook
2022-09-22 3:10 ` Kees Cook
2022-09-22 3:10 ` Kees Cook
2022-09-22 4:18 ` [Intel-wired-lan] " Kalle Valo
2022-09-22 4:18 ` Kalle Valo
2022-09-22 4:18 ` Kalle Valo
2022-09-22 5:26 ` [Intel-wired-lan] " Kees Cook
2022-09-22 5:26 ` Kees Cook
2022-09-22 5:26 ` Kees Cook
2022-09-22 3:10 ` [Intel-wired-lan] [PATCH 11/12] slab: Remove __malloc attribute from realloc functions Kees Cook
2022-09-22 3:10 ` Kees Cook
2022-09-22 3:10 ` Kees Cook
2022-09-22 9:23 ` [Intel-wired-lan] " Miguel Ojeda
2022-09-22 9:23 ` Miguel Ojeda
2022-09-22 9:23 ` Miguel Ojeda
2022-09-22 15:56 ` [Intel-wired-lan] " Kees Cook
2022-09-22 15:56 ` Kees Cook
2022-09-22 15:56 ` Kees Cook
2022-09-22 17:41 ` [Intel-wired-lan] " Miguel Ojeda
2022-09-22 17:41 ` Miguel Ojeda
2022-09-22 17:41 ` Miguel Ojeda
2022-09-22 3:10 ` [Intel-wired-lan] [PATCH 12/12] slab: Restore __alloc_size attribute to __kmalloc_track_caller Kees Cook
2022-09-22 3:10 ` Kees Cook
2022-09-22 3:10 ` Kees Cook
2022-09-22 7:10 ` [Intel-wired-lan] [PATCH 00/12] slab: Introduce kmalloc_size_roundup() Christian König
2022-09-22 7:10 ` Christian König
2022-09-22 7:10 ` Christian König
2022-09-22 15:55 ` [Intel-wired-lan] " Kees Cook
2022-09-22 15:55 ` Kees Cook
2022-09-22 15:55 ` Kees Cook
2022-09-22 21:05 ` [Intel-wired-lan] " Vlastimil Babka
2022-09-22 21:05 ` Vlastimil Babka
2022-09-22 21:05 ` Vlastimil Babka
2022-09-22 21:49 ` [Intel-wired-lan] " Kees Cook
2022-09-22 21:49 ` Kees Cook
2022-09-22 21:49 ` Kees Cook
2022-09-23 9:07 ` [Intel-wired-lan] " Vlastimil Babka
2022-09-23 9:07 ` Vlastimil Babka
2022-09-23 9:07 ` Vlastimil Babka
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=20220922124039.688be0b8@kernel.org \
--to=kuba@kernel.org \
--cc=akpm@linux-foundation.org \
--cc=christian.koenig@amd.com \
--cc=danielmicay@gmail.com \
--cc=davem@davemloft.net \
--cc=dev@openvswitch.org \
--cc=dri-devel@lists.freedesktop.org \
--cc=dsterba@suse.com \
--cc=edumazet@google.com \
--cc=elder@kernel.org \
--cc=elver@google.com \
--cc=gregkh@linuxfoundation.org \
--cc=iamjoonsoo.kim@lge.com \
--cc=intel-wired-lan@lists.osuosl.org \
--cc=jacob.shin@amd.com \
--cc=josef@toxicpanda.com \
--cc=keescook@chromium.org \
--cc=linaro-mm-sig@lists.linaro.org \
--cc=linux-btrfs@vger.kernel.org \
--cc=linux-fsdevel@vger.kernel.org \
--cc=linux-hardening@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-media@vger.kernel.org \
--cc=linux-mm@kvack.org \
--cc=linux-wireless@vger.kernel.org \
--cc=llvm@lists.linux.dev \
--cc=ndesaulniers@google.com \
--cc=netdev@vger.kernel.org \
--cc=ojeda@kernel.org \
--cc=pabeni@redhat.com \
--cc=penberg@kernel.org \
--cc=rientjes@google.com \
--cc=sumit.semwal@linaro.org \
--cc=vbabka@suse.cz \
--cc=x86@kernel.org \
--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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.