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.0 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_PASS,URIBL_BLOCKED,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 CD940C282C4 for ; Mon, 4 Feb 2019 10:52:40 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 952962070C for ; Mon, 4 Feb 2019 10:52:40 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1549277560; bh=Us18A6mqEVV8oqbIcG3xiC7MisDl6N87KOoQ4SyL2Yo=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=Oao3Z2HUHKM/bjwEikIj+chYN7V430SFLYowibakYSqNXy+e+G6wSSBfHyrwUBM3u v7C6Gmgzbs9594/YoweGyT+cWD1fd23IOMEyMgBIjkEgoq5qIgM2ZtL3BO26QURvEL c5nyVA9Qs4bXqA8HBRky1Cn7P6iWhAegBBA/RmDU= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1732630AbfBDKwj (ORCPT ); Mon, 4 Feb 2019 05:52:39 -0500 Received: from mail.kernel.org ([198.145.29.99]:50236 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1732626AbfBDKwf (ORCPT ); Mon, 4 Feb 2019 05:52:35 -0500 Received: from localhost (5356596B.cm-6-7b.dynamic.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 993BA2070C; Mon, 4 Feb 2019 10:52:34 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1549277555; bh=Us18A6mqEVV8oqbIcG3xiC7MisDl6N87KOoQ4SyL2Yo=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=ObC7wVioRc9AAuyFnjkbyjA2hOWFL2phmwZlaVegqVr4c11nJTstyUQmvYWqRALst dk1RYzJJpuPmd5/WK6WlBODHB8bHMrGEZZS0DrOGeKcCNkheC4b1DrOBIG9IfYkzKO NeBzy0vC5gsMJcboLIfNezzqRzQIHylA+5BXM3xE= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Toshiaki Makita , Jason Wang , Jesper Dangaard Brouer , "Michael S. Tsirkin" , "David S. Miller" Subject: [PATCH 4.20 32/80] virtio_net: Use xdp_return_frame to free xdp_frames on destroying vqs Date: Mon, 4 Feb 2019 11:36:52 +0100 Message-Id: <20190204103624.473271485@linuxfoundation.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190204103620.287366543@linuxfoundation.org> References: <20190204103620.287366543@linuxfoundation.org> User-Agent: quilt/0.65 X-stable: review X-Patchwork-Hint: ignore 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 4.20-stable review patch. If anyone has any objections, please let me know. ------------------ From: Toshiaki Makita [ Upstream commit 07b344f494ddda9f061b396407c96df8c46c82b5 ] put_page() can work as a fallback for freeing xdp_frames, but the appropriate way is to use xdp_return_frame(). Fixes: cac320c850ef ("virtio_net: convert to use generic xdp_frame and xdp_return_frame API") Signed-off-by: Toshiaki Makita Acked-by: Jason Wang Acked-by: Jesper Dangaard Brouer Acked-by: Michael S. Tsirkin Signed-off-by: David S. Miller Signed-off-by: Greg Kroah-Hartman --- drivers/net/virtio_net.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --- a/drivers/net/virtio_net.c +++ b/drivers/net/virtio_net.c @@ -2642,7 +2642,7 @@ static void free_unused_bufs(struct virt if (!is_xdp_raw_buffer_queue(vi, i)) dev_kfree_skb(buf); else - put_page(virt_to_head_page(buf)); + xdp_return_frame(buf); } }