From patchwork Tue Jun 18 07:13:19 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sebastian Andrzej Siewior X-Patchwork-Id: 13701885 X-Patchwork-Delegate: kuba@kernel.org Received: from galois.linutronix.de (Galois.linutronix.de [193.142.43.55]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 450F913B587; Tue, 18 Jun 2024 07:25:34 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=193.142.43.55 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1718695536; cv=none; b=fpzlbSswxGAFeKokE2yI4FT1e2tyXtYqoQx9wNCX0KVZxVRlgAzW8EWEYhu0kEYHk7FGXPVPVWJGqtWZs7LEKgb3Lp30C+8ygMveTOxsIKHLHCEZ7Z1wFXNDfsiTQpowg5x899N7I5xArBGvroMCf07AHpQk+dRtMgyBFwmwyu0= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1718695536; c=relaxed/simple; bh=9Lh6yED4JkBOgnEWhEg5MLGSkozpx3Dnb7sg4GUiXTM=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=cnKxytNP569z4J3Jm6SIafjjGO/EUrydd9B2x2FfXf4u8YlfHLudr2OEUD+HNj0+/K1HxUug6PVrjLa9GHKf5UNuoj75rgRP75aoaZ+/qQPOVgeGAjXAVxHCoY+kKpDrppaCQ9NlveY+/JLgGTYXbfAN7Tc1HQshsmDAAEARhvU= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linutronix.de; spf=pass smtp.mailfrom=linutronix.de; dkim=pass (2048-bit key) header.d=linutronix.de header.i=@linutronix.de header.b=Zo1owcmR; dkim=permerror (0-bit key) header.d=linutronix.de header.i=@linutronix.de header.b=GtmEAzio; arc=none smtp.client-ip=193.142.43.55 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linutronix.de Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=linutronix.de Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=linutronix.de header.i=@linutronix.de header.b="Zo1owcmR"; dkim=permerror (0-bit key) header.d=linutronix.de header.i=@linutronix.de header.b="GtmEAzio" From: Sebastian Andrzej Siewior DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020; t=1718695531; 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: in-reply-to:in-reply-to:references:references; bh=jEgrAQzPM3pCkJrAWGRjvGTANpNXKbEZYpnc+bTSS/w=; b=Zo1owcmRtKAfrvdo7dwb0Az5sh73sgmCi8tvhhD5tehUxMXzwI7wPMKI6RdEo4q9MOWuRx oP+aCvPQ7snB9ItGv/dVNYOeylVpEwF0NaUsXRT/YRzDOaBwlyyAQoqMRK9PeaeJTpH4JF LaLmotLi5WroUpJqICOG3XBB1dV205IDAA0uqYmomLgH7xuDXkHxIz9aH2neS8nc2PmX5k X7xEGdWZ0FdZsHQ00nGZHCcrq4px18XA4pewQhqbn7Vy17b2Qmh5bo1YpyR7Vt3of06BA+ kqzLWQMnC2Vrtwbg3nLbwrzZqGWDRYy1/24tAfl+vDUbb2rev4Wouuzft6YAfA== DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020e; t=1718695531; 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: in-reply-to:in-reply-to:references:references; bh=jEgrAQzPM3pCkJrAWGRjvGTANpNXKbEZYpnc+bTSS/w=; b=GtmEAzioyFCYaj11KyDaumgIh//ZkvnvgO7yJ2zjlpe+Ff3O8fFQC7a31QrRomvrO8/0Bx BB6LvVpuYFJ6ZJCw== To: linux-kernel@vger.kernel.org, netdev@vger.kernel.org Cc: "David S. Miller" , Daniel Bristot de Oliveira , Boqun Feng , Daniel Borkmann , Eric Dumazet , Frederic Weisbecker , Ingo Molnar , Jakub Kicinski , Paolo Abeni , Peter Zijlstra , Thomas Gleixner , Waiman Long , Will Deacon , Sebastian Andrzej Siewior Subject: [PATCH v7 net-next 03/15] net: Use __napi_alloc_frag_align() instead of open coding it. Date: Tue, 18 Jun 2024 09:13:19 +0200 Message-ID: <20240618072526.379909-4-bigeasy@linutronix.de> In-Reply-To: <20240618072526.379909-1-bigeasy@linutronix.de> References: <20240618072526.379909-1-bigeasy@linutronix.de> Precedence: bulk X-Mailing-List: netdev@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-Patchwork-Delegate: kuba@kernel.org The else condition within __netdev_alloc_frag_align() is an open coded __napi_alloc_frag_align(). Use __napi_alloc_frag_align() instead of open coding it. Move fragsz assignment before page_frag_alloc_align() invocation because __napi_alloc_frag_align() also contains this statement. Signed-off-by: Sebastian Andrzej Siewior --- net/core/skbuff.c | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/net/core/skbuff.c b/net/core/skbuff.c index c8ac79851cd67..656b298255c5f 100644 --- a/net/core/skbuff.c +++ b/net/core/skbuff.c @@ -318,19 +318,15 @@ void *__netdev_alloc_frag_align(unsigned int fragsz, unsigned int align_mask) { void *data; - fragsz = SKB_DATA_ALIGN(fragsz); if (in_hardirq() || irqs_disabled()) { struct page_frag_cache *nc = this_cpu_ptr(&netdev_alloc_cache); + fragsz = SKB_DATA_ALIGN(fragsz); data = __page_frag_alloc_align(nc, fragsz, GFP_ATOMIC, align_mask); } else { - struct napi_alloc_cache *nc; - local_bh_disable(); - nc = this_cpu_ptr(&napi_alloc_cache); - data = __page_frag_alloc_align(&nc->page, fragsz, GFP_ATOMIC, - align_mask); + data = __napi_alloc_frag_align(fragsz, align_mask); local_bh_enable(); } return data;