lkml.org 
[lkml]   [2022]   [Jun]   [4]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH v3 29/33] PCI/P2PDMA: Convert to printbuf
    Date
    This converts from seq_buf to printbuf. We're using printbuf in external
    buffer mode, so it's a direct conversion, aside from some trivial
    refactoring in cpu_show_meltdown() to make the code more consistent.

    Signed-off-by: Kent Overstreet <kent.overstreet@gmail.com>
    Cc: linux-pci@vger.kernel.org
    ---
    drivers/pci/p2pdma.c | 17 ++++++-----------
    1 file changed, 6 insertions(+), 11 deletions(-)

    diff --git a/drivers/pci/p2pdma.c b/drivers/pci/p2pdma.c
    index 30b1df3c9d..c40d91912a 100644
    --- a/drivers/pci/p2pdma.c
    +++ b/drivers/pci/p2pdma.c
    @@ -17,7 +17,7 @@
    #include <linux/memremap.h>
    #include <linux/percpu-refcount.h>
    #include <linux/random.h>
    -#include <linux/seq_buf.h>
    +#include <linux/printbuf.h>
    #include <linux/xarray.h>

    enum pci_p2pdma_map_type {
    @@ -281,12 +281,9 @@ static int pci_bridge_has_acs_redir(struct pci_dev *pdev)
    return 0;
    }

    -static void seq_buf_print_bus_devfn(struct seq_buf *buf, struct pci_dev *pdev)
    +static void prt_bus_devfn(struct printbuf *buf, struct pci_dev *pdev)
    {
    - if (!buf)
    - return;
    -
    - seq_buf_printf(buf, "%s;", pci_name(pdev));
    + prt_printf(buf, "%s;", pci_name(pdev));
    }

    static bool cpu_supports_p2pdma(void)
    @@ -455,13 +452,11 @@ calc_map_type_and_dist(struct pci_dev *provider, struct pci_dev *client,
    struct pci_dev *a = provider, *b = client, *bb;
    bool acs_redirects = false;
    struct pci_p2pdma *p2pdma;
    - struct seq_buf acs_list;
    int acs_cnt = 0;
    int dist_a = 0;
    int dist_b = 0;
    char buf[128];
    -
    - seq_buf_init(&acs_list, buf, sizeof(buf));
    + struct printbuf acs_list = PRINTBUF_EXTERN(buf, sizeof(buf));

    /*
    * Note, we don't need to take references to devices returned by
    @@ -472,7 +467,7 @@ calc_map_type_and_dist(struct pci_dev *provider, struct pci_dev *client,
    dist_b = 0;

    if (pci_bridge_has_acs_redir(a)) {
    - seq_buf_print_bus_devfn(&acs_list, a);
    + prt_bus_devfn(&acs_list, a);
    acs_cnt++;
    }

    @@ -501,7 +496,7 @@ calc_map_type_and_dist(struct pci_dev *provider, struct pci_dev *client,
    break;

    if (pci_bridge_has_acs_redir(bb)) {
    - seq_buf_print_bus_devfn(&acs_list, bb);
    + prt_bus_devfn(&acs_list, bb);
    acs_cnt++;
    }

    --
    2.36.0
    \
     
     \ /
      Last update: 2022-06-04 21:34    [W:4.255 / U:0.320 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site