From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from dpdk.org (dpdk.org [92.243.14.124]) by inbox.dpdk.org (Postfix) with ESMTP id CC8DBA034E for ; Fri, 29 May 2020 12:46:15 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 1DE2E1DC03; Fri, 29 May 2020 12:46:15 +0200 (CEST) Received: from mail-lf1-f68.google.com (mail-lf1-f68.google.com [209.85.167.68]) by dpdk.org (Postfix) with ESMTP id B2CB51DC03 for ; Fri, 29 May 2020 12:46:13 +0200 (CEST) Received: by mail-lf1-f68.google.com with SMTP id z22so1040118lfd.0 for ; Fri, 29 May 2020 03:46:13 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=semihalf-com.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=6Thuib75zz31G43LzCN5xA+1D52JbuLP/dGBsW5pN+I=; b=Nf9jW0hIF93SD0pww/3q4J4v++dakP6Gsoz5744R/aO/QDTSgfVXmfj29nl8y1ETc5 Z39yONX8PrydB/vvpkP97GdtmQFJbtmBDHflvNhSpvrw3lkx6Ktm+S3tEAQhojObCPWO a2sZ8Gd75i1yQeDFhnzB9LQlYfxsGSF3iGTZDSBYNpA4Vy0k6dhEGEcW8wQjj38nXbv8 gTsM2pZ9yCMYd+D6cS4XDLqk5OIQqp9iVgXuxLYuuEmGkuQKdfxL+PLfinQ9kW7ovI0k q8qTF1cjnbkpW43YjDYK4DM8buGUHb6Yoty/Psjh2Ze8Xh82kCq0MwvJF8mkhE6HNok3 ocLQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=6Thuib75zz31G43LzCN5xA+1D52JbuLP/dGBsW5pN+I=; b=U4r8qp6Be++HaVwPBPe0Qh/N1CSJsfyFVwIfP+UD0tLq0wEDD9JZbT6yocag9lHfp/ V33HWBrIo9lZEgkXqQOZ1RVvugnjrOhay1lBSnj1KWfLlhV3zPMXPL0ujjqln9DyoSG1 bIPbWvq//65nHGjyek0nijifX2HtYUUv9dO5pg6tukltojrIer6U78JiRv9eBJ7+8ih2 udM1DeBDkJLE0ggHoUKW0KAHQD3qDAAzGTb7cOWq7uEp8+TX815P2eoj2DAb/U4FvPki QtWuEo3dRII1/R3kF3Xeejxhb6966ayOxWs7bQDBkZ5l3u8LY3rFoUnAxxNzO/LW0OIx cjXQ== X-Gm-Message-State: AOAM531GLjuo24aMelniTJcYYQMqlwqvJFZxP5WNLMQ6PSwuyG0ZqOqv /Rii4kGJb0TiVuQcWWA8m+MYu3XzowM= X-Google-Smtp-Source: ABdhPJy4uqbDNt6TB8Brn7sCG3PtgXsawDNxysYG/+vIfrHES7r7fbF6yBg7kCMUjpByzp3vXxpzZg== X-Received: by 2002:a19:a405:: with SMTP id q5mr3986637lfc.164.1590749172629; Fri, 29 May 2020 03:46:12 -0700 (PDT) Received: from mkPC.semihalf.local (193-106-246-138.noc.fibertech.net.pl. [193.106.246.138]) by smtp.gmail.com with ESMTPSA id w24sm1919859ljo.136.2020.05.29.03.46.11 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 29 May 2020 03:46:11 -0700 (PDT) From: Michal Krawczyk To: stable@dpdk.org Cc: luca.boccassi@gmail.com, Michal Krawczyk Date: Fri, 29 May 2020 12:46:04 +0200 Message-Id: <20200529104604.28836-1-mk@semihalf.com> X-Mailer: git-send-email 2.20.1 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [dpdk-stable] [PATCH 19.11] net/ena/base: fix testing for supported hash function X-BeenThere: stable@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: patches for DPDK stable branches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: stable-bounces@dpdk.org Sender: "stable" [ upstream commit 6e585db68903b9ef8e0a547efc8f3e71af424397 ] There was a bug in ena_com_fill_hash_function(), which was causing bit to be shifted left one bit too much. To fix that, the ENA_FFS macro is being used (returning the location of the first bit set), hash_function value is being subtracted by 1 if any hash function is supported by the device and BIT macro is used for shifting for better verbosity. Fixes: 99ecfbf845b3 ("ena: import communication layer") Signed-off-by: Michal Krawczyk --- drivers/net/ena/base/ena_com.c | 22 +++++++++++++++------- drivers/net/ena/base/ena_plat_dpdk.h | 2 ++ 2 files changed, 17 insertions(+), 7 deletions(-) diff --git a/drivers/net/ena/base/ena_com.c b/drivers/net/ena/base/ena_com.c index b3cdf712e1..147c039124 100644 --- a/drivers/net/ena/base/ena_com.c +++ b/drivers/net/ena/base/ena_com.c @@ -2313,7 +2313,7 @@ int ena_com_set_hash_function(struct ena_com_dev *ena_dev) if (unlikely(ret)) return ret; - if (get_resp.u.flow_hash_func.supported_func & (1 << rss->hash_func)) { + if (get_resp.u.flow_hash_func.supported_func & BIT(rss->hash_func)) { ena_trc_err("Func hash %d isn't supported by device, abort\n", rss->hash_func); return ENA_COM_UNSUPPORTED; @@ -2356,12 +2356,14 @@ int ena_com_fill_hash_function(struct ena_com_dev *ena_dev, enum ena_admin_hash_functions func, const u8 *key, u16 key_len, u32 init_val) { - struct ena_rss *rss = &ena_dev->rss; + struct ena_admin_feature_rss_flow_hash_control *hash_key; struct ena_admin_get_feat_resp get_resp; - struct ena_admin_feature_rss_flow_hash_control *hash_key = - rss->hash_key; + enum ena_admin_hash_functions old_func; + struct ena_rss *rss = &ena_dev->rss; int rc; + hash_key = rss->hash_key; + /* Make sure size is a mult of DWs */ if (unlikely(key_len & 0x3)) return ENA_COM_INVAL; @@ -2373,7 +2375,7 @@ int ena_com_fill_hash_function(struct ena_com_dev *ena_dev, if (unlikely(rc)) return rc; - if (!((1 << func) & get_resp.u.flow_hash_func.supported_func)) { + if (!(BIT(func) & get_resp.u.flow_hash_func.supported_func)) { ena_trc_err("Flow hash function %d isn't supported\n", func); return ENA_COM_UNSUPPORTED; } @@ -2398,11 +2400,13 @@ int ena_com_fill_hash_function(struct ena_com_dev *ena_dev, return ENA_COM_INVAL; } + old_func = rss->hash_func; + rss->hash_func = func; rc = ena_com_set_hash_function(ena_dev); /* Restore the old function */ if (unlikely(rc)) - ena_com_get_hash_function(ena_dev, NULL, NULL); + rss->hash_func = old_func; return rc; } @@ -2424,7 +2428,11 @@ int ena_com_get_hash_function(struct ena_com_dev *ena_dev, if (unlikely(rc)) return rc; - rss->hash_func = get_resp.u.flow_hash_func.selected_func; + /* ENA_FFS returns 1 in case the lsb is set */ + rss->hash_func = ENA_FFS(get_resp.u.flow_hash_func.selected_func); + if (rss->hash_func) + rss->hash_func--; + if (func) *func = rss->hash_func; diff --git a/drivers/net/ena/base/ena_plat_dpdk.h b/drivers/net/ena/base/ena_plat_dpdk.h index dddfe65403..da97efca46 100644 --- a/drivers/net/ena/base/ena_plat_dpdk.h +++ b/drivers/net/ena/base/ena_plat_dpdk.h @@ -297,4 +297,6 @@ extern rte_atomic32_t ena_alloc_cnt; #define DIV_ROUND_UP(n, d) (((n) + (d) - 1) / (d)) +#define ENA_FFS(x) ffs(x) + #endif /* DPDK_ENA_COM_ENA_PLAT_DPDK_H_ */ -- 2.20.1