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=-7.1 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS 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 81220C76199 for ; Sun, 16 Feb 2020 19:31:35 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 5D8722084E for ; Sun, 16 Feb 2020 19:31:35 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1581881495; bh=s8hhJxNSjLc/Db0ToxiU1lugZGp26piyxPVxpfOdEwg=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=Z11r8cHF5iI8Ps2HcMSIcFqtCL/YsmdeVN+ZohMrMqTTQOuO7Jt63EWKHusNPtdTu Oe/D3Qrnf7FoFP7rk7oKhPqlsPP6whGtHwDVWhI28dylecV94zQsh4yBUI4JXmUzEg Fadk2xf0+id+VoYwPutYDtHtdwT/8vZjgptDU2cg= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727993AbgBPTbf convert rfc822-to-8bit (ORCPT ); Sun, 16 Feb 2020 14:31:35 -0500 Received: from us-smtp-2.mimecast.com ([207.211.31.81]:26101 "EHLO us-smtp-delivery-1.mimecast.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1727936AbgBPTbe (ORCPT ); Sun, 16 Feb 2020 14:31:34 -0500 Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-401-MPLiEuvGOq2eSxEDCcrY6g-1; Sun, 16 Feb 2020 14:31:29 -0500 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id BA9B78017DF; Sun, 16 Feb 2020 19:31:27 +0000 (UTC) Received: from krava.redhat.com (ovpn-204-28.brq.redhat.com [10.40.204.28]) by smtp.corp.redhat.com (Postfix) with ESMTP id 739628574E; Sun, 16 Feb 2020 19:31:23 +0000 (UTC) From: Jiri Olsa To: Alexei Starovoitov , Daniel Borkmann Cc: Andrii Nakryiko , netdev@vger.kernel.org, bpf@vger.kernel.org, Yonghong Song , Song Liu , Martin KaFai Lau , Jakub Kicinski , David Miller , =?UTF-8?q?Bj=C3=B6rn=20T=C3=B6pel?= , John Fastabend , Jesper Dangaard Brouer , 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 We don't currently propagate error value from bpf_dispatcher_update function. This will be needed in following patch, that needs to update kallsyms based on the success of dispatcher update. Suggested-by: Andrii Nakryiko Signed-off-by: Jiri Olsa --- kernel/bpf/dispatcher.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/kernel/bpf/dispatcher.c b/kernel/bpf/dispatcher.c index b3e5b214fed8..3a5871bbd6d0 100644 --- a/kernel/bpf/dispatcher.c +++ b/kernel/bpf/dispatcher.c @@ -102,7 +102,7 @@ static int bpf_dispatcher_prepare(struct bpf_dispatcher *d, void *image) return arch_prepare_bpf_dispatcher(image, &ips[0], d->num_progs); } -static void bpf_dispatcher_update(struct bpf_dispatcher *d, int prev_num_progs) +static int bpf_dispatcher_update(struct bpf_dispatcher *d, int prev_num_progs) { void *old, *new; u32 noff; @@ -118,15 +118,17 @@ static void bpf_dispatcher_update(struct bpf_dispatcher *d, int prev_num_progs) new = d->num_progs ? d->image + noff : NULL; if (new) { - if (bpf_dispatcher_prepare(d, new)) - return; + err = bpf_dispatcher_prepare(d, new); + if (err) + return err; } err = bpf_arch_text_poke(d->func, BPF_MOD_JUMP, old, new); if (err || !new) - return; + return err; d->image_off = noff; + return 0; } void bpf_dispatcher_change_prog(struct bpf_dispatcher *d, struct bpf_prog *from, -- 2.24.1