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 Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 19415C433F5 for ; Mon, 31 Jan 2022 18:33:12 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1356607AbiAaSdK (ORCPT ); Mon, 31 Jan 2022 13:33:10 -0500 Received: from mga07.intel.com ([134.134.136.100]:38038 "EHLO mga07.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1356747AbiAaSco (ORCPT ); Mon, 31 Jan 2022 13:32:44 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1643653964; x=1675189964; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=qNN/Pr1UGpj5rJgoa9Ghaszlu7rgGfg7K0nqQ8KwRpc=; b=QsuAKYS66+Y6qc/WTkDT/jYXsfyoHYKl0HRGw6BF5YycGKa04hoo5Ggq jXt8+E5nTiUYaparpFPgn2uWAcogXoeHYfxQrEFOBPtyk5/1xApI588hP m1bEu89XgqswUNUYT/1oUNcrSldyqWCpIYnKPhWSRITjut9TF0t8vUZow EdYgahoyU4BfKMMXJRGc+R9OHSsDMhAEtXgwI0BP+mb1iftb81g1trCDm hrN0S6y7cRy3gLKvFbJ4u3UtfIOLNDbZg9AalsKkGvXb8wR5B9drko0b3 HNkLGzoQAcPSmDhsC1UC66L0Bjx9lYa76j3Y+ukMfFJzLZuladLR/FDin w==; X-IronPort-AV: E=McAfee;i="6200,9189,10244"; a="310833091" X-IronPort-AV: E=Sophos;i="5.88,331,1635231600"; d="scan'208";a="310833091" Received: from fmsmga004.fm.intel.com ([10.253.24.48]) by orsmga105.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 31 Jan 2022 10:32:20 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.88,331,1635231600"; d="scan'208";a="598920432" Received: from anguy11-desk2.jf.intel.com ([10.166.244.147]) by fmsmga004.fm.intel.com with ESMTP; 31 Jan 2022 10:32:20 -0800 From: Tony Nguyen To: davem@davemloft.net, kuba@kernel.org Cc: Alexander Lobakin , netdev@vger.kernel.org, anthony.l.nguyen@intel.com, ast@kernel.org, daniel@iogearbox.net, hawk@kernel.org, john.fastabend@gmail.com, bjorn@kernel.org, maciej.fijalkowski@intel.com, michal.swiatkowski@linux.intel.com, kafai@fb.com, songliubraving@fb.com, kpsingh@kernel.org, yhs@fb.com, andrii@kernel.org, bpf@vger.kernel.org, Sandeep Penigalapati Subject: [PATCH net-next 8/9] ixgbe: don't reserve excessive XDP_PACKET_HEADROOM on XSK Rx to skb Date: Mon, 31 Jan 2022 10:31:51 -0800 Message-Id: <20220131183152.3085432-9-anthony.l.nguyen@intel.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20220131183152.3085432-1-anthony.l.nguyen@intel.com> References: <20220131183152.3085432-1-anthony.l.nguyen@intel.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org From: Alexander Lobakin {__,}napi_alloc_skb() allocates and reserves additional NET_SKB_PAD + NET_IP_ALIGN for any skb. OTOH, ixgbe_construct_skb_zc() currently allocates and reserves additional `xdp->data - xdp->data_hard_start`, which is XDP_PACKET_HEADROOM for XSK frames. There's no need for that at all as the frame is post-XDP and will go only to the networking stack core. Pass the size of the actual data only to __napi_alloc_skb() and don't reserve anything. This will give enough headroom for stack processing. Fixes: d0bcacd0a130 ("ixgbe: add AF_XDP zero-copy Rx support") Signed-off-by: Alexander Lobakin Reviewed-by: Michal Swiatkowski Tested-by: Sandeep Penigalapati Signed-off-by: Tony Nguyen --- drivers/net/ethernet/intel/ixgbe/ixgbe_xsk.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/drivers/net/ethernet/intel/ixgbe/ixgbe_xsk.c b/drivers/net/ethernet/intel/ixgbe/ixgbe_xsk.c index 5447bfb31838..80078762ed24 100644 --- a/drivers/net/ethernet/intel/ixgbe/ixgbe_xsk.c +++ b/drivers/net/ethernet/intel/ixgbe/ixgbe_xsk.c @@ -214,13 +214,11 @@ static struct sk_buff *ixgbe_construct_skb_zc(struct ixgbe_ring *rx_ring, struct sk_buff *skb; /* allocate a skb to store the frags */ - skb = __napi_alloc_skb(&rx_ring->q_vector->napi, - xdp->data_end - xdp->data_hard_start, + skb = __napi_alloc_skb(&rx_ring->q_vector->napi, datasize, GFP_ATOMIC | __GFP_NOWARN); if (unlikely(!skb)) return NULL; - skb_reserve(skb, xdp->data - xdp->data_hard_start); memcpy(__skb_put(skb, datasize), xdp->data, datasize); if (metasize) skb_metadata_set(skb, metasize); -- 2.31.1