From patchwork Fri Nov 24 16:42:33 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ivan Vecera X-Patchwork-Id: 169516 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:ce62:0:b0:403:3b70:6f57 with SMTP id o2csp1357674vqx; Fri, 24 Nov 2023 08:42:47 -0800 (PST) X-Google-Smtp-Source: AGHT+IHScVxBZV1EB9mCB5sxxEEKcki8nuqYZDkjYVcPyKhM4CwMGJIUMgyAgFkWphd1A2pOdKVs X-Received: by 2002:a05:6a20:e68b:b0:18b:d09d:6910 with SMTP id mz11-20020a056a20e68b00b0018bd09d6910mr5074621pzb.29.1700844167045; Fri, 24 Nov 2023 08:42:47 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1700844167; cv=none; d=google.com; s=arc-20160816; b=HTNoHL6K6MyYEksfJ0OvsTw+daVw2QZHAZMtXQvU5jUKa4BPhY2VW5el8H2epTDTrH +TCCElg3Fr9j+4KaQ6vvVCBeND1gYhtZNNfko4C0DFCo4d2H41vkvcS5HOq27s55asDF D1NE1sZFeTdSVfKoLjx0X356O6GQC6EKTrcuC8XBfrO0ckAX/fXApD4c19zw0jFFZSUr HtqrOIG6Wc6qLAY5l3OPzs0sbpsrvuKdbNGfuijYFthXbcxYO3vKdJbZC8eip5y44GMP zcZc8LbWy3ci1DsntFupe9Y8uHHG0pCXzS1sqZBtcSZ5B7ii+A1AGIZrGDSgDlOT5sgq ZfGA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :message-id:date:subject:cc:to:from:dkim-signature; bh=RrwRzTuMrZE9vgEWEXLUt24jPM0zsHvVGPBzoGtCfrw=; fh=5oiG4W87ZsicgI868eBt+dRXnDx4O5cLmNk0ZRsxn44=; b=0seTz6j03QTO87GZVajxWwoH8hAwYZYO6vNW3Cj52iJl+MOhMjpVllyW0bnMpblQuS 6dKPL1AkIXksHDD9jNIEHxhJ+HQMxkCdHt4jfkb/i/mYz2wiAr+6i0tUc4Vhnx5RTee4 ErkZcVxFTtrNZGNFVnf1ItIacPG/aMO8q6wULJVLqmK4/KcxN+a1LkgH+9ChOKWpvmP6 Mt7r+dnWGlXRClB7mW+iO4m3fzCUkboLuHjWClLpALUQR9PBvejal8qhIZUalgc/urPS sVBSDkO+CczccHH0VTC7/LM3VtlrkMepsibxBTkPLjQQcX3khhXUMpJmI+FIe9rF5Yxu nRkg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b="P0xG7rv/"; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:1 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=redhat.com Received: from morse.vger.email (morse.vger.email. [2620:137:e000::3:1]) by mx.google.com with ESMTPS id ck21-20020a056a02091500b005bd03d2fda6si4021559pgb.350.2023.11.24.08.42.46 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 24 Nov 2023 08:42:47 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:1 as permitted sender) client-ip=2620:137:e000::3:1; Authentication-Results: mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b="P0xG7rv/"; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:1 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=redhat.com Received: from out1.vger.email (depot.vger.email [IPv6:2620:137:e000::3:0]) by morse.vger.email (Postfix) with ESMTP id 7D0ED80B19ED; Fri, 24 Nov 2023 08:42:42 -0800 (PST) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.11 at morse.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230140AbjKXQmd (ORCPT + 99 others); Fri, 24 Nov 2023 11:42:33 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:46412 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229715AbjKXQmc (ORCPT ); Fri, 24 Nov 2023 11:42:32 -0500 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 1C264173D for ; Fri, 24 Nov 2023 08:42:39 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1700844158; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding; bh=RrwRzTuMrZE9vgEWEXLUt24jPM0zsHvVGPBzoGtCfrw=; b=P0xG7rv/q2G4txzMVyYouYLHvXW4Mg9alK/Huy14UPzDa8taUa+JeIrrs7lET/AHZvBvpb Q0K9iDaRwBPwoCglpkZqLXmnVg165o/QOF2HXlazL2Ad/xFZI8fMnPqg+s73EiqgServT0 ud2K8mh+sxhybFyRKENgmRlPRIZ4xEg= Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-99-u27mpJ7LPQal20htICYGbg-1; Fri, 24 Nov 2023 11:42:36 -0500 X-MC-Unique: u27mpJ7LPQal20htICYGbg-1 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.rdu2.redhat.com [10.11.54.5]) (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 mimecast-mx02.redhat.com (Postfix) with ESMTPS id 4D92B80D721; Fri, 24 Nov 2023 16:42:36 +0000 (UTC) Received: from p1.luc.cera.cz (unknown [10.45.226.4]) by smtp.corp.redhat.com (Postfix) with ESMTP id 1BB6B5028; Fri, 24 Nov 2023 16:42:33 +0000 (UTC) From: Ivan Vecera To: netdev@vger.kernel.org Cc: Jacob Keller , Wojciech Drewek , Simon Horman , Jesse Brandeburg , Tony Nguyen , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Harshitha Ramamurthy , Jeff Kirsher , intel-wired-lan@lists.osuosl.org (moderated list:INTEL ETHERNET DRIVERS), linux-kernel@vger.kernel.org (open list) Subject: [PATCH iwl-net] i40e: Fix kernel crash during macvlan offloading setup Date: Fri, 24 Nov 2023 17:42:33 +0100 Message-ID: <20231124164233.86691-1-ivecera@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.4.1 on 10.11.54.5 X-Spam-Status: No, score=-0.9 required=5.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on morse.vger.email Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (morse.vger.email [0.0.0.0]); Fri, 24 Nov 2023 08:42:42 -0800 (PST) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1783464373037418437 X-GMAIL-MSGID: 1783464373037418437 Function i40e_fwd_add() computes num of created channels and num of queues per channel according value of pf->num_lan_msix. This is wrong because the channels are used for subordinated net devices that reuse existing queues from parent net device and number of existing queue pairs (pf->num_queue_pairs) should be used instead. E.g.: Let's have (pf->num_lan_msix == 32)... Then we reduce number of combined queues by ethtool to 8 (so pf->num_queue_pairs == 8). i40e_fwd_add() called by macvlan then computes number of macvlans channels to be 16 and queues per channel 1 and calls i40e_setup_macvlans(). This computes new number of queue pairs for PF as: num_qps = vsi->num_queue_pairs - (macvlan_cnt * qcnt); This is evaluated in this case as: num_qps = (8 - 16 * 1) = (u16)-8 = 0xFFF8 ...and this number is stored vsi->next_base_queue that is used during channel creation. This leads to kernel crash. Fix this bug by computing the number of offloaded macvlan devices and no. their queues according the current number of queues instead of maximal one. Reproducer: 1) Enable l2-fwd-offload 2) Reduce number of queues 3) Create macvlan device 4) Make it up Result: [root@cnb-03 ~]# ethtool -K enp2s0f0np0 l2-fwd-offload on [root@cnb-03 ~]# ethtool -l enp2s0f0np0 | grep Combined Combined: 32 Combined: 32 [root@cnb-03 ~]# ethtool -L enp2s0f0np0 combined 8 [root@cnb-03 ~]# ip link add link enp2s0f0np0 mac0 type macvlan mode bridge [root@cnb-03 ~]# ip link set mac0 up ... [ 1225.686698] i40e 0000:02:00.0: User requested queue count/HW max RSS count: 8/32 [ 1242.399103] BUG: kernel NULL pointer dereference, address: 0000000000000118 [ 1242.406064] #PF: supervisor write access in kernel mode [ 1242.411288] #PF: error_code(0x0002) - not-present page [ 1242.416417] PGD 0 P4D 0 [ 1242.418950] Oops: 0002 [#1] PREEMPT SMP NOPTI [ 1242.423308] CPU: 26 PID: 2253 Comm: ip Kdump: loaded Not tainted 6.7.0-rc1+ #20 [ 1242.430607] Hardware name: Abacus electric, s.r.o. - servis@abacus.cz Super Server/H12SSW-iN, BIOS 2.4 04/13/2022 [ 1242.440850] RIP: 0010:i40e_channel_config_tx_ring.constprop.0+0xd9/0x180 [i40e] [ 1242.448165] Code: 48 89 b3 80 00 00 00 48 89 bb 88 00 00 00 74 3c 31 c9 0f b7 53 16 49 8b b4 24 f0 0c 00 00 01 ca 83 c1 01 0f b7 d2 48 8b 34 d6 <48> 89 9e 18 01 00 00 49 8b b4 24 e8 0c 00 00 48 8b 14 d6 48 89 9a [ 1242.466902] RSP: 0018:ffffa4d52cd2f610 EFLAGS: 00010202 [ 1242.472121] RAX: 0000000000000000 RBX: ffff9390a4ba2e40 RCX: 0000000000000001 [ 1242.479244] RDX: 000000000000fff8 RSI: 0000000000000000 RDI: ffffffffffffffff [ 1242.486370] RBP: ffffa4d52cd2f650 R08: 0000000000000020 R09: 0000000000000000 [ 1242.493494] R10: 0000000000000000 R11: 0000000100000001 R12: ffff9390b861a000 [ 1242.500626] R13: 00000000000000a0 R14: 0000000000000010 R15: ffff9390b861a000 [ 1242.507751] FS: 00007efda536b740(0000) GS:ffff939f4ec80000(0000) knlGS:0000000000000000 [ 1242.515826] CS: 0010 DS: 0000 ES: 0000 CR0: 0000000080050033 [ 1242.521564] CR2: 0000000000000118 CR3: 000000010bd48002 CR4: 0000000000770ef0 [ 1242.528699] PKRU: 55555554 [ 1242.531400] Call Trace: [ 1242.533846] [ 1242.535943] ? __die+0x20/0x70 [ 1242.539004] ? page_fault_oops+0x76/0x170 [ 1242.543018] ? exc_page_fault+0x65/0x150 [ 1242.546942] ? asm_exc_page_fault+0x22/0x30 [ 1242.551131] ? i40e_channel_config_tx_ring.constprop.0+0xd9/0x180 [i40e] [ 1242.557847] i40e_setup_channel.part.0+0x5f/0x130 [i40e] [ 1242.563167] i40e_setup_macvlans.constprop.0+0x256/0x420 [i40e] [ 1242.569099] i40e_fwd_add+0xbf/0x270 [i40e] [ 1242.573300] macvlan_open+0x16f/0x200 [macvlan] [ 1242.577831] __dev_open+0xe7/0x1b0 [ 1242.581236] __dev_change_flags+0x1db/0x250 ... Fixes: 1d8d80b4e4ff ("i40e: Add macvlan support on i40e") Signed-off-by: Ivan Vecera Reviewed-by: Wojciech Drewek Reviewed-by: Simon Horman --- drivers/net/ethernet/intel/i40e/i40e_main.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/drivers/net/ethernet/intel/i40e/i40e_main.c b/drivers/net/ethernet/intel/i40e/i40e_main.c index c36535145a41..7bb1f64833eb 100644 --- a/drivers/net/ethernet/intel/i40e/i40e_main.c +++ b/drivers/net/ethernet/intel/i40e/i40e_main.c @@ -7981,8 +7981,8 @@ static void *i40e_fwd_add(struct net_device *netdev, struct net_device *vdev) netdev_info(netdev, "Macvlans are not supported when HW TC offload is on\n"); return ERR_PTR(-EINVAL); } - if (pf->num_lan_msix < I40E_MIN_MACVLAN_VECTORS) { - netdev_info(netdev, "Not enough vectors available to support macvlans\n"); + if (vsi->num_queue_pairs < I40E_MIN_MACVLAN_VECTORS) { + netdev_info(netdev, "Not enough queues to support macvlans\n"); return ERR_PTR(-EINVAL); } @@ -8000,7 +8000,7 @@ static void *i40e_fwd_add(struct net_device *netdev, struct net_device *vdev) * reserve 3/4th of max vectors, then half, then quarter and * calculate Qs per macvlan as you go */ - vectors = pf->num_lan_msix; + vectors = vsi->num_queue_pairs; if (vectors <= I40E_MAX_MACVLANS && vectors > 64) { /* allocate 4 Qs per macvlan and 32 Qs to the PF*/ q_per_macvlan = 4;