| lists.openwall.net | lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC | |
|
Open Source and information security mailing list archives
| ||
|
Date: Tue, 26 Nov 2019 14:35:23 +0000
From: "Nath, Arindam" <Arindam.Nath@....com>
To: "Mehta, Sanju" <Sanju.Mehta@....com>,
Jiasen Lin <linjiasen@...on.cn>
CC: "S-k, Shyam-sundar <Shyam-sundar.S-k@....com> Dave Jiang"
<dave.jiang@...el.com>, Allen Hubbe <allenbh@...il.com>,
linux-kernel <linux-kernel@...r.kernel.org>,
linux-ntb <linux-ntb@...glegroups.com>,
"linjiasen007@...il.com" <linjiasen007@...il.com>
Subject: RE: Fwd: [PATCH] NTB: Fix an error in get link status
> -----Original Message-----
> From: Mehta, Sanju <Sanju.Mehta@....com>
> Sent: Tuesday, November 26, 2019 18:40
> To: Jiasen Lin <linjiasen@...on.cn>
> Cc: S-k, Shyam-sundar <Shyam-sundar.S-k@....com> Dave Jiang
> <dave.jiang@...el.com>; Nath, Arindam <Arindam.Nath@....com>; Allen
> Hubbe <allenbh@...il.com>; linux-kernel <linux-kernel@...r.kernel.org>;
> linux-ntb <linux-ntb@...glegroups.com>; linjiasen007@...il.com
> Subject: Re: Fwd: [PATCH] NTB: Fix an error in get link status
>
>
> > Hi Sanjay R Mehta
> >
> > In more complex topology, read the Link Status and Control register of
> > RP is also wrong. Suppose that a PCIe switch bridge to the Secondary RP,
> > and Secondary internal SW.ds is a child device for switch's downstream
> > port as illustrated in the following topology.
> >
> > In secondary PCI domain:
> > Secondary RP--Switch UP--Switch DP--Secondary internal SW.us--
> Secondary
> > internal SW.ds--Secondary NTB
> >
> > pci_rp = pci_find_pcie_root_port(ndev->ntb.pdev) will return the
> > Secondary RP, and pcie_capability_read_dword(pci_rp,
> > PCI_EXP_LNKCTL,&stat) will get the link status between Secondary RP and
> > Switch UP. Maybe, read the Link Status and control register of Secondary
> > internal SW.us is appropriate.
> >
> Hi Jiansen Lin,
>
> I modified the code as per your suggestion and is working fine.
> Adding Arindam for comments who was the co-author of the patch I was
> about to send for upstream review.
Hi Jiansen Lin,
I am okay with the changes proposed by you. But one thing we need to keep
in mind is that, the configuration SWUS+SWDS+EP as visible from the NTB
secondary, might change in future AMD implementations where these internal
switches are not present anymore. So we might have to re-visit the patch
again later.
Thanks,
Arindam
>
> Thanks,
> Sanjay Mehta
> > struct pci_dev *pci_up = NULL;
> > struct pci_dev *pci_dp = NULL;
> >
> > if (ndev->ntb.topo == NTB_TOPO_SEC) {
> > /* Locate the pointer to Secondary up for this device */
> > pci_dp = pci_upstream_bridge(ndev->ntb.pdev);
> > /* Read the PCIe Link Control and Status register */
> > if (pci_dp) {
> > pci_up = pci_upstream_bridge(pci_dp);
> > if (pci_up) {
> > rc = pcie_capability_read_dword(pci_up, PCI_EXP_LNKCTL,
> > &stat);
> > if (rc)
> > return 0;
> > }
> > }
> > }
> >
> > Thanks,
> > Jiansen Lin
> >
> >> I have modified the code according to your suggestion and tested it
> >> on Dhyana platform, it works well, expect to receice your patch.
> >>
> >> Before modify the code, read the Link Status and control register of the
> >> secondary NTB device to get link status.
> >>
> >> cat /sys/kernel/debug/ntb_hw_amd/0000\:43\:00.1/info
> >> NTB Device Information:
> >> Connection Topology - NTB_TOPO_SEC
> >> LNK STA - 0x11030042
> >> Link Status - Up
> >> Link Speed - PCI-E Gen 3
> >> Link Width - x16
> >>
> >> After modify the code, read the Link Status and control register of the
> >> secondary RP to get link status.
> >>
> >> cat /sys/kernel/debug/ntb_hw_amd/0000\:43\:00.1/info
> >> NTB Device Information:
> >> Connection Topology - NTB_TOPO_SEC
> >> LNK STA - 0x70830042
> >> Link Status - Up
> >> Link Speed - PCI-E Gen 3
> >> Link Width - x8
> >>
> >> Thanks,
> >> Jiasen Lin
> >>
> >>> ---
> >>> drivers/ntb/hw/amd/ntb_hw_amd.c | 27
> +++++++++++++++++++++++----
> >>> drivers/ntb/hw/amd/ntb_hw_amd.h | 1 -
> >>> 2 files changed, 23 insertions(+), 5 deletions(-)
> >>>
> >>> diff --git a/drivers/ntb/hw/amd/ntb_hw_amd.c
> >>> b/drivers/ntb/hw/amd/ntb_hw_amd.c
> >>> index 14ad69c..91e1966 100644
> >>> --- a/drivers/ntb/hw/amd/ntb_hw_amd.c
> >>> +++ b/drivers/ntb/hw/amd/ntb_hw_amd.c
> >>> @@ -842,6 +842,8 @@ static inline void ndev_init_struct(struct
> >>> amd_ntb_dev *ndev,
> >>> static int amd_poll_link(struct amd_ntb_dev *ndev)
> >>> {
> >>> void __iomem *mmio = ndev->peer_mmio;
> >>> + struct pci_dev *pci_rp = NULL;
> >>> + struct pci_dev *pdev = NULL;
> >>> u32 reg, stat;
> >>> int rc;
> >>> @@ -855,10 +857,27 @@ static int amd_poll_link(struct amd_ntb_dev
> *ndev)
> >>> ndev->cntl_sta = reg;
> >>> - rc = pci_read_config_dword(ndev->ntb.pdev,
> >>> - AMD_LINK_STATUS_OFFSET, &stat);
> >>> - if (rc)
> >>> - return 0;
> >>> + if (ndev->ntb.topo == NTB_TOPO_SEC) {
> >>> + /* Locate the pointer to PCIe Root Port for this device */
> >>> + pci_rp = pci_find_pcie_root_port(ndev->ntb.pdev);
> >>> + /* Read the PCIe Link Control and Status register */
> >>> + if (pci_rp) {
> >>> + rc = pcie_capability_read_dword(pci_rp, PCI_EXP_LNKCTL,
> >>> + &stat);
> >>> + if (rc)
> >>> + return 0;
> >>> + }
> >>> + } else if (ndev->ntb.topo == NTB_TOPO_PRI) {
> >>> + /*
> >>> + * For NTB primary, we simply read the Link Status and control
> >>> + * register of the NTB device itself.
> >>> + */
> >>> + pdev = ndev->ntb.pdev;
> >>> + rc = pcie_capability_read_dword(pdev, PCI_EXP_LNKCTL, &stat);
> >>> + if (rc)
> >>> + return 0;
> >>> + }
> >>> +
> >>> ndev->lnk_sta = stat;
> >>> return 1;
> >>> diff --git a/drivers/ntb/hw/amd/ntb_hw_amd.h
> >>> b/drivers/ntb/hw/amd/ntb_hw_amd.h
> >>> index 139a307..39e5d18 100644
> >>> --- a/drivers/ntb/hw/amd/ntb_hw_amd.h
> >>> +++ b/drivers/ntb/hw/amd/ntb_hw_amd.h
> >>> @@ -53,7 +53,6 @@
> >>> #include <linux/pci.h>
> >>> #define AMD_LINK_HB_TIMEOUT msecs_to_jiffies(1000)
> >>> -#define AMD_LINK_STATUS_OFFSET 0x68
> >>> #define NTB_LIN_STA_ACTIVE_BIT 0x00000002
> >>> #define NTB_LNK_STA_SPEED_MASK 0x000F0000
> >>> #define NTB_LNK_STA_WIDTH_MASK 0x03F00000
> >>>
Powered by blists - more mailing lists