From patchwork Fri Jan 13 00:35:13 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: John Fastabend X-Patchwork-Id: 714719 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 3v03ZC6Mg3z9t10 for ; Fri, 13 Jan 2017 11:35:31 +1100 (AEDT) Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="jFbhrlLm"; dkim-atps=neutral Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751055AbdAMAf3 (ORCPT ); Thu, 12 Jan 2017 19:35:29 -0500 Received: from mail-pf0-f193.google.com ([209.85.192.193]:34628 "EHLO mail-pf0-f193.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751015AbdAMAf2 (ORCPT ); Thu, 12 Jan 2017 19:35:28 -0500 Received: by mail-pf0-f193.google.com with SMTP id y143so5585362pfb.1 for ; Thu, 12 Jan 2017 16:35:28 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:subject:to:cc:date:message-id:in-reply-to:references :user-agent:mime-version:content-transfer-encoding; bh=TBg84Pc3qyxpkKGDOwsJfpgPOIoCXLLd8L5ulGvz6HY=; b=jFbhrlLm8wJXZw4x7mQYUnqolkrSGavy+Z8xqbJR8ccxJRtRSpySA+wXcXSlDZ2d7C pt8CwwARKp3JTQGaN/cHqG+eq0sZxZyf+Wl2JZYTZ34lGHFRAUNVner5XAQE3MNj2eR1 wwlvJmFp2PRlqid1BlSQPmPOddzEA+EMZdizQRstQYUQSSx8EuQ1X+CjvC88Pcs/4mQD ktXrsiX/UqxPRe/B69NTpUq7TC8bhxdLzOIdPjezydWen34JszugcrW1eNKkcwdci91c QfhUYnY2zBPwHqo7aNBwoecANThxPtdU5hJJWW1lT5yhMBYqk6U+s8oMubvwTLkTjnAK 5k7g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:subject:to:cc:date:message-id:in-reply-to :references:user-agent:mime-version:content-transfer-encoding; bh=TBg84Pc3qyxpkKGDOwsJfpgPOIoCXLLd8L5ulGvz6HY=; b=QbWxtDgWFFWQsLv2jlQ2LxqQGYU+zqrrmsayGRQ3bgAgjM0dA/aijNX/6WGAhvSEj1 xRnOwnzufVXpCwvLgrqngKLk1WXDeP7qgeS4lGnmKFAGDslZTCufFKKEiwBTkbGTw/1U YGuMq55vPAApgJJ5+cKr6jDrjofxDLqls37DI4WDHpO/ybCeyDC6DeDLhy+GfEE65+1U QkaTnerFNDKppNb106CFoIs8NU1OCsh7l8FQf8fOkVbY/PpfD8sDA2MVVkyUpj3IZ/Ji eL7Q68uT0aQIWnxg7iy7NA40g5CL2iQr5l6q6xfm2iVwm61Q02idmZFofs+hCR+SKEaS RAZw== X-Gm-Message-State: AIkVDXLTuwrcCyRtC+jEOeP6DGaCVETvVqkimULmrt3WxD/zfTE2HrML2smSu3Fqiwnh3A== X-Received: by 10.84.215.194 with SMTP id g2mr25641516plj.16.1484267728017; Thu, 12 Jan 2017 16:35:28 -0800 (PST) Received: from [127.0.1.1] ([72.168.145.15]) by smtp.gmail.com with ESMTPSA id h67sm24239398pfj.34.2017.01.12.16.35.20 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 12 Jan 2017 16:35:27 -0800 (PST) From: John Fastabend X-Google-Original-From: John Fastabend Subject: [net PATCH v2 1/5] virtio_net: use dev_kfree_skb for small buffer XDP receive To: jasowang@redhat.com, mst@redhat.com Cc: john.r.fastabend@intel.com, netdev@vger.kernel.org, john.fastabend@gmail.com, alexei.starovoitov@gmail.com, daniel@iogearbox.net Date: Thu, 12 Jan 2017 16:35:13 -0800 Message-ID: <20170113003513.4167.37678.stgit@john-Precision-Tower-5810> In-Reply-To: <20170113003412.4167.12250.stgit@john-Precision-Tower-5810> References: <20170113003412.4167.12250.stgit@john-Precision-Tower-5810> User-Agent: StGit/0.17.1-dirty MIME-Version: 1.0 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org In the small buffer case during driver unload we currently use put_page instead of dev_kfree_skb. Resolve this by adding a check for virtnet mode when checking XDP queue type. Also name the function so that the code reads correctly to match the additional check. Signed-off-by: John Fastabend --- drivers/net/virtio_net.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/drivers/net/virtio_net.c b/drivers/net/virtio_net.c index 4a10500..d97bb71 100644 --- a/drivers/net/virtio_net.c +++ b/drivers/net/virtio_net.c @@ -1890,8 +1890,12 @@ static void free_receive_page_frags(struct virtnet_info *vi) put_page(vi->rq[i].alloc_frag.page); } -static bool is_xdp_queue(struct virtnet_info *vi, int q) +static bool is_xdp_raw_buffer_queue(struct virtnet_info *vi, int q) { + /* For small receive mode always use kfree_skb variants */ + if (!vi->mergeable_rx_bufs) + return false; + if (q < (vi->curr_queue_pairs - vi->xdp_queue_pairs)) return false; else if (q < vi->curr_queue_pairs) @@ -1908,7 +1912,7 @@ static void free_unused_bufs(struct virtnet_info *vi) for (i = 0; i < vi->max_queue_pairs; i++) { struct virtqueue *vq = vi->sq[i].vq; while ((buf = virtqueue_detach_unused_buf(vq)) != NULL) { - if (!is_xdp_queue(vi, i)) + if (!is_xdp_raw_buffer_queue(vi, i)) dev_kfree_skb(buf); else put_page(virt_to_head_page(buf));