From patchwork Fri Mar 8 06:09:38 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bo YU X-Patchwork-Id: 1053368 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=gmail.com Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="GT5lBK7j"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 44FxtJ66wZz9s9h for ; Fri, 8 Mar 2019 17:10:00 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726346AbfCHGJq (ORCPT ); Fri, 8 Mar 2019 01:09:46 -0500 Received: from mail-yw1-f65.google.com ([209.85.161.65]:39223 "EHLO mail-yw1-f65.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726039AbfCHGJq (ORCPT ); Fri, 8 Mar 2019 01:09:46 -0500 Received: by mail-yw1-f65.google.com with SMTP id z191so15452840ywa.6; Thu, 07 Mar 2019 22:09:45 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id; bh=EoYCz66ft2NTt/PnS2Fszn3JHSWf44OPbEFuS+P6CWA=; b=GT5lBK7jcxiBo1mdUIhPLQ77v+xpOIRYaRVJP23+lECYhMWp4+EUK5XeTW5gL+CWi2 yViBkvp+NI2+//OTDorQeDrlhoRmze15rF1X7gTNDxUV5cbcSKsUty2sgc3py9NGmF7v z3lsA87yrsuRmIXYDwABWwbbZiKLR95TnALBZW+srnX4kFISQWxGVRXWxw43KO7LnN91 tecvml5XX3RkWYUrKI+2sbmDwWwF6ejdEQCtcaABmoyH9xCtKqzlUnhJX8djyrqKPWdT qkU/jRh0ubk3/DGwjP9GMiWl9ECluKzZS4pxxiNaR/9i36Kg21WQjwdNN2/gtV4tmUUR owFA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=EoYCz66ft2NTt/PnS2Fszn3JHSWf44OPbEFuS+P6CWA=; b=PRIcY9Nkv2EmHZdF4BbBHBROS1XWg0bSsD19K4DWw3W/MNsuIahltBp7AOjPz+pSu8 4Ujz+pnHlLeg1bMk7xFbDzazSkQ726tJB9t53Nd/j5GpcSJfxEwwdL/4Fa2/yQHJsbK7 QSM+qSTkAf1b+2O/mGl5scTWJ0dGL59Xtcb3ME8qudVKQaJW9zjyfXlC8hDmdz1ryUtN +nJHvzh9BJYclXg83zGVeJVLb3YCEAEicJKBzAcduk+Ug6TKETB+SNhYI6qwYxWMLI+l Y2leBVssYaPCMsqLXvZyiQPrQ43a1oF/AEueaMPVog87citKMek2+2/IMPWT03oNKnKE cXQA== X-Gm-Message-State: APjAAAX4L9Co1G0W/+ORHgawHxVCgSF60L9lBXYTc5U25M0G+QJIH6WJ 5LhgWEG2Y5Q2ClYDBwHbF/4= X-Google-Smtp-Source: APXvYqzO38qgvPeJVyZfA8tFK6M9Vil7cgMK4Rvz2vIxSNSxyAQmxzt14FvBrdeYfHntvPMy871IgA== X-Received: by 2002:a0d:c544:: with SMTP id h65mr13252955ywd.35.1552025385446; Thu, 07 Mar 2019 22:09:45 -0800 (PST) Received: from localhost.localdomain ([191.101.9.198]) by smtp.gmail.com with ESMTPSA id s5sm2436205ywg.108.2019.03.07.22.09.44 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 07 Mar 2019 22:09:45 -0800 (PST) From: Bo YU To: ast@kernel.org, daniel@iogearbox.net, kafai@fb.com, ongliubraving@fb.com, yhs@fb.com, davem@davemloft.net Cc: Bo YU , netdev@vger.kernel.org, bpf@vger.kernel.org, linux-kernel@vger.kernel.org, yuzibode@126.com Subject: [PATCH V2] bpf: fix warning about using plain integer as NULL Date: Fri, 8 Mar 2019 01:09:38 -0500 Message-Id: <20190308060938.17305-1-tsu.yubo@gmail.com> X-Mailer: git-send-email 2.11.0 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Sparse warning below: sudo make C=2 CF=-D__CHECK_ENDIAN__ M=net/bpf/ CHECK net/bpf//test_run.c net/bpf//test_run.c:19:77: warning: Using plain integer as NULL pointer ./include/linux/bpf-cgroup.h:295:77: warning: Using plain integer as NULL pointer Fixes: 8bad74f9840f ("bpf: extend cgroup bpf core to allow multiple cgroup storage types") Acked-by: Yonghong Song Signed-off-by: Bo YU --- V2: Add fix-up tag from Yonghong --- include/linux/bpf-cgroup.h | 2 +- net/bpf/test_run.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/include/linux/bpf-cgroup.h b/include/linux/bpf-cgroup.h index 695b2a880d9a..a4c644c1c091 100644 --- a/include/linux/bpf-cgroup.h +++ b/include/linux/bpf-cgroup.h @@ -292,7 +292,7 @@ static inline int bpf_cgroup_storage_assign(struct bpf_prog *prog, static inline void bpf_cgroup_storage_release(struct bpf_prog *prog, struct bpf_map *map) {} static inline struct bpf_cgroup_storage *bpf_cgroup_storage_alloc( - struct bpf_prog *prog, enum bpf_cgroup_storage_type stype) { return 0; } + struct bpf_prog *prog, enum bpf_cgroup_storage_type stype) { return NULL; } static inline void bpf_cgroup_storage_free( struct bpf_cgroup_storage *storage) {} static inline int bpf_percpu_cgroup_storage_copy(struct bpf_map *map, void *key, diff --git a/net/bpf/test_run.c b/net/bpf/test_run.c index da7051d62727..fab142b796ef 100644 --- a/net/bpf/test_run.c +++ b/net/bpf/test_run.c @@ -16,7 +16,7 @@ static int bpf_test_run(struct bpf_prog *prog, void *ctx, u32 repeat, u32 *retval, u32 *time) { - struct bpf_cgroup_storage *storage[MAX_BPF_CGROUP_STORAGE_TYPE] = { 0 }; + struct bpf_cgroup_storage *storage[MAX_BPF_CGROUP_STORAGE_TYPE] = { NULL }; enum bpf_cgroup_storage_type stype; u64 time_start, time_spent = 0; int ret = 0;