From mboxrd@z Thu Jan 1 00:00:00 1970 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=-6.1 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_PASS,USER_AGENT_GIT autolearn=ham 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 95F88C43381 for ; Thu, 21 Feb 2019 14:48:54 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 65DCF20700 for ; Thu, 21 Feb 2019 14:48:54 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1550760534; bh=ayb26v0SisjBjHz4fVKtALDQCalQ3VVzMAAvHDD64yA=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=0lNGBI7azsP4q1fMydPPCKtbYL8hVRYSwuD1o5F4a0mMCOi24DB39RgVi6bmLxsud pyUYbjR/WMtX0uQfsfMadHC2XSGcjppaTmOHSrfrwgConJ9H38Z3++C4pbDHT5hA8I QBYrB3z1KW71P9ZXwPd2XkNpTnPSQh84bjzwXt4g= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729052AbfBUOsx (ORCPT ); Thu, 21 Feb 2019 09:48:53 -0500 Received: from mail.kernel.org ([198.145.29.99]:34232 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728515AbfBUOj6 (ORCPT ); Thu, 21 Feb 2019 09:39:58 -0500 Received: from localhost (5356596B.cm-6-7b.dynamic.ziggo.nl [83.86.89.107]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 71BA22084D; Thu, 21 Feb 2019 14:39:57 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1550759997; bh=ayb26v0SisjBjHz4fVKtALDQCalQ3VVzMAAvHDD64yA=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=kIit28VvdUrZFfUnoEIcqyT2Bm79LLQG04lwbHqfxu9zG/CTj531PJ53JH+aj7rjL Z1GQ+F5/8vTNbdamgrchRmvavTSJBIHDOyupGM2EBYHz/BIYjtu+XuavkQTSQiWjxD pdtomEJiJjo7fZMn2TMgY8Jq8uKghX0mgsulIx7k= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Jann Horn , Alexander Duyck , "David S. Miller" Subject: [PATCH 4.14 18/23] net: Do not allocate page fragments that are not skb aligned Date: Thu, 21 Feb 2019 15:36:00 +0100 Message-Id: <20190221125247.664264080@linuxfoundation.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190221125246.162644302@linuxfoundation.org> References: <20190221125246.162644302@linuxfoundation.org> User-Agent: quilt/0.65 X-stable: review X-Patchwork-Hint: ignore MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 4.14-stable review patch. If anyone has any objections, please let me know. ------------------ From: Alexander Duyck [ Upstream commit 3bed3cc4156eedf652b4df72bdb35d4f1a2a739d ] This patch addresses the fact that there are drivers, specifically tun, that will call into the network page fragment allocators with buffer sizes that are not cache aligned. Doing this could result in data alignment and DMA performance issues as these fragment pools are also shared with the skb allocator and any other devices that will use napi_alloc_frags or netdev_alloc_frags. Fixes: ffde7328a36d ("net: Split netdev_alloc_frag into __alloc_page_frag and add __napi_alloc_frag") Reported-by: Jann Horn Signed-off-by: Alexander Duyck Signed-off-by: David S. Miller Signed-off-by: Greg Kroah-Hartman --- net/core/skbuff.c | 4 ++++ 1 file changed, 4 insertions(+) --- a/net/core/skbuff.c +++ b/net/core/skbuff.c @@ -353,6 +353,8 @@ static void *__netdev_alloc_frag(unsigne */ void *netdev_alloc_frag(unsigned int fragsz) { + fragsz = SKB_DATA_ALIGN(fragsz); + return __netdev_alloc_frag(fragsz, GFP_ATOMIC | __GFP_COLD); } EXPORT_SYMBOL(netdev_alloc_frag); @@ -366,6 +368,8 @@ static void *__napi_alloc_frag(unsigned void *napi_alloc_frag(unsigned int fragsz) { + fragsz = SKB_DATA_ALIGN(fragsz); + return __napi_alloc_frag(fragsz, GFP_ATOMIC | __GFP_COLD); } EXPORT_SYMBOL(napi_alloc_frag);