From patchwork Wed Apr 25 02:07:13 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Wang Sheng-Hui X-Patchwork-Id: 903930 X-Patchwork-Delegate: bpf@iogearbox.net Return-Path: X-Original-To: patchwork-incoming-netdev@ozlabs.org Delivered-To: patchwork-incoming-netdev@ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=netdev-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dmarc=pass (p=none dis=none) header.from=foxmail.com Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=foxmail.com header.i=@foxmail.com header.b="J3MZVMnh"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 40W3Vx1fgWz9rxx for ; Wed, 25 Apr 2018 12:07:37 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751027AbeDYCHe (ORCPT ); Tue, 24 Apr 2018 22:07:34 -0400 Received: from smtpbgau2.qq.com ([54.206.34.216]:53489 "EHLO smtpbgau2.qq.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750841AbeDYCHd (ORCPT ); Tue, 24 Apr 2018 22:07:33 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=foxmail.com; s=s201512; t=1524622048; bh=u9KGLDUdBOidqKwI9PDIPemXRpgGCAbLCrK2fFLz8zQ=; h=From:To:Subject:Date:Message-Id; b=J3MZVMnhlsygQOZFH8Zumvx8aNHuQ+DazAAfJPDbNDft56REU6CqeJ+Wu1195UdL+ cAF0Pa71sxflZHbeHzKzagaBDBDq72CDXavMSSIBvX91aSBVhJszmlu7eGzGtjHY0n VWpbwDLIZJ2KPTmD2pTjsQc8nNQpzfeqoU2YfYiA= X-QQ-mid: esmtp27t1524622047tpaq4w7qp Received: from localhost.localdomain (unknown [114.240.89.65]) by esmtp4.qq.com (ESMTP) with id ; Wed, 25 Apr 2018 10:07:13 +0800 (CST) X-QQ-SSF: 01000000000000F0FG3000000000000 X-QQ-FEAT: R3tZgSt770Npr4xyLlMI3FgMFBuqMBRn3nbxuDTmmj8ZgmeTauwnxGJCtwri2 eU02vD6n8K01RztR1m0w5GTl06XTvq167s4J5iYyQqC7QNM4fO2SpBtwFrTi/sQuLbQbn7c dWGXz7QeyUrbjGhfqDk8N15HoLLQa2dLSa/pBaxfCbWKlt00VgnXMwQ2e7cCG1znEs8Fs82 JqiGdnuNgiyWl7CX/L1xMzFbd4bdNQUKAQdJaxx+erC2v5joL1V28QUGLR794Lhrz5yTUEv 4fTz1U4TUMCasZ7G92fPVAfro= X-QQ-GoodBg: 0 From: Wang Sheng-Hui To: ast@kernel.org, daniel@iogearbox.net, netdev@vger.kernel.org Subject: [PATCH] [PATCH bpf-next] samples/bpf/bpf_load.c: remove redundant ret assignment in bpf_load_program() Date: Wed, 25 Apr 2018 10:07:13 +0800 Message-Id: <20180425020713.1795-1-shhuiw@foxmail.com> X-Mailer: git-send-email 2.17.0 X-QQ-SENDSIZE: 520 Feedback-ID: esmtp:foxmail.com:bgforeign:bgforeign1 X-QQ-Bgrelay: 1 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org 2 redundant ret assignments removded: * 'ret = 1' before the logic 'if (data_maps)', and if any errors jump to label 'done'. No 'ret = 1' needed before the error jump. * After the '/* load programs */' part, if everything goes well, then the BPF code will be loaded and 'ret' set to 0 by load_and_attach(). If something goes wrong, 'ret' set to none-O, the redundant 'ret = 0' after the for clause will make the error skipped. For example, if some BPF code cannot provide supported program types in ELF SEC("unknown"), the for clause will not call load_and_attach() to load the BPF code. 1 should be returned to callees instead of 0. Signed-off-by: Wang Sheng-Hui --- samples/bpf/bpf_load.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/samples/bpf/bpf_load.c b/samples/bpf/bpf_load.c index bebe4188b4b3..feca497d6afd 100644 --- a/samples/bpf/bpf_load.c +++ b/samples/bpf/bpf_load.c @@ -549,7 +549,6 @@ static int do_load_bpf_file(const char *path, fixup_map_cb fixup_map) if (nr_maps < 0) { printf("Error: Failed loading ELF maps (errno:%d):%s\n", nr_maps, strerror(-nr_maps)); - ret = 1; goto done; } if (load_maps(map_data, nr_maps, fixup_map)) @@ -615,7 +614,6 @@ static int do_load_bpf_file(const char *path, fixup_map_cb fixup_map) } } - ret = 0; done: close(fd); return ret;