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 X-Spam-Level: X-Spam-Status: No, score=-10.1 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 7B9F8C43332 for ; Wed, 18 Mar 2020 20:55:46 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 43D84208E0 for ; Wed, 18 Mar 2020 20:55:46 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1584564946; bh=FWsmFzMQ/sS1qgsZvfWpRuNBoguZ6P0zBx2PZK6IJv0=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=SbbhaZZSSejg8CiOTYvSrVgNN7aVDKqUHShQ2hESfI11hD4D7KMIjHJtVDugXbNdh SfgiN3ISmtCuvycClCICg+Rk16sh4ees99sdXHddzRtEXZf9PzTcDCOURnmQH9RdMG Cz9stdA2H9oqvorTAfFBIBa3+bEt/2jEq0UYb+lU= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728445AbgCRUzp (ORCPT ); Wed, 18 Mar 2020 16:55:45 -0400 Received: from mail.kernel.org ([198.145.29.99]:56248 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728420AbgCRUzo (ORCPT ); Wed, 18 Mar 2020 16:55:44 -0400 Received: from sasha-vm.mshome.net (c-73-47-72-35.hsd1.nh.comcast.net [73.47.72.35]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id A96B720BED; Wed, 18 Mar 2020 20:55:42 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1584564943; bh=FWsmFzMQ/sS1qgsZvfWpRuNBoguZ6P0zBx2PZK6IJv0=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Z+pIyildjqARsh4yF03ajwJb9ia51qRAkKLg7Bp7xh8z6YAeFYwMg0qFQqeCkilTa 0BRFiWXebnT7lOuBf40y8BDPXYBoyD9PP6u6gOIU936bqOie+VARkNHEHhpc6mrIDA 5ZTiddse5aWu5Lvue74F/91RoQsnejRX9VzqXYYE= From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Eric Dumazet , Mahesh Bandewar , "David S . Miller" , Sasha Levin , netdev@vger.kernel.org Subject: [PATCH AUTOSEL 4.19 28/37] ipvlan: do not use cond_resched_rcu() in ipvlan_process_multicast() Date: Wed, 18 Mar 2020 16:55:00 -0400 Message-Id: <20200318205509.17053-28-sashal@kernel.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200318205509.17053-1-sashal@kernel.org> References: <20200318205509.17053-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org From: Eric Dumazet [ Upstream commit afe207d80a61e4d6e7cfa0611a4af46d0ba95628 ] Commit e18b353f102e ("ipvlan: add cond_resched_rcu() while processing muticast backlog") added a cond_resched_rcu() in a loop using rcu protection to iterate over slaves. This is breaking rcu rules, so lets instead use cond_resched() at a point we can reschedule Fixes: e18b353f102e ("ipvlan: add cond_resched_rcu() while processing muticast backlog") Signed-off-by: Eric Dumazet Cc: Mahesh Bandewar Signed-off-by: David S. Miller Signed-off-by: Sasha Levin --- drivers/net/ipvlan/ipvlan_core.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/net/ipvlan/ipvlan_core.c b/drivers/net/ipvlan/ipvlan_core.c index 6fe24721e4856..40ac60904c8dd 100644 --- a/drivers/net/ipvlan/ipvlan_core.c +++ b/drivers/net/ipvlan/ipvlan_core.c @@ -282,7 +282,6 @@ void ipvlan_process_multicast(struct work_struct *work) } ipvlan_count_rx(ipvlan, len, ret == NET_RX_SUCCESS, true); local_bh_enable(); - cond_resched_rcu(); } rcu_read_unlock(); @@ -299,6 +298,7 @@ void ipvlan_process_multicast(struct work_struct *work) } if (dev) dev_put(dev); + cond_resched(); } } -- 2.20.1