From patchwork Wed Oct 26 22:43:32 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Ahelenia_Ziemia=C5=84ska?= X-Patchwork-Id: 11456 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:6687:0:0:0:0:0 with SMTP id l7csp519530wru; Wed, 26 Oct 2022 15:45:46 -0700 (PDT) X-Google-Smtp-Source: AMsMyM4/3TDy6fgFw3hoom90vC4xNx3teiB/mZc9U/sy/LyItHFD8ni1WTUVJPd1iS5mlV7qsjxr X-Received: by 2002:a17:907:a047:b0:7ac:ff72:977c with SMTP id gz7-20020a170907a04700b007acff72977cmr7836508ejc.260.1666824345821; Wed, 26 Oct 2022 15:45:45 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1666824345; cv=none; d=google.com; s=arc-20160816; b=eMlfGzKzhGN6mA8zuPLDU9pANFg9kyaSuPx6sYgS1SLPrzVL0ZFNCHltQEG7kXTdCs 9Y48Y9NnwBKI2sNgmIaoBYY/d9+P83R8OTKkHFXsEpDmik7JzYxjpG6Z8i7JUOKgF/su QoLMz6MpYdO4rQAfUgHt5sGXkEJGvRzRckEgyo5sPqYRqXEH2wJCCEQ1thC5sgJuAkt6 aau9Mr7Lg5anYeB6QlgT6eECgJnkCinV+LBSzijJWBFFy9kCZIYvazLJXJAIOEFDxlhI 0NEi7fxFN4mFDOQJeCUH8pH0G07EY3KDC53AT/94NxPmAhyePmK9GswU/xvR6ePJgkVy o2Gw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:to:user-agent:in-reply-to:content-disposition :mime-version:references:message-id:subject:cc:from:date :dkim-signature; bh=WAxgj/LgUwA8lQLw1kF4//CB05HxM8AkI8fq+AXrhdA=; b=f2Yyc15TmXUXpzhEqXIPe4sEld69Ayie81beA51zXcI9kBSApPNRkmSvy6EZ2cymF2 vhDLCVNMYQKi26Oysm5n2zjTJ/rMhxmdmKgX4yBb59SNsun9402nTVmDK2HzoZaGHJUf AX8bRbbgoq6wFNIwiFZErRUIGfcLxy4ua8EqQCq7uw67S4ietKQAz4RrohbP0xWl4l89 QToesttIQpkyBOpA3tdOVvDJg1O6NLC4Thgpnlre5Nv2TQJADlekxN4AGnk9COwHL8td gHAA8fQj4kxAVBiry6uqwzTIeNLLqibgVt3dHm11iBfoMDZ7ua7cgXzlFp1GFYwxuC6i YkGg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@nabijaczleweli.xyz header.s=202205 header.b=uB03pUvQ; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=nabijaczleweli.xyz Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id d23-20020aa7d5d7000000b0045caa1628c6si5243651eds.216.2022.10.26.15.45.21; Wed, 26 Oct 2022 15:45:45 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@nabijaczleweli.xyz header.s=202205 header.b=uB03pUvQ; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=nabijaczleweli.xyz Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233921AbiJZWob (ORCPT + 99 others); Wed, 26 Oct 2022 18:44:31 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:54710 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233914AbiJZWnx (ORCPT ); Wed, 26 Oct 2022 18:43:53 -0400 Received: from tarta.nabijaczleweli.xyz (unknown [139.28.40.42]) by lindbergh.monkeyblade.net (Postfix) with ESMTP id CE2FC108266; Wed, 26 Oct 2022 15:43:33 -0700 (PDT) Received: from tarta.nabijaczleweli.xyz (unknown [192.168.1.250]) by tarta.nabijaczleweli.xyz (Postfix) with ESMTPSA id 2979445F2; Thu, 27 Oct 2022 00:43:33 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=nabijaczleweli.xyz; s=202205; t=1666824213; bh=peSt6Ngd9dQwG3mJMnSEDxxpVnYEqXKHKBMQf6O6+NA=; h=Date:From:Cc:Subject:References:In-Reply-To:From; b=uB03pUvQoQ3l89bCq8VZ6g43zIA1TozMbKO/u0r3royUEci2wPDbNtn3vTC0iMI21 iCndnMA8JtnZzauiY126qxn+NyIZMQxeY4RS+MHwrMqH1GWWfc1L0una8VSjMpB+Mh DJl3ngRAkp8DnYCtewsTHQtsTvpAZYMXDsXFUz+KWBFCoIbw8pBlHoe8qhJEahBuIc faLTs5P/1pBg65cnzyf47L/YX8ahM5qhSyhl2RqypEcbaoxBkaqqe1Y637gaF1FNh4 U/+I1ONvpF90+PTUYqnO8fWzLrHQ3KvKWs+QeLsSuaD90nS7XKacNqW2NZJFlNtfeu j5022/PL6pWIEeP+7XJN//kPECVciEkq9S6vQj2+1kwFGi960+vHz6IHYMunA9oVGf MXRKSnF6tTbimwHjNzz2fITmP8ZH1xUMduOzTBFlnHyfw+H6TT0Xz51ZWCfYer6rAe YX7KBMEtg9HLCePThFRZVxh9dVpDRc2XulO8gD7Mxj15eZNe/YDl4DJe185miwjEXb ps4G4AF9wGvcLopKivR+DGSq6O0cTkpUU2Cmche1a+CnPvQW/TgAUc9LDy6CuJMkVZ fO0SgvuNtKAuLm73p4MWZ0Wv5e1j0aXG/AY1eqPLHK6VweBP9P7ofIaZ4m8ErrMilC yrkEFPpOG5gssZUyUeXHZPsY= Date: Thu, 27 Oct 2022 00:43:32 +0200 From: =?utf-8?b?0L3QsNCx?= Cc: Jonathan Corbet , Federico Vaga , Alex Shi , Yanteng Si , Hu Haowen , "David S. Miller" , Eric Dumazet , Jakub =?utf-8?b?S2ljacWEc2tp?= , Paolo Abeni , Greg Kroah-Hartman , Jiri Slaby , Marc Kleine-Budde , Oliver Hartkopp , Sebastian Andrzej Siewior , Duoming Zhou , Huang Pei , linux-doc@vger.kernel.org, linux-kernel@vger.kernel.org, linux-doc-tw-discuss@lists.sourceforge.net, netdev@vger.kernel.org Subject: [PATCH 12/15] drivers: net: slip: remove SLIP_MAGIC Message-ID: References: <9a453437b5c3b4b1887c1bd84455b0cc3d1c40b2.1666822928.git.nabijaczleweli@nabijaczleweli.xyz> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <9a453437b5c3b4b1887c1bd84455b0cc3d1c40b2.1666822928.git.nabijaczleweli@nabijaczleweli.xyz> User-Agent: NeoMutt/20220429 X-Spam-Status: No, score=1.9 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,FROM_SUSPICIOUS_NTLD, MISSING_HEADERS,PDS_OTHER_BAD_TLD,PDS_RDNS_DYNAMIC_FP,RDNS_DYNAMIC, SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED autolearn=no autolearn_force=no version=3.4.6 X-Spam-Level: * X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net To: unlisted-recipients:; (no To-header on input) Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1747792005518331477?= X-GMAIL-MSGID: =?utf-8?q?1747792005518331477?= According to Greg, in the context of magic numbers as defined in magic-number.rst, "the tty layer should not need this and I'll gladly take patches" We have largely moved away from this approach, and we have better debugging instrumentation nowadays: kill it Additionally, all SLIP_MAGIC checks just early-exit instead of noting the bug, so they're detrimental, if anything Ref: https://lore.kernel.org/linux-doc/YyMlovoskUcHLEb7@kroah.com/ Signed-off-by: Ahelenia Ziemiańska Reviewed-by: Oliver Hartkopp --- Documentation/process/magic-number.rst | 1 - .../translations/it_IT/process/magic-number.rst | 1 - .../translations/zh_CN/process/magic-number.rst | 1 - .../translations/zh_TW/process/magic-number.rst | 1 - drivers/net/slip/slip.c | 11 +++++------ drivers/net/slip/slip.h | 4 ---- 6 files changed, 5 insertions(+), 14 deletions(-) diff --git a/Documentation/process/magic-number.rst b/Documentation/process/magic-number.rst index 3b3e607e1cbc..e59c707ec785 100644 --- a/Documentation/process/magic-number.rst +++ b/Documentation/process/magic-number.rst @@ -69,6 +69,5 @@ Changelog:: Magic Name Number Structure File ===================== ================ ======================== ========================================== FASYNC_MAGIC 0x4601 fasync_struct ``include/linux/fs.h`` -SLIP_MAGIC 0x5302 slip ``drivers/net/slip.h`` CCB_MAGIC 0xf2691ad2 ccb ``drivers/scsi/ncr53c8xx.c`` ===================== ================ ======================== ========================================== diff --git a/Documentation/translations/it_IT/process/magic-number.rst b/Documentation/translations/it_IT/process/magic-number.rst index e8c659b6a743..37a539867b6f 100644 --- a/Documentation/translations/it_IT/process/magic-number.rst +++ b/Documentation/translations/it_IT/process/magic-number.rst @@ -75,6 +75,5 @@ Registro dei cambiamenti:: Nome magico Numero Struttura File ===================== ================ ======================== ========================================== FASYNC_MAGIC 0x4601 fasync_struct ``include/linux/fs.h`` -SLIP_MAGIC 0x5302 slip ``drivers/net/slip.h`` CCB_MAGIC 0xf2691ad2 ccb ``drivers/scsi/ncr53c8xx.c`` ===================== ================ ======================== ========================================== diff --git a/Documentation/translations/zh_CN/process/magic-number.rst b/Documentation/translations/zh_CN/process/magic-number.rst index 2105af32187c..8a3a3e872c52 100644 --- a/Documentation/translations/zh_CN/process/magic-number.rst +++ b/Documentation/translations/zh_CN/process/magic-number.rst @@ -58,6 +58,5 @@ Linux 魔术数 魔术数名 数字 结构 文件 ===================== ================ ======================== ========================================== FASYNC_MAGIC 0x4601 fasync_struct ``include/linux/fs.h`` -SLIP_MAGIC 0x5302 slip ``drivers/net/slip.h`` CCB_MAGIC 0xf2691ad2 ccb ``drivers/scsi/ncr53c8xx.c`` ===================== ================ ======================== ========================================== diff --git a/Documentation/translations/zh_TW/process/magic-number.rst b/Documentation/translations/zh_TW/process/magic-number.rst index 793a0ae9fb7c..7ace7834f7f9 100644 --- a/Documentation/translations/zh_TW/process/magic-number.rst +++ b/Documentation/translations/zh_TW/process/magic-number.rst @@ -61,6 +61,5 @@ Linux 魔術數 魔術數名 數字 結構 文件 ===================== ================ ======================== ========================================== FASYNC_MAGIC 0x4601 fasync_struct ``include/linux/fs.h`` -SLIP_MAGIC 0x5302 slip ``drivers/net/slip.h`` CCB_MAGIC 0xf2691ad2 ccb ``drivers/scsi/ncr53c8xx.c`` ===================== ================ ======================== ========================================== diff --git a/drivers/net/slip/slip.c b/drivers/net/slip/slip.c index 6865d32270e5..95f5c79772e7 100644 --- a/drivers/net/slip/slip.c +++ b/drivers/net/slip/slip.c @@ -426,7 +426,7 @@ static void slip_transmit(struct work_struct *work) spin_lock_bh(&sl->lock); /* First make sure we're connected. */ - if (!sl->tty || sl->magic != SLIP_MAGIC || !netif_running(sl->dev)) { + if (!sl->tty || !netif_running(sl->dev)) { spin_unlock_bh(&sl->lock); return; } @@ -690,7 +690,7 @@ static void slip_receive_buf(struct tty_struct *tty, const unsigned char *cp, { struct slip *sl = tty->disc_data; - if (!sl || sl->magic != SLIP_MAGIC || !netif_running(sl->dev)) + if (!sl || !netif_running(sl->dev)) return; /* Read the characters out of the buffer */ @@ -761,7 +761,6 @@ static struct slip *sl_alloc(void) sl = netdev_priv(dev); /* Initialize channel control data */ - sl->magic = SLIP_MAGIC; sl->dev = dev; spin_lock_init(&sl->lock); INIT_WORK(&sl->tx_work, slip_transmit); @@ -809,7 +808,7 @@ static int slip_open(struct tty_struct *tty) err = -EEXIST; /* First make sure we're not already connected. */ - if (sl && sl->magic == SLIP_MAGIC) + if (sl) goto err_exit; /* OK. Find a free SLIP channel to use. */ @@ -886,7 +885,7 @@ static void slip_close(struct tty_struct *tty) struct slip *sl = tty->disc_data; /* First make sure we're connected. */ - if (!sl || sl->magic != SLIP_MAGIC || sl->tty != tty) + if (!sl || sl->tty != tty) return; spin_lock_bh(&sl->lock); @@ -1080,7 +1079,7 @@ static int slip_ioctl(struct tty_struct *tty, unsigned int cmd, int __user *p = (int __user *)arg; /* First make sure we're connected. */ - if (!sl || sl->magic != SLIP_MAGIC) + if (!sl) return -EINVAL; switch (cmd) { diff --git a/drivers/net/slip/slip.h b/drivers/net/slip/slip.h index 3d7f88b330c1..d7dbedd27669 100644 --- a/drivers/net/slip/slip.h +++ b/drivers/net/slip/slip.h @@ -50,8 +50,6 @@ struct slip { - int magic; - /* Various fields. */ struct tty_struct *tty; /* ptr to TTY structure */ struct net_device *dev; /* easy for intr handling */ @@ -100,6 +98,4 @@ struct slip { #endif }; -#define SLIP_MAGIC 0x5302 - #endif /* _LINUX_SLIP.H */