From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Cyrus-Session-Id: sloti22d1t05-3308147-1523479248-2-124299391616000022 X-Sieve: CMU Sieve 3.0 X-Spam-known-sender: no X-Spam-score: 0.0 X-Spam-hits: BAYES_00 -1.9, HEADER_FROM_DIFFERENT_DOMAINS 0.25, MAILING_LIST_MULTI -1, ME_NOAUTH 0.01, RCVD_IN_DNSWL_HI -5, LANGUAGES en, BAYES_USED global, SA_VERSION 3.4.0 X-Spam-source: IP='209.132.180.67', Host='vger.kernel.org', Country='US', FromHeader='org', MailFrom='org' X-Spam-charsets: plain='UTF-8' X-Resolved-to: greg@kroah.com X-Delivered-to: greg@kroah.com X-Mail-from: stable-owner@vger.kernel.org ARC-Seal: i=1; a=rsa-sha256; cv=none; d=messagingengine.com; s=fm2; t= 1523479248; b=nWo4vEOdRHYXYmqp6hXpQe0j5KP7cXIzhR285+V0/+CfGvlpqX ehiAomF8wcGdPkwjy2DlAK2jXxRV4Qv5E7fod/mDMRxkKeHbu6LDfsBipCqjiu/G EES0KZhkHVVk2MfX+oTW155dUJd8TKLYPDDS6gzFfqRe/3so1zsYQOf1s8bMzj/w sc1jbmM8m+U3tPCG7WAyQxJue9sO/9Oq19eyWCXaXO/Xw8RgkR8/tMYMvhz+8EK5 wJ8wlJAvYOS5uWxqkFyTfmFv7Kl/SMpYhIH3WD3t1DhVI5cH27i3OnUuqI/3Hzg4 vqL+66qlZNrNIZTSE0G4X07M3uELejab3/bw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-type:sender :list-id; s=fm2; t=1523479248; bh=mJgdUyV0ePPoGOKHLwjqRxr7dH2E9s rIWjWTH9IkeA8=; b=t/mlsuhMS5ta2wEBvKFPFnnzE4aUFKvPSh2ijloQNvO5Sw xIr1qJbRM/nudVfPaCbPpeosbvx6f2J2O7HXkQkRwJK4gR8wClP76H0KcuUfbM1o Q9UkXC0P9lf0K5TYrMNh3Uhhk7frgoGXjhI9GnWfk+tPOlHALULN5+6jfgQknI+m higR6fQmTxPKfzN7MY3u1jvOMAHySyu6XTOhQddG338WGOfoOkChtC3pJdDFcaU5 SV0FduzV9HyIZe2jd++M77uzw6DxOygfLMgQnKrpVwUzx2A4MnFPS1cnupKtVqEa CkfspmMCm2XYpcA3YyKvWbi6onV7Lsj8FG8IbzIQ== ARC-Authentication-Results: i=1; mx4.messagingengine.com; arc=none (no signatures found); dkim=none (no signatures found); dmarc=none (p=none,has-list-id=yes,d=none) header.from=linuxfoundation.org; iprev=pass policy.iprev=209.132.180.67 (vger.kernel.org); spf=none smtp.mailfrom=stable-owner@vger.kernel.org smtp.helo=vger.kernel.org; x-aligned-from=fail; x-cm=none score=0; x-ptr=pass x-ptr-helo=vger.kernel.org x-ptr-lookup=vger.kernel.org; x-return-mx=pass smtp.domain=vger.kernel.org smtp.result=pass smtp_org.domain=kernel.org smtp_org.result=pass smtp_is_org_domain=no header.domain=linuxfoundation.org header.result=pass header_is_org_domain=yes; x-vs=clean score=-100 state=0 Authentication-Results: mx4.messagingengine.com; arc=none (no signatures found); dkim=none (no signatures found); dmarc=none (p=none,has-list-id=yes,d=none) header.from=linuxfoundation.org; iprev=pass policy.iprev=209.132.180.67 (vger.kernel.org); spf=none smtp.mailfrom=stable-owner@vger.kernel.org smtp.helo=vger.kernel.org; x-aligned-from=fail; x-cm=none score=0; x-ptr=pass x-ptr-helo=vger.kernel.org x-ptr-lookup=vger.kernel.org; x-return-mx=pass smtp.domain=vger.kernel.org smtp.result=pass smtp_org.domain=kernel.org smtp_org.result=pass smtp_is_org_domain=no header.domain=linuxfoundation.org header.result=pass header_is_org_domain=yes; x-vs=clean score=-100 state=0 X-ME-VSCategory: clean X-CM-Envelope: MS4wfDU+TbKiS8AP2SwigfVgnsxXHceFNl4VftUM4tkxIm9/CdeDaWY+maB4tHDg+PiuZZG1CuLMx/lEXSar9pDQa6npBUVdG4IJRs404G3CdO56dBsaAFzn J5dwdxLfzSXp/GGMicfh/afHpjKUJHDEUQSMNTKKBt+6xrF0yOQnF+CYw4bStRLp4Qk+51eKiF2syUhbFIRUmDNWVPC6jSz4mzA0eUl0rrO7C4Nv6mOO0H9I X-CM-Analysis: v=2.3 cv=JLoVTfCb c=1 sm=1 tr=0 a=UK1r566ZdBxH71SXbqIOeA==:117 a=UK1r566ZdBxH71SXbqIOeA==:17 a=IkcTkHD0fZMA:10 a=Kd1tUaAdevIA:10 a=20KFwNOVAAAA:8 a=CbDCq_QkAAAA:8 a=J1Y8HTJGAAAA:8 a=yMhMjlubAAAA:8 a=ag1SF4gXAAAA:8 a=4hgxAXUplmqpgkMKfa0A:9 a=QEXdDO2ut3YA:10 a=1qrBK16LubpBFNPVNq2M:22 a=y1Q9-5lHfBjTkpIzbSAN:22 a=Yupwre4RP9_Eg_Bd0iYG:22 X-ME-CMScore: 0 X-ME-CMCategory: none Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756018AbeDKSr5 (ORCPT ); Wed, 11 Apr 2018 14:47:57 -0400 Received: from mail.linuxfoundation.org ([140.211.169.12]:59486 "EHLO mail.linuxfoundation.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756016AbeDKSr4 (ORCPT ); Wed, 11 Apr 2018 14:47:56 -0400 From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Jesper Dangaard Brouer , Saeed Mahameed , "David S. Miller" , Sasha Levin Subject: [PATCH 4.4 066/190] mlx5: fix bug reading rss_hash_type from CQE Date: Wed, 11 Apr 2018 20:35:12 +0200 Message-Id: <20180411183554.157122721@linuxfoundation.org> X-Mailer: git-send-email 2.17.0 In-Reply-To: <20180411183550.114495991@linuxfoundation.org> References: <20180411183550.114495991@linuxfoundation.org> User-Agent: quilt/0.65 X-stable: review MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Sender: stable-owner@vger.kernel.org X-Mailing-List: stable@vger.kernel.org X-getmail-retrieved-from-mailbox: INBOX X-Mailing-List: linux-kernel@vger.kernel.org List-ID: 4.4-stable review patch. If anyone has any objections, please let me know. ------------------ From: Jesper Dangaard Brouer [ Upstream commit 12e8b570e732eaa5eae3a2895ba3fbcf91bde2b4 ] Masks for extracting part of the Completion Queue Entry (CQE) field rss_hash_type was swapped, namely CQE_RSS_HTYPE_IP and CQE_RSS_HTYPE_L4. The bug resulted in setting skb->l4_hash, even-though the rss_hash_type indicated that hash was NOT computed over the L4 (UDP or TCP) part of the packet. Added comments from the datasheet, to make it more clear what these masks are selecting. Signed-off-by: Jesper Dangaard Brouer Acked-by: Saeed Mahameed Signed-off-by: David S. Miller Signed-off-by: Sasha Levin Signed-off-by: Greg Kroah-Hartman --- include/linux/mlx5/device.h | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) --- a/include/linux/mlx5/device.h +++ b/include/linux/mlx5/device.h @@ -635,8 +635,14 @@ enum { }; enum { - CQE_RSS_HTYPE_IP = 0x3 << 6, - CQE_RSS_HTYPE_L4 = 0x3 << 2, + CQE_RSS_HTYPE_IP = 0x3 << 2, + /* cqe->rss_hash_type[3:2] - IP destination selected for hash + * (00 = none, 01 = IPv4, 10 = IPv6, 11 = Reserved) + */ + CQE_RSS_HTYPE_L4 = 0x3 << 6, + /* cqe->rss_hash_type[7:6] - L4 destination selected for hash + * (00 = none, 01 = TCP. 10 = UDP, 11 = IPSEC.SPI + */ }; enum {