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.8 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,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 B12DDC54FCB for ; Mon, 20 Apr 2020 12:47:26 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 8751C2072B for ; Mon, 20 Apr 2020 12:47:26 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1587386846; bh=33fn3yXMDa+Tc5RNZdD1AuSOPIrelWV2k2G/xTBgVZk=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=QsotdDo8XgK+joRftGTG92Zoexwn6j+qS0/2Dr5pkn///g9dkkIaZywj5RQhAU+2I oE9653Kvg7PoGPXaGZd6trNEuTzOT8qA5TGyuCVxTXY/mGOu+cU/vqWmBJIQ6fWcHu +I79ifFYHlghu53LC+MYTEobCDy4EZ49+r6EUIGI= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729071AbgDTMrZ (ORCPT ); Mon, 20 Apr 2020 08:47:25 -0400 Received: from mail.kernel.org ([198.145.29.99]:43344 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728436AbgDTMrX (ORCPT ); Mon, 20 Apr 2020 08:47:23 -0400 Received: from localhost (83-86-89-107.cable.dynamic.v4.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 D7AB5206DD; Mon, 20 Apr 2020 12:47:22 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1587386843; bh=33fn3yXMDa+Tc5RNZdD1AuSOPIrelWV2k2G/xTBgVZk=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=qXB+tzKmhLizJlovnK3DqfwNxOAIDL/B6BBqecvr/zjLK/WbyGBOBf2eZvf/s73CR IthG3mZdfwsth8Xnm1AdUvOLVi8TXYQx6IwY8crG7kq5h9fF74msJOF9d9SoyG7RGj giSVEkB7QpsMoCgkrl5RJZDYQuwC1cYel2i7Es1s= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Gilberto Bertin , "David S. Miller" Subject: [PATCH 5.4 10/60] net: tun: record RX queue in skb before do_xdp_generic() Date: Mon, 20 Apr 2020 14:38:48 +0200 Message-Id: <20200420121504.321132199@linuxfoundation.org> X-Mailer: git-send-email 2.26.1 In-Reply-To: <20200420121500.490651540@linuxfoundation.org> References: <20200420121500.490651540@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Gilberto Bertin [ Upstream commit 3fe260e00cd0bf0be853c48fcc1e19853df615bb ] This allows netif_receive_generic_xdp() to correctly determine the RX queue from which the skb is coming, so that the context passed to the XDP program will contain the correct RX queue index. Signed-off-by: Gilberto Bertin Signed-off-by: David S. Miller Signed-off-by: Greg Kroah-Hartman --- drivers/net/tun.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) --- a/drivers/net/tun.c +++ b/drivers/net/tun.c @@ -1925,6 +1925,7 @@ drop: skb_reset_network_header(skb); skb_probe_transport_header(skb); + skb_record_rx_queue(skb, tfile->queue_index); if (skb_xdp) { struct bpf_prog *xdp_prog; @@ -2492,6 +2493,7 @@ build: skb->protocol = eth_type_trans(skb, tun->dev); skb_reset_network_header(skb); skb_probe_transport_header(skb); + skb_record_rx_queue(skb, tfile->queue_index); if (skb_xdp) { err = do_xdp_generic(xdp_prog, skb); @@ -2503,7 +2505,6 @@ build: !tfile->detached) rxhash = __skb_get_hash_symmetric(skb); - skb_record_rx_queue(skb, tfile->queue_index); netif_receive_skb(skb); /* No need for get_cpu_ptr() here since this function is