Received: by 2002:ad5:474a:0:0:0:0:0 with SMTP id i10csp2083853imu; Wed, 28 Nov 2018 22:06:06 -0800 (PST) X-Google-Smtp-Source: AFSGD/Xd3mZI5hgNEaHkfufOMHybZ1fj/DQWP4Q4PKApLvTggmlm9BQzg/p45Z2L6ytalvZxMGWK X-Received: by 2002:a62:3948:: with SMTP id g69mr213861pfa.114.1543471566565; Wed, 28 Nov 2018 22:06:06 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1543471566; cv=none; d=google.com; s=arc-20160816; b=UNf9r1dzBCDk4vPxFdXsPRf+tRzIHiByPcoY0if/0pbF/61MzYdrP822t4iu373iSf f5QRSoU8AZvquAn9R9RbSqbs0cR/Fb1eF2i7urck7mGk98HtVC0tCdeSykA/XW3gTQAp U+iRruSl9AC+aGGfPvPiMTY7iBJBcFeud8WD5FU+MAoGz/QTLJuKKEhGOw+ZCJBrIIFu Zd3wTCVGbAfZcn2LLJezYA86e7HVrtkAVQniOUGfyQj1QgiSKC4uTduklZyy/41+B/wy tpn/tfw/4sD1Qrgphp9exsGK67SMHJXe/0D+2IeDUlZcWPaebmkafz0mniTfuDoFrO0P nXkQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:references:in-reply-to:message-id:date :subject:cc:to:from:dkim-signature; bh=5l9F7q3CiegP6eh3XmBNMb6IIO2fZdNr8Um96MESncA=; b=Nd9WMgnByd+o02LLQtoYrOMmwjeScW6dsDGJAAHihy1PwZJmTi+EreNE+j2ojccoWQ NYXyawWQkY+Fc4tsT/zZTCnV42LDMMKu/WF1N/uyOCixTsjp8k5ix/LQdESEvnhpm5D1 R40LMAczcEgR89dj/IMC4ueVPeWdGrlZ3BGLf9mIA35Ji1QxJbvPBnXvYZ2iVaA178Ot PcF5L3ihXILnDAguFlWnIw5S99B3FfiExIrOm46arkJuVSDYXYvzfauTLQpL4N60s30T Mr2BJ/SVsJ14Z9EkQI/V+rJoSwRLWsid0Dii5PJMCwJt1KtEHeAGK/M49y+FfSF/zh5i IOQA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=nCiilabG; 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; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id a81si1097573pfj.195.2018.11.28.22.05.52; Wed, 28 Nov 2018 22:06:06 -0800 (PST) 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=nCiilabG; 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; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729863AbeK2RHb (ORCPT + 99 others); Thu, 29 Nov 2018 12:07:31 -0500 Received: from mail.kernel.org ([198.145.29.99]:44878 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728407AbeK2RH3 (ORCPT ); Thu, 29 Nov 2018 12:07:29 -0500 Received: from sasha-vm.mshome.net (unknown [37.142.5.207]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id C4EB72145D; Thu, 29 Nov 2018 06:03:14 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1543471398; bh=WVktEqcl13D/ikuAPq/P4KHAmWhIgnD+e9EwB13lsZI=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=nCiilabGEqVI9HOFxHdDpFMiN9NjCUzf9ycj6I/z7SNIDvBOYhvBpwFoBJRNqGHVq oPIdgXaM7Le97Ob5Gvrvis2zkzlT38o+q7Na9Ej7l3Bc9benIKfiJztfTfMwiGZzTm reZQ2owvjvhz895YUM3QVVZ67WhJ3akNhRnKMO/Q= From: Sasha Levin To: stable@vger.kernel.org, linux-kernel@vger.kernel.org Cc: Jason Wang , Jesper Dangaard Brouer , Pavel Popa , David Ahern , "David S . Miller" , Sasha Levin , virtualization@lists.linux-foundation.org, netdev@vger.kernel.org Subject: [PATCH AUTOSEL 4.14 32/35] virtio-net: fail XDP set if guest csum is negotiated Date: Thu, 29 Nov 2018 01:01:06 -0500 Message-Id: <20181129060110.159878-32-sashal@kernel.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20181129060110.159878-1-sashal@kernel.org> References: <20181129060110.159878-1-sashal@kernel.org> Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Jason Wang [ Upstream commit 18ba58e1c234ea1a2d9835ac8c1735d965ce4640 ] We don't support partial csumed packet since its metadata will be lost or incorrect during XDP processing. So fail the XDP set if guest_csum feature is negotiated. Fixes: f600b6905015 ("virtio_net: Add XDP support") Reported-by: Jesper Dangaard Brouer Cc: Jesper Dangaard Brouer Cc: Pavel Popa Cc: David Ahern Signed-off-by: Jason Wang Signed-off-by: David S. Miller Signed-off-by: Sasha Levin --- drivers/net/virtio_net.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/drivers/net/virtio_net.c b/drivers/net/virtio_net.c index 2ffa7b290591..0e8e3be50332 100644 --- a/drivers/net/virtio_net.c +++ b/drivers/net/virtio_net.c @@ -1966,8 +1966,9 @@ static int virtnet_xdp_set(struct net_device *dev, struct bpf_prog *prog, && (virtio_has_feature(vi->vdev, VIRTIO_NET_F_GUEST_TSO4) || virtio_has_feature(vi->vdev, VIRTIO_NET_F_GUEST_TSO6) || virtio_has_feature(vi->vdev, VIRTIO_NET_F_GUEST_ECN) || - virtio_has_feature(vi->vdev, VIRTIO_NET_F_GUEST_UFO))) { - NL_SET_ERR_MSG_MOD(extack, "Can't set XDP while host is implementing LRO, disable LRO first"); + virtio_has_feature(vi->vdev, VIRTIO_NET_F_GUEST_UFO) || + virtio_has_feature(vi->vdev, VIRTIO_NET_F_GUEST_CSUM))) { + NL_SET_ERR_MSG_MOD(extack, "Can't set XDP while host is implementing LRO/CSUM, disable LRO/CSUM first"); return -EOPNOTSUPP; } -- 2.17.1