From patchwork Wed Jul 5 13:20:51 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexandru Ardelean X-Patchwork-Id: 784604 X-Patchwork-Delegate: nbd@openwrt.org Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from bombadil.infradead.org (bombadil.infradead.org [65.50.211.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3x2hNh0krbz9s3w for ; Wed, 5 Jul 2017 23:21:56 +1000 (AEST) Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="DgRvRqnF"; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="GRmqZKvI"; dkim-atps=neutral DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:MIME-Version:Cc:List-Subscribe: List-Help:List-Post:List-Archive:List-Unsubscribe:List-Id:Subject:Message-Id: Date:To:From:Reply-To:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To:References: List-Owner; bh=EvxseHHR8MVtE50Ssgkhv1XmrHUsWQ9vILhMS1WyTCE=; b=DgRvRqnFvjCI3Y Vlg/I800Y0Cm3Hmcgtvf7iQGHNLKP/BDfx/CjuLcYXUTLV9eWrPSjZCMRWLPzbZCHOFYs3Gdo/CWy NIfDIQN1Hq9bKlGlWjPszTYBBKd3Ejp+ATwyXc6oMpHcr9J0erRnqVGOhnSpkv/0X4xpx/JdMIbXB wCCW2dxWAolk2mwnDx7dA+OgWvWunfNFJFbIKOStHDLDMKPhb0UwH3cMnli8oYWWymyMLfRSULGsz fvZ0YRFyWeJc3YYzC3s0OWQt/tUX0QdSVyYL1ou0DJQztXpv9aXHYdwTSN/pGt5GD0MeDFDUeUkkx juXTAd2W6oRBQOwSigdw==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.87 #1 (Red Hat Linux)) id 1dSkFV-0005p2-Pm; Wed, 05 Jul 2017 13:21:45 +0000 Received: from mail-wr0-x241.google.com ([2a00:1450:400c:c0c::241]) by bombadil.infradead.org with esmtps (Exim 4.87 #1 (Red Hat Linux)) id 1dSkF9-0005Zz-0a for lede-dev@lists.infradead.org; Wed, 05 Jul 2017 13:21:26 +0000 Received: by mail-wr0-x241.google.com with SMTP id z45so50154967wrb.2 for ; Wed, 05 Jul 2017 06:21:02 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id; bh=lgSWc5xrgvgH4AldjSntF4G9y1NKJCryMNHtrfu5MI0=; b=GRmqZKvImm57HmpXRPW7K25/GFp34Gdha0HAeiVNQbSf9gFyXDBpNnqcD2zXJ3IbVb ziO/ZCoOh7DD+ZRanDYybXwvLVZZ4akn80etwQNU7x5pQfSsv73IWa6H41VUpwHDsazW 473MzIfDA/AK1F2WGYwvELAAn/9MtbHYhPoM2jynmiPL5/uUwXFJdjUxwxjxwblMcLdE QYHUbMTAO0xOGtmSYSIlhqvBoYlKRfLIsb9lNIZEuqBaPDdCIJddA5yZvZDtGZALSy5Y xPuIUo1EC41s6Ig3KRSo9IflnInpqAct0c5z01+0P9eX2taCV6rmJf4XAiOUYoLgb5VW fnIQ== 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=lgSWc5xrgvgH4AldjSntF4G9y1NKJCryMNHtrfu5MI0=; b=KmSnVvmNiA4oPDgho6nQmDVOxZ2fevsZUe3ldHrqu4RtLNsnzCh/yy32iKCv4+XdIf w0t4Goii68SL1llKykkvnWe9J17HmE9C8SqZx8V6jMmj+gP3H9jUl6zwCSlujWC7W9OF UpSB3mpKUzOFCSEBgixD5b/Z0XN7smCNLzYZalT+ACf+NEeH5sQaAU3Fr37NZPR5vGbW bKZ0+8I/KntekBclKKnCo59tjYUW8lVMEmipeOnkq6R8YCFpTcGWEbVDWmG76EvANcuF ogyfREok9IoUaVoXgAgdFtF3zmX65zE54gqNMf2RaLV5hcvaCggLwZh7z43m/aep/dPB Wu4w== X-Gm-Message-State: AKS2vOyFEKWZZkIg1Am25yg8adLzhuifXlj6RzSU7qDzc7qViweJcJEv 6gNS7zUQ0HqxvixB X-Received: by 10.223.175.18 with SMTP id z18mr43124926wrc.22.1499260860358; Wed, 05 Jul 2017 06:21:00 -0700 (PDT) Received: from localhost.localdomain ([5.2.198.78]) by smtp.googlemail.com with ESMTPSA id y77sm25519700wrb.39.2017.07.05.06.20.59 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 05 Jul 2017 06:20:59 -0700 (PDT) From: Alexandru Ardelean To: lede-dev@lists.infradead.org Date: Wed, 5 Jul 2017 16:20:51 +0300 Message-Id: <1499260853-7616-1-git-send-email-ardeleanalex@gmail.com> X-Mailer: git-send-email 2.7.4 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20170705_062123_530729_8899B6EA X-CRM114-Status: GOOD ( 15.93 ) X-Spam-Score: -2.0 (--) X-Spam-Report: SpamAssassin version 3.4.1 on bombadil.infradead.org summary: Content analysis details: (-2.0 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at http://www.dnswl.org/, no trust [2a00:1450:400c:c0c:0:0:0:241 listed in] [list.dnswl.org] -0.0 SPF_PASS SPF: sender matches SPF record 0.0 FREEMAIL_FROM Sender email is commonly abused enduser mail provider (ardeleanalex[at]gmail.com) -1.9 BAYES_00 BODY: Bayes spam probability is 0 to 1% [score: 0.0000] -0.1 DKIM_VALID Message has at least one valid DKIM or DK signature 0.1 DKIM_SIGNED Message has a DKIM or DK signature, not necessarily valid -0.1 DKIM_VALID_AU Message has a valid DKIM or DK signature from author's domain Subject: [LEDE-DEV] [PATCH 1/3] ubusd: don't free messages in ubus_send_msg() anymore X-BeenThere: lede-dev@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Alexandru Ardelean , nbd@nbd.name MIME-Version: 1.0 Sender: "Lede-dev" Errors-To: lede-dev-bounces+incoming=patchwork.ozlabs.org@lists.infradead.org This makes it clear that `ubus_msg_send()` is only about sending and queue-ing messages, and has nothing to do with free-ing. It can be a bit misleading/confusing when trying to go through the code and make assumptions about whether a buffer is free'd in ubus_send_msg(), or is free'd outside. In `ubusd_proto_receive_message()` the `ubus_msg_free()` is now called before the `if (ret == -1)` check. That way, all callbacks will have their messages free'd, which is what's desired, but confusing, because: * ubusd_handle_invoke() called ubus_msg_free() before returning -1 * ubusd_handle_notify() called ubus_msg_free() before returning -1 * ubusd_handle_response() called ubus_msg_send(,,free=true) before returning -1 * ubus_msg_send() would call ubus_msg_send(,,free=false) * all other callback callers would `ubus_msg_send(,,free=true)` (free the buffers in ubus_msg_send() ) In all other places, where `ubus_msg_send(,,free=true)` an explicit `ubus_msg_free()` was added. Signed-off-by: Alexandru Ardelean --- ubusd.c | 8 ++------ ubusd.h | 2 +- ubusd_event.c | 2 +- ubusd_monitor.c | 3 ++- ubusd_proto.c | 29 +++++++++++++++-------------- 5 files changed, 21 insertions(+), 23 deletions(-) diff --git a/ubusd.c b/ubusd.c index f060b38..ba1ff07 100644 --- a/ubusd.c +++ b/ubusd.c @@ -146,7 +146,7 @@ static void ubus_msg_enqueue(struct ubus_client *cl, struct ubus_msg_buf *ub) } /* takes the msgbuf reference */ -void ubus_msg_send(struct ubus_client *cl, struct ubus_msg_buf *ub, bool free) +void ubus_msg_send(struct ubus_client *cl, struct ubus_msg_buf *ub) { int written; @@ -160,7 +160,7 @@ void ubus_msg_send(struct ubus_client *cl, struct ubus_msg_buf *ub, bool free) written = 0; if (written >= ub->len + sizeof(ub->hdr)) - goto out; + return; cl->txq_ofs = written; @@ -168,10 +168,6 @@ void ubus_msg_send(struct ubus_client *cl, struct ubus_msg_buf *ub, bool free) uloop_fd_add(&cl->sock, ULOOP_READ | ULOOP_WRITE | ULOOP_EDGE_TRIGGER); } ubus_msg_enqueue(cl, ub); - -out: - if (free) - ubus_msg_free(ub); } static struct ubus_msg_buf *ubus_msg_head(struct ubus_client *cl) diff --git a/ubusd.h b/ubusd.h index 5031ed4..991a59f 100644 --- a/ubusd.h +++ b/ubusd.h @@ -67,7 +67,7 @@ struct ubus_path { extern const char *ubusd_acl_dir; struct ubus_msg_buf *ubus_msg_new(void *data, int len, bool shared); -void ubus_msg_send(struct ubus_client *cl, struct ubus_msg_buf *ub, bool free); +void ubus_msg_send(struct ubus_client *cl, struct ubus_msg_buf *ub); void ubus_msg_free(struct ubus_msg_buf *ub); struct blob_attr **ubus_parse_msg(struct blob_attr *msg); diff --git a/ubusd_event.c b/ubusd_event.c index 984f341..0469c20 100644 --- a/ubusd_event.c +++ b/ubusd_event.c @@ -129,7 +129,7 @@ static void ubusd_send_event_msg(struct ubus_msg_buf **ub, struct ubus_client *c *objid_ptr = htonl(obj->id.id); (*ub)->hdr.seq = ++event_seq; - ubus_msg_send(obj->client, *ub, false); + ubus_msg_send(obj->client, *ub); } static bool strmatch_len(const char *s1, const char *s2, int *len) diff --git a/ubusd_monitor.c b/ubusd_monitor.c index 82d0333..a192206 100644 --- a/ubusd_monitor.c +++ b/ubusd_monitor.c @@ -76,7 +76,8 @@ ubusd_monitor_message(struct ubus_client *cl, struct ubus_msg_buf *ub, bool send ub = ubus_msg_new(mb.head, blob_raw_len(mb.head), true); ub->hdr.type = UBUS_MSG_MONITOR; ub->hdr.seq = ++m->seq; - ubus_msg_send(m->cl, ub, true); + ubus_msg_send(m->cl, ub); + ubus_msg_free(ub); } } diff --git a/ubusd_proto.c b/ubusd_proto.c index 72da7a7..441d084 100644 --- a/ubusd_proto.c +++ b/ubusd_proto.c @@ -89,7 +89,8 @@ ubus_proto_send_msg_from_blob(struct ubus_client *cl, struct ubus_msg_buf *ub, ub->hdr.type = type; ub->fd = fd; - ubus_msg_send(cl, ub, true); + ubus_msg_send(cl, ub); + ubus_msg_free(ub); } static bool ubusd_send_hello(struct ubus_client *cl) @@ -102,14 +103,15 @@ static bool ubusd_send_hello(struct ubus_client *cl) return false; ubus_msg_init(ub, UBUS_MSG_HELLO, 0, cl->id.id); - ubus_msg_send(cl, ub, true); + ubus_msg_send(cl, ub); + ubus_msg_free(ub); return true; } static int ubusd_send_pong(struct ubus_client *cl, struct ubus_msg_buf *ub, struct blob_attr **attr) { ub->hdr.type = UBUS_MSG_DATA; - ubus_msg_send(cl, ub, false); + ubus_msg_send(cl, ub); return 0; } @@ -274,7 +276,6 @@ static int ubusd_handle_invoke(struct ubus_client *cl, struct ubus_msg_buf *ub, blob_buf_init(&b, 0); ubusd_forward_invoke(cl, obj, method, ub, attr[UBUS_ATTR_DATA]); - ubus_msg_free(ub); return -1; } @@ -322,7 +323,6 @@ static int ubusd_handle_notify(struct ubus_client *cl, struct ubus_msg_buf *ub, blob_put_int8(&b, UBUS_ATTR_NO_REPLY, 1); ubusd_forward_invoke(cl, s->subscriber, method, ub, attr[UBUS_ATTR_DATA]); } - ubus_msg_free(ub); return -1; } @@ -359,11 +359,8 @@ static int ubusd_handle_response(struct ubus_client *cl, struct ubus_msg_buf *ub goto error; ub->hdr.peer = blob_get_u32(attr[UBUS_ATTR_OBJID]); - ubus_msg_send(cl, ub, true); - return -1; - + ubus_msg_send(cl, ub); error: - ubus_msg_free(ub); return -1; } @@ -454,18 +451,20 @@ void ubusd_proto_receive_message(struct ubus_client *cl, struct ubus_msg_buf *ub if (ub->hdr.type != UBUS_MSG_STATUS && ub->hdr.type != UBUS_MSG_INVOKE) ubus_msg_close_fd(ub); + /* Note: no callback should free the `ub` buffer + that's always done right after the callback finishes */ if (cb) ret = cb(cl, ub, ubus_parse_msg(ub->data)); else ret = UBUS_STATUS_INVALID_COMMAND; + ubus_msg_free(ub); + if (ret == -1) return; - ubus_msg_free(ub); - *retmsg_data = htonl(ret); - ubus_msg_send(cl, retmsg, false); + ubus_msg_send(cl, retmsg); } struct ubus_client *ubusd_proto_new_client(int fd, uloop_fd_handler cb) @@ -526,7 +525,8 @@ void ubus_notify_subscription(struct ubus_object *obj) return; ubus_msg_init(ub, UBUS_MSG_NOTIFY, ++obj->invoke_seq, 0); - ubus_msg_send(obj->client, ub, true); + ubus_msg_send(obj->client, ub); + ubus_msg_free(ub); } void ubus_notify_unsubscribe(struct ubus_subscription *s) @@ -540,7 +540,8 @@ void ubus_notify_unsubscribe(struct ubus_subscription *s) ub = ubus_msg_from_blob(false); if (ub != NULL) { ubus_msg_init(ub, UBUS_MSG_UNSUBSCRIBE, ++s->subscriber->invoke_seq, 0); - ubus_msg_send(s->subscriber->client, ub, true); + ubus_msg_send(s->subscriber->client, ub); + ubus_msg_free(ub); } ubus_unsubscribe(s);