{"id":807123,"url":"http://patchwork.ozlabs.org/api/1.0/patches/807123/?format=json","project":{"id":7,"url":"http://patchwork.ozlabs.org/api/1.0/projects/7/?format=json","name":"Linux network development","link_name":"netdev","list_id":"netdev.vger.kernel.org","list_email":"netdev@vger.kernel.org","web_url":null,"scm_url":null,"webscm_url":null},"msgid":"<150401746079.16384.6082507760415730494.stgit@firesoul>","date":"2017-08-29T14:37:40","name":"[net-next,1/7] xdp: remove redundant argument to trace_xdp_redirect","commit_ref":null,"pull_url":null,"state":"accepted","archived":true,"hash":"e0fa724e890a584da966d5b5249d3c3f36579a87","submitter":{"id":13625,"url":"http://patchwork.ozlabs.org/api/1.0/people/13625/?format=json","name":"Jesper Dangaard Brouer","email":"brouer@redhat.com"},"delegate":{"id":34,"url":"http://patchwork.ozlabs.org/api/1.0/users/34/?format=json","username":"davem","first_name":"David","last_name":"Miller","email":"davem@davemloft.net"},"mbox":"http://patchwork.ozlabs.org/project/netdev/patch/150401746079.16384.6082507760415730494.stgit@firesoul/mbox/","series":[{"id":382,"url":"http://patchwork.ozlabs.org/api/1.0/series/382/?format=json","date":"2017-08-29T14:37:35","name":"XDP redirect tracepoints","version":1,"mbox":"http://patchwork.ozlabs.org/series/382/mbox/"}],"check":"pending","checks":"http://patchwork.ozlabs.org/api/patches/807123/checks/","tags":{},"headers":{"Return-Path":"","X-Original-To":"patchwork-incoming@ozlabs.org","Delivered-To":"patchwork-incoming@ozlabs.org","Authentication-Results":["ozlabs.org;\n\tspf=none (mailfrom) smtp.mailfrom=vger.kernel.org\n\t(client-ip=209.132.180.67; helo=vger.kernel.org;\n\tenvelope-from=netdev-owner@vger.kernel.org;\n\treceiver=)","ext-mx05.extmail.prod.ext.phx2.redhat.com;\n\tdmarc=none (p=none dis=none) header.from=redhat.com","ext-mx05.extmail.prod.ext.phx2.redhat.com;\n\tspf=fail smtp.mailfrom=brouer@redhat.com"],"Received":["from vger.kernel.org (vger.kernel.org [209.132.180.67])\n\tby ozlabs.org (Postfix) with ESMTP id 3xhWSq3Ynwz9s7f\n\tfor ;\n\tWed, 30 Aug 2017 00:37:47 +1000 (AEST)","(majordomo@vger.kernel.org) by vger.kernel.org via listexpand\n\tid S1754521AbdH2Ohp (ORCPT );\n\tTue, 29 Aug 2017 10:37:45 -0400","from mx1.redhat.com ([209.132.183.28]:33836 \"EHLO mx1.redhat.com\"\n\trhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP\n\tid S1752746AbdH2Oho (ORCPT );\n\tTue, 29 Aug 2017 10:37:44 -0400","from smtp.corp.redhat.com\n\t(int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12])\n\t(using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))\n\t(No client certificate requested)\n\tby mx1.redhat.com (Postfix) with ESMTPS id 0442846279;\n\tTue, 29 Aug 2017 14:37:44 +0000 (UTC)","from firesoul.localdomain (ovpn-200-32.brq.redhat.com\n\t[10.40.200.32])\n\tby smtp.corp.redhat.com (Postfix) with ESMTP id CDD0C77EF9;\n\tTue, 29 Aug 2017 14:37:41 +0000 (UTC)","from [192.168.5.1] (localhost [IPv6:::1])\n\tby firesoul.localdomain (Postfix) with ESMTP id DB25630F12C9F;\n\tTue, 29 Aug 2017 16:37:40 +0200 (CEST)"],"DMARC-Filter":"OpenDMARC Filter v1.3.2 mx1.redhat.com 0442846279","Subject":"[PATCH net-next 1/7] xdp: remove redundant argument to\n\ttrace_xdp_redirect","From":"Jesper Dangaard Brouer ","To":"netdev@vger.kernel.org","Cc":"John Fastabend ,\n\tJesper Dangaard Brouer ","Date":"Tue, 29 Aug 2017 16:37:40 +0200","Message-ID":"<150401746079.16384.6082507760415730494.stgit@firesoul>","In-Reply-To":"<150401743083.16384.15778781741742858567.stgit@firesoul>","References":"<150401743083.16384.15778781741742858567.stgit@firesoul>","User-Agent":"StGit/0.17.1-dirty","MIME-Version":"1.0","Content-Type":"text/plain; charset=\"utf-8\"","Content-Transfer-Encoding":"7bit","X-Scanned-By":"MIMEDefang 2.79 on 10.5.11.12","X-Greylist":"Sender IP whitelisted, not delayed by milter-greylist-4.5.16\n\t(mx1.redhat.com [10.5.110.29]);\n\tTue, 29 Aug 2017 14:37:44 +0000 (UTC)","Sender":"netdev-owner@vger.kernel.org","Precedence":"bulk","List-ID":"","X-Mailing-List":"netdev@vger.kernel.org"},"content":"Supplying the action argument XDP_REDIRECT to the tracepoint xdp_redirect\nis redundant as it is only called in-case this action was specified.\n\nRemove the argument, but keep \"act\" member of the tracepoint struct and\npopulate it with XDP_REDIRECT. This makes it easier to write a common bpf_prog\nprocessing events.\n\nSigned-off-by: Jesper Dangaard Brouer \n---\n include/trace/events/xdp.h | 6 +++---\n net/core/filter.c | 6 +++---\n 2 files changed, 6 insertions(+), 6 deletions(-)","diff":"diff --git a/include/trace/events/xdp.h b/include/trace/events/xdp.h\nindex 27cf2ef35f5f..f684f3b36bca 100644\n--- a/include/trace/events/xdp.h\n+++ b/include/trace/events/xdp.h\n@@ -52,10 +52,10 @@ TRACE_EVENT(xdp_exception,\n TRACE_EVENT(xdp_redirect,\n \n \tTP_PROTO(const struct net_device *dev,\n-\t\t const struct bpf_prog *xdp, u32 act,\n+\t\t const struct bpf_prog *xdp,\n \t\t int to_index, int err),\n \n-\tTP_ARGS(dev, xdp, act, to_index, err),\n+\tTP_ARGS(dev, xdp, to_index, err),\n \n \tTP_STRUCT__entry(\n \t\t__array(u8, prog_tag, 8)\n@@ -68,7 +68,7 @@ TRACE_EVENT(xdp_redirect,\n \tTP_fast_assign(\n \t\tBUILD_BUG_ON(sizeof(__entry->prog_tag) != sizeof(xdp->tag));\n \t\tmemcpy(__entry->prog_tag, xdp->tag, sizeof(xdp->tag));\n-\t\t__entry->act\t\t= act;\n+\t\t__entry->act\t\t= XDP_REDIRECT;\n \t\t__entry->ifindex\t= dev->ifindex;\n \t\t__entry->to_index\t= to_index;\n \t\t__entry->err\t\t= err;\ndiff --git a/net/core/filter.c b/net/core/filter.c\nindex 4bcd6baa80c9..de31fb684ad4 100644\n--- a/net/core/filter.c\n+++ b/net/core/filter.c\n@@ -2524,7 +2524,7 @@ static int xdp_do_redirect_map(struct net_device *dev, struct xdp_buff *xdp,\n \tif (likely(!err))\n \t\tri->map_to_flush = map;\n out:\n-\ttrace_xdp_redirect(dev, xdp_prog, XDP_REDIRECT, index, err);\n+\ttrace_xdp_redirect(dev, xdp_prog, index, err);\n \treturn err;\n }\n \n@@ -2548,7 +2548,7 @@ int xdp_do_redirect(struct net_device *dev, struct xdp_buff *xdp,\n \n \terr = __bpf_tx_xdp(fwd, NULL, xdp, 0);\n out:\n-\ttrace_xdp_redirect(dev, xdp_prog, XDP_REDIRECT, index, err);\n+\ttrace_xdp_redirect(dev, xdp_prog, index, err);\n \treturn err;\n }\n EXPORT_SYMBOL_GPL(xdp_do_redirect);\n@@ -2582,7 +2582,7 @@ int xdp_do_generic_redirect(struct net_device *dev, struct sk_buff *skb,\n \n \tskb->dev = fwd;\n out:\n-\ttrace_xdp_redirect(dev, xdp_prog, XDP_REDIRECT, index, err);\n+\ttrace_xdp_redirect(dev, xdp_prog, index, err);\n \treturn err;\n }\n EXPORT_SYMBOL_GPL(xdp_do_generic_redirect);\n","prefixes":["net-next","1/7"]}