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 Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 4FF90C6FD1D for ; Thu, 30 Mar 2023 12:40:09 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231345AbjC3MkH (ORCPT ); Thu, 30 Mar 2023 08:40:07 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:35534 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230427AbjC3MkF (ORCPT ); Thu, 30 Mar 2023 08:40:05 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [IPv6:2604:1380:4641:c500::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 526A07D83; Thu, 30 Mar 2023 05:40:04 -0700 (PDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id D971462040; Thu, 30 Mar 2023 12:40:03 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 8E930C433D2; Thu, 30 Mar 2023 12:40:00 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1680180003; bh=ZA55vgJCegp65j39BBfbZOuuoolCKnWNWh0gaLJ9iRQ=; h=Date:From:To:Cc:Subject:References:In-Reply-To:From; b=PfkIDIPUwSVC1XTZlRntNwS3iELVw2E5HW+hM12xE6zgIHI0zS4Fuxk8IjclaHkwC EnfYwqb1hJHinYk44kVj5jG1xB/82GwdZzW8f3fPIQFxkLoGzfkNhaPngtIk+mtHxK PKw+1aSdq2l1jMhUHiL3qBXee2G4kF+g/+bPKuvROkMQEAR4RMpTI7cMmOEPwNPJZp fMsvAi65q+9N9+8rJMICh0kT+Y8ywwLwg9m1Z01FKESPCltWhmVM1lk/OUzkLL0RcW pmE4RXH66NN9wPoIwzKtowy8XJQ4g13vYlQayI6l1xbEMnzb0lqvhDyLJZ0U7XFqEH +4QU8r5KgLyLQ== Date: Thu, 30 Mar 2023 18:09:50 +0530 From: Manivannan Sadhasivam To: Sricharan R Cc: manivannan.sadhasivam@linaro.org, davem@davemloft.net, edumazet@google.com, kuba@kernel.org, pabeni@redhat.com, linux-arm-msm@vger.kernel.org, netdev@vger.kernel.org, linux-kernel@vger.kernel.org Subject: Re: [PATCH] net: qrtr: Do not do DEL_SERVER broadcast after DEL_CLIENT Message-ID: <20230330112716.GA84386@thinkpad> References: <1680095250-21032-1-git-send-email-quic_srichara@quicinc.com> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline Content-Transfer-Encoding: 8bit In-Reply-To: <1680095250-21032-1-git-send-email-quic_srichara@quicinc.com> Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org On Wed, Mar 29, 2023 at 06:37:30PM +0530, Sricharan R wrote: > When the qrtr socket is released, qrtr_port_remove gets called, which > broadcasts a DEL_CLIENT. After this DEL_SERVER is also additionally > broadcasted, which becomes NOP, but triggers the below error msg. > > "failed while handling packet from 2:-2", since remote node already > acted upon on receiving the DEL_CLIENT, once again when it receives > the DEL_SERVER, it returns -ENOENT. > > Fixing it by not sending a 'DEL_SERVER' to remote when a 'DEL_CLIENT' > was sent for that port. > How about: "On the remote side, when QRTR socket is removed, af_qrtr will call qrtr_port_remove() which broadcasts the DEL_CLIENT packet to all neighbours including local NS. NS upon receiving the DEL_CLIENT packet, will remove the lookups associated with the node:port and broadcasts the DEL_SERVER packet. But on the host side, due to the arrival of the DEL_CLIENT packet, the NS would've already deleted the server belonging to that port. So when the remote's NS again broadcasts the DEL_SERVER for that port, it throws below error message on the host: "failed while handling packet from 2:-2" So fix this error by not broadcasting the DEL_SERVER packet when the DEL_CLIENT packet gets processed." > Signed-off-by: Ram Kumar D > Signed-off-by: Sricharan R > --- > Note: Functionally tested on 5.4 kernel and compile tested on 6.3 TOT > > net/qrtr/ns.c | 16 ++++++++++------ > 1 file changed, 10 insertions(+), 6 deletions(-) > > diff --git a/net/qrtr/ns.c b/net/qrtr/ns.c > index 722936f..6fbb195 100644 > --- a/net/qrtr/ns.c > +++ b/net/qrtr/ns.c > @@ -274,7 +274,7 @@ static struct qrtr_server *server_add(unsigned int service, > return NULL; > } > > -static int server_del(struct qrtr_node *node, unsigned int port) > +static int server_del(struct qrtr_node *node, unsigned int port, bool del_server) s/bool del_server/bool bcast/g > { > struct qrtr_lookup *lookup; > struct qrtr_server *srv; > @@ -287,7 +287,7 @@ static int server_del(struct qrtr_node *node, unsigned int port) > radix_tree_delete(&node->servers, port); > > /* Broadcast the removal of local servers */ > - if (srv->node == qrtr_ns.local_node) > + if (srv->node == qrtr_ns.local_node && del_server) > service_announce_del(&qrtr_ns.bcast_sq, srv); > > /* Announce the service's disappearance to observers */ > @@ -373,7 +373,7 @@ static int ctrl_cmd_bye(struct sockaddr_qrtr *from) > } > slot = radix_tree_iter_resume(slot, &iter); > rcu_read_unlock(); > - server_del(node, srv->port); > + server_del(node, srv->port, true); > rcu_read_lock(); > } > rcu_read_unlock(); > @@ -459,10 +459,14 @@ static int ctrl_cmd_del_client(struct sockaddr_qrtr *from, > kfree(lookup); > } > > - /* Remove the server belonging to this port */ > + /* Remove the server belonging to this port > + * Given that DEL_CLIENT is already broadcasted > + * by port_remove, no need to send DEL_SERVER for > + * the same port to remote > + */ /* * Remove the server belonging to this port but don't broadcast * DEL_SERVER. Neighbours would've already removed the server belonging * to this port due to the DEL_CLIENT broadcast from qrtr_port_remove(). */ - Mani > node = node_get(node_id); > if (node) > - server_del(node, port); > + server_del(node, port, false); > > /* Advertise the removal of this client to all local servers */ > local_node = node_get(qrtr_ns.local_node); > @@ -567,7 +571,7 @@ static int ctrl_cmd_del_server(struct sockaddr_qrtr *from, > if (!node) > return -ENOENT; > > - return server_del(node, port); > + return server_del(node, port, true); > } > > static int ctrl_cmd_new_lookup(struct sockaddr_qrtr *from, > -- > 2.7.4 > -- மணிவண்ணன் சதாசிவம்