Received-SPF: pass (google.com: domain of linux-wireless-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20;
From:   "Ruhl, Michael J" <michael.j.ruhl@intel.com>
To:     Kees Cook <keescook@chromium.org>, Vlastimil Babka <vbabka@suse.cz>
CC:     "linux-wireless@vger.kernel.org" <linux-wireless@vger.kernel.org>,
        "Jacob Shin" <jacob.shin@amd.com>,
        "llvm@lists.linux.dev" <llvm@lists.linux.dev>,
        "dri-devel@lists.freedesktop.org" <dri-devel@lists.freedesktop.org>,
        "linux-mm@kvack.org" <linux-mm@kvack.org>,
        Eric Dumazet <edumazet@google.com>,
        "Nguyen, Anthony L" <anthony.l.nguyen@intel.com>,
        "linux-hardening@vger.kernel.org" <linux-hardening@vger.kernel.org>,
        "Sumit Semwal" <sumit.semwal@linaro.org>,
        "dev@openvswitch.org" <dev@openvswitch.org>,
        "x86@kernel.org" <x86@kernel.org>,
        "Brandeburg, Jesse" <jesse.brandeburg@intel.com>,
        "intel-wired-lan@lists.osuosl.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" <linux-media@vger.kernel.org>,
        Marco Elver <elver@google.com>,
        Josef Bacik <josef@toxicpanda.com>,
        "linaro-mm-sig@lists.linaro.org" <linaro-mm-sig@lists.linaro.org>,
        Jakub Kicinski <kuba@kernel.org>,
        "David Sterba" <dsterba@suse.com>,
        Joonsoo Kim <iamjoonsoo.kim@lge.com>,
        Alex Elder <elder@kernel.org>,
        Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
        "Nick Desaulniers" <ndesaulniers@google.com>,
        "linux-kernel@vger.kernel.org" <linux-kernel@vger.kernel.org>,
        "David S. Miller" <davem@davemloft.net>,
        Pekka Enberg <penberg@kernel.org>,
        Daniel Micay <danielmicay@gmail.com>,
        "netdev@vger.kernel.org" <netdev@vger.kernel.org>,
        "linux-fsdevel@vger.kernel.org" <linux-fsdevel@vger.kernel.org>,
        "Andrew Morton" <akpm@linux-foundation.org>,
        =?iso-8859-1?Q?Christian_K=F6nig?= <christian.koenig@amd.com>,
        "linux-btrfs@vger.kernel.org" <linux-btrfs@vger.kernel.org>
Subject: RE: [PATCH 07/12] igb: Proactively round up to kmalloc bucket size
Thread-Topic: [PATCH 07/12] igb: Proactively round up to kmalloc bucket size
Thread-Index: AQHYzjEYR++WbhctVUaYQWdb/SDWtK3rmzpg
Date:   Thu, 22 Sep 2022 15:56:54 +0000
Message-ID: <DM5PR11MB13241226F3AACC81398F7E8EC14E9@DM5PR11MB1324.namprd11.prod.outlook.com>
References: <20220922031013.2150682-1-keescook@chromium.org>
 <20220922031013.2150682-8-keescook@chromium.org>
In-Reply-To: <20220922031013.2150682-8-keescook@chromium.org>
Accept-Language: en-US
Content-Language: en-US
dlp-product: dlpe-windows
dlp-reaction: no-action
dlp-version: 11.6.500.17
x-ms-exchange-antispam-messagedata-chunkcount: 1
x-ms-exchange-antispam-messagedata-0: =?iso-8859-1?Q?zJhFA5mxPgQpqh/ck+6T9IyB+1LM/uzPHowvaMEwnBkee1ETzkSvs+0zny?=
 =?iso-8859-1?Q?seQsS7RNJDEoTaa5iJ7voQOG4o5vCngruymmV5oxTyzqGM9C3AyKy4WsJA?=
 =?iso-8859-1?Q?sbyCNzE8jaUL1tV4lQCpg2q4OIRVVqPpbcNdtm3oxg2Xl1aOjgDohxRqnE?=
 =?iso-8859-1?Q?800pagqVHeFFUId71tv2PA+vXaE/1utooKszx/z7KHCuXmpdezYCLwHJdK?=
 =?iso-8859-1?Q?DLVCEmAC12e25VoZqDXJMkDKuQXQVusYZV1O96vcFTsn0phVbHBtm3YsG1?=
 =?iso-8859-1?Q?OnIQzDFuapjJVdIIBZlD0kYp0RcgkVCwqufxcJlDh9NUpzwcQ7GbFw9DAV?=
 =?iso-8859-1?Q?BqCvL7AuVKJTcpETvB2YCSllKSWl1LnK9gv74wbnDfBEYC7fUShOp10u/Z?=
 =?iso-8859-1?Q?w9kMsRxRzsmOcHEp3lN47mJIVIb4GxgTTCEOSttmDt55QWSlY5UH7UBPeU?=
 =?iso-8859-1?Q?UTOjx/BItUq33R35fqEszW8WuDIYKqiVTXmOLnZyKdr004Wq9bj1udc+uZ?=
 =?iso-8859-1?Q?PqFRYV6jYtBncdZwlvOSEQKmN3vdUzjw8PLpxUHGJuLIIOyJyJVs9JRWqn?=
 =?iso-8859-1?Q?OB4xfhRulWjG8ZiAronwYavQBPfRYZTF7LmgXBvERTq/AK2xFcvpgeEy48?=
 =?iso-8859-1?Q?uDUwp9IvOkDcdwvoDbkFkL4XXhZqHK2fWxpmwwn+L7weyJB/fLgDvIExkb?=
 =?iso-8859-1?Q?AOVpK6kxBwM053PcMp55vRkvpXLHmpwD6FvWWfE2iOsCBWIK1aHpK3+2Jg?=
 =?iso-8859-1?Q?RqdyB1M8g5ZlG2rHRRpxmftfcblergPLLcgvK1coAbeP1QNbygZonRUsXe?=
 =?iso-8859-1?Q?XkH1QIouCBzFyyGEwzJOjBjZ0OCWg2rwlfnFm0FHGpvacHIcS13Y0X0HrB?=
 =?iso-8859-1?Q?X3OSkTZgS0MhbAahU1Uxhy60dd5I3q1GAR5CtscSO5GqYQ1uq1oeUK9Vd1?=
 =?iso-8859-1?Q?6991XCpJwzrYsDvv+Lxq0rC69/oFZ8csY3ln5VMC+03MiebANPO49zVUtn?=
 =?iso-8859-1?Q?LPgNh47q1aiPwe2d6q/FoGW3ONp8Fl/SvAkAOBZjOK77RJZitkYrHaKWAp?=
 =?iso-8859-1?Q?ybCfCa6MXELiQuFbjOTNbsiRy34BnNVJI/cVmyL6gl9VDnUFKHGiv1m8q3?=
 =?iso-8859-1?Q?tgjig66y8xga5SU9jRvIxzIntdGCmZrCbPFGxPOxu3+DVRYnWaV7dAzxYp?=
 =?iso-8859-1?Q?8FGHxFT1e8PyxNgI22pb9hAyVyyUKqYFh5SLCiThRVPRT5ukA9y4KS8MPp?=
 =?iso-8859-1?Q?7rZ/1/T1K31q/yozpvDvKlpEkcJWU51DR7pea/Wz8UDiKBgLakI7051C7o?=
 =?iso-8859-1?Q?IRy4W38JGag7TMOlP2zH7JnBVPKOzQhRunk3+ins72LAy6kVKsepWh+DVT?=
 =?iso-8859-1?Q?pMzzAak+iK2EDsya8J0Yd8x1mZq0OLDjxijWWPsPYTBoOg2hBYbIjdG+0A?=
 =?iso-8859-1?Q?4NNEn7ODLBN/poPH9rFfioM2fP8kz4sODTS96YfTUHNLsYZ6PLPQ9BglYI?=
 =?iso-8859-1?Q?OCUR4SP9oBXNqTY5PU0ZVhoeMNJohfUMKac0p/S93BsEnCah9C8o7km/ca?=
 =?iso-8859-1?Q?Zd8L8ixqkj2Zf2xB72PIZET/oeAtFfsRUb3CRgqYd2+RGNjhvLF0rmh7N0?=
 =?iso-8859-1?Q?tueWHs/lzHjGAYS+7R5etVjyfJSdqepNEG?=
Content-Type: text/plain; charset="iso-8859-1"
Content-Transfer-Encoding: quoted-printable
MIME-Version: 1.0
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-AuthSource: DM5PR11MB1324.namprd11.prod.outlook.com
X-MS-Exchange-CrossTenant-Network-Message-Id: e49b8d06-731d-4d65-73fd-08da9cb3122e
X-MS-Exchange-CrossTenant-originalarrivaltime: 22 Sep 2022 15:56:54.3834
 (UTC)
X-MS-Exchange-CrossTenant-fromentityheader: Hosted
X-MS-Exchange-CrossTenant-id: 46c98d88-e344-4ed4-8496-4ed7712e255d
X-MS-Exchange-CrossTenant-mailboxtype: HOSTED
X-MS-Exchange-CrossTenant-userprincipalname: B+vMJqqgOi99hRaZ+cvay0ISVgix+N3SnwYMj12dhqgFD5h6L8bos3tyP219+0v3Iiyismy5gsp3cmPheX8hbuA/hFwxG5zpx16XwO2SKvI=
X-MS-Exchange-Transport-CrossTenantHeadersStamped: CY5PR11MB6365
X-OriginatorOrg: intel.com
X-Spam-Status: No, score=-4.4 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH,
        DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_MED,
        RCVD_IN_MSPIKE_H3,RCVD_IN_MSPIKE_WL,SPF_HELO_NONE,SPF_NONE
        autolearn=ham autolearn_force=no version=3.4.6
X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on
        lindbergh.monkeyblade.net
Precedence: bulk
List-ID: <linux-wireless.vger.kernel.org>
X-Mailing-List: linux-wireless@vger.kernel.org


>-----Original Message-----
>From: dri-devel <dri-devel-bounces@lists.freedesktop.org> On Behalf Of
>Kees Cook
>Sent: Wednesday, September 21, 2022 11:10 PM
>To: Vlastimil Babka <vbabka@suse.cz>
>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>; Nguyen, Anthony L
><anthony.l.nguyen@intel.com>; linux-hardening@vger.kernel.org; Sumit
>Semwal <sumit.semwal@linaro.org>; dev@openvswitch.org; x86@kernel.org;
>Brandeburg, Jesse <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>; Kees Cook <keescook@chromium.org>; Josef Bacik
><josef@toxicpanda.com>; linaro-mm-sig@lists.linaro.org; Jakub Kicinski
><kuba@kernel.org>; David Sterba <dsterba@suse.com>; Joonsoo Kim
><iamjoonsoo.kim@lge.com>; Alex Elder <elder@kernel.org>; Greg Kroah-
>Hartman <gregkh@linuxfoundation.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>; netdev@vger.kernel.org; linux-
>fsdevel@vger.kernel.org; Andrew Morton <akpm@linux-foundation.org>;
>Christian K=F6nig <christian.koenig@amd.com>; linux-btrfs@vger.kernel.org
>Subject: [PATCH 07/12] igb: Proactively round up to kmalloc bucket size
>
>Instead of having a mismatch between the requested allocation size and
>the actual kmalloc bucket size, which is examined later via ksize(),
>round up proactively so the allocation is explicitly made for the full
>size, allowing the compiler to correctly reason about the resulting size
>of the buffer through the existing __alloc_size() hint.
>
>Cc: Jesse Brandeburg <jesse.brandeburg@intel.com>
>Cc: Tony Nguyen <anthony.l.nguyen@intel.com>
>Cc: "David S. Miller" <davem@davemloft.net>
>Cc: Eric Dumazet <edumazet@google.com>
>Cc: Jakub Kicinski <kuba@kernel.org>
>Cc: Paolo Abeni <pabeni@redhat.com>
>Cc: intel-wired-lan@lists.osuosl.org
>Cc: netdev@vger.kernel.org
>Signed-off-by: Kees Cook <keescook@chromium.org>
>---
> drivers/net/ethernet/intel/igb/igb_main.c | 1 +
> 1 file changed, 1 insertion(+)
>
>diff --git a/drivers/net/ethernet/intel/igb/igb_main.c
>b/drivers/net/ethernet/intel/igb/igb_main.c
>index 2796e81d2726..4d70ee5b0f79 100644
>--- a/drivers/net/ethernet/intel/igb/igb_main.c
>+++ b/drivers/net/ethernet/intel/igb/igb_main.c
>@@ -1196,6 +1196,7 @@ static int igb_alloc_q_vector(struct igb_adapter
>*adapter,
>
> 	ring_count =3D txr_count + rxr_count;
> 	size =3D struct_size(q_vector, ring, ring_count);
>+	size =3D kmalloc_size_roundup(size);

why not:

	size =3D kmalloc_size_roundup(struct_size(q_vector, ring, ring_count));

?

m
> 	/* allocate q_vector and rings */
> 	q_vector =3D adapter->q_vector[v_idx];
>--
>2.34.1