From patchwork Tue Apr 30 11:39:13 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg Kroah-Hartman X-Patchwork-Id: 163106 Delivered-To: patch@linaro.org Received: by 2002:a92:7e86:0:0:0:0:0 with SMTP id q6csp3121573ill; Tue, 30 Apr 2019 04:52:55 -0700 (PDT) X-Google-Smtp-Source: APXvYqzdJ+wbG+mhDNszGgOGpDuljs2T4GgX4w4umytQeuONI3quN5aGnFnVKf0dVE+SA3zUfSUe X-Received: by 2002:a62:5915:: with SMTP id n21mr14389629pfb.180.1556625175015; Tue, 30 Apr 2019 04:52:55 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1556625175; cv=none; d=google.com; s=arc-20160816; b=E3hUmW3UgVbdqpjXF1TML3gkyf8PoSp/vKsX9ncDHC03qMdSkPhjPHqTG7o/mXSWlv YzCb24ExVSpQvomNfDKPUqb6WAZ5xo3errIEKBDG3P8bx0gnLDole8t2gcG9xnE7Dcdj YnTP+g1JQcIsUH7i/rCZ1Hjv4UOkMs+imL3IdF2kioNFa457i2Dgnogaz6VEEZiHYpHG SOQnAHE1NGfP/PIHNHPiBwneljtCNLx0hSkD/SZvJeyDiXrsGC7tZSWXlPPcQ76rTiAd N6eUArDLIK+ZJZM3HKakzULZ7qJrsCxQmPpFOj9dtj8UGAAa/y6GRZP/VSThlviMUVCT EiKA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=zEDVWTkwDSxYB5kNdE46oB6IXcb24SH0GPT312r5pDo=; b=h7wKZCbN4foc4M3v3q0Nbxe9rFT5zQRMWLnI3JP1bsIz+GiCIl1lcDt5i5qfRvhDZa 6GBt4SMQLqbXwGKhnQ2ZIBwcbqX4Px8Ru4PWllpW/yYHretFBk6yRzkhQOpTF3e7ie5T O5/XgcRAUD151V6nwOX4TAqvHXiyVZlMiNrNMyhyih/c+vxYVHWUb5Tx1m34KlOUNU8T pP2B6PBQlHoKXfWp4KkzP1GXVj39fwLDzI8390lqc4gybAl79g9N2xKqCFFEsyi73Kth VikEgd755W/31Co4H6iFYn0yZ70idPlQ/LYlautTjFddiznKOHYUcYXImuRiTUzTh1zJ dGZg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b="pOk/Yf7l"; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id n6si29534665pgv.458.2019.04.30.04.52.54; Tue, 30 Apr 2019 04:52:55 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b="pOk/Yf7l"; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1730969AbfD3Lwx (ORCPT + 30 others); Tue, 30 Apr 2019 07:52:53 -0400 Received: from mail.kernel.org ([198.145.29.99]:38994 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1731361AbfD3LvU (ORCPT ); Tue, 30 Apr 2019 07:51:20 -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 504362054F; Tue, 30 Apr 2019 11:51:19 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1556625079; bh=OdYzluc1D8RkQFvapLx5SNZPZ7XFPmP5OcuUtZr9ZEw=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=pOk/Yf7l7iPUV3L2N3K6NAL+H1o4F3Kl/dT7Lb/5vfQCeJSu+Qxq8vbCB4yrFe2JU VQ06Ti1Pvjmnc8ZTdTQu2otQ1/Z7Tlofmb2ZEP3vrbm1YanHWmb0l9rP705ie3KtjQ Es4Nj8bM6tAeJXnM2VcmkkSSsvSERvEsuyiETiR0= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Ard Biesheuvel , Jassi Brar , Ilias Apalodimas , "David S. Miller" Subject: [PATCH 5.0 82/89] net: socionext: replace napi_alloc_frag with the netdev variant on init Date: Tue, 30 Apr 2019 13:39:13 +0200 Message-Id: <20190430113613.629688800@linuxfoundation.org> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20190430113609.741196396@linuxfoundation.org> References: <20190430113609.741196396@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Ilias Apalodimas [ Upstream commit ffbf9870dcf1342592a1a26f4cf70bda39046134 ] The netdev variant is usable on any context since it disables interrupts. The napi variant of the call should only be used within softirq context. Replace napi_alloc_frag on driver init with the correct netdev_alloc_frag call Changes since v1: - Adjusted commit message Acked-by: Ard Biesheuvel Acked-by: Jassi Brar Fixes: 4acb20b46214 ("net: socionext: different approach on DMA") Signed-off-by: Ilias Apalodimas Signed-off-by: David S. Miller Signed-off-by: Greg Kroah-Hartman --- drivers/net/ethernet/socionext/netsec.c | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) --- a/drivers/net/ethernet/socionext/netsec.c +++ b/drivers/net/ethernet/socionext/netsec.c @@ -673,7 +673,8 @@ static void netsec_process_tx(struct net } static void *netsec_alloc_rx_data(struct netsec_priv *priv, - dma_addr_t *dma_handle, u16 *desc_len) + dma_addr_t *dma_handle, u16 *desc_len, + bool napi) { size_t total_len = SKB_DATA_ALIGN(sizeof(struct skb_shared_info)); size_t payload_len = NETSEC_RX_BUF_SZ; @@ -682,7 +683,7 @@ static void *netsec_alloc_rx_data(struct total_len += SKB_DATA_ALIGN(payload_len + NETSEC_SKB_PAD); - buf = napi_alloc_frag(total_len); + buf = napi ? napi_alloc_frag(total_len) : netdev_alloc_frag(total_len); if (!buf) return NULL; @@ -765,7 +766,8 @@ static int netsec_process_rx(struct nets /* allocate a fresh buffer and map it to the hardware. * This will eventually replace the old buffer in the hardware */ - buf_addr = netsec_alloc_rx_data(priv, &dma_handle, &desc_len); + buf_addr = netsec_alloc_rx_data(priv, &dma_handle, &desc_len, + true); if (unlikely(!buf_addr)) break; @@ -1069,7 +1071,8 @@ static int netsec_setup_rx_dring(struct void *buf; u16 len; - buf = netsec_alloc_rx_data(priv, &dma_handle, &len); + buf = netsec_alloc_rx_data(priv, &dma_handle, &len, + false); if (!buf) { netsec_uninit_pkt_dring(priv, NETSEC_RING_RX); goto err_out;