From patchwork Mon Nov 15 07:37:59 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Chan X-Patchwork-Id: 12618813 X-Patchwork-Delegate: kuba@kernel.org Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id E7534C433EF for ; Mon, 15 Nov 2021 07:38:34 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id CE9AD63215 for ; Mon, 15 Nov 2021 07:38:34 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230360AbhKOHlY (ORCPT ); Mon, 15 Nov 2021 02:41:24 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:45984 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229727AbhKOHlR (ORCPT ); Mon, 15 Nov 2021 02:41:17 -0500 Received: from mail-pj1-x102d.google.com (mail-pj1-x102d.google.com [IPv6:2607:f8b0:4864:20::102d]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 589CAC061746 for ; Sun, 14 Nov 2021 23:38:22 -0800 (PST) Received: by mail-pj1-x102d.google.com with SMTP id nh10-20020a17090b364a00b001a69adad5ebso13313165pjb.2 for ; Sun, 14 Nov 2021 23:38:22 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=broadcom.com; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=L4a9KT7ocpQb8HI9E51O+AVzEY/sVWV6nrefQL+wNd0=; b=L0yK65533wXWdr34EjOehGpk8e8LGzDL4EgkZLgWV0ZroMMDDJf+JkGXUli/PqbIfI NvGn4lFVEbyRqsNFBJNIdOPQzwfWffcQSRZxBOt2wrGSZ3Goyg1u9Ue26SUsBx7BKarw n7H8AceoflfmYkvlq94hWIX9Z0U+S2FKhX06E= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=L4a9KT7ocpQb8HI9E51O+AVzEY/sVWV6nrefQL+wNd0=; b=PRe3FDS5hZjEc15/1+K85g4o4uMZgzhokDmolfPycbO7WBbIiAOd/GzEnVpnCZI5kQ rFmTA/sSv7B/XFG8vS2pccFMMydQxbzboanNmcO6Je256S0QhsvnYi+BiTiHKicX9VAt CUHKo5hSEsGTH65/hNZGSCWKt2u7jf5xaEXK4phZcaJTPdQjpXpiGnLmwYBBsvM0YV+h povZJTTXmb/NxwLSt+fmYo7TYDTQXRxem3VoO9GtYs/6jQNkFqC7Cxs96MWU+YNnwewt 0uSkKr24lsZeB6cFduKDucYrXHoDbKmrroDHnJYeEsyHLraNlNKgcmT6Lnf99Cvs2GCR oNmg== X-Gm-Message-State: AOAM532qG8artAIY9ZpZYaRCz4elona4jr3WNJdLXezwZwiAFikWx/gs 2CeuBYNMVb0Y0nY7m2hOzqSUYQOkaESSzQ== X-Google-Smtp-Source: ABdhPJzzZV/W9Q4jx5EyY0s3eyVWWW5pCokcnDhfSz0bXXPz9rC+1TO5IvqEYU4g0xacjtKNKvZxjg== X-Received: by 2002:a17:903:2344:b0:142:25b4:76c1 with SMTP id c4-20020a170903234400b0014225b476c1mr33095239plh.43.1636961901726; Sun, 14 Nov 2021 23:38:21 -0800 (PST) Received: from localhost.swdvt.lab.broadcom.net ([192.19.223.252]) by smtp.gmail.com with ESMTPSA id x135sm13961462pfd.78.2021.11.14.23.38.20 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Sun, 14 Nov 2021 23:38:21 -0800 (PST) From: Michael Chan To: davem@davemloft.net Cc: netdev@vger.kernel.org, kuba@kernel.org, edwin.peer@broadcom.com, gospo@broadcom.com, Leon Romanovsky Subject: [PATCH net 1/3] bnxt_en: extend RTNL to VF check in devlink driver_reinit Date: Mon, 15 Nov 2021 02:37:59 -0500 Message-Id: <1636961881-17824-2-git-send-email-michael.chan@broadcom.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1636961881-17824-1-git-send-email-michael.chan@broadcom.com> References: <1636961881-17824-1-git-send-email-michael.chan@broadcom.com> Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org X-Patchwork-Delegate: kuba@kernel.org From: Edwin Peer The fixes the race condition between configuring SR-IOV and devlink reload. The SR-IOV configure logic already takes the RTNL lock, setting sriov_cfg under the lock while changes are underway. Extend the lock scope in devlink driver_reinit to cover the VF check and don't run concurrently with SR-IOV configure. Reported-by: Leon Romanovsky Fixes: 228ea8c187d8 ("bnxt_en: implement devlink dev reload driver_reinit") Cc: Leon Romanovsky Reviewed-by: Somnath Kotur Reviewed-by: Pavan Chebbi Reviewed-by: Andy Gospodarek Signed-off-by: Edwin Peer Signed-off-by: Michael Chan Reported-by: kernel test robot --- drivers/net/ethernet/broadcom/bnxt/bnxt_devlink.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/drivers/net/ethernet/broadcom/bnxt/bnxt_devlink.c b/drivers/net/ethernet/broadcom/bnxt/bnxt_devlink.c index 5c464ea73576..a0a9af402642 100644 --- a/drivers/net/ethernet/broadcom/bnxt/bnxt_devlink.c +++ b/drivers/net/ethernet/broadcom/bnxt/bnxt_devlink.c @@ -441,12 +441,13 @@ static int bnxt_dl_reload_down(struct devlink *dl, bool netns_change, switch (action) { case DEVLINK_RELOAD_ACTION_DRIVER_REINIT: { - if (BNXT_PF(bp) && bp->pf.active_vfs) { + rtnl_lock(); + if (BNXT_PF(bp) && (bp->pf.active_vfs || bp->sriov_cfg)) { NL_SET_ERR_MSG_MOD(extack, - "reload is unsupported when VFs are allocated"); + "reload is unsupported while VFs are allocated or being configured"); + rtnl_unlock(); return -EOPNOTSUPP; } - rtnl_lock(); if (bp->dev->reg_state == NETREG_UNREGISTERED) { rtnl_unlock(); return -ENODEV; From patchwork Mon Nov 15 07:38:00 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Chan X-Patchwork-Id: 12618815 X-Patchwork-Delegate: kuba@kernel.org Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 3FB9FC433EF for ; Mon, 15 Nov 2021 07:38:38 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 1BCA163215 for ; Mon, 15 Nov 2021 07:38:38 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230389AbhKOHl3 (ORCPT ); Mon, 15 Nov 2021 02:41:29 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:45994 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230292AbhKOHlT (ORCPT ); Mon, 15 Nov 2021 02:41:19 -0500 Received: from mail-pf1-x431.google.com (mail-pf1-x431.google.com [IPv6:2607:f8b0:4864:20::431]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 81340C061746 for ; Sun, 14 Nov 2021 23:38:23 -0800 (PST) Received: by mail-pf1-x431.google.com with SMTP id n26so9660563pff.3 for ; Sun, 14 Nov 2021 23:38:23 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=broadcom.com; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=O8+izZQflhLzvCw5SVClPfXWryaLtselAorNr+cGRRg=; b=Sv7SltjxK6gPORp4u8Ig5CyBZn0ydcGRvG2WH+J+2ZVD2Cn9lz/5nr6H9+AW9kyWP8 871gmEKn8BEGcb1EU0ucWQAg2cNMM2mg1TOQAknYVg+7IxBZxb54gZ924+Gcg/CCyma7 J1XfbjLFTN/ewwP9R5dzdmk9Oetv1Oro/5eP0= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=O8+izZQflhLzvCw5SVClPfXWryaLtselAorNr+cGRRg=; b=wNYhBAljK0t4j2oPT0U8G0exPJSnTmE93fMH2JUeYOC++y9DwijbWFjJe/Z4Z4ZH3S XDIbWGxMY9ddHjkolcoMIXuBlNqOJYZB8C7MlAZuRQc5K9RPhbnn6qoYpWjIkC8kvdDn lMX5uh2kQ3Mr3vTu685nnBwoT73KqchzvBzIPZZ/InUtG4m8Pk4AICX6H+PVZ3lJe5MU uy257LakwyPqZvbYPz2gC3vS3lBCnJ+qCR8RVViPTNPyjany1onitlT+DrG8NhpQjQAt wNIxaiyOtwnVv5IJkAc7vIAvGz+UNUimmMGCIjCOyPpr5zXiMKSlPfSRpRMuhc8fluPs jwmQ== X-Gm-Message-State: AOAM532ftEvQ8osAkr0ot29ZI/EeqELd4K7P2sW0gcUJZ9DGuoFwqyof RvNK/y5EDW2JGiLysMvtr61E/g== X-Google-Smtp-Source: ABdhPJwWdkSztsIwLxbUi40tQ4MNyi2yaztUffZ50YOCRc5rTCk9vcRXzxzj8Ffyn5Q2YW9E8HqToQ== X-Received: by 2002:a63:b50d:: with SMTP id y13mr23047608pge.286.1636961902905; Sun, 14 Nov 2021 23:38:22 -0800 (PST) Received: from localhost.swdvt.lab.broadcom.net ([192.19.223.252]) by smtp.gmail.com with ESMTPSA id x135sm13961462pfd.78.2021.11.14.23.38.21 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Sun, 14 Nov 2021 23:38:22 -0800 (PST) From: Michael Chan To: davem@davemloft.net Cc: netdev@vger.kernel.org, kuba@kernel.org, edwin.peer@broadcom.com, gospo@broadcom.com Subject: [PATCH net 2/3] bnxt_en: fix format specifier in live patch error message Date: Mon, 15 Nov 2021 02:38:00 -0500 Message-Id: <1636961881-17824-3-git-send-email-michael.chan@broadcom.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1636961881-17824-1-git-send-email-michael.chan@broadcom.com> References: <1636961881-17824-1-git-send-email-michael.chan@broadcom.com> Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org X-Patchwork-Delegate: kuba@kernel.org From: Edwin Peer This fixes type mismatch warning. Reported-by: kernel test robot Fixes: 3c4153394e2c ("bnxt_en: implement firmware live patching") Signed-off-by: Edwin Peer Signed-off-by: Michael Chan --- drivers/net/ethernet/broadcom/bnxt/bnxt_devlink.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/net/ethernet/broadcom/bnxt/bnxt_devlink.c b/drivers/net/ethernet/broadcom/bnxt/bnxt_devlink.c index a0a9af402642..6fe9e9b59f83 100644 --- a/drivers/net/ethernet/broadcom/bnxt/bnxt_devlink.c +++ b/drivers/net/ethernet/broadcom/bnxt/bnxt_devlink.c @@ -360,7 +360,7 @@ bnxt_dl_livepatch_report_err(struct bnxt *bp, struct netlink_ext_ack *extack, NL_SET_ERR_MSG_MOD(extack, "Live patch already applied"); break; default: - netdev_err(bp->dev, "Unexpected live patch error: %hhd\n", err); + netdev_err(bp->dev, "Unexpected live patch error: %d\n", err); NL_SET_ERR_MSG_MOD(extack, "Failed to activate live patch"); break; } From patchwork Mon Nov 15 07:38:01 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Chan X-Patchwork-Id: 12618817 X-Patchwork-Delegate: kuba@kernel.org Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 4D422C433F5 for ; Mon, 15 Nov 2021 07:38:51 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 3046E63215 for ; Mon, 15 Nov 2021 07:38:51 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231919AbhKOHlf (ORCPT ); Mon, 15 Nov 2021 02:41:35 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:45998 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229694AbhKOHlU (ORCPT ); Mon, 15 Nov 2021 02:41:20 -0500 Received: from mail-pf1-x42f.google.com (mail-pf1-x42f.google.com [IPv6:2607:f8b0:4864:20::42f]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id F26CAC061766 for ; Sun, 14 Nov 2021 23:38:24 -0800 (PST) Received: by mail-pf1-x42f.google.com with SMTP id r130so14305475pfc.1 for ; Sun, 14 Nov 2021 23:38:24 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=broadcom.com; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=uQD7F3lOSd7D/p5RJx0H5yS5oh3qKn54cyd65zxscDs=; b=V1rM/MWORDbYA+mOeKVnV6q4rV498+dPsCG2+ezxb3eI1L/u/+PpLkCRjVR6DPMKNl DlX0G3rtq0Hzb05nCOwk/Ff5+Obtp9WWrNe7Grwbhn6WkAq3zSd5GgPeChjQjOSYzC91 zfIJldAhQ4j5NBoaVshT/M1t2dfotXGVc/d6A= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=uQD7F3lOSd7D/p5RJx0H5yS5oh3qKn54cyd65zxscDs=; b=Dw+lrV8dXUEwZgEKrSV+XRKRb86iLogbeK+4avWb6AM4YfRsMBwu/amabF9DqK+umf vO9W9+HYBzm4gOr78PfoLQqJHE+KQVBxxoB6kK5pP5V297+bC1etd8uFhcw0DkdIgdYX kMIKHJ/uTxNgzcluUlyObrq5kS4g+XOVXgAUrC9eFLRhCRx2Y0hVydLCnsCJrgc1IL3m 5geKPb1Uf+wA+9bzce9ElcWTQLqNwB9Nr78C9R2o3FinmGUkAXwQ9YrqDgxBdy8fCcFL NTx/3yIXSudPfIVHgicextJvXkmV0EsFKSr0SJSXvfeYUcLWOgWUDuV+ur6jpKpGwc2f 7IrA== X-Gm-Message-State: AOAM533/Yqi+vOvGD8TckKPsx1JrGTo3zka97H6w2tu2zQROE7+BJ+4v 6FFwjDbM9m5+OKGbCRx/409/Ph06XneOyg== X-Google-Smtp-Source: ABdhPJzWZsO/ILmqTCg69UhrZGHC9Y7+ZSqOC0ZqQf6021pyOtF0XUSwAblR8QlHCz04FUKCSFEFBw== X-Received: by 2002:a62:dd0d:0:b0:494:6e7a:23d with SMTP id w13-20020a62dd0d000000b004946e7a023dmr31412627pff.17.1636961904225; Sun, 14 Nov 2021 23:38:24 -0800 (PST) Received: from localhost.swdvt.lab.broadcom.net ([192.19.223.252]) by smtp.gmail.com with ESMTPSA id x135sm13961462pfd.78.2021.11.14.23.38.23 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Sun, 14 Nov 2021 23:38:23 -0800 (PST) From: Michael Chan To: davem@davemloft.net Cc: netdev@vger.kernel.org, kuba@kernel.org, edwin.peer@broadcom.com, gospo@broadcom.com, Sriharsha Basavapatna Subject: [PATCH net 3/3] bnxt_en: reject indirect blk offload when hw-tc-offload is off Date: Mon, 15 Nov 2021 02:38:01 -0500 Message-Id: <1636961881-17824-4-git-send-email-michael.chan@broadcom.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1636961881-17824-1-git-send-email-michael.chan@broadcom.com> References: <1636961881-17824-1-git-send-email-michael.chan@broadcom.com> Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org X-Patchwork-Delegate: kuba@kernel.org From: Sriharsha Basavapatna The driver does not check if hw-tc-offload is enabled for the device before offloading a flow in the context of indirect block callback. Fix this by checking NETIF_F_HW_TC in the features flag and rejecting the offload request. This will avoid unnecessary dmesg error logs when hw-tc-offload is disabled, such as these: bnxt_en 0000:19:00.1 eno2np1: dev(ifindex=294) not on same switch bnxt_en 0000:19:00.1 eno2np1: Error: bnxt_tc_add_flow: cookie=0xffff8dace1c88000 error=-22 bnxt_en 0000:19:00.0 eno1np0: dev(ifindex=294) not on same switch bnxt_en 0000:19:00.0 eno1np0: Error: bnxt_tc_add_flow: cookie=0xffff8dace1c88000 error=-22 Reported-by: Marcelo Ricardo Leitner Fixes: 627c89d00fb9 ("bnxt_en: flow_offload: offload tunnel decap rules via indirect callbacks") Signed-off-by: Sriharsha Basavapatna Signed-off-by: Michael Chan --- drivers/net/ethernet/broadcom/bnxt/bnxt_tc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/net/ethernet/broadcom/bnxt/bnxt_tc.c b/drivers/net/ethernet/broadcom/bnxt/bnxt_tc.c index e6a4a768b10b..1471b6130a2b 100644 --- a/drivers/net/ethernet/broadcom/bnxt/bnxt_tc.c +++ b/drivers/net/ethernet/broadcom/bnxt/bnxt_tc.c @@ -1868,7 +1868,7 @@ static int bnxt_tc_setup_indr_block_cb(enum tc_setup_type type, struct flow_cls_offload *flower = type_data; struct bnxt *bp = priv->bp; - if (flower->common.chain_index) + if (!tc_cls_can_offload_and_chain0(bp->dev, type_data)) return -EOPNOTSUPP; switch (type) {