From patchwork Wed Jun 30 05:11:18 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yajun Deng X-Patchwork-Id: 12351219 X-Patchwork-Delegate: kuba@kernel.org Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-15.8 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER, INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 5B11DC11F65 for ; Wed, 30 Jun 2021 05:11:46 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 4178161D2A for ; Wed, 30 Jun 2021 05:11:46 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233633AbhF3FOI (ORCPT ); Wed, 30 Jun 2021 01:14:08 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:42956 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233538AbhF3FOG (ORCPT ); Wed, 30 Jun 2021 01:14:06 -0400 Received: from out1.migadu.com (out1.migadu.com [IPv6:2001:41d0:2:863f::]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id A7A0BC061766; Tue, 29 Jun 2021 22:11:37 -0700 (PDT) X-Report-Abuse: Please report any abuse attempt to abuse@migadu.com and include these headers. DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linux.dev; s=key1; t=1625029894; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding; bh=xugq2Itb92GveGC9lFrpW1MMdYEHoWa1T9rN2HNUDKY=; b=MHZr4odTyNS4111aBfmnfJLq5X6M+HczsTMpadbO/67kWKT4gL8lESEOm3RPx2CXT5WPnj hNQXX9plwJtCyFyd4nVqTjlBdjgH6LFVpiJ2+7wMNB+op0w8pbyEIo337SAXw2rLa9GQnc IPO+vgycuNwp73PpNSm0ooZ2oJM3N6w= From: Yajun Deng To: davem@davemloft.net, kuba@kernel.org, andriin@fb.com, atenart@kernel.org, alobakin@pm.me, ast@kernel.org, edumazet@google.com, daniel@iogearbox.net, weiwan@google.com, ap420073@gmail.com Cc: netdev@vger.kernel.org, linux-kernel@vger.kernel.org, Yajun Deng Subject: [PATCH] net: core: Modify alloc_size in alloc_netdev_mqs() Date: Wed, 30 Jun 2021 13:11:18 +0800 Message-Id: <20210630051118.2212-1-yajun.deng@linux.dev> MIME-Version: 1.0 X-Migadu-Flow: FLOW_OUT X-Migadu-Auth-User: yajun.deng@linux.dev Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org X-Patchwork-Delegate: kuba@kernel.org Use ALIGN for 'struct net_device', and remove the unneeded 'NETDEV_ALIGN - 1'. This can save a few bytes. and modify the pr_err content when txqs < 1. Signed-off-by: Yajun Deng --- net/core/dev.c | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/net/core/dev.c b/net/core/dev.c index c253c2aafe97..c42a682a624d 100644 --- a/net/core/dev.c +++ b/net/core/dev.c @@ -10789,7 +10789,7 @@ struct net_device *alloc_netdev_mqs(int sizeof_priv, const char *name, BUG_ON(strlen(name) >= sizeof(dev->name)); if (txqs < 1) { - pr_err("alloc_netdev: Unable to allocate device with zero queues\n"); + pr_err("alloc_netdev: Unable to allocate device with zero TX queues\n"); return NULL; } @@ -10798,14 +10798,12 @@ struct net_device *alloc_netdev_mqs(int sizeof_priv, const char *name, return NULL; } - alloc_size = sizeof(struct net_device); + /* ensure 32-byte alignment of struct net_device*/ + alloc_size = ALIGN(sizeof(struct net_device), NETDEV_ALIGN); if (sizeof_priv) { /* ensure 32-byte alignment of private area */ - alloc_size = ALIGN(alloc_size, NETDEV_ALIGN); - alloc_size += sizeof_priv; + alloc_size += ALIGN(sizeof_priv, NETDEV_ALIGN); } - /* ensure 32-byte alignment of whole construct */ - alloc_size += NETDEV_ALIGN - 1; p = kvzalloc(alloc_size, GFP_KERNEL | __GFP_RETRY_MAYFAIL); if (!p)