Received: by 2002:ac0:a5a7:0:0:0:0:0 with SMTP id m36-v6csp2650219imm; Sun, 12 Aug 2018 20:19:00 -0700 (PDT) X-Google-Smtp-Source: AA+uWPy1KtkWdgcXIdonExe8RxOf8dm1McvHhbEJW5xMLAE/h/jdTJXPLhindZNr1godx5+5h8Hi X-Received: by 2002:a63:24c:: with SMTP id 73-v6mr15719792pgc.252.1534130340608; Sun, 12 Aug 2018 20:19:00 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1534130340; cv=none; d=google.com; s=arc-20160816; b=lrR9qzquTrWV8Am6QqdnO4k9evsez2rlc8pC8/NSkzbspTl7yUJDme3TEEaXFVt+Cz 1sHMvszwGxIAwUYJHId8ILw/L2JivAPYoNJ+3hMBt3QiJfQ6weOE4LusQSPXcIEg35pa HFgvbZ4FwjrOehJ16s8Q/WLBHpnT3zO/MsCgzwIIk+c3IYMf0elRK+A08Mc+TqlIgkQU Je/gihonxrcQd8hsjob6lokbxZffMvVwiDBUarb510nFpqa+z4ncKdP0VZajbogDAsQk nfwsTdvUiiiIhc/tJ/J8n3lxLjzqrGH6FUl6sTNyoKhhYqzIxl0NZCF6r0wMU2CE6v9t wKFQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:references:in-reply-to:message-id:date :subject:cc:to:from:arc-authentication-results; bh=VEQ+b1NxVVSrFDBlai4MWG8CvOSvADXLHz7ODkLPH7g=; b=1BzJvwCr58IkevItqsjHzN0FPv6ejHc77Xf0Eq0NrzSYW0bCKnCdD92IB6wauy+wnb assoonPMkOLaW9J2qOKfsguCRiD6VZDLk5Z1beNRQFdqJ0CfYfmBhjh0cULXRVEUloEq pTRAs8FtfW5wULLAzGRrFR/deYEKfQ74sBkzXbpKEj8WVPhBO6z0uC+PXrUorYPSXlGq +KD3VfFt4LhqtwSFiRXwfp6eTyHrxLTCcx/qEyTj8WY1FPfTbmEiizdok1P6Caez000/ n+L/HncvvzIv2TQ4J0yW6VOz59IFNoQzmKZAk9z/q32KNtou84fWJl0v6ezKw/y/HKlF arNg== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=redhat.com Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id p185-v6si17027650pga.476.2018.08.12.20.18.42; Sun, 12 Aug 2018 20:19:00 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=redhat.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728315AbeHMF57 (ORCPT + 99 others); Mon, 13 Aug 2018 01:57:59 -0400 Received: from mx3-rdu2.redhat.com ([66.187.233.73]:57822 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1728204AbeHMF56 (ORCPT ); Mon, 13 Aug 2018 01:57:58 -0400 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.rdu2.redhat.com [10.11.54.6]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 51BE187A74; Mon, 13 Aug 2018 03:17:43 +0000 (UTC) Received: from jason-ThinkPad-T450s.redhat.com (ovpn-12-183.pek2.redhat.com [10.72.12.183]) by smtp.corp.redhat.com (Postfix) with ESMTP id 647C82156712; Mon, 13 Aug 2018 03:17:40 +0000 (UTC) From: Jason Wang To: netdev@vger.kernel.org, linux-kernel@vger.kernel.org Cc: ast@kernel.org, daniel@iogearbox.net, jbrouer@redhat.com, mst@redhat.com, Jason Wang Subject: [RFC PATCH net-next V2 2/6] net: core: generic XDP support for stacked device Date: Mon, 13 Aug 2018 11:17:26 +0800 Message-Id: <1534130250-5302-3-git-send-email-jasowang@redhat.com> In-Reply-To: <1534130250-5302-1-git-send-email-jasowang@redhat.com> References: <1534130250-5302-1-git-send-email-jasowang@redhat.com> X-Scanned-By: MIMEDefang 2.78 on 10.11.54.6 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.11.55.1]); Mon, 13 Aug 2018 03:17:43 +0000 (UTC) X-Greylist: inspected by milter-greylist-4.5.16 (mx1.redhat.com [10.11.55.1]); Mon, 13 Aug 2018 03:17:43 +0000 (UTC) for IP:'10.11.54.6' DOMAIN:'int-mx06.intmail.prod.int.rdu2.redhat.com' HELO:'smtp.corp.redhat.com' FROM:'jasowang@redhat.com' RCPT:'' Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Stacked device usually change skb->dev to its own and return RX_HANDLER_ANOTHER during rx handler processing. But we don't call generic XDP routine at that time, this means it can't work for stacked device. Fixing this by calling netif_do_generic_xdp() if rx handler returns RX_HANDLER_ANOTHER. This allows us to do generic XDP on stacked device e.g macvlan. Signed-off-by: Jason Wang --- net/core/dev.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/net/core/dev.c b/net/core/dev.c index 605c66e..a77ce08 100644 --- a/net/core/dev.c +++ b/net/core/dev.c @@ -4822,6 +4822,11 @@ static int __netif_receive_skb_core(struct sk_buff *skb, bool pfmemalloc, ret = NET_RX_SUCCESS; goto out; case RX_HANDLER_ANOTHER: + ret = netif_do_generic_xdp(skb); + if (ret != XDP_PASS) { + ret = NET_RX_SUCCESS; + goto out; + } goto another_round; case RX_HANDLER_EXACT: deliver_exact = true; -- 2.7.4