Date: Fri, 22 May 2015 19:23:02 +0200
From: Jiri Olsa <jolsa@redhat.com>
To: Wang Nan <wangnan0@huawei.com>
Cc: paulus@samba.org, a.p.zijlstra@chello.nl, mingo@redhat.com,
        acme@kernel.org, namhyung@kernel.org, jolsa@kernel.org,
        dsahern@gmail.com, ast@plumgrid.com, daniel@iogearbox.net,
        brendan.d.gregg@gmail.com, masami.hiramatsu.pt@hitachi.com,
        lizefan@huawei.com, linux-kernel@vger.kernel.org, pi3orama@163.com
Subject: Re: [RFC PATCH v3 21/37] bpf tools: Create eBPF maps defined in an
 object file
Message-ID: <20150522172302.GD6609@krava.redhat.com>
References: <1431860222-61636-1-git-send-email-wangnan0@huawei.com>
 <1431860222-61636-22-git-send-email-wangnan0@huawei.com>
MIME-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
In-Reply-To: <1431860222-61636-22-git-send-email-wangnan0@huawei.com>
User-Agent: Mutt/1.5.23 (2014-03-12)
Sender: linux-kernel-owner@vger.kernel.org
Content-Length: 1093
Lines: 39

On Sun, May 17, 2015 at 10:56:46AM +0000, Wang Nan wrote:

SNIP

> +				i * sizeof(struct bpf_map_def));
> +
> +		if (obj->needs_swap) {
> +			def.type	= bswap_32(def.type);
> +			def.key_size	= bswap_32(def.key_size);
> +			def.value_size	= bswap_32(def.value_size);
> +			def.max_entries	= bswap_32(def.max_entries);
> +		}
> +
> +		*pfd = bpf_create_map(def.type,
> +				      def.key_size,
> +				      def.value_size,
> +				      def.max_entries);
> +		if (*pfd < 0) {
> +			size_t j;
> +			int err = *pfd;
> +
> +			pr_warning("failed to create map: %s\n",
> +				   strerror(errno));
> +			for (j = 0; j < i; j++) {
> +				close(obj->maps_fds[j]);
> +				obj->maps_fds[j] = -1;
> +			}
> +			free(obj->maps_fds);
> +			obj->maps_fds = NULL;

the close/free code above could go into separate function
and be used in bpf_unload_object

jirka
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/