From patchwork Thu Jun 21 11:49:36 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hangbin Liu X-Patchwork-Id: 932693 X-Patchwork-Delegate: davem@davemloft.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="f2FzQ5MI"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 41BKkh2ZMdz9s1B for ; Thu, 21 Jun 2018 21:50:04 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S933268AbeFULuC (ORCPT ); Thu, 21 Jun 2018 07:50:02 -0400 Received: from mail-pl0-f67.google.com ([209.85.160.67]:44027 "EHLO mail-pl0-f67.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S933130AbeFULuA (ORCPT ); Thu, 21 Jun 2018 07:50:00 -0400 Received: by mail-pl0-f67.google.com with SMTP id c41-v6so1559975plj.10 for ; Thu, 21 Jun 2018 04:50:00 -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=KJFLo8b+lyW3xhIfFRDH7eufuk7HK0NNLHsRQfD2Vrw=; b=f2FzQ5MIcn+SpVLTmflQgBKAhR6zG7Ou3L/1cyMGRAEMe3/0HCqTlngG7OpUvg6Te1 rbpfIij/leBuDnXDhw9Fw3OVLO/tk23K6ytQ9CGjPWhEMQe8J2bjkVZ8p6p8A6e6hLxZ GGpnIbKXkUbVMaVx/WnpSg7dZNujeJW1vXw1hN1IRVKoXJcJdL1W+Zg1wh7TLbW0pCNR JARGhpiLo9DAPrcMXn/ZotVubDNgqBYn85sMNU4M5vTXkZAPFmsZmWu2WZNUU8zB7DNi m+nYyuTmgyPTUO4Xl8U9WuUeilwMwUzd4VMdYS6UPXWJtdWdwoLfVQKvFTkMsfDsd20g nhIQ== 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=KJFLo8b+lyW3xhIfFRDH7eufuk7HK0NNLHsRQfD2Vrw=; b=UR2TILUG6+f1kM5Ou2+85vJgtZBcO+euBi+wyo7j7fdHQUsF+Hlp4+lwJU9fitL5yM 5XiyAXIszY3CCE4ICg/X95ZguCEn2K0WwDaVOJ4bm9EV5ETx14qvmhYEFd59Zeq6siX4 0K4Tm6K5KflBsha5+QKjL+341Bl2z8A1HvsX0LLsBNVRI30i25Z8qe6Rj6rSQHdwc06x xA7M+j3IUqGFZjtiHnHM9dWzz59JokHeZn3ALMBCY4Ctz4GlVrVye88hlUsIpL+dzrqy D5/vc+ecw6J4bOgnE2OYpEoUHeL0rbuDNoComF0Onl2UF0fdVLIGervv3dZdaVlb4nmK qBRQ== X-Gm-Message-State: APt69E18K+iUNPxpECWK84+DFk1LTMPAUt7pixVBMfRvGGgKIlEhH4hu IJCOWVh8EqplHokj5ZCZUxeCcjFA X-Google-Smtp-Source: ADUXVKJfUoEP6Bbi2X9qNGArfCaZyDGc9fZiXQkzi40m3skE4kEusLw4iHPrukxpUedkD+0D693F5g== X-Received: by 2002:a17:902:7d84:: with SMTP id a4-v6mr3607193plm.139.1529581800286; Thu, 21 Jun 2018 04:50:00 -0700 (PDT) Received: from leo.usersys.redhat.com ([209.132.188.80]) by smtp.gmail.com with ESMTPSA id s19-v6sm10197789pfe.97.2018.06.21.04.49.57 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 21 Jun 2018 04:49:59 -0700 (PDT) From: Hangbin Liu To: netdev@vger.kernel.org Cc: Hannes Frederic Sowa , Cong Wang , YOSHIFUJI Hideaki , David Miller , Hangbin Liu Subject: [PATCH net] ipv6: mcast: fix unsolicited report interval after receiving querys Date: Thu, 21 Jun 2018 19:49:36 +0800 Message-Id: <1529581776-30260-1-git-send-email-liuhangbin@gmail.com> X-Mailer: git-send-email 2.5.5 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org After recieving MLD querys, we update idev->mc_maxdelay with max_delay from query header. This make the later unsolicited reports have the same interval with mc_maxdelay, which means we may send unsolicited reports with long interval time instead of default configured interval time. Also as we will not call ipv6_mc_reset() after device up. This issue will be there even after leave the group and join other groups. Fixes: fc4eba58b4c14 ("ipv6: make unsolicited report intervals configurable for mld") Signed-off-by: Hangbin Liu --- net/ipv6/mcast.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/net/ipv6/mcast.c b/net/ipv6/mcast.c index 975021d..c0c7408 100644 --- a/net/ipv6/mcast.c +++ b/net/ipv6/mcast.c @@ -2082,7 +2082,8 @@ void ipv6_mc_dad_complete(struct inet6_dev *idev) mld_send_initial_cr(idev); idev->mc_dad_count--; if (idev->mc_dad_count) - mld_dad_start_timer(idev, idev->mc_maxdelay); + mld_dad_start_timer(idev, + unsolicited_report_interval(idev)); } } @@ -2094,7 +2095,8 @@ static void mld_dad_timer_expire(struct timer_list *t) if (idev->mc_dad_count) { idev->mc_dad_count--; if (idev->mc_dad_count) - mld_dad_start_timer(idev, idev->mc_maxdelay); + mld_dad_start_timer(idev, + unsolicited_report_interval(idev)); } in6_dev_put(idev); } @@ -2452,7 +2454,8 @@ static void mld_ifc_timer_expire(struct timer_list *t) if (idev->mc_ifc_count) { idev->mc_ifc_count--; if (idev->mc_ifc_count) - mld_ifc_start_timer(idev, idev->mc_maxdelay); + mld_ifc_start_timer(idev, + unsolicited_report_interval(idev)); } in6_dev_put(idev); }