From patchwork Tue Dec 1 07:24:20 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ivan Malov X-Patchwork-Id: 84646 X-Patchwork-Delegate: ferruh.yigit@amd.com Return-Path: X-Original-To: patchwork@inbox.dpdk.org Delivered-To: patchwork@inbox.dpdk.org Received: from dpdk.org (dpdk.org [92.243.14.124]) by inbox.dpdk.org (Postfix) with ESMTP id 56CAFA04DB; Tue, 1 Dec 2020 08:24:33 +0100 (CET) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id AF2CBC980; Tue, 1 Dec 2020 08:24:31 +0100 (CET) Received: from shelob.oktetlabs.ru (shelob.oktetlabs.ru [91.220.146.113]) by dpdk.org (Postfix) with ESMTP id 32DC1C954; Tue, 1 Dec 2020 08:24:29 +0100 (CET) Received: from localhost.localdomain (unknown [188.242.7.54]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by shelob.oktetlabs.ru (Postfix) with ESMTPSA id 74ECB7F508; Tue, 1 Dec 2020 10:24:27 +0300 (MSK) DKIM-Filter: OpenDKIM Filter v2.11.0 shelob.oktetlabs.ru 74ECB7F508 DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=oktetlabs.ru; s=default; t=1606807467; bh=sLXCSB9ShfwQyi3E7U7WCQhfzD6vlg0I/RW8mBnvyKc=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=V9J+vO+QN5azRFaf0GjEER4UxdzKSxXSRuq+NwR7C2eZw1F9wmUm81mMK7coTMUas 03vV4kk1yYh2EJRgLK5rFW+NHe041nLF3aCsrXZCH8TopuMAdJRBWAdbsRSJqh9mxW clEpFDx89gdSHYM64H9LqgY+ZdpGZbQHLpeW3Q88= From: Ivan Malov To: dev@dpdk.org Cc: stable@dpdk.org, Andrew Rybchenko , Andy Moreton Date: Tue, 1 Dec 2020 10:24:20 +0300 Message-Id: <20201201072421.8327-1-ivan.malov@oktetlabs.ru> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20201130220254.28467-1-ivan.malov@oktetlabs.ru> References: <20201130220254.28467-1-ivan.malov@oktetlabs.ru> MIME-Version: 1.0 Subject: [dpdk-dev] [PATCH v2 1/2] common/sfc_efx/base: remove warnings about inline specifiers X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Sender: "dev" Windows build of the current libefx rejects these specifiers. They're unneeded anyway; the compiler should decide inlining. Fixes: 34285fd0891d ("common/sfc_efx/base: add match spec validate API") Cc: stable@dpdk.org Signed-off-by: Ivan Malov Reviewed-by: Andrew Rybchenko Reviewed-by: Andy Moreton --- drivers/common/sfc_efx/base/efx_mae.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/drivers/common/sfc_efx/base/efx_mae.c b/drivers/common/sfc_efx/base/efx_mae.c index ee0a3d319..cbc1cb28c 100644 --- a/drivers/common/sfc_efx/base/efx_mae.c +++ b/drivers/common/sfc_efx/base/efx_mae.c @@ -760,7 +760,7 @@ efx_mae_match_specs_equal( ((_mask)[(_bit) / (_mask_page_nbits)] & \ (1ULL << ((_bit) & ((_mask_page_nbits) - 1)))) -static inline boolean_t +static boolean_t efx_mask_is_prefix( __in size_t mask_nbytes, __in_bcount(mask_nbytes) const uint8_t *maskp) @@ -780,7 +780,7 @@ efx_mask_is_prefix( return B_TRUE; } -static inline boolean_t +static boolean_t efx_mask_is_all_ones( __in size_t mask_nbytes, __in_bcount(mask_nbytes) const uint8_t *maskp) @@ -794,7 +794,7 @@ efx_mask_is_all_ones( return (t == (uint8_t)(~0)); } -static inline boolean_t +static boolean_t efx_mask_is_all_zeros( __in size_t mask_nbytes, __in_bcount(mask_nbytes) const uint8_t *maskp) From patchwork Tue Dec 1 07:24:21 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ivan Malov X-Patchwork-Id: 84647 X-Patchwork-Delegate: ferruh.yigit@amd.com Return-Path: X-Original-To: patchwork@inbox.dpdk.org Delivered-To: patchwork@inbox.dpdk.org Received: from dpdk.org (dpdk.org [92.243.14.124]) by inbox.dpdk.org (Postfix) with ESMTP id D73DFA04DB; Tue, 1 Dec 2020 08:24:51 +0100 (CET) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 76DCFC9A4; Tue, 1 Dec 2020 08:24:33 +0100 (CET) Received: from shelob.oktetlabs.ru (shelob.oktetlabs.ru [91.220.146.113]) by dpdk.org (Postfix) with ESMTP id 44C66C980; Tue, 1 Dec 2020 08:24:29 +0100 (CET) Received: from localhost.localdomain (unknown [188.242.7.54]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by shelob.oktetlabs.ru (Postfix) with ESMTPSA id E3A867F516; Tue, 1 Dec 2020 10:24:27 +0300 (MSK) DKIM-Filter: OpenDKIM Filter v2.11.0 shelob.oktetlabs.ru E3A867F516 DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=oktetlabs.ru; s=default; t=1606807467; bh=K50n1nBm8MhtTtQvS63kUBEz0VXtWd9vTgwAxccjif4=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=WMVpqFE9FjZ5JgpOr0QYL5QyMqOuKcSNX/z6IYWmVlX2Z9RZQuM5r4ThG17c9QdpW lSAfeCpo1jSDkSOhs+M8F+eoC9Fd08LtS6O/oD4Hnlym8YQ0w184mpfqeM9FM1edzA 9Uq0ZY71UeJWXv0PraW7iOwYYJYl4A4vLW63Nyrg= From: Ivan Malov To: dev@dpdk.org Cc: stable@dpdk.org, Andrew Rybchenko , Andy Moreton Date: Tue, 1 Dec 2020 10:24:21 +0300 Message-Id: <20201201072421.8327-2-ivan.malov@oktetlabs.ru> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20201201072421.8327-1-ivan.malov@oktetlabs.ru> References: <20201130220254.28467-1-ivan.malov@oktetlabs.ru> <20201201072421.8327-1-ivan.malov@oktetlabs.ru> MIME-Version: 1.0 Subject: [dpdk-dev] [PATCH v2 2/2] common/sfc_efx/base: fix signed/unsigned mismatch warnings X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Sender: "dev" Fix signed/unsigned mismatch issues found by Windows build. Fixes: 34285fd0891d ("common/sfc_efx/base: add match spec validate API") Fixes: bb71f7e0a35a ("common/sfc_efx/base: add match specs class comparison API") Fixes: e9d5c5fb6872 ("common/sfc_efx/base: avoid reading past buffer") Cc: stable@dpdk.org Signed-off-by: Ivan Malov Reviewed-by: Andrew Rybchenko Reviewed-by: Andy Moreton --- drivers/common/sfc_efx/base/efx_mae.c | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/drivers/common/sfc_efx/base/efx_mae.c b/drivers/common/sfc_efx/base/efx_mae.c index cbc1cb28c..2f5b16727 100644 --- a/drivers/common/sfc_efx/base/efx_mae.c +++ b/drivers/common/sfc_efx/base/efx_mae.c @@ -644,7 +644,7 @@ efx_mae_match_spec_field_set( goto fail1; } - if (field_id >= desc_set_nentries) { + if ((unsigned int)field_id >= desc_set_nentries) { rc = EINVAL; goto fail2; } @@ -844,7 +844,8 @@ efx_mae_match_spec_is_valid( if (field_caps == NULL) return (B_FALSE); - for (field_id = 0; field_id < desc_set_nentries; ++field_id) { + for (field_id = 0; (unsigned int)field_id < desc_set_nentries; + ++field_id) { const efx_mae_mv_desc_t *descp = &desc_setp[field_id]; efx_mae_field_cap_id_t field_cap_id = descp->emmd_field_cap_id; const uint8_t *m_buf = mvp + descp->emmd_mask_offset; @@ -853,7 +854,7 @@ efx_mae_match_spec_is_valid( if (m_size == 0) continue; /* Skip array gap */ - if (field_cap_id >= field_ncaps) + if ((unsigned int)field_cap_id >= field_ncaps) break; switch (field_caps[field_cap_id].emfc_support) { @@ -1350,14 +1351,15 @@ efx_mae_match_specs_class_cmp( return (0); } - for (field_id = 0; field_id < desc_set_nentries; ++field_id) { + for (field_id = 0; (unsigned int)field_id < desc_set_nentries; + ++field_id) { const efx_mae_mv_desc_t *descp = &desc_setp[field_id]; efx_mae_field_cap_id_t field_cap_id = descp->emmd_field_cap_id; if (descp->emmd_mask_size == 0) continue; /* Skip array gap */ - if (field_cap_id >= field_ncaps) + if ((unsigned int)field_cap_id >= field_ncaps) break; if (field_caps[field_cap_id].emfc_mask_affects_class) {