From patchwork Mon Apr 20 12:38:14 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg KH X-Patchwork-Id: 227493 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=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 11B90C54FCB for ; Mon, 20 Apr 2020 12:40:10 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id E10772072B for ; Mon, 20 Apr 2020 12:40:09 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1587386409; bh=plMxhHApsc4BN2fh/xPdBd++keSZJd9EE9BXwTtjyPs=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=nt8pQPu8grDvbA19XrkH0LI1GcUXsqX2zhlCatDEYK/+ooO6/dIjNqxfAHc/vtZJ+ FraiiZIGvKvucUgyotLrw+lcXMEMs93VAczk3rOYe1SqoM14U455NgCry8+ug5CvOA dKKFfr7I7vhutQqnAk1+YSV6O77JRN7Z1oVrcobE= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726936AbgDTMkG (ORCPT ); Mon, 20 Apr 2020 08:40:06 -0400 Received: from mail.kernel.org ([198.145.29.99]:60298 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726318AbgDTMkF (ORCPT ); Mon, 20 Apr 2020 08:40:05 -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 E2E5D20724; Mon, 20 Apr 2020 12:40:04 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1587386405; bh=plMxhHApsc4BN2fh/xPdBd++keSZJd9EE9BXwTtjyPs=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Xg8yV2P0eG/RtprZ1XKB1mOAgNOS5tQyG7WrTckexiqOcDWdWXKpd3izDRZCc6uda YRt65alDB5TpZZtA+U7zTErwjXWS8RNLVqMfSbzB/CvxI7PGHg4nAKJrah73yO59SD 84/xdw3ydSiIt3E/KoXf/ZEJCOaLw4e+oCE6qapU= 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.5 10/65] net: tun: record RX queue in skb before do_xdp_generic() Date: Mon, 20 Apr 2020 14:38:14 +0200 Message-Id: <20200420121508.901892043@linuxfoundation.org> X-Mailer: git-send-email 2.26.1 In-Reply-To: <20200420121505.909671922@linuxfoundation.org> References: <20200420121505.909671922@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 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; @@ -2498,6 +2499,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); @@ -2509,7 +2511,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