From patchwork Mon Jun 5 03:27:06 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Koba Ko X-Patchwork-Id: 1790202 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.ubuntu.com (client-ip=91.189.94.19; helo=huckleberry.canonical.com; envelope-from=kernel-team-bounces@lists.ubuntu.com; receiver=) Authentication-Results: legolas.ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=canonical.com header.i=@canonical.com header.a=rsa-sha256 header.s=20210705 header.b=V2lC9XLN; dkim-atps=neutral Received: from huckleberry.canonical.com (huckleberry.canonical.com [91.189.94.19]) (using TLSv1.2 with cipher ECDHE-ECDSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4QZJvZ1c1Fz20Ty for ; Mon, 5 Jun 2023 13:27:36 +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 ) id 1q60sL-0006Gb-P8; Mon, 05 Jun 2023 03:27:21 +0000 Received: from smtp-relay-internal-1.internal ([10.131.114.114] helo=smtp-relay-internal-1.canonical.com) by huckleberry.canonical.com with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.86_2) (envelope-from ) id 1q60sK-0006GN-5w for kernel-team@lists.ubuntu.com; Mon, 05 Jun 2023 03:27:20 +0000 Received: from mail-oi1-f199.google.com (mail-oi1-f199.google.com [209.85.167.199]) (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 smtp-relay-internal-1.canonical.com (Postfix) with ESMTPS id F13B23F22B for ; Mon, 5 Jun 2023 03:27:19 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canonical.com; s=20210705; t=1685935640; bh=/Ji94El1LN5eRCtrEEIW+xlKDi3/pxcMGNGUUYBmrY8=; h=From:To:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version:Content-Type; b=V2lC9XLNHi9TlgR2IuiM420dmVZceecFpcd4NlNruozBpr8R3QOmw2o0ei1C1aAx4 3+XtUxpC+ZHbYifjoz9l5Ksk7gZeYdltYQNg61S/pfO7T8+DDyQrTyCMx5ZHec7PvF ZCsMu9qMtZfL/76ivkuLVlAhv6Oo58TDIwttc+JVNFH6/lUPwjxu7ApiTYce/7IOjv Gu/oqTVSJAhODXHAJhp7QyyTNR/tBqImkEtaU7jIHv06fxyTM6AWOBsP5N/R0Qg3Ie Ih9yzT6z3WpTwH1lOXXCLzh9TLp8uLa80gINLTMkjpRvLdC+cwAkrlsyiQmu4nBIxU p6hWmB/hU62jQ== Received: by mail-oi1-f199.google.com with SMTP id 5614622812f47-39aa9617c6bso675695b6e.1 for ; Sun, 04 Jun 2023 20:27:19 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1685935638; x=1688527638; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=/Ji94El1LN5eRCtrEEIW+xlKDi3/pxcMGNGUUYBmrY8=; b=QctWe+pw2IcYZFPY9ElxuJwuQm40TSKPIN63mF8gNH2O1oCN6rtkTapKZARfzpbXEW qkB6qPpYx5/tMspz09sjLDWMf66NOoDlQMFgVIlAdqhoBzuDrmywNpxJEcypQ92wjt8d GHZ29QXfWZHDl8ic46WAYjO64xHBIryQmSJllmrtE0ZCpkycCdiUlqPX48Gduqu3Z8r+ wMdQcDokpPpin99m7Ty9gp0xN1FUHlKS6//OYOQvoiGs3x3Jy1rDmoeYaUfr//X/6EXl ftn0QfhEhSD5RZ3XhUsdELdvKB9DYKm58KXfjH57hbBYmWTHkQzW3JeMennWY4A4sA2n GpGw== X-Gm-Message-State: AC+VfDy+4flpWnJRnh4kI6bqX3Kg4tmkWM3SQaJw+Y9Ymt6fC9di5jht iUXesfymGw5O36Sl1hbt/TwQsck2wVP0QkaTZBavGg2mm89Sa0t+XY2ydSGKiudv/HQeGVY4Ip9 zHVct9Tk+qx7XXD0tmUIMjzh+hR6XyGN2CzgIUMfRxkKSRCKNnQ== X-Received: by 2002:a05:6808:8ce:b0:38d:fdf2:962e with SMTP id k14-20020a05680808ce00b0038dfdf2962emr6525635oij.23.1685935638207; Sun, 04 Jun 2023 20:27:18 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ4E5LppPSioFkyJgKvw+PMoV4qMA4PEHlMEpe4r2RKnf6qi7AcAhw9tWcx1QMCdvfYl9odPVw== X-Received: by 2002:a05:6808:8ce:b0:38d:fdf2:962e with SMTP id k14-20020a05680808ce00b0038dfdf2962emr6525621oij.23.1685935637747; Sun, 04 Jun 2023 20:27:17 -0700 (PDT) Received: from canonical.com (211-75-139-218.hinet-ip.hinet.net. [211.75.139.218]) by smtp.gmail.com with ESMTPSA id v20-20020a63f854000000b005348af1b84csm4764202pgj.74.2023.06.04.20.27.16 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 04 Jun 2023 20:27:17 -0700 (PDT) From: Koba Ko To: kernel-team@lists.ubuntu.com Subject: [PATCH 1/6 V2][SRU][Lunar] r8169: use spinlock to protect mac ocp register access Date: Mon, 5 Jun 2023 11:27:06 +0800 Message-Id: <20230605032711.606574-2-koba.ko@canonical.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230605032711.606574-1-koba.ko@canonical.com> References: <20230605032711.606574-1-koba.ko@canonical.com> MIME-Version: 1.0 X-BeenThere: kernel-team@lists.ubuntu.com X-Mailman-Version: 2.1.20 Precedence: list List-Id: Kernel team discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: kernel-team-bounces@lists.ubuntu.com Sender: "kernel-team" From: Heiner Kallweit BugLink: https://bugs.launchpad.net/bugs/1946433 For disabling ASPM during NAPI poll we'll have to access mac ocp registers in atomic context. This could result in races because a mac ocp read consists of a write to register OCPDR, followed by a read from the same register. Therefore add a spinlock to protect access to mac ocp registers. Reviewed-by: Simon Horman Tested-by: Kai-Heng Feng Tested-by: Holger Hoffstätte Signed-off-by: Heiner Kallweit Signed-off-by: David S. Miller (cherry picked from commit 91c8643578a21e435c412ffbe902bb4b4773e262) Signed-off-by: Koba Ko --- drivers/net/ethernet/realtek/r8169_main.c | 37 ++++++++++++++++++++--- 1 file changed, 33 insertions(+), 4 deletions(-) diff --git a/drivers/net/ethernet/realtek/r8169_main.c b/drivers/net/ethernet/realtek/r8169_main.c index 6fd040dd74234..c3ba74c611199 100644 --- a/drivers/net/ethernet/realtek/r8169_main.c +++ b/drivers/net/ethernet/realtek/r8169_main.c @@ -612,6 +612,8 @@ struct rtl8169_private { struct work_struct work; } wk; + spinlock_t mac_ocp_lock; + unsigned supports_gmii:1; unsigned aspm_manageable:1; dma_addr_t counters_phys_addr; @@ -846,7 +848,7 @@ static int r8168_phy_ocp_read(struct rtl8169_private *tp, u32 reg) (RTL_R32(tp, GPHY_OCP) & 0xffff) : -ETIMEDOUT; } -static void r8168_mac_ocp_write(struct rtl8169_private *tp, u32 reg, u32 data) +static void __r8168_mac_ocp_write(struct rtl8169_private *tp, u32 reg, u32 data) { if (rtl_ocp_reg_failure(reg)) return; @@ -854,7 +856,16 @@ static void r8168_mac_ocp_write(struct rtl8169_private *tp, u32 reg, u32 data) RTL_W32(tp, OCPDR, OCPAR_FLAG | (reg << 15) | data); } -static u16 r8168_mac_ocp_read(struct rtl8169_private *tp, u32 reg) +static void r8168_mac_ocp_write(struct rtl8169_private *tp, u32 reg, u32 data) +{ + unsigned long flags; + + spin_lock_irqsave(&tp->mac_ocp_lock, flags); + __r8168_mac_ocp_write(tp, reg, data); + spin_unlock_irqrestore(&tp->mac_ocp_lock, flags); +} + +static u16 __r8168_mac_ocp_read(struct rtl8169_private *tp, u32 reg) { if (rtl_ocp_reg_failure(reg)) return 0; @@ -864,12 +875,28 @@ static u16 r8168_mac_ocp_read(struct rtl8169_private *tp, u32 reg) return RTL_R32(tp, OCPDR); } +static u16 r8168_mac_ocp_read(struct rtl8169_private *tp, u32 reg) +{ + unsigned long flags; + u16 val; + + spin_lock_irqsave(&tp->mac_ocp_lock, flags); + val = __r8168_mac_ocp_read(tp, reg); + spin_unlock_irqrestore(&tp->mac_ocp_lock, flags); + + return val; +} + static void r8168_mac_ocp_modify(struct rtl8169_private *tp, u32 reg, u16 mask, u16 set) { - u16 data = r8168_mac_ocp_read(tp, reg); + unsigned long flags; + u16 data; - r8168_mac_ocp_write(tp, reg, (data & ~mask) | set); + spin_lock_irqsave(&tp->mac_ocp_lock, flags); + data = __r8168_mac_ocp_read(tp, reg); + __r8168_mac_ocp_write(tp, reg, (data & ~mask) | set); + spin_unlock_irqrestore(&tp->mac_ocp_lock, flags); } /* Work around a hw issue with RTL8168g PHY, the quirk disables @@ -5155,6 +5182,8 @@ static int rtl_init_one(struct pci_dev *pdev, const struct pci_device_id *ent) tp->eee_adv = -1; tp->ocp_base = OCP_STD_PHY_BASE; + spin_lock_init(&tp->mac_ocp_lock); + dev->tstats = devm_netdev_alloc_pcpu_stats(&pdev->dev, struct pcpu_sw_netstats); if (!dev->tstats)