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=-6.8 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,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 D31CAC4332B for ; Thu, 19 Mar 2020 13:15:51 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 9DE1020787 for ; Thu, 19 Mar 2020 13:15:51 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1584623751; bh=gvVJ5keGwcxVzT6ADFecWys5iQDyyDbvVjxB0dVH26o=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=PsrrFoB82PKv8xp1LAd91zgeqQZAA0eKLaaJNnTZv3zT4qdAcykgjRK8q60fpm5Tm 3gCRvp3ODZtYOJJSG30X4lkJ2hFcO2qyD+alD2LOSgY0hpwz62pU56d3qPts/9+2PO tF0jneDB8G/H83D3pW6ni8VfrCkslRBCFDBaBcFA= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727843AbgCSNPu (ORCPT ); Thu, 19 Mar 2020 09:15:50 -0400 Received: from mail.kernel.org ([198.145.29.99]:35664 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727326AbgCSNPo (ORCPT ); Thu, 19 Mar 2020 09:15:44 -0400 Received: from localhost (83-86-89-107.cable.dynamic.v4.ziggo.nl [83.86.89.107]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id C062420787; Thu, 19 Mar 2020 13:15:43 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1584623744; bh=gvVJ5keGwcxVzT6ADFecWys5iQDyyDbvVjxB0dVH26o=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Cb28ZQvO7mWqhicfVtXQE86aam4abvPmUxCjQ5RM3d/JNHUiGkkIMofV5Jm2PPXHs 33NoHXH0zB4NClw6o/FxFYpB1DzYeQJqMSnnTEHzoqQE+ilmLUaUFbquCrE9tdbR/7 hGO5tlQ50lH7IFcIqjowFzY7ZDNBFW7DEk0aCjGA= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Eric Dumazet , Mahesh Bandewar , "David S. Miller" Subject: [PATCH 4.14 07/99] ipvlan: do not use cond_resched_rcu() in ipvlan_process_multicast() Date: Thu, 19 Mar 2020 14:02:45 +0100 Message-Id: <20200319123943.745019798@linuxfoundation.org> X-Mailer: git-send-email 2.25.2 In-Reply-To: <20200319123941.630731708@linuxfoundation.org> References: <20200319123941.630731708@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@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: Greg Kroah-Hartman --- drivers/net/ipvlan/ipvlan_core.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --- a/drivers/net/ipvlan/ipvlan_core.c +++ b/drivers/net/ipvlan/ipvlan_core.c @@ -240,7 +240,6 @@ void ipvlan_process_multicast(struct wor } ipvlan_count_rx(ipvlan, len, ret == NET_RX_SUCCESS, true); local_bh_enable(); - cond_resched_rcu(); } rcu_read_unlock(); @@ -257,6 +256,7 @@ void ipvlan_process_multicast(struct wor } if (dev) dev_put(dev); + cond_resched(); } }