Message ID | 20210406175209.1714809-8-roid@nvidia.com |
---|---|
State | New |
Headers | show
Return-Path: <kernel-team-bounces@lists.ubuntu.com> X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (no SPF record) smtp.mailfrom=lists.ubuntu.com (client-ip=91.189.94.19; helo=huckleberry.canonical.com; envelope-from=kernel-team-bounces@lists.ubuntu.com; receiver=<UNKNOWN>) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=Nvidia.com header.i=@Nvidia.com header.a=rsa-sha256 header.s=selector2 header.b=gpvU3iHh; dkim-atps=neutral Received: from huckleberry.canonical.com (huckleberry.canonical.com [91.189.94.19]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4FFFYL1Sk5z9sWQ; Wed, 7 Apr 2021 03:55:18 +1000 (AEST) Received: from localhost ([127.0.0.1] helo=huckleberry.canonical.com) by huckleberry.canonical.com with esmtp (Exim 4.86_2) (envelope-from <kernel-team-bounces@lists.ubuntu.com>) id 1lTpv0-0002vm-8Z; Tue, 06 Apr 2021 17:55:14 +0000 Received: from mail-eopbgr680075.outbound.protection.outlook.com ([40.107.68.75] helo=NAM04-BN3-obe.outbound.protection.outlook.com) by huckleberry.canonical.com with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.86_2) (envelope-from <roid@nvidia.com>) id 1lTpur-0002ny-J1 for kernel-team@lists.ubuntu.com; Tue, 06 Apr 2021 17:55:05 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=JdQM3ZkH6B533DTc+dL5ywO/y5I7NnEOcayTYU/b+s02yTcRVVal7ZmnNnkGj47FZR6bUFC+iKZSoLLvv9VLjE+u+s1+Nt5v+6+AXxLNJ6Wa1EasxcrqhBW0xUpPeUljhfPzswDar/6c8eDIKp/bWi/VEFyXM3bbokMy90PQ5nZUkvtWHkHQ8lud3RsYHOza6WbqtoJNqlem9eE01w6dRVZFyBjXs8+in1ax+0jheq+hm0NSTc1Ga33YfXmbOMt7ZfSgJB0xZ46ueGGO+ScGEDwyvoWzeNhwz3asevVCcZVOOHwwZNMOlD3Y2g6dJ2K5RT+FwP5Mh0Z62LeooSn1sg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=PvAU0KFQv89rrolpadP0SMZweDDKC7H9dMlMFOKWB4c=; b=FBDNBXKDiZTd22DgPHO7LunblEEVBi7cm+QH7YAJo2CfoL0tvY2ypPgWZRoJNFR8SEQ2atYRTU1CvogSLZDfklJX6zrKqf87IwFusKpSc064suVAhf7GlqDL2p0I8eO7UfU38B4Hory5LOj/d+Hzdac2WoZe5c0yA0sp+4HSP2LucUV6f2eOlH2nrJRAeGJl9xJ7KVD0WxcCh6SXzE+bmdgIv7pymwEb7aYlWPp8lyptqxetyZ9lnPJY9/w1Q6iL99uTLaQdW3BWkhbULuohP1mEZGOkasOO2KfcSkYpUNnt+EtUUJ2Xwsjje5rO4h17qLMRDEJD6EyDWeC9+rjHiw== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 216.228.112.34) smtp.rcpttodomain=lists.ubuntu.com smtp.mailfrom=nvidia.com; dmarc=pass (p=none sp=none pct=100) action=none header.from=nvidia.com; dkim=none (message not signed); arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=Nvidia.com; s=selector2; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=PvAU0KFQv89rrolpadP0SMZweDDKC7H9dMlMFOKWB4c=; b=gpvU3iHhJd7/rysnIjkzu/PemxQ4MHA5O3zOqnSW3CeqFf2mL5ddfv6OgqnEF7vFZEUOhpKBg1ZSrG6Nx4k8dMnhs6r8MHbGYbeXBTCqR1+Y09EM8g2fjvIp7nORnPBSBDqIRWXC+BP/QkEmcdM1BXVW+TWEX3VqBzXN+Rt5q65Cv/WKiWNrNG5ui4VjDVT17/yQpM948k7xkhGsCF6TK13neJVCkQU1+DF3HRVnl2FkJhKWfmjGLTWpNQHt7ud59dsY6SpXDvOGG4gflCCdDmfYhr+aM0KS53ua0CWLRNiSgep/iebFne/Qk3uYZoELt/PD8pIJaaLZj0ftdIkU8A== Received: from MWHPR10CA0066.namprd10.prod.outlook.com (2603:10b6:300:2c::28) by DM5PR12MB1307.namprd12.prod.outlook.com (2603:10b6:3:79::21) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3999.32; Tue, 6 Apr 2021 17:55:02 +0000 Received: from CO1NAM11FT039.eop-nam11.prod.protection.outlook.com (2603:10b6:300:2c:cafe::f6) by MWHPR10CA0066.outlook.office365.com (2603:10b6:300:2c::28) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4020.16 via Frontend Transport; Tue, 6 Apr 2021 17:55:01 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 216.228.112.34) smtp.mailfrom=nvidia.com; lists.ubuntu.com; dkim=none (message not signed) header.d=none;lists.ubuntu.com; dmarc=pass action=none header.from=nvidia.com; Received-SPF: Pass (protection.outlook.com: domain of nvidia.com designates 216.228.112.34 as permitted sender) receiver=protection.outlook.com; client-ip=216.228.112.34; helo=mail.nvidia.com; Received: from mail.nvidia.com (216.228.112.34) by CO1NAM11FT039.mail.protection.outlook.com (10.13.174.110) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384) id 15.20.3999.28 via Frontend Transport; Tue, 6 Apr 2021 17:55:01 +0000 Received: from HQMAIL101.nvidia.com (172.20.187.10) by HQMAIL107.nvidia.com (172.20.187.13) with Microsoft SMTP Server (TLS) id 15.0.1497.2; Tue, 6 Apr 2021 17:55:01 +0000 Received: from dev-r-vrt-138.mtr.labs.mlnx (172.20.145.6) by mail.nvidia.com (172.20.187.10) with Microsoft SMTP Server id 15.0.1497.2 via Frontend Transport; Tue, 6 Apr 2021 17:54:59 +0000 From: Roi Dayan <roid@nvidia.com> To: <kernel-team@lists.ubuntu.com> Subject: [SRU][F:linux-bluefield][PATCH 7/9] net/sched: act_ct: clear post_ct if doing ct_clear Date: Tue, 6 Apr 2021 20:52:07 +0300 Message-ID: <20210406175209.1714809-8-roid@nvidia.com> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20210406175209.1714809-1-roid@nvidia.com> References: <20210406175209.1714809-1-roid@nvidia.com> MIME-Version: 1.0 X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 51aa94ea-db7d-4ff5-cb6a-08d8f92519f7 X-MS-TrafficTypeDiagnostic: DM5PR12MB1307: X-Microsoft-Antispam-PRVS: <DM5PR12MB130775E084C105A95ACCEC49B8769@DM5PR12MB1307.namprd12.prod.outlook.com> X-MS-Oob-TLC-OOBClassifiers: OLM:2089; X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: C7Ix4p44liesqhdZZbCUx32bWu4p/gmcGjVwZL6FAmqUpzX+nhRVco+Ngs/iHa29MZ8/2QVFAC5kaicZj61Ch0Ft6neLOY5meMK71f+iTNmJZyiMUJxM3HThdyBnWdrk110RLOtL2nOxaxG/x4zhcYzrN/qXPATAPe8zUmRcTB18SUk+506XcRlDMLSleOJfNzdn9crvFFC9+zJNr+LAXkLnsW/LtHtwdfuJXIt5/2ZGcCKNR8wFum8qnqDnBPIKCpu2JUDw5s1jM4naoMKDtvZhZtw6Ypnt8j3nuttEy0AYWTf7TCYks3JuxySSfovDoSM/nT4f5T/y6kWuckvlJUWaYRMZG677uezJaeP1cFXozSWju97C4RXEGtAN90JbL0bD1ex+dHto2rAGq1+S4U8EfFQGPaoVoxqY9IeeivdvirWkMqM5foL0OR5cxB/LZGrR3dFuCCJ6T5iUq6LmameHg2w284uspm4OP3xczJhvcA9nAK3BV6RjQxhonfNXrEbPdPUSEeJMvU13wFkWyyic8ozCu+sNe7eJbJ8jBCI/x8D0XJ3mXo/vsBfSVptBsBhtiCWvuu0cPDiMBrgxIzwosYlfuhRc0PMAMkSwxHxj3fYYgyGv0ymrYzbDB3+oZRzq9VeRoYAjqT/xZ8UId35vpN9HGEnhRiUxZV7naUMbngBznqwUDoDBJ19egA5IFfpOF350KhNu2gi38C5huMFfu7bcDn/j0gfaC+Xu5O8= X-Forefront-Antispam-Report: CIP:216.228.112.34; CTRY:US; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:mail.nvidia.com; PTR:schybrid03.nvidia.com; CAT:NONE; SFS:(4636009)(39860400002)(376002)(346002)(136003)(396003)(36840700001)(46966006)(82740400003)(7636003)(356005)(107886003)(8676002)(36860700001)(70206006)(4326008)(36756003)(6916009)(47076005)(2906002)(478600001)(8936002)(966005)(83380400001)(36906005)(54906003)(82310400003)(336012)(316002)(186003)(26005)(70586007)(5660300002)(6666004)(1076003)(426003)(2616005)(86362001); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 06 Apr 2021 17:55:01.6591 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 51aa94ea-db7d-4ff5-cb6a-08d8f92519f7 X-MS-Exchange-CrossTenant-Id: 43083d15-7273-40c1-b7db-39efd9ccc17a X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=43083d15-7273-40c1-b7db-39efd9ccc17a; Ip=[216.228.112.34]; Helo=[mail.nvidia.com] X-MS-Exchange-CrossTenant-AuthSource: CO1NAM11FT039.eop-nam11.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM5PR12MB1307 X-BeenThere: kernel-team@lists.ubuntu.com X-Mailman-Version: 2.1.20 Precedence: list List-Id: Kernel team discussions <kernel-team.lists.ubuntu.com> List-Unsubscribe: <https://lists.ubuntu.com/mailman/options/kernel-team>, <mailto:kernel-team-request@lists.ubuntu.com?subject=unsubscribe> List-Archive: <https://lists.ubuntu.com/archives/kernel-team> List-Post: <mailto:kernel-team@lists.ubuntu.com> List-Help: <mailto:kernel-team-request@lists.ubuntu.com?subject=help> List-Subscribe: <https://lists.ubuntu.com/mailman/listinfo/kernel-team>, <mailto:kernel-team-request@lists.ubuntu.com?subject=subscribe> Cc: Vladimir Sokolovsky <vlad@nvidia.com>, Daniel Jurgens <danielj@nvidia.com> Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Errors-To: kernel-team-bounces@lists.ubuntu.com Sender: "kernel-team" <kernel-team-bounces@lists.ubuntu.com> |
Series |
CT offload fixes
|
expand
|
diff --git a/net/sched/act_ct.c b/net/sched/act_ct.c index a117beaf063e..fe132943eac2 100644 --- a/net/sched/act_ct.c +++ b/net/sched/act_ct.c @@ -926,13 +926,14 @@ static int tcf_ct_act(struct sk_buff *skb, const struct tc_action *a, tmpl = p->tmpl; if (clear) { + qdisc_skb_cb(skb)->post_ct = false; ct = nf_ct_get(skb, &ctinfo); if (ct) { nf_conntrack_put(&ct->ct_general); nf_ct_set(skb, NULL, IP_CT_UNTRACKED); } - goto out; + goto out_clear; } family = tcf_ct_skb_nf_family(skb); @@ -1011,8 +1012,9 @@ static int tcf_ct_act(struct sk_buff *skb, const struct tc_action *a, skb_push_rcsum(skb, nh_ofs); out: - tcf_action_update_bstats(&c->common, skb); qdisc_skb_cb(skb)->post_ct = true; +out_clear: + tcf_action_update_bstats(&c->common, skb); return retval; drop: