{"id":1238825,"url":"http://patchwork.ozlabs.org/api/patches/1238825/?format=json","web_url":"http://patchwork.ozlabs.org/project/netdev/patch/20200216193005.144157-14-jolsa@kernel.org/","project":{"id":7,"url":"http://patchwork.ozlabs.org/api/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,"list_archive_url":"","list_archive_url_format":"","commit_url_format":""},"msgid":"<20200216193005.144157-14-jolsa@kernel.org>","list_archive_url":null,"date":"2020-02-16T19:30:00","name":"[13/18] bpf: Return error value in bpf_dispatcher_update","commit_ref":null,"pull_url":null,"state":"changes-requested","archived":false,"hash":"5fe53316d7202c68b819ec5498da5be47fb97c64","submitter":{"id":73687,"url":"http://patchwork.ozlabs.org/api/people/73687/?format=json","name":"Jiri Olsa","email":"jolsa@kernel.org"},"delegate":{"id":77147,"url":"http://patchwork.ozlabs.org/api/users/77147/?format=json","username":"bpf","first_name":"BPF","last_name":"Maintainers","email":"bpf@iogearbox.net"},"mbox":"http://patchwork.ozlabs.org/project/netdev/patch/20200216193005.144157-14-jolsa@kernel.org/mbox/","series":[{"id":158829,"url":"http://patchwork.ozlabs.org/api/series/158829/?format=json","web_url":"http://patchwork.ozlabs.org/project/netdev/list/?series=158829","date":"2020-02-16T19:29:47","name":"bpf: Add trampoline and dispatcher to /proc/kallsyms","version":1,"mbox":"http://patchwork.ozlabs.org/series/158829/mbox/"}],"comments":"http://patchwork.ozlabs.org/api/patches/1238825/comments/","check":"pending","checks":"http://patchwork.ozlabs.org/api/patches/1238825/checks/","tags":{},"related":[],"headers":{"Return-Path":"","X-Original-To":"incoming-bpf@patchwork.ozlabs.org","Delivered-To":"patchwork-incoming-bpf@bilbo.ozlabs.org","Authentication-Results":["ozlabs.org; spf=none (no SPF record)\n\tsmtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67;\n\thelo=vger.kernel.org; envelope-from=bpf-owner@vger.kernel.org;\n\treceiver=)","ozlabs.org;\n\tdmarc=fail (p=none dis=none) header.from=kernel.org"],"Received":["from vger.kernel.org (vger.kernel.org [209.132.180.67])\n\tby ozlabs.org (Postfix) with ESMTP id 48LHKz3R5Fz9sP7\n\tfor ;\n\tMon, 17 Feb 2020 06:31:35 +1100 (AEDT)","(majordomo@vger.kernel.org) by vger.kernel.org via listexpand\n\tid S1727993AbgBPTbf convert rfc822-to-8bit (ORCPT\n\t);\n\tSun, 16 Feb 2020 14:31:35 -0500","from us-smtp-2.mimecast.com ([207.211.31.81]:26101 \"EHLO\n\tus-smtp-delivery-1.mimecast.com\" rhost-flags-OK-OK-OK-FAIL)\n\tby vger.kernel.org with ESMTP id S1727936AbgBPTbe (ORCPT\n\t); Sun, 16 Feb 2020 14:31:34 -0500","from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com\n\t[209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id\n\tus-mta-401-MPLiEuvGOq2eSxEDCcrY6g-1; Sun, 16 Feb 2020 14:31:29 -0500","from smtp.corp.redhat.com\n\t(int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11])\n\t(using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))\n\t(No client certificate requested)\n\tby mimecast-mx01.redhat.com (Postfix) with ESMTPS id BA9B78017DF;\n\tSun, 16 Feb 2020 19:31:27 +0000 (UTC)","from krava.redhat.com (ovpn-204-28.brq.redhat.com [10.40.204.28])\n\tby smtp.corp.redhat.com (Postfix) with ESMTP id 739628574E;\n\tSun, 16 Feb 2020 19:31:23 +0000 (UTC)"],"From":"Jiri Olsa ","To":"Alexei Starovoitov ,\n\tDaniel Borkmann ","Cc":"Andrii Nakryiko , netdev@vger.kernel.org,\n\tbpf@vger.kernel.org, Yonghong Song , Song Liu\n\t, Martin KaFai Lau ,\n\tJakub Kicinski , David Miller ,\n\t=?utf-8?b?QmrDtnJuIFTDtnBlbA==?= ,\n\tJohn Fastabend , Jesper Dangaard Brouer\n\t, Arnaldo Carvalho de Melo ","Subject":"[PATCH 13/18] bpf: Return error value in bpf_dispatcher_update","Date":"Sun, 16 Feb 2020 20:30:00 +0100","Message-Id":"<20200216193005.144157-14-jolsa@kernel.org>","In-Reply-To":"<20200216193005.144157-1-jolsa@kernel.org>","References":"<20200216193005.144157-1-jolsa@kernel.org>","MIME-Version":"1.0","X-Scanned-By":"MIMEDefang 2.79 on 10.5.11.11","X-MC-Unique":"MPLiEuvGOq2eSxEDCcrY6g-1","X-Mimecast-Spam-Score":"0","X-Mimecast-Originator":"kernel.org","Content-Type":"text/plain; charset=WINDOWS-1252","Content-Transfer-Encoding":"8BIT","Sender":"bpf-owner@vger.kernel.org","Precedence":"bulk","List-ID":"","X-Mailing-List":"bpf@vger.kernel.org"},"content":"We don't currently propagate error value from\nbpf_dispatcher_update function. This will be\nneeded in following patch, that needs to update\nkallsyms based on the success of dispatcher\nupdate.\n\nSuggested-by: Andrii Nakryiko \nSigned-off-by: Jiri Olsa \n---\n kernel/bpf/dispatcher.c | 10 ++++++----\n 1 file changed, 6 insertions(+), 4 deletions(-)","diff":"diff --git a/kernel/bpf/dispatcher.c b/kernel/bpf/dispatcher.c\nindex b3e5b214fed8..3a5871bbd6d0 100644\n--- a/kernel/bpf/dispatcher.c\n+++ b/kernel/bpf/dispatcher.c\n@@ -102,7 +102,7 @@ static int bpf_dispatcher_prepare(struct bpf_dispatcher *d, void *image)\n \treturn arch_prepare_bpf_dispatcher(image, &ips[0], d->num_progs);\n }\n \n-static void bpf_dispatcher_update(struct bpf_dispatcher *d, int prev_num_progs)\n+static int bpf_dispatcher_update(struct bpf_dispatcher *d, int prev_num_progs)\n {\n \tvoid *old, *new;\n \tu32 noff;\n@@ -118,15 +118,17 @@ static void bpf_dispatcher_update(struct bpf_dispatcher *d, int prev_num_progs)\n \n \tnew = d->num_progs ? d->image + noff : NULL;\n \tif (new) {\n-\t\tif (bpf_dispatcher_prepare(d, new))\n-\t\t\treturn;\n+\t\terr = bpf_dispatcher_prepare(d, new);\n+\t\tif (err)\n+\t\t\treturn err;\n \t}\n \n \terr = bpf_arch_text_poke(d->func, BPF_MOD_JUMP, old, new);\n \tif (err || !new)\n-\t\treturn;\n+\t\treturn err;\n \n \td->image_off = noff;\n+\treturn 0;\n }\n \n void bpf_dispatcher_change_prog(struct bpf_dispatcher *d, struct bpf_prog *from,\n","prefixes":["13/18"]}