From patchwork Sat Jun 13 04:35:47 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Scott Feldman X-Patchwork-Id: 483815 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 113AB140273 for ; Sat, 13 Jun 2015 14:34:17 +1000 (AEST) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b=xymRpJpb; dkim-atps=neutral Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751237AbbFMEeL (ORCPT ); Sat, 13 Jun 2015 00:34:11 -0400 Received: from mail-ig0-f182.google.com ([209.85.213.182]:33082 "EHLO mail-ig0-f182.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750725AbbFMEeD (ORCPT ); Sat, 13 Jun 2015 00:34:03 -0400 Received: by igbpi8 with SMTP id pi8so23455939igb.0 for ; Fri, 12 Jun 2015 21:34:02 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=dEQ3bpjquendAq6mDAw9aeiEi8lUx7cZnNLEF6YtAxQ=; b=xymRpJpbcd1Ng7SOfV6P/6TEvz4E1hcpt5bAE1snPraFn2KqwdlsP5mp8PHWIULdvx ZO6DKPOCbRG5X++u8ZMneCbzHQnlcc+7MDJl5TmWD2rRvpb0KusOlPnp7XptFbbgMJK6 LcODFa1JajvVRbOVo/4+nTjWq0moN/z4uFCk3sJ/dQt0KK4Shx9AMt4HAOjEvgUqnaox TlHJb4MmKr0YbpEJpByMv82eJwvEHNGCFA+iV7+ca5CQw2xwSL3ZNEBS1GmeOE43Hz+1 9pTOyFhGPvKJULqcSrvBqYOGB2ECwx9zQgjJbwPzryN+/4qVVCKMyJ7UTdmuSsGdWdEB viGw== X-Received: by 10.107.131.81 with SMTP id f78mr22282266iod.42.1434170042806; Fri, 12 Jun 2015 21:34:02 -0700 (PDT) Received: from rocker1.rocker.net ([199.58.98.143]) by mx.google.com with ESMTPSA id 140sm3948094ion.16.2015.06.12.21.34.01 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 12 Jun 2015 21:34:02 -0700 (PDT) From: sfeldma@gmail.com To: netdev@vger.kernel.org Cc: jiri@resnulli.us, simon.horman@netronome.com, makita.toshiaki@lab.ntt.co.jp Subject: [PATCH net-next 2/5] rocker: mark neigh update event processing as 'no wait' Date: Fri, 12 Jun 2015 21:35:47 -0700 Message-Id: <1434170150-63838-3-git-send-email-sfeldma@gmail.com> X-Mailer: git-send-email 1.7.10.4 In-Reply-To: <1434170150-63838-1-git-send-email-sfeldma@gmail.com> References: <1434170150-63838-1-git-send-email-sfeldma@gmail.com> Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org From: Scott Feldman Neigh update event handler runs in a context where we can't sleep, so mark processing in driver with ROCKER_OP_FLAG_NOWAIT. NOWAIT will use GFP_ATOMIC for allocations and will queue cmds to the device's cmd ring but will not wait (sleep) for cmd response back from device. Signed-off-by: Scott Feldman --- drivers/net/ethernet/rocker/rocker.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/drivers/net/ethernet/rocker/rocker.c b/drivers/net/ethernet/rocker/rocker.c index c1910c1..1995b59 100644 --- a/drivers/net/ethernet/rocker/rocker.c +++ b/drivers/net/ethernet/rocker/rocker.c @@ -5251,7 +5251,8 @@ static struct notifier_block rocker_netdevice_nb __read_mostly = { static int rocker_neigh_update(struct net_device *dev, struct neighbour *n) { struct rocker_port *rocker_port = netdev_priv(dev); - int flags = (n->nud_state & NUD_VALID) ? 0 : ROCKER_OP_FLAG_REMOVE; + int flags = (n->nud_state & NUD_VALID ? 0 : ROCKER_OP_FLAG_REMOVE) | + ROCKER_OP_FLAG_NOWAIT; __be32 ip_addr = *(__be32 *)n->primary_key; return rocker_port_ipv4_neigh(rocker_port, SWITCHDEV_TRANS_NONE,