From patchwork Sun Apr 14 08:18:05 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lei Chen X-Patchwork-Id: 13628927 X-Patchwork-Delegate: kuba@kernel.org Received: from mail-pg1-f176.google.com (mail-pg1-f176.google.com [209.85.215.176]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 562D6208A8 for ; Sun, 14 Apr 2024 08:18:23 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.215.176 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1713082705; cv=none; b=TE945eYV7RPLDJNLSpwKKkyKg+mlmcI+ogOyDFnDKZnOP9FJzxFoXqjX1cMAHyPZDMvwbhpV1ojzXUykLUIshQg7A/UfTby784BdzBhYoMSX8J3kihLPH5N3ozlP06Efh0sgyo+1tikfom59N7n6c88+rLXg2xCcPDNwUDnMPsM= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1713082705; c=relaxed/simple; bh=9gbB2V+XRKA4BUsb4k+PNhZDgg72q7XI2/1GSg9K8Qc=; h=From:To:Cc:Subject:Date:Message-ID:MIME-Version; b=DmhJh7wKf7TufruTlK+FJSOzvelR6RzkkkfLRdfLKeQWFgF852wfKn7FSqJMYuzrv/EpzEJxx69Lr1XYZpm0b5qFreS/+GQuPOBbBONAdEjsUryQwWvAXAmIdQbEchJEMDwR0tr4LBi/MeEi1hhTc4so8N/Ky6ItJx6dY3NZREg= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=smartx.com; spf=none smtp.mailfrom=smartx.com; dkim=pass (2048-bit key) header.d=smartx-com.20230601.gappssmtp.com header.i=@smartx-com.20230601.gappssmtp.com header.b=wN8NwpPp; arc=none smtp.client-ip=209.85.215.176 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=smartx.com Authentication-Results: smtp.subspace.kernel.org; spf=none smtp.mailfrom=smartx.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=smartx-com.20230601.gappssmtp.com header.i=@smartx-com.20230601.gappssmtp.com header.b="wN8NwpPp" Received: by mail-pg1-f176.google.com with SMTP id 41be03b00d2f7-5f034b4dcecso1285645a12.1 for ; Sun, 14 Apr 2024 01:18:23 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=smartx-com.20230601.gappssmtp.com; s=20230601; t=1713082702; x=1713687502; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=NqdYOjaGRi8Ao/HBdeRS83wqPYe36FAKk8geF0dSUP0=; b=wN8NwpPpOf/kdfJg6+64aoLwvuCUxWS9TeoI/07bpxi8O0dIpTBh3a64Rs6qmM13+q hjOXWXAZUMyzQgLWWIVghIR6gqEMX4V2z6nZUhhOKJ48rKopE7Z8yJGr5IfL+V6B5hET 8HAkRWBKVrR2NVJ+WukEoJGWej4Z9cmhD0CxYiLzWTVo7JskyXrp90/6mloVVYTt57e8 2sxp8nApAX3OkKZzEnHr29JWDK3VC4CuIdDvBrqBuncE0SWPSGH54nVJIcpeIA0SbWV1 rKlGgWW6kKd/Pta0IPrweXNVBBM/u36R2HWH05422SpZiqgHp/ifWknNA0oGbUYQKUF/ I5eQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1713082702; x=1713687502; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=NqdYOjaGRi8Ao/HBdeRS83wqPYe36FAKk8geF0dSUP0=; b=FobAnffeleXebQ6IQaR/nwegByftJ5JURxoSM4zwATEf05nboRLpie9TYIs8KytGuN dd4abGjPm8Qw3741mCfH4WE0en3w5qHyNIgQY0EBx3nlEaaCRJ/Hkqu0LrNX5RPhQQne dzJ8Z0njXlytODBX07tu/CuiyQsaI64BYu9ddGbfFhUlRDTug6uv0HR4lL/wvv2u9/m9 ZDssN9Ra8+UiIRcNCBQix2rE2t+9t2YYC5gBrvylesBDD5HL+0b+oc5H5OualfT+PcbK TfR17IXwZR2Gq3RG7Cy2MhBy+Ad/HXMnCjDwaXU+sJsJsPnghFSWMPs/lmzBFGWOm3Wy IqEA== X-Forwarded-Encrypted: i=1; AJvYcCWt73NPle5so4MpRdSF8+jzAe/sPCG1S0CrfzyxMFJA9Sqra/u7T03tw95+U65HSaKrU6TUaft3TBFhPRWjGOMOQJKVfSV6 X-Gm-Message-State: AOJu0YxU1VengHfWP11Ww4sP/nWKVh9fZnzz5yYba/bV9NHaH81GHjgg JFBgolN5gZnFmtheH58IQlwAxmKdEonk0G1IBrJlC8V/n689D5zT91GtJqwk6Q4= X-Google-Smtp-Source: AGHT+IEQ7LOjl1eC1hy0XG7j2jZZeucoi3B0IntyqmOMGYmfCkf/CDiZjWHDIgUg2CF23GpuQ4SHZw== X-Received: by 2002:a17:90b:1244:b0:2a1:64a:bb63 with SMTP id gx4-20020a17090b124400b002a1064abb63mr9435927pjb.2.1713082701943; Sun, 14 Apr 2024 01:18:21 -0700 (PDT) Received: from localhost.localdomain ([8.210.91.195]) by smtp.googlemail.com with ESMTPSA id bx33-20020a056a02052100b005f0bc6d04adsm4440543pgb.46.2024.04.14.01.18.18 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 14 Apr 2024 01:18:21 -0700 (PDT) From: Lei Chen To: Willem de Bruijn , Jason Wang , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Herbert Xu , "Michael S. Tsirkin" Cc: Lei Chen , Willem de Bruijn , netdev@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH net-next v4] tun: limit printing rate when illegal packet received by tun dev Date: Sun, 14 Apr 2024 04:18:05 -0400 Message-ID: <20240414081806.2173098-1-lei.chen@smartx.com> X-Mailer: git-send-email 2.44.0 Precedence: bulk X-Mailing-List: netdev@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-Patchwork-Delegate: kuba@kernel.org vhost_worker will call tun call backs to receive packets. If too many illegal packets arrives, tun_do_read will keep dumping packet contents. When console is enabled, it will costs much more cpu time to dump packet and soft lockup will be detected. net_ratelimit mechanism can be used to limit the dumping rate. PID: 33036 TASK: ffff949da6f20000 CPU: 23 COMMAND: "vhost-32980" #0 [fffffe00003fce50] crash_nmi_callback at ffffffff89249253 #1 [fffffe00003fce58] nmi_handle at ffffffff89225fa3 #2 [fffffe00003fceb0] default_do_nmi at ffffffff8922642e #3 [fffffe00003fced0] do_nmi at ffffffff8922660d #4 [fffffe00003fcef0] end_repeat_nmi at ffffffff89c01663 [exception RIP: io_serial_in+20] RIP: ffffffff89792594 RSP: ffffa655314979e8 RFLAGS: 00000002 RAX: ffffffff89792500 RBX: ffffffff8af428a0 RCX: 0000000000000000 RDX: 00000000000003fd RSI: 0000000000000005 RDI: ffffffff8af428a0 RBP: 0000000000002710 R8: 0000000000000004 R9: 000000000000000f R10: 0000000000000000 R11: ffffffff8acbf64f R12: 0000000000000020 R13: ffffffff8acbf698 R14: 0000000000000058 R15: 0000000000000000 ORIG_RAX: ffffffffffffffff CS: 0010 SS: 0018 #5 [ffffa655314979e8] io_serial_in at ffffffff89792594 #6 [ffffa655314979e8] wait_for_xmitr at ffffffff89793470 #7 [ffffa65531497a08] serial8250_console_putchar at ffffffff897934f6 #8 [ffffa65531497a20] uart_console_write at ffffffff8978b605 #9 [ffffa65531497a48] serial8250_console_write at ffffffff89796558 #10 [ffffa65531497ac8] console_unlock at ffffffff89316124 #11 [ffffa65531497b10] vprintk_emit at ffffffff89317c07 #12 [ffffa65531497b68] printk at ffffffff89318306 #13 [ffffa65531497bc8] print_hex_dump at ffffffff89650765 #14 [ffffa65531497ca8] tun_do_read at ffffffffc0b06c27 [tun] #15 [ffffa65531497d38] tun_recvmsg at ffffffffc0b06e34 [tun] #16 [ffffa65531497d68] handle_rx at ffffffffc0c5d682 [vhost_net] #17 [ffffa65531497ed0] vhost_worker at ffffffffc0c644dc [vhost] #18 [ffffa65531497f10] kthread at ffffffff892d2e72 #19 [ffffa65531497f50] ret_from_fork at ffffffff89c0022f Fixes: ef3db4a59542 ("tun: avoid BUG, dump packet on GSO errors") Signed-off-by: Lei Chen Reviewed-by: Willem de Bruijn Acked-by: Jason Wang --- Changes from v3: https://lore.kernel.org/all/20240412065841.2148691-1-lei.chen@smartx.com/ 1. Change patch target from net tun to tun. 2. Move change log below the seperator "---". 3. Remove escaped parentheses in the Fixes string. Changes from v2: https://lore.kernel.org/netdev/20240410042245.2044516-1-lei.chen@smartx.com/ 1. Add net-dev to patch subject-prefix. 2. Add fix tag. Changes from v1: https://lore.kernel.org/all/20240409062407.1952728-1-lei.chen@smartx.com/ 1. Use net_ratelimit instead of raw __ratelimit. 2. Use netdev_err instead of pr_err to print more info abort net dev. 3. Adjust git commit message to make git am happy. drivers/net/tun.c | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/drivers/net/tun.c b/drivers/net/tun.c index 0b3f21cba552..ca9b4bc89de7 100644 --- a/drivers/net/tun.c +++ b/drivers/net/tun.c @@ -2125,14 +2125,16 @@ static ssize_t tun_put_user(struct tun_struct *tun, tun_is_little_endian(tun), true, vlan_hlen)) { struct skb_shared_info *sinfo = skb_shinfo(skb); - pr_err("unexpected GSO type: " - "0x%x, gso_size %d, hdr_len %d\n", - sinfo->gso_type, tun16_to_cpu(tun, gso.gso_size), - tun16_to_cpu(tun, gso.hdr_len)); - print_hex_dump(KERN_ERR, "tun: ", - DUMP_PREFIX_NONE, - 16, 1, skb->head, - min((int)tun16_to_cpu(tun, gso.hdr_len), 64), true); + + if (net_ratelimit()) { + netdev_err(tun->dev, "unexpected GSO type: 0x%x, gso_size %d, hdr_len %d\n", + sinfo->gso_type, tun16_to_cpu(tun, gso.gso_size), + tun16_to_cpu(tun, gso.hdr_len)); + print_hex_dump(KERN_ERR, "tun: ", + DUMP_PREFIX_NONE, + 16, 1, skb->head, + min((int)tun16_to_cpu(tun, gso.hdr_len), 64), true); + } WARN_ON_ONCE(1); return -EINVAL; }