* [Bug 110659] pageflipping seems to cause jittering on mouse input when running Hitman 2 in Wine/DXVK with amdgpu.dc=1
From: bugzilla-daemon @ 2019-06-20 10:40 UTC (permalink / raw)
To: dri-devel
In-Reply-To: <bug-110659-502@http.bugs.freedesktop.org/>
[-- Attachment #1.1: Type: text/plain, Size: 382 bytes --]
https://bugs.freedesktop.org/show_bug.cgi?id=110659
--- Comment #23 from tempel.julian@gmail.com ---
Any news on this? I'd really like to have this sorted out before I
wholeheartedly recommended Navi for Linux gaming.
I can imagine that Navi causes a ton of work, but still this issue is painful.
--
You are receiving this mail because:
You are the assignee for the bug.
[-- Attachment #1.2: Type: text/html, Size: 1264 bytes --]
[-- Attachment #2: Type: text/plain, Size: 159 bytes --]
_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel
^ permalink raw reply
* [PATCH v2 0/6] mm: Further memory block device cleanups
From: David Hildenbrand @ 2019-06-20 10:35 UTC (permalink / raw)
To: linux-kernel
Cc: Oscar Salvador, Michal Hocko, David Hildenbrand, Wei Yang,
Keith Busch, linux-mm, Arun KS, Rashmica Gupta, Thomas Gleixner,
Stephen Rothwell, Michael Neuling, Baoquan He, Rafael J. Wysocki,
Pavel Tatashin, linux-acpi, Len Brown, Pavel Tatashin,
Pavel Tatashin, Anshuman Khandual, mike.travis@hpe.com,
linuxppc-dev, Mike Rapoport, Qian Cai, Dan Williams,
Vlastimil Babka, Oscar Salvador, Juergen Gross, Andrew Banman,
Greg Kroah-Hartman, Rafael J. Wysocki, Johannes Weiner,
Paul Mackerras, Andrew Morton, Mel Gorman
@Andrew: Only patch 1 and 6 changed. The patches are based on the
same state as the previous patches (replace the old ones if possible).
Some further cleanups around memory block devices. Especially, clean up
and simplify walk_memory_range(). Including some other minor cleanups.
Compiled + tested on x86 with DIMMs under QEMU.
v1 -> v2:
- "mm: Section numbers use the type "unsigned long""
-- "unsigned long i" -> "unsigned long nr", in one case -> "int i"
- "drivers/base/memory.c: Get rid of find_memory_block_hinted("
-- Fix compilation error
-- Get rid of the "hint" parameter completely
David Hildenbrand (6):
mm: Section numbers use the type "unsigned long"
drivers/base/memory: Use "unsigned long" for block ids
mm: Make register_mem_sect_under_node() static
mm/memory_hotplug: Rename walk_memory_range() and pass start+size
instead of pfns
mm/memory_hotplug: Move and simplify walk_memory_blocks()
drivers/base/memory.c: Get rid of find_memory_block_hinted()
arch/powerpc/platforms/powernv/memtrace.c | 22 ++---
drivers/acpi/acpi_memhotplug.c | 19 +---
drivers/base/memory.c | 115 ++++++++++++++--------
drivers/base/node.c | 8 +-
include/linux/memory.h | 5 +-
include/linux/memory_hotplug.h | 2 -
include/linux/mmzone.h | 4 +-
include/linux/node.h | 7 --
mm/memory_hotplug.c | 57 +----------
mm/sparse.c | 12 +--
10 files changed, 105 insertions(+), 146 deletions(-)
--
2.21.0
^ permalink raw reply
* [PATCH v4] mt76: mt76u: reduce rx memory footprint
From: Lorenzo Bianconi @ 2019-06-20 10:39 UTC (permalink / raw)
To: nbd; +Cc: lorenzo.bianconi, linux-wireless, sgruszka
Reduce rx memory footprint allocating just one SG buffer since for the
moment we support just 3839B as maximal size of an A-MSDU.
Introduce different SG_MAX_SIZE definitions for TX and RX sides.
Moreover set q->buf_size to PAGE_SIZE even for SG case.
Signed-off-by: Lorenzo Bianconi <lorenzo@kernel.org>
---
Changes since v3:
- drop patch 2/3: mt76u: introduce mt76u_ep data structure
- do not align usb buffer size to usb max endpoint length
---
drivers/net/wireless/mediatek/mt76/mt76.h | 3 ++-
.../net/wireless/mediatek/mt76/mt76x0/usb.c | 2 +-
.../wireless/mediatek/mt76/mt76x2/usb_init.c | 2 +-
drivers/net/wireless/mediatek/mt76/usb.c | 18 +++++++++++-------
4 files changed, 15 insertions(+), 10 deletions(-)
diff --git a/drivers/net/wireless/mediatek/mt76/mt76.h b/drivers/net/wireless/mediatek/mt76/mt76.h
index 23a5ebefac3a..eee83c369a64 100644
--- a/drivers/net/wireless/mediatek/mt76/mt76.h
+++ b/drivers/net/wireless/mediatek/mt76/mt76.h
@@ -384,7 +384,8 @@ enum mt76u_out_ep {
__MT_EP_OUT_MAX,
};
-#define MT_SG_MAX_SIZE 8
+#define MT_TX_SG_MAX_SIZE 8
+#define MT_RX_SG_MAX_SIZE 1
#define MT_NUM_TX_ENTRIES 256
#define MT_NUM_RX_ENTRIES 128
#define MCU_RESP_URB_SIZE 1024
diff --git a/drivers/net/wireless/mediatek/mt76/mt76x0/usb.c b/drivers/net/wireless/mediatek/mt76/mt76x0/usb.c
index 7c38ec4418db..5b9701ce6f37 100644
--- a/drivers/net/wireless/mediatek/mt76/mt76x0/usb.c
+++ b/drivers/net/wireless/mediatek/mt76/mt76x0/usb.c
@@ -191,7 +191,7 @@ static int mt76x0u_register_device(struct mt76x02_dev *dev)
/* check hw sg support in order to enable AMSDU */
if (dev->mt76.usb.sg_en)
- hw->max_tx_fragments = MT_SG_MAX_SIZE;
+ hw->max_tx_fragments = MT_TX_SG_MAX_SIZE;
else
hw->max_tx_fragments = 1;
diff --git a/drivers/net/wireless/mediatek/mt76/mt76x2/usb_init.c b/drivers/net/wireless/mediatek/mt76/mt76x2/usb_init.c
index f2c57d5b87f9..94f52f98019b 100644
--- a/drivers/net/wireless/mediatek/mt76/mt76x2/usb_init.c
+++ b/drivers/net/wireless/mediatek/mt76/mt76x2/usb_init.c
@@ -225,7 +225,7 @@ int mt76x2u_register_device(struct mt76x02_dev *dev)
/* check hw sg support in order to enable AMSDU */
if (dev->mt76.usb.sg_en)
- hw->max_tx_fragments = MT_SG_MAX_SIZE;
+ hw->max_tx_fragments = MT_TX_SG_MAX_SIZE;
else
hw->max_tx_fragments = 1;
diff --git a/drivers/net/wireless/mediatek/mt76/usb.c b/drivers/net/wireless/mediatek/mt76/usb.c
index dd90427b2d67..ecc1aa59f5c1 100644
--- a/drivers/net/wireless/mediatek/mt76/usb.c
+++ b/drivers/net/wireless/mediatek/mt76/usb.c
@@ -333,12 +333,13 @@ mt76u_refill_rx(struct mt76_dev *dev, struct urb *urb, int nsgs, gfp_t gfp)
}
static int
-mt76u_urb_alloc(struct mt76_dev *dev, struct mt76_queue_entry *e)
+mt76u_urb_alloc(struct mt76_dev *dev, struct mt76_queue_entry *e,
+ int sg_max_size)
{
unsigned int size = sizeof(struct urb);
if (dev->usb.sg_en)
- size += MT_SG_MAX_SIZE * sizeof(struct scatterlist);
+ size += sg_max_size * sizeof(struct scatterlist);
e->urb = kzalloc(size, GFP_KERNEL);
if (!e->urb)
@@ -357,11 +358,12 @@ mt76u_rx_urb_alloc(struct mt76_dev *dev, struct mt76_queue_entry *e)
{
int err;
- err = mt76u_urb_alloc(dev, e);
+ err = mt76u_urb_alloc(dev, e, MT_RX_SG_MAX_SIZE);
if (err)
return err;
- return mt76u_refill_rx(dev, e->urb, MT_SG_MAX_SIZE, GFP_KERNEL);
+ return mt76u_refill_rx(dev, e->urb, MT_RX_SG_MAX_SIZE,
+ GFP_KERNEL);
}
static void mt76u_urb_free(struct urb *urb)
@@ -605,8 +607,9 @@ static int mt76u_alloc_rx(struct mt76_dev *dev)
if (!q->entry)
return -ENOMEM;
- q->buf_size = dev->usb.sg_en ? MT_RX_BUF_SIZE : PAGE_SIZE;
q->ndesc = MT_NUM_RX_ENTRIES;
+ q->buf_size = PAGE_SIZE;
+
for (i = 0; i < q->ndesc; i++) {
err = mt76u_rx_urb_alloc(dev, &q->entry[i]);
if (err < 0)
@@ -763,7 +766,7 @@ mt76u_tx_setup_buffers(struct mt76_dev *dev, struct sk_buff *skb,
urb->transfer_buffer = skb->data;
return 0;
} else {
- sg_init_table(urb->sg, MT_SG_MAX_SIZE);
+ sg_init_table(urb->sg, MT_TX_SG_MAX_SIZE);
urb->num_sgs = skb_to_sgvec(skb, urb->sg, 0, skb->len);
if (urb->num_sgs == 0)
return -ENOMEM;
@@ -857,7 +860,8 @@ static int mt76u_alloc_tx(struct mt76_dev *dev)
q->ndesc = MT_NUM_TX_ENTRIES;
for (j = 0; j < q->ndesc; j++) {
- err = mt76u_urb_alloc(dev, &q->entry[j]);
+ err = mt76u_urb_alloc(dev, &q->entry[j],
+ MT_TX_SG_MAX_SIZE);
if (err < 0)
return err;
}
--
2.21.0
^ permalink raw reply related
* [Xen-devel] [PATCH] xen/arm: merge make_timer_node and make_timer_domU_node
From: Viktor Mitin @ 2019-06-20 10:38 UTC (permalink / raw)
To: xen-devel; +Cc: julien.grall, sstabellini, Viktor Mitin, Viktor Mitin
Functions make_timer_node and make_timer_domU_node are quite similar.
The only difference between Dom0 and DomU timer DT node
is the timer interrupts used. All the rest code should be the same.
So it is better to merge them to avoid discrepancy.
Tested dom0 boot with rcar h3 sk board.
Suggested-by: Julien Grall <julien.grall@arm.com>
Signed-off-by: Viktor Mitin <viktor_mitin@epam.com>
---
xen/arch/arm/domain_build.c | 66 ++++++++++++-------------------------
1 file changed, 21 insertions(+), 45 deletions(-)
diff --git a/xen/arch/arm/domain_build.c b/xen/arch/arm/domain_build.c
index 7fb828cae2..610dd3e8e7 100644
--- a/xen/arch/arm/domain_build.c
+++ b/xen/arch/arm/domain_build.c
@@ -976,6 +976,8 @@ static int __init make_timer_node(const struct domain *d, void *fdt)
gic_interrupt_t intrs[3];
u32 clock_frequency;
bool clock_valid;
+ bool d0 = is_hardware_domain(d);
+ uint32_t ip_val;
dt_dprintk("Create timer node\n");
@@ -1004,22 +1006,36 @@ static int __init make_timer_node(const struct domain *d, void *fdt)
/* The timer IRQ is emulated by Xen. It always exposes an active-low
* level-sensitive interrupt */
- irq = timer_get_irq(TIMER_PHYS_SECURE_PPI);
+ irq = d0
+ ? timer_get_irq(TIMER_PHYS_SECURE_PPI)
+ : GUEST_TIMER_PHYS_S_PPI;
dt_dprintk(" Secure interrupt %u\n", irq);
set_interrupt(intrs[0], irq, 0xf, DT_IRQ_TYPE_LEVEL_LOW);
- irq = timer_get_irq(TIMER_PHYS_NONSECURE_PPI);
+ irq = d0
+ ? timer_get_irq(TIMER_PHYS_NONSECURE_PPI)
+ : GUEST_TIMER_PHYS_NS_PPI;
dt_dprintk(" Non secure interrupt %u\n", irq);
set_interrupt(intrs[1], irq, 0xf, DT_IRQ_TYPE_LEVEL_LOW);
- irq = timer_get_irq(TIMER_VIRT_PPI);
+ irq = d0
+ ? timer_get_irq(TIMER_VIRT_PPI)
+ : GUEST_TIMER_VIRT_PPI;
dt_dprintk(" Virt interrupt %u\n", irq);
set_interrupt(intrs[2], irq, 0xf, DT_IRQ_TYPE_LEVEL_LOW);
- res = fdt_property_interrupts(fdt, intrs, 3);
+ res = fdt_property(fdt, "interrupts", intrs, sizeof (intrs[0]) * 3);
if ( res )
return res;
+ ip_val = d0
+ ? dt_interrupt_controller->phandle
+ : GUEST_PHANDLE_GIC;
+
+ res = fdt_property_cell(fdt, "interrupt-parent", ip_val);
+ if (res)
+ return res;
+
clock_valid = dt_property_read_u32(dev, "clock-frequency",
&clock_frequency);
if ( clock_valid )
@@ -1581,46 +1597,6 @@ static int __init make_gic_domU_node(const struct domain *d, void *fdt)
}
}
-static int __init make_timer_domU_node(const struct domain *d, void *fdt)
-{
- int res;
- gic_interrupt_t intrs[3];
-
- res = fdt_begin_node(fdt, "timer");
- if ( res )
- return res;
-
- if ( !is_64bit_domain(d) )
- {
- res = fdt_property_string(fdt, "compatible", "arm,armv7-timer");
- if ( res )
- return res;
- }
- else
- {
- res = fdt_property_string(fdt, "compatible", "arm,armv8-timer");
- if ( res )
- return res;
- }
-
- set_interrupt(intrs[0], GUEST_TIMER_PHYS_S_PPI, 0xf, DT_IRQ_TYPE_LEVEL_LOW);
- set_interrupt(intrs[1], GUEST_TIMER_PHYS_NS_PPI, 0xf, DT_IRQ_TYPE_LEVEL_LOW);
- set_interrupt(intrs[2], GUEST_TIMER_VIRT_PPI, 0xf, DT_IRQ_TYPE_LEVEL_LOW);
-
- res = fdt_property(fdt, "interrupts", intrs, sizeof (intrs[0]) * 3);
- if ( res )
- return res;
-
- res = fdt_property_cell(fdt, "interrupt-parent",
- GUEST_PHANDLE_GIC);
- if (res)
- return res;
-
- res = fdt_end_node(fdt);
-
- return res;
-}
-
#ifdef CONFIG_SBSA_VUART_CONSOLE
static int __init make_vpl011_uart_node(const struct domain *d, void *fdt)
{
@@ -1726,7 +1702,7 @@ static int __init prepare_dtb_domU(struct domain *d, struct kernel_info *kinfo)
if ( ret )
goto err;
- ret = make_timer_domU_node(d, kinfo->fdt);
+ ret = make_timer_node(d, kinfo->fdt);
if ( ret )
goto err;
--
2.17.1
_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xenproject.org
https://lists.xenproject.org/mailman/listinfo/xen-devel
^ permalink raw reply related
* [U-Boot] Issue enabling TPM 2.0 on RPI
From: Hecht, Martin @ 2019-06-20 10:39 UTC (permalink / raw)
To: u-boot
In-Reply-To: <20190617162841.41bc611a@xps13>
Hi Elena, Miquel,
I'm busy on SLB9670 again after a longer interruption. I'm using Xilinx Zynq/ZynqMP and SLB960/SLM9670/SLI9670 and u-boot 2019.06-rc2.
Out of the box the driver can access on the TPM after patching the Cadence SPI driver what I use on Zynq/ZynqMP. So you should be able to discover the TPM while using the setup you mentioned below but slow down the speed. Eventually 1MHz is too fast for Soft-SPI too.
I recommend to select a SPI speed between 10MHz to 25MHz when using a hard SPI like me. Why are you trying to use soft-spi instead of the hard-spi?
Also please try the command tpm info before trying tpm init. tpm info doesn't require to open the driver really but it reads out the vendor id.
Nevertheless I see an issue how the tpm driver controls the CS#. It seems CS# does not remain low long enough. Probably the TPMs of several vendors behave slightly different on CS#.
But firstly check tpm init please.
Dipl. Inform. Martin Hecht
Senior Embedded Specialist /
Functional Safety Engineer
TA1130871952
Avnet SILICA
Englische Straße 27
10587 Berlin
martin.hecht at avnet.eu
O +49 (0) 30 214 88 227
M +49 (0) 172 890 60 19
avnet-silica.com
________________________________________
Von: U-Boot <u-boot-bounces@lists.denx.de> im Auftrag von Miquel Raynal <miquel.raynal@bootlin.com>
Gesendet: Montag, 17. Juni 2019 16:28
An: Elena Unix
Cc: u-boot at lists.denx.de
Betreff: Re: [U-Boot] Issue enabling TPM 2.0 on RPI
Hi Elena,
Elena Unix <elenaunix01@gmail.com> wrote on Mon, 17 Jun 2019 15:46:29
+0200:
> Hi Miquèl,
>
> Thank you for your answer.
>
> > Miquel Raynal <miquel.raynal@bootlin.com> wrote on Mon, 17 Jun 2019 10:44:52 +0200:
> >
> > Hi Elena,
> >
> > Elena Unix <elenaunix01@gmail.com> wrote on Fri, 14 Jun 2019 09:43:46
> > +0200:
> >
> >> Hello,
> >>
> >> I am trying to enable the TPM 2.0 SLB9670 in U-Boot for a Raspberry Pi 3 B+. More precisely, the TPM is on an add-on board, the IRIDIUM SLB9670.
> >> The communication between the RPI and the TPM is ensured by SPI so I enabled the software spi driver (spi-gpio) in U-Boot because the bcm28x spi driver is not available in U-Boot.
> >>
> >> CONFIG_SPI=y
> >> CONFIG_DM_SPI=y
> >> CONFIG_SOFT_SPI=y
> > Are you sure the SPI bus is correctly driven? Can you connect anything
> > else and ensure it works? You may also probe all the GPIO lines (using
> > an oscilloscope) and check each of them is clocked correctly.
>
> I simply checked by doing a loopback test, i.e connecting MISO and MOSI by a cable and it worked.
> I will test with an oscilloscope when I have one and keep you up to date.
>
> >
> >>
> >> Then, I enabled the TPM support in U-Boot.
> >>
> >> CONFIG_CMD_TPM_V2=y
> >> CONFIG_CMD_TPM=y
> >
> > If you use TPM V2, CMD_TPM is not needed. But that's not your problem.
> >
> >> CONFIG_TPM_V2=y
> >> CONFIG_TPM2_TIS_SPI=y
> >> CONFIG_TPM=y
> >
> > Looks fine.
> >
> >>
> >> Finally, I updated my Device Tree.
> >> /dts-v1/
> >> / {
> >> ...
> >> aliases {
> >> spi0 = &soft_spi;
> >> };
> >>
> >> soft_spi: soft-spi {
> >> compatible = "spi-gpio";
> >> pinctrl-names = "default";
> >> pinctrl-0 = <&spi0_gpio7>;
> >> status = "okay";
> >> gpio-sck = <&gpio 11 0>;
> >> gpio-mosi = <&gpio 10 0>;
> >> gpio-miso = <&gpio 9 0>;
> >> cs-gpios = <&gpio 7 1>;
> >> #address-cells = <1>;
> >> #size-cells = <0>;
> >>
> >> slb9670: slb9670 at 0 {
> >> compatible = "tis,tpm2-spi";
> >> reg = <1>;
> >> #address-cells = <1>;
> >> #size-cells = <0>;
> >> spi-max-frequency = <32000000>;
> >
> > You might want to slow down a bit this frequency, try it with 1MHz,
> > just for testing (and see something meaningful with the scope).
>
> I tried to lower the frequency to 1MHZ but without success.
>
> >> status = "okay";
> >> };
> >> };
> >>
> >> spio0_gpio7: spio0_gpio7 {
> >> brcm,pins = <7 8 9 10 11>;
> >> brcm,function = <4>;
> >
> > If you bit-bang the SPI bus, I suppose you must use the GPIO function
> > on each pin, is <4> the GPIO function or the SPI function?
>
> No the <4> function is the SPI function, thank you it was a mistake. I changed it to GPIO function but I have the same errors when executing tpm2 commands in U-Boot.
>
> >
> >> };
> >> ...
> >> };
> >>
> >> But, when I try to execute the following command :
> >> U-Boot> tpm2 init
> >>
> >> I have the following response :
> >>
> >> tpm_tis_spi_probe : missing reset GPIO
> >
> > This is indeed harmless, just a warning.
> >
> >> tpm_tis_spi_request_locality : Timeout getting locality : -2
> >
> > This usually means you cannot talk to the chip.
> >
> >> tpm_tis_spi_probe : could not request locality 0
> >> Could not find TPM (ret=-2)
> >>
> >> The Iridium board contains a reset circuit on board, which pulls the reset line of the TPM to GND after VCC becomes available, so the reset GPIO is not needed I think.
> >>
> >> I don’t see what is wrong with my setup, a little help would be very appreciated.
> >>
> >> Thank you in advance,
> >> Elena
> >> ___________
> >
> >
> > Good luck,
> > Miquèl
>
> Moreover, I commented out the tpm_tis_spi_request_locality() function in the TPM driver just to perform a test by executing the U-Boot> tpm2 init
> I then had the following response :
> tpm_tis_spi_probe() SPI TPMv2.0 found (vid:15d1, did:001b, rid:10)
Right, so it seems that the communication works.
Back to debugging then, you may dump the bytes read/written in your SPI
driver's read/write callbacks. Once you'll have a working solution,
it would be very appreciated if you could contribute it back. Good luck!
Thanks,
Miquèl
_______________________________________________
U-Boot mailing list
U-Boot at lists.denx.de
https://lists.denx.de/listinfo/u-boot
We continuously commit to comply with the applicable data protection laws and ensure fair and transparent processing of your personal data.
Please read our privacy statement including an information notice and data protection policy for detailed information on our website.
^ permalink raw reply
* [PATCH net] tipc: change to use register_pernet_device
From: Xin Long @ 2019-06-20 10:39 UTC (permalink / raw)
To: network dev; +Cc: davem, Jon Maloy, Ying Xue, tipc-discussion
This patch is to fix a dst defcnt leak, which can be reproduced by doing:
# ip net a c; ip net a s; modprobe tipc
# ip net e s ip l a n eth1 type veth peer n eth1 netns c
# ip net e c ip l s lo up; ip net e c ip l s eth1 up
# ip net e s ip l s lo up; ip net e s ip l s eth1 up
# ip net e c ip a a 1.1.1.2/8 dev eth1
# ip net e s ip a a 1.1.1.1/8 dev eth1
# ip net e c tipc b e m udp n u1 localip 1.1.1.2
# ip net e s tipc b e m udp n u1 localip 1.1.1.1
# ip net d c; ip net d s; rmmod tipc
and it will get stuck and keep logging the error:
unregister_netdevice: waiting for lo to become free. Usage count = 1
The cause is that a dst is held by the udp sock's sk_rx_dst set on udp rx
path with udp_early_demux == 1, and this dst (eventually holding lo dev)
can't be released as bearer's removal in tipc pernet .exit happens after
lo dev's removal, default_device pernet .exit.
"There are two distinct types of pernet_operations recognized: subsys and
device. At creation all subsys init functions are called before device
init functions, and at destruction all device exit functions are called
before subsys exit function."
So by calling register_pernet_device instead to register tipc_net_ops, the
pernet .exit() will be invoked earlier than loopback dev's removal when a
netns is being destroyed, as fou/gue does.
Note that vxlan and geneve udp tunnels don't have this issue, as the udp
sock is released in their device ndo_stop().
This fix is also necessary for tipc dst_cache, which will hold dsts on tx
path and I will introduce in my next patch.
Reported-by: Li Shuang <shuali@redhat.com>
Signed-off-by: Xin Long <lucien.xin@gmail.com>
---
net/tipc/core.c | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/net/tipc/core.c b/net/tipc/core.c
index ed536c0..c837072 100644
--- a/net/tipc/core.c
+++ b/net/tipc/core.c
@@ -134,7 +134,7 @@ static int __init tipc_init(void)
if (err)
goto out_sysctl;
- err = register_pernet_subsys(&tipc_net_ops);
+ err = register_pernet_device(&tipc_net_ops);
if (err)
goto out_pernet;
@@ -142,7 +142,7 @@ static int __init tipc_init(void)
if (err)
goto out_socket;
- err = register_pernet_subsys(&tipc_topsrv_net_ops);
+ err = register_pernet_device(&tipc_topsrv_net_ops);
if (err)
goto out_pernet_topsrv;
@@ -153,11 +153,11 @@ static int __init tipc_init(void)
pr_info("Started in single node mode\n");
return 0;
out_bearer:
- unregister_pernet_subsys(&tipc_topsrv_net_ops);
+ unregister_pernet_device(&tipc_topsrv_net_ops);
out_pernet_topsrv:
tipc_socket_stop();
out_socket:
- unregister_pernet_subsys(&tipc_net_ops);
+ unregister_pernet_device(&tipc_net_ops);
out_pernet:
tipc_unregister_sysctl();
out_sysctl:
@@ -172,9 +172,9 @@ static int __init tipc_init(void)
static void __exit tipc_exit(void)
{
tipc_bearer_cleanup();
- unregister_pernet_subsys(&tipc_topsrv_net_ops);
+ unregister_pernet_device(&tipc_topsrv_net_ops);
tipc_socket_stop();
- unregister_pernet_subsys(&tipc_net_ops);
+ unregister_pernet_device(&tipc_net_ops);
tipc_netlink_stop();
tipc_netlink_compat_stop();
tipc_unregister_sysctl();
--
2.1.0
^ permalink raw reply related
* Re: [PATCH v5 2/3] KVM: vmx: Emulate MSR IA32_UMWAIT_CONTROL
From: Xiaoyao Li @ 2019-06-20 10:34 UTC (permalink / raw)
To: Tao Xu, pbonzini, rkrcmar, corbet, tglx, mingo, bp, hpa,
sean.j.christopherson
Cc: kvm, linux-kernel, fenghua.yu, jingqi.liu
In-Reply-To: <20190620084620.17974-3-tao3.xu@intel.com>
On Thu, 2019-06-20 at 16:46 +0800, Tao Xu wrote:
> UMWAIT and TPAUSE instructions use IA32_UMWAIT_CONTROL at MSR index E1H
> to determines the maximum time in TSC-quanta that the processor can reside
> in either C0.1 or C0.2.
>
> This patch emulates MSR IA32_UMWAIT_CONTROL in guest and differentiate
> IA32_UMWAIT_CONTROL between host and guest. The variable
> mwait_control_cached in arch/x86/power/umwait.c caches the MSR value, so
> this patch uses it to avoid frequently rdmsr of IA32_UMWAIT_CONTROL.
>
> Co-developed-by: Jingqi Liu <jingqi.liu@intel.com>
> Signed-off-by: Jingqi Liu <jingqi.liu@intel.com>
> Signed-off-by: Tao Xu <tao3.xu@intel.com>
> ---
>
> Changes in v5:
> remove vmx_waitpkg_supported() to fix guest can rdmsr or wrmsr
> when the feature is off (Xiaoyao)
> remove the atomic_switch_ia32_umwait_control() and move the
> codes into vmx_set_msr()
> rebase the patch because the kernel dependcy patch updated to
> v5: https://lkml.org/lkml/2019/6/19/972
> ---
> arch/x86/kernel/cpu/umwait.c | 3 ++-
> arch/x86/kvm/vmx/vmx.c | 24 ++++++++++++++++++++++++
> arch/x86/kvm/vmx/vmx.h | 3 +++
> arch/x86/kvm/x86.c | 1 +
> 4 files changed, 30 insertions(+), 1 deletion(-)
>
> diff --git a/arch/x86/kernel/cpu/umwait.c b/arch/x86/kernel/cpu/umwait.c
> index 4b2aff7b2d4d..db5c193ef136 100644
> --- a/arch/x86/kernel/cpu/umwait.c
> +++ b/arch/x86/kernel/cpu/umwait.c
> @@ -15,7 +15,8 @@
> * MSR value. By default, umwait max time is 100000 in TSC-quanta and C0.2
> * is enabled
> */
> -static u32 umwait_control_cached = UMWAIT_CTRL_VAL(100000,
> UMWAIT_C02_ENABLED);
> +u32 umwait_control_cached = UMWAIT_CTRL_VAL(100000, UMWAIT_C02_ENABLED);
> +EXPORT_SYMBOL_GPL(umwait_control_cached);
>
> /*
> * Serialize access to umwait_control_cached and IA32_UMWAIT_CONTROL MSR
> diff --git a/arch/x86/kvm/vmx/vmx.c b/arch/x86/kvm/vmx/vmx.c
> index b35bfac30a34..0fb55c8426e2 100644
> --- a/arch/x86/kvm/vmx/vmx.c
> +++ b/arch/x86/kvm/vmx/vmx.c
> @@ -1679,6 +1679,12 @@ static int vmx_get_msr(struct kvm_vcpu *vcpu, struct
> msr_data *msr_info)
> #endif
> case MSR_EFER:
> return kvm_get_msr_common(vcpu, msr_info);
> + case MSR_IA32_UMWAIT_CONTROL:
> + if (!guest_cpuid_has(vcpu, X86_FEATURE_WAITPKG))
Need to check (!msr_info->host_initiated &&
!guest_cpuid_has(vcpu, X86_FEATURE_WAITPKG))
otherwise, userspace, like qemu, cannot access this msr.
Also, same for vmx_set_msr.
> + return 1;
> +
> + msr_info->data = vmx->msr_ia32_umwait_control;
> + break;
> case MSR_IA32_SPEC_CTRL:
> if (!msr_info->host_initiated &&
> !guest_cpuid_has(vcpu, X86_FEATURE_SPEC_CTRL))
> @@ -1841,6 +1847,22 @@ static int vmx_set_msr(struct kvm_vcpu *vcpu, struct
> msr_data *msr_info)
> return 1;
> vmcs_write64(GUEST_BNDCFGS, data);
> break;
> + case MSR_IA32_UMWAIT_CONTROL:
> + if (!guest_cpuid_has(vcpu, X86_FEATURE_WAITPKG))
> + return 1;
> +
> + /* The reserved bit IA32_UMWAIT_CONTROL[1] should be zero */
> + if (data & BIT_ULL(1))
> + return 1;
> +
> + vmx->msr_ia32_umwait_control = data;
> + if (vmx->msr_ia32_umwait_control != umwait_control_cached)
> + add_atomic_switch_msr(vmx, MSR_IA32_UMWAIT_CONTROL,
> + vmx->msr_ia32_umwait_control,
> + umwait_control_cached, false);
> + else
> + clear_atomic_switch_msr(vmx, MSR_IA32_UMWAIT_CONTROL);
> + break;
> case MSR_IA32_SPEC_CTRL:
> if (!msr_info->host_initiated &&
> !guest_cpuid_has(vcpu, X86_FEATURE_SPEC_CTRL))
> @@ -4126,6 +4148,8 @@ static void vmx_vcpu_reset(struct kvm_vcpu *vcpu, bool
> init_event)
> vmx->rmode.vm86_active = 0;
> vmx->spec_ctrl = 0;
>
> + vmx->msr_ia32_umwait_control = 0;
> +
> vcpu->arch.microcode_version = 0x100000000ULL;
> vmx->vcpu.arch.regs[VCPU_REGS_RDX] = get_rdx_init_val();
> kvm_set_cr8(vcpu, 0);
> diff --git a/arch/x86/kvm/vmx/vmx.h b/arch/x86/kvm/vmx/vmx.h
> index 61128b48c503..8485bec7c38a 100644
> --- a/arch/x86/kvm/vmx/vmx.h
> +++ b/arch/x86/kvm/vmx/vmx.h
> @@ -14,6 +14,8 @@
> extern const u32 vmx_msr_index[];
> extern u64 host_efer;
>
> +extern u32 umwait_control_cached;
> +
> #define MSR_TYPE_R 1
> #define MSR_TYPE_W 2
> #define MSR_TYPE_RW 3
> @@ -194,6 +196,7 @@ struct vcpu_vmx {
> #endif
>
> u64 spec_ctrl;
> + u64 msr_ia32_umwait_control;
>
> u32 vm_entry_controls_shadow;
> u32 vm_exit_controls_shadow;
> diff --git a/arch/x86/kvm/x86.c b/arch/x86/kvm/x86.c
> index 83aefd759846..4480de459bf4 100644
> --- a/arch/x86/kvm/x86.c
> +++ b/arch/x86/kvm/x86.c
> @@ -1138,6 +1138,7 @@ static u32 msrs_to_save[] = {
> MSR_IA32_RTIT_ADDR1_A, MSR_IA32_RTIT_ADDR1_B,
> MSR_IA32_RTIT_ADDR2_A, MSR_IA32_RTIT_ADDR2_B,
> MSR_IA32_RTIT_ADDR3_A, MSR_IA32_RTIT_ADDR3_B,
> + MSR_IA32_UMWAIT_CONTROL,
> };
>
> static unsigned num_msrs_to_save;
^ permalink raw reply
* [PATCH v2 2/6] drivers/base/memory: Use "unsigned long" for block ids
From: David Hildenbrand @ 2019-06-20 10:35 UTC (permalink / raw)
To: linux-kernel
Cc: David Hildenbrand, Greg Kroah-Hartman, Rafael J. Wysocki,
linux-mm, linux-acpi, Dan Williams, linuxppc-dev, Andrew Morton
In-Reply-To: <20190620103520.23481-1-david@redhat.com>
Block ids are just shifted section numbers, so let's also use
"unsigned long" for them, too.
Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Cc: "Rafael J. Wysocki" <rafael@kernel.org>
Signed-off-by: David Hildenbrand <david@redhat.com>
---
drivers/base/memory.c | 22 +++++++++++-----------
1 file changed, 11 insertions(+), 11 deletions(-)
diff --git a/drivers/base/memory.c b/drivers/base/memory.c
index 5947b5a5686d..c54e80fd25a8 100644
--- a/drivers/base/memory.c
+++ b/drivers/base/memory.c
@@ -34,12 +34,12 @@ static DEFINE_MUTEX(mem_sysfs_mutex);
static int sections_per_block;
-static inline int base_memory_block_id(unsigned long section_nr)
+static inline unsigned long base_memory_block_id(unsigned long section_nr)
{
return section_nr / sections_per_block;
}
-static inline int pfn_to_block_id(unsigned long pfn)
+static inline unsigned long pfn_to_block_id(unsigned long pfn)
{
return base_memory_block_id(pfn_to_section_nr(pfn));
}
@@ -587,7 +587,7 @@ int __weak arch_get_memory_phys_device(unsigned long start_pfn)
* A reference for the returned object is held and the reference for the
* hinted object is released.
*/
-static struct memory_block *find_memory_block_by_id(int block_id,
+static struct memory_block *find_memory_block_by_id(unsigned long block_id,
struct memory_block *hint)
{
struct device *hintdev = hint ? &hint->dev : NULL;
@@ -604,7 +604,7 @@ static struct memory_block *find_memory_block_by_id(int block_id,
struct memory_block *find_memory_block_hinted(struct mem_section *section,
struct memory_block *hint)
{
- int block_id = base_memory_block_id(__section_nr(section));
+ unsigned long block_id = base_memory_block_id(__section_nr(section));
return find_memory_block_by_id(block_id, hint);
}
@@ -663,8 +663,8 @@ int register_memory(struct memory_block *memory)
return ret;
}
-static int init_memory_block(struct memory_block **memory, int block_id,
- unsigned long state)
+static int init_memory_block(struct memory_block **memory,
+ unsigned long block_id, unsigned long state)
{
struct memory_block *mem;
unsigned long start_pfn;
@@ -729,8 +729,8 @@ static void unregister_memory(struct memory_block *memory)
*/
int create_memory_block_devices(unsigned long start, unsigned long size)
{
- const int start_block_id = pfn_to_block_id(PFN_DOWN(start));
- int end_block_id = pfn_to_block_id(PFN_DOWN(start + size));
+ const unsigned long start_block_id = pfn_to_block_id(PFN_DOWN(start));
+ unsigned long end_block_id = pfn_to_block_id(PFN_DOWN(start + size));
struct memory_block *mem;
unsigned long block_id;
int ret = 0;
@@ -766,10 +766,10 @@ int create_memory_block_devices(unsigned long start, unsigned long size)
*/
void remove_memory_block_devices(unsigned long start, unsigned long size)
{
- const int start_block_id = pfn_to_block_id(PFN_DOWN(start));
- const int end_block_id = pfn_to_block_id(PFN_DOWN(start + size));
+ const unsigned long start_block_id = pfn_to_block_id(PFN_DOWN(start));
+ const unsigned long end_block_id = pfn_to_block_id(PFN_DOWN(start + size));
struct memory_block *mem;
- int block_id;
+ unsigned long block_id;
if (WARN_ON_ONCE(!IS_ALIGNED(start, memory_block_size_bytes()) ||
!IS_ALIGNED(size, memory_block_size_bytes())))
--
2.21.0
^ permalink raw reply related
* Re: [PATCH v2 2/2] x86/cpufeatures: Enumerate new AVX512 BFLOAT16 instructions
From: Borislav Petkov @ 2019-06-20 10:37 UTC (permalink / raw)
To: Fenghua Yu
Cc: Thomas Gleixner, Ingo Molnar, H Peter Anvin,
Christopherson Sean J, Paolo Bonzini, Radim Krcmar,
Ravi V Shankar, linux-kernel, x86
In-Reply-To: <20190619213404.GB234387@romley-ivt3.sc.intel.com>
On Wed, Jun 19, 2019 at 02:34:04PM -0700, Fenghua Yu wrote:
> diff --git a/arch/x86/kernel/cpu/common.c b/arch/x86/kernel/cpu/common.c
> index efb114298cfb..4910cb421b82 100644
> --- a/arch/x86/kernel/cpu/common.c
> +++ b/arch/x86/kernel/cpu/common.c
> @@ -847,6 +847,9 @@ void get_cpu_cap(struct cpuinfo_x86 *c)
> c->x86_capability[CPUID_7_0_EBX] = ebx;
> c->x86_capability[CPUID_7_ECX] = ecx;
> c->x86_capability[CPUID_7_EDX] = edx;
> +
> + cpuid_count(0x00000007, 1, &eax, &ebx, &ecx, &edx);
> + c->x86_capability[CPUID_7_1_EAX] = eax;
> }
You need to test the sub-leaf index validity here before accessing
subleaf 1:
diff --git a/arch/x86/kernel/cpu/common.c b/arch/x86/kernel/cpu/common.c
index 4910cb421b82..dad20bc891d5 100644
--- a/arch/x86/kernel/cpu/common.c
+++ b/arch/x86/kernel/cpu/common.c
@@ -848,8 +848,11 @@ void get_cpu_cap(struct cpuinfo_x86 *c)
c->x86_capability[CPUID_7_ECX] = ecx;
c->x86_capability[CPUID_7_EDX] = edx;
- cpuid_count(0x00000007, 1, &eax, &ebx, &ecx, &edx);
- c->x86_capability[CPUID_7_1_EAX] = eax;
+ /* Check valid sub-leaf index before accessing it */
+ if (eax >= 1) {
+ cpuid_count(0x00000007, 1, &eax, &ebx, &ecx, &edx);
+ c->x86_capability[CPUID_7_1_EAX] = eax;
+ }
}
/* Extended state features: level 0x0000000d */
--
Regards/Gruss,
Boris.
Good mailing practices for 400: avoid top-posting and trim the reply.
^ permalink raw reply related
* Re: [GSoC][PATCH v5 4/5] cherry-pick/revert: add --skip option
From: Rohit Ashiwal @ 2019-06-20 10:34 UTC (permalink / raw)
To: phillip.wood123
Cc: git, gitster, jrnieder, martin.agren, newren, phillip.wood,
rohit.ashiwal265, t.gummerer
In-Reply-To: <0047b8c6-8a58-7546-2ae8-19c4ab668fa3@gmail.com>
Hi Phillip
On 2019-06-20 10:02 UTC Phillip Wood <phillip.wood123@gmail.com> wrote:
>
> > +test_expect_success 'allow skipping stopped cherry-pick because of untracked file modifications' '
> > + pristine_detach initial &&
> > + git rm --cached unrelated &&
> > + git commit -m "untrack unrelated" &&
> > + test_must_fail git cherry-pick initial base &&
> > + test_path_is_missing .git/CHERRY_PICK_HEAD &&
> > + git cherry-pick --skip
>
> If you change this to --continue rather than --skip the test also
> passes! I think we could fix this by checking if HEAD has changed if
> CHERRY_PICK_HEAD/REVERT_HEAD is missing and not dropping the last
> command in the todo list in that case when we continue.
I don't think I fully understood this. At this point --skip is essentially
--continue. How is checking unmoved HEAD and unchanged todo uniquely related
to --skip flag (or for that matter any _flag_)?
Thanks
Rohit
^ permalink raw reply
* [PATCH v2 2/6] drivers/base/memory: Use "unsigned long" for block ids
From: David Hildenbrand @ 2019-06-20 10:35 UTC (permalink / raw)
To: linux-kernel
Cc: Dan Williams, Andrew Morton, linuxppc-dev, linux-acpi, linux-mm,
David Hildenbrand, Greg Kroah-Hartman, Rafael J. Wysocki
In-Reply-To: <20190620103520.23481-1-david@redhat.com>
Block ids are just shifted section numbers, so let's also use
"unsigned long" for them, too.
Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Cc: "Rafael J. Wysocki" <rafael@kernel.org>
Signed-off-by: David Hildenbrand <david@redhat.com>
---
drivers/base/memory.c | 22 +++++++++++-----------
1 file changed, 11 insertions(+), 11 deletions(-)
diff --git a/drivers/base/memory.c b/drivers/base/memory.c
index 5947b5a5686d..c54e80fd25a8 100644
--- a/drivers/base/memory.c
+++ b/drivers/base/memory.c
@@ -34,12 +34,12 @@ static DEFINE_MUTEX(mem_sysfs_mutex);
static int sections_per_block;
-static inline int base_memory_block_id(unsigned long section_nr)
+static inline unsigned long base_memory_block_id(unsigned long section_nr)
{
return section_nr / sections_per_block;
}
-static inline int pfn_to_block_id(unsigned long pfn)
+static inline unsigned long pfn_to_block_id(unsigned long pfn)
{
return base_memory_block_id(pfn_to_section_nr(pfn));
}
@@ -587,7 +587,7 @@ int __weak arch_get_memory_phys_device(unsigned long start_pfn)
* A reference for the returned object is held and the reference for the
* hinted object is released.
*/
-static struct memory_block *find_memory_block_by_id(int block_id,
+static struct memory_block *find_memory_block_by_id(unsigned long block_id,
struct memory_block *hint)
{
struct device *hintdev = hint ? &hint->dev : NULL;
@@ -604,7 +604,7 @@ static struct memory_block *find_memory_block_by_id(int block_id,
struct memory_block *find_memory_block_hinted(struct mem_section *section,
struct memory_block *hint)
{
- int block_id = base_memory_block_id(__section_nr(section));
+ unsigned long block_id = base_memory_block_id(__section_nr(section));
return find_memory_block_by_id(block_id, hint);
}
@@ -663,8 +663,8 @@ int register_memory(struct memory_block *memory)
return ret;
}
-static int init_memory_block(struct memory_block **memory, int block_id,
- unsigned long state)
+static int init_memory_block(struct memory_block **memory,
+ unsigned long block_id, unsigned long state)
{
struct memory_block *mem;
unsigned long start_pfn;
@@ -729,8 +729,8 @@ static void unregister_memory(struct memory_block *memory)
*/
int create_memory_block_devices(unsigned long start, unsigned long size)
{
- const int start_block_id = pfn_to_block_id(PFN_DOWN(start));
- int end_block_id = pfn_to_block_id(PFN_DOWN(start + size));
+ const unsigned long start_block_id = pfn_to_block_id(PFN_DOWN(start));
+ unsigned long end_block_id = pfn_to_block_id(PFN_DOWN(start + size));
struct memory_block *mem;
unsigned long block_id;
int ret = 0;
@@ -766,10 +766,10 @@ int create_memory_block_devices(unsigned long start, unsigned long size)
*/
void remove_memory_block_devices(unsigned long start, unsigned long size)
{
- const int start_block_id = pfn_to_block_id(PFN_DOWN(start));
- const int end_block_id = pfn_to_block_id(PFN_DOWN(start + size));
+ const unsigned long start_block_id = pfn_to_block_id(PFN_DOWN(start));
+ const unsigned long end_block_id = pfn_to_block_id(PFN_DOWN(start + size));
struct memory_block *mem;
- int block_id;
+ unsigned long block_id;
if (WARN_ON_ONCE(!IS_ALIGNED(start, memory_block_size_bytes()) ||
!IS_ALIGNED(size, memory_block_size_bytes())))
--
2.21.0
^ permalink raw reply related
* [PATCH v2 5/6] mm/memory_hotplug: Move and simplify walk_memory_blocks()
From: David Hildenbrand @ 2019-06-20 10:35 UTC (permalink / raw)
To: linux-kernel
Cc: Dan Williams, Andrew Morton, linuxppc-dev, linux-acpi, linux-mm,
David Hildenbrand, Greg Kroah-Hartman, Rafael J. Wysocki,
Stephen Rothwell, Pavel Tatashin, Andrew Banman,
mike.travis@hpe.com, Oscar Salvador, Michal Hocko, Wei Yang,
Arun KS, Qian Cai
In-Reply-To: <20190620103520.23481-1-david@redhat.com>
Let's move walk_memory_blocks() to the place where memory block logic
resides and simplify it. While at it, add a type for the callback function.
Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Cc: "Rafael J. Wysocki" <rafael@kernel.org>
Cc: David Hildenbrand <david@redhat.com>
Cc: Andrew Morton <akpm@linux-foundation.org>
Cc: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: Pavel Tatashin <pasha.tatashin@soleen.com>
Cc: Andrew Banman <andrew.banman@hpe.com>
Cc: "mike.travis@hpe.com" <mike.travis@hpe.com>
Cc: Oscar Salvador <osalvador@suse.com>
Cc: Michal Hocko <mhocko@suse.com>
Cc: Wei Yang <richard.weiyang@gmail.com>
Cc: Arun KS <arunks@codeaurora.org>
Cc: Qian Cai <cai@lca.pw>
Signed-off-by: David Hildenbrand <david@redhat.com>
---
drivers/base/memory.c | 42 ++++++++++++++++++++++++++
include/linux/memory.h | 3 ++
include/linux/memory_hotplug.h | 2 --
mm/memory_hotplug.c | 55 ----------------------------------
4 files changed, 45 insertions(+), 57 deletions(-)
diff --git a/drivers/base/memory.c b/drivers/base/memory.c
index c54e80fd25a8..0204384b4d1d 100644
--- a/drivers/base/memory.c
+++ b/drivers/base/memory.c
@@ -44,6 +44,11 @@ static inline unsigned long pfn_to_block_id(unsigned long pfn)
return base_memory_block_id(pfn_to_section_nr(pfn));
}
+static inline unsigned long phys_to_block_id(unsigned long phys)
+{
+ return pfn_to_block_id(PFN_DOWN(phys));
+}
+
static int memory_subsys_online(struct device *dev);
static int memory_subsys_offline(struct device *dev);
@@ -851,3 +856,40 @@ int __init memory_dev_init(void)
printk(KERN_ERR "%s() failed: %d\n", __func__, ret);
return ret;
}
+
+/**
+ * walk_memory_blocks - walk through all present memory blocks overlapped
+ * by the range [start, start + size)
+ *
+ * @start: start address of the memory range
+ * @size: size of the memory range
+ * @arg: argument passed to func
+ * @func: callback for each memory section walked
+ *
+ * This function walks through all present memory blocks overlapped by the
+ * range [start, start + size), calling func on each memory block.
+ *
+ * In case func() returns an error, walking is aborted and the error is
+ * returned.
+ */
+int walk_memory_blocks(unsigned long start, unsigned long size,
+ void *arg, walk_memory_blocks_func_t func)
+{
+ const unsigned long start_block_id = phys_to_block_id(start);
+ const unsigned long end_block_id = phys_to_block_id(start + size - 1);
+ struct memory_block *mem;
+ unsigned long block_id;
+ int ret = 0;
+
+ for (block_id = start_block_id; block_id <= end_block_id; block_id++) {
+ mem = find_memory_block_by_id(block_id, NULL);
+ if (!mem)
+ continue;
+
+ ret = func(mem, arg);
+ put_device(&mem->dev);
+ if (ret)
+ break;
+ }
+ return ret;
+}
diff --git a/include/linux/memory.h b/include/linux/memory.h
index f26a5417ec5d..b3b388775a30 100644
--- a/include/linux/memory.h
+++ b/include/linux/memory.h
@@ -119,6 +119,9 @@ extern int memory_isolate_notify(unsigned long val, void *v);
extern struct memory_block *find_memory_block_hinted(struct mem_section *,
struct memory_block *);
extern struct memory_block *find_memory_block(struct mem_section *);
+typedef int (*walk_memory_blocks_func_t)(struct memory_block *, void *);
+extern int walk_memory_blocks(unsigned long start, unsigned long size,
+ void *arg, walk_memory_blocks_func_t func);
#define CONFIG_MEM_BLOCK_SIZE (PAGES_PER_SECTION<<PAGE_SHIFT)
#endif /* CONFIG_MEMORY_HOTPLUG_SPARSE */
diff --git a/include/linux/memory_hotplug.h b/include/linux/memory_hotplug.h
index d9fffc34949f..475aff8efbf8 100644
--- a/include/linux/memory_hotplug.h
+++ b/include/linux/memory_hotplug.h
@@ -340,8 +340,6 @@ static inline void __remove_memory(int nid, u64 start, u64 size) {}
#endif /* CONFIG_MEMORY_HOTREMOVE */
extern void __ref free_area_init_core_hotplug(int nid);
-extern int walk_memory_blocks(unsigned long start, unsigned long size,
- void *arg, int (*func)(struct memory_block *, void *));
extern int __add_memory(int nid, u64 start, u64 size);
extern int add_memory(int nid, u64 start, u64 size);
extern int add_memory_resource(int nid, struct resource *resource);
diff --git a/mm/memory_hotplug.c b/mm/memory_hotplug.c
index 122a7d31efdd..fc558e9ff939 100644
--- a/mm/memory_hotplug.c
+++ b/mm/memory_hotplug.c
@@ -1661,62 +1661,7 @@ int offline_pages(unsigned long start_pfn, unsigned long nr_pages)
{
return __offline_pages(start_pfn, start_pfn + nr_pages);
}
-#endif /* CONFIG_MEMORY_HOTREMOVE */
-/**
- * walk_memory_blocks - walk through all present memory blocks overlapped
- * by the range [start, start + size)
- *
- * @start: start address of the memory range
- * @size: size of the memory range
- * @arg: argument passed to func
- * @func: callback for each memory block walked
- *
- * This function walks through all present memory blocks overlapped by the
- * range [start, start + size), calling func on each memory block.
- *
- * Returns the return value of func.
- */
-int walk_memory_blocks(unsigned long start, unsigned long size,
- void *arg, int (*func)(struct memory_block *, void *))
-{
- const unsigned long start_pfn = PFN_DOWN(start);
- const unsigned long end_pfn = PFN_UP(start + size - 1);
- struct memory_block *mem = NULL;
- struct mem_section *section;
- unsigned long pfn, section_nr;
- int ret;
-
- for (pfn = start_pfn; pfn < end_pfn; pfn += PAGES_PER_SECTION) {
- section_nr = pfn_to_section_nr(pfn);
- if (!present_section_nr(section_nr))
- continue;
-
- section = __nr_to_section(section_nr);
- /* same memblock? */
- if (mem)
- if ((section_nr >= mem->start_section_nr) &&
- (section_nr <= mem->end_section_nr))
- continue;
-
- mem = find_memory_block_hinted(section, mem);
- if (!mem)
- continue;
-
- ret = func(mem, arg);
- if (ret) {
- kobject_put(&mem->dev.kobj);
- return ret;
- }
- }
-
- if (mem)
- kobject_put(&mem->dev.kobj);
-
- return 0;
-}
-
-#ifdef CONFIG_MEMORY_HOTREMOVE
static int check_memblock_offlined_cb(struct memory_block *mem, void *arg)
{
int ret = !is_memblock_offlined(mem);
--
2.21.0
^ permalink raw reply related
* [PATCH v2 6/6] drivers/base/memory.c: Get rid of find_memory_block_hinted()
From: David Hildenbrand @ 2019-06-20 10:35 UTC (permalink / raw)
To: linux-kernel
Cc: Dan Williams, Andrew Morton, linuxppc-dev, linux-acpi, linux-mm,
David Hildenbrand, Greg Kroah-Hartman, Rafael J. Wysocki,
Stephen Rothwell, Pavel Tatashin, mike.travis@hpe.com
In-Reply-To: <20190620103520.23481-1-david@redhat.com>
No longer needed, let's remove it. Also, drop the "hint" parameter
completely from "find_memory_block_by_id", as nobody needs it anymore.
Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Cc: "Rafael J. Wysocki" <rafael@kernel.org>
Cc: Andrew Morton <akpm@linux-foundation.org>
Cc: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: Pavel Tatashin <pasha.tatashin@soleen.com>
Cc: "mike.travis@hpe.com" <mike.travis@hpe.com>
Signed-off-by: David Hildenbrand <david@redhat.com>
---
drivers/base/memory.c | 32 ++++++++++----------------------
include/linux/memory.h | 2 --
2 files changed, 10 insertions(+), 24 deletions(-)
diff --git a/drivers/base/memory.c b/drivers/base/memory.c
index 0204384b4d1d..fefb64d3588e 100644
--- a/drivers/base/memory.c
+++ b/drivers/base/memory.c
@@ -592,26 +592,12 @@ int __weak arch_get_memory_phys_device(unsigned long start_pfn)
* A reference for the returned object is held and the reference for the
* hinted object is released.
*/
-static struct memory_block *find_memory_block_by_id(unsigned long block_id,
- struct memory_block *hint)
+static struct memory_block *find_memory_block_by_id(unsigned long block_id)
{
- struct device *hintdev = hint ? &hint->dev : NULL;
struct device *dev;
- dev = subsys_find_device_by_id(&memory_subsys, block_id, hintdev);
- if (hint)
- put_device(&hint->dev);
- if (!dev)
- return NULL;
- return to_memory_block(dev);
-}
-
-struct memory_block *find_memory_block_hinted(struct mem_section *section,
- struct memory_block *hint)
-{
- unsigned long block_id = base_memory_block_id(__section_nr(section));
-
- return find_memory_block_by_id(block_id, hint);
+ dev = subsys_find_device_by_id(&memory_subsys, block_id, NULL);
+ return dev ? to_memory_block(dev) : NULL;
}
/*
@@ -624,7 +610,9 @@ struct memory_block *find_memory_block_hinted(struct mem_section *section,
*/
struct memory_block *find_memory_block(struct mem_section *section)
{
- return find_memory_block_hinted(section, NULL);
+ unsigned long block_id = base_memory_block_id(__section_nr(section));
+
+ return find_memory_block_by_id(block_id);
}
static struct attribute *memory_memblk_attrs[] = {
@@ -675,7 +663,7 @@ static int init_memory_block(struct memory_block **memory,
unsigned long start_pfn;
int ret = 0;
- mem = find_memory_block_by_id(block_id, NULL);
+ mem = find_memory_block_by_id(block_id);
if (mem) {
put_device(&mem->dev);
return -EEXIST;
@@ -755,7 +743,7 @@ int create_memory_block_devices(unsigned long start, unsigned long size)
end_block_id = block_id;
for (block_id = start_block_id; block_id != end_block_id;
block_id++) {
- mem = find_memory_block_by_id(block_id, NULL);
+ mem = find_memory_block_by_id(block_id);
mem->section_count = 0;
unregister_memory(mem);
}
@@ -782,7 +770,7 @@ void remove_memory_block_devices(unsigned long start, unsigned long size)
mutex_lock(&mem_sysfs_mutex);
for (block_id = start_block_id; block_id != end_block_id; block_id++) {
- mem = find_memory_block_by_id(block_id, NULL);
+ mem = find_memory_block_by_id(block_id);
if (WARN_ON_ONCE(!mem))
continue;
mem->section_count = 0;
@@ -882,7 +870,7 @@ int walk_memory_blocks(unsigned long start, unsigned long size,
int ret = 0;
for (block_id = start_block_id; block_id <= end_block_id; block_id++) {
- mem = find_memory_block_by_id(block_id, NULL);
+ mem = find_memory_block_by_id(block_id);
if (!mem)
continue;
diff --git a/include/linux/memory.h b/include/linux/memory.h
index b3b388775a30..02e633f3ede0 100644
--- a/include/linux/memory.h
+++ b/include/linux/memory.h
@@ -116,8 +116,6 @@ void remove_memory_block_devices(unsigned long start, unsigned long size);
extern int memory_dev_init(void);
extern int memory_notify(unsigned long val, void *v);
extern int memory_isolate_notify(unsigned long val, void *v);
-extern struct memory_block *find_memory_block_hinted(struct mem_section *,
- struct memory_block *);
extern struct memory_block *find_memory_block(struct mem_section *);
typedef int (*walk_memory_blocks_func_t)(struct memory_block *, void *);
extern int walk_memory_blocks(unsigned long start, unsigned long size,
--
2.21.0
^ permalink raw reply related
* [PATCH v2 4/6] mm/memory_hotplug: Rename walk_memory_range() and pass start+size instead of pfns
From: David Hildenbrand @ 2019-06-20 10:35 UTC (permalink / raw)
To: linux-kernel
Cc: Dan Williams, Andrew Morton, linuxppc-dev, linux-acpi, linux-mm,
David Hildenbrand, Benjamin Herrenschmidt, Paul Mackerras,
Michael Ellerman, Rafael J. Wysocki, Len Brown,
Greg Kroah-Hartman, Rashmica Gupta, Pavel Tatashin,
Anshuman Khandual, Michael Neuling, Thomas Gleixner,
Oscar Salvador, Michal Hocko, Wei Yang, Juergen Gross, Qian Cai,
Arun KS
In-Reply-To: <20190620103520.23481-1-david@redhat.com>
walk_memory_range() was once used to iterate over sections. Now, it
iterates over memory blocks. Rename the function, fixup the
documentation. Also, pass start+size instead of PFNs, which is what most
callers already have at hand. (we'll rework link_mem_sections() most
probably soon)
Follow-up patches wil rework, simplify, and move walk_memory_blocks() to
drivers/base/memory.c.
Note: walk_memory_blocks() only works correctly right now if the
start_pfn is aligned to a section start. This is the case right now,
but we'll generalize the function in a follow up patch so the semantics
match the documentation.
Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Cc: Paul Mackerras <paulus@samba.org>
Cc: Michael Ellerman <mpe@ellerman.id.au>
Cc: "Rafael J. Wysocki" <rjw@rjwysocki.net>
Cc: Len Brown <lenb@kernel.org>
Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Cc: David Hildenbrand <david@redhat.com>
Cc: Rashmica Gupta <rashmica.g@gmail.com>
Cc: Andrew Morton <akpm@linux-foundation.org>
Cc: Pavel Tatashin <pavel.tatashin@microsoft.com>
Cc: Anshuman Khandual <anshuman.khandual@arm.com>
Cc: Michael Neuling <mikey@neuling.org>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: Oscar Salvador <osalvador@suse.de>
Cc: Michal Hocko <mhocko@suse.com>
Cc: Wei Yang <richard.weiyang@gmail.com>
Cc: Juergen Gross <jgross@suse.com>
Cc: Qian Cai <cai@lca.pw>
Cc: Arun KS <arunks@codeaurora.org>
Signed-off-by: David Hildenbrand <david@redhat.com>
---
arch/powerpc/platforms/powernv/memtrace.c | 22 ++++++++++-----------
drivers/acpi/acpi_memhotplug.c | 19 ++++--------------
drivers/base/node.c | 5 +++--
include/linux/memory_hotplug.h | 2 +-
mm/memory_hotplug.c | 24 ++++++++++++-----------
5 files changed, 32 insertions(+), 40 deletions(-)
diff --git a/arch/powerpc/platforms/powernv/memtrace.c b/arch/powerpc/platforms/powernv/memtrace.c
index 5e53c1392d3b..8c82c041afe6 100644
--- a/arch/powerpc/platforms/powernv/memtrace.c
+++ b/arch/powerpc/platforms/powernv/memtrace.c
@@ -70,23 +70,24 @@ static int change_memblock_state(struct memory_block *mem, void *arg)
/* called with device_hotplug_lock held */
static bool memtrace_offline_pages(u32 nid, u64 start_pfn, u64 nr_pages)
{
+ const unsigned long start = PFN_PHYS(start_pfn);
+ const unsigned long size = PFN_PHYS(nr_pages);
u64 end_pfn = start_pfn + nr_pages - 1;
- if (walk_memory_range(start_pfn, end_pfn, NULL,
- check_memblock_online))
+ if (walk_memory_blocks(start, size, NULL, check_memblock_online))
return false;
- walk_memory_range(start_pfn, end_pfn, (void *)MEM_GOING_OFFLINE,
- change_memblock_state);
+ walk_memory_blocks(start, size, (void *)MEM_GOING_OFFLINE,
+ change_memblock_state);
if (offline_pages(start_pfn, nr_pages)) {
- walk_memory_range(start_pfn, end_pfn, (void *)MEM_ONLINE,
- change_memblock_state);
+ walk_memory_blocks(start, size, (void *)MEM_ONLINE,
+ change_memblock_state);
return false;
}
- walk_memory_range(start_pfn, end_pfn, (void *)MEM_OFFLINE,
- change_memblock_state);
+ walk_memory_blocks(start, size, (void *)MEM_OFFLINE,
+ change_memblock_state);
return true;
@@ -242,9 +243,8 @@ static int memtrace_online(void)
*/
if (!memhp_auto_online) {
lock_device_hotplug();
- walk_memory_range(PFN_DOWN(ent->start),
- PFN_UP(ent->start + ent->size - 1),
- NULL, online_mem_block);
+ walk_memory_blocks(ent->start, ent->size, NULL,
+ online_mem_block);
unlock_device_hotplug();
}
diff --git a/drivers/acpi/acpi_memhotplug.c b/drivers/acpi/acpi_memhotplug.c
index db013dc21c02..e294f44a7850 100644
--- a/drivers/acpi/acpi_memhotplug.c
+++ b/drivers/acpi/acpi_memhotplug.c
@@ -155,16 +155,6 @@ static int acpi_memory_check_device(struct acpi_memory_device *mem_device)
return 0;
}
-static unsigned long acpi_meminfo_start_pfn(struct acpi_memory_info *info)
-{
- return PFN_DOWN(info->start_addr);
-}
-
-static unsigned long acpi_meminfo_end_pfn(struct acpi_memory_info *info)
-{
- return PFN_UP(info->start_addr + info->length-1);
-}
-
static int acpi_bind_memblk(struct memory_block *mem, void *arg)
{
return acpi_bind_one(&mem->dev, arg);
@@ -173,9 +163,8 @@ static int acpi_bind_memblk(struct memory_block *mem, void *arg)
static int acpi_bind_memory_blocks(struct acpi_memory_info *info,
struct acpi_device *adev)
{
- return walk_memory_range(acpi_meminfo_start_pfn(info),
- acpi_meminfo_end_pfn(info), adev,
- acpi_bind_memblk);
+ return walk_memory_blocks(info->start_addr, info->length, adev,
+ acpi_bind_memblk);
}
static int acpi_unbind_memblk(struct memory_block *mem, void *arg)
@@ -186,8 +175,8 @@ static int acpi_unbind_memblk(struct memory_block *mem, void *arg)
static void acpi_unbind_memory_blocks(struct acpi_memory_info *info)
{
- walk_memory_range(acpi_meminfo_start_pfn(info),
- acpi_meminfo_end_pfn(info), NULL, acpi_unbind_memblk);
+ walk_memory_blocks(info->start_addr, info->length, NULL,
+ acpi_unbind_memblk);
}
static int acpi_memory_enable_device(struct acpi_memory_device *mem_device)
diff --git a/drivers/base/node.c b/drivers/base/node.c
index e6364e3e3e31..d8c02e65df68 100644
--- a/drivers/base/node.c
+++ b/drivers/base/node.c
@@ -833,8 +833,9 @@ void unregister_memory_block_under_nodes(struct memory_block *mem_blk)
int link_mem_sections(int nid, unsigned long start_pfn, unsigned long end_pfn)
{
- return walk_memory_range(start_pfn, end_pfn, (void *)&nid,
- register_mem_sect_under_node);
+ return walk_memory_blocks(PFN_PHYS(start_pfn),
+ PFN_PHYS(end_pfn - start_pfn), (void *)&nid,
+ register_mem_sect_under_node);
}
#ifdef CONFIG_HUGETLBFS
diff --git a/include/linux/memory_hotplug.h b/include/linux/memory_hotplug.h
index 79e0add6a597..d9fffc34949f 100644
--- a/include/linux/memory_hotplug.h
+++ b/include/linux/memory_hotplug.h
@@ -340,7 +340,7 @@ static inline void __remove_memory(int nid, u64 start, u64 size) {}
#endif /* CONFIG_MEMORY_HOTREMOVE */
extern void __ref free_area_init_core_hotplug(int nid);
-extern int walk_memory_range(unsigned long start_pfn, unsigned long end_pfn,
+extern int walk_memory_blocks(unsigned long start, unsigned long size,
void *arg, int (*func)(struct memory_block *, void *));
extern int __add_memory(int nid, u64 start, u64 size);
extern int add_memory(int nid, u64 start, u64 size);
diff --git a/mm/memory_hotplug.c b/mm/memory_hotplug.c
index a88c5f334e5a..122a7d31efdd 100644
--- a/mm/memory_hotplug.c
+++ b/mm/memory_hotplug.c
@@ -1126,8 +1126,7 @@ int __ref add_memory_resource(int nid, struct resource *res)
/* online pages if requested */
if (memhp_auto_online)
- walk_memory_range(PFN_DOWN(start), PFN_UP(start + size - 1),
- NULL, online_memory_block);
+ walk_memory_blocks(start, size, NULL, online_memory_block);
return ret;
error:
@@ -1665,20 +1664,24 @@ int offline_pages(unsigned long start_pfn, unsigned long nr_pages)
#endif /* CONFIG_MEMORY_HOTREMOVE */
/**
- * walk_memory_range - walks through all mem sections in [start_pfn, end_pfn)
- * @start_pfn: start pfn of the memory range
- * @end_pfn: end pfn of the memory range
+ * walk_memory_blocks - walk through all present memory blocks overlapped
+ * by the range [start, start + size)
+ *
+ * @start: start address of the memory range
+ * @size: size of the memory range
* @arg: argument passed to func
- * @func: callback for each memory section walked
+ * @func: callback for each memory block walked
*
- * This function walks through all present mem sections in range
- * [start_pfn, end_pfn) and call func on each mem section.
+ * This function walks through all present memory blocks overlapped by the
+ * range [start, start + size), calling func on each memory block.
*
* Returns the return value of func.
*/
-int walk_memory_range(unsigned long start_pfn, unsigned long end_pfn,
+int walk_memory_blocks(unsigned long start, unsigned long size,
void *arg, int (*func)(struct memory_block *, void *))
{
+ const unsigned long start_pfn = PFN_DOWN(start);
+ const unsigned long end_pfn = PFN_UP(start + size - 1);
struct memory_block *mem = NULL;
struct mem_section *section;
unsigned long pfn, section_nr;
@@ -1824,8 +1827,7 @@ static int __ref try_remove_memory(int nid, u64 start, u64 size)
* whether all memory blocks in question are offline and return error
* if this is not the case.
*/
- rc = walk_memory_range(PFN_DOWN(start), PFN_UP(start + size - 1), NULL,
- check_memblock_offlined_cb);
+ rc = walk_memory_blocks(start, size, NULL, check_memblock_offlined_cb);
if (rc)
goto done;
--
2.21.0
^ permalink raw reply related
* [PATCH v2 3/6] mm: Make register_mem_sect_under_node() static
From: David Hildenbrand @ 2019-06-20 10:35 UTC (permalink / raw)
To: linux-kernel
Cc: Dan Williams, Andrew Morton, linuxppc-dev, linux-acpi, linux-mm,
David Hildenbrand, Greg Kroah-Hartman, Rafael J. Wysocki,
Keith Busch, Oscar Salvador
In-Reply-To: <20190620103520.23481-1-david@redhat.com>
It is only used internally.
Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Cc: "Rafael J. Wysocki" <rafael@kernel.org>
Cc: Andrew Morton <akpm@linux-foundation.org>
Cc: Keith Busch <keith.busch@intel.com>
Cc: Oscar Salvador <osalvador@suse.de>
Signed-off-by: David Hildenbrand <david@redhat.com>
---
drivers/base/node.c | 3 ++-
include/linux/node.h | 7 -------
2 files changed, 2 insertions(+), 8 deletions(-)
diff --git a/drivers/base/node.c b/drivers/base/node.c
index 9be88fd05147..e6364e3e3e31 100644
--- a/drivers/base/node.c
+++ b/drivers/base/node.c
@@ -752,7 +752,8 @@ static int __ref get_nid_for_pfn(unsigned long pfn)
}
/* register memory section under specified node if it spans that node */
-int register_mem_sect_under_node(struct memory_block *mem_blk, void *arg)
+static int register_mem_sect_under_node(struct memory_block *mem_blk,
+ void *arg)
{
int ret, nid = *(int *)arg;
unsigned long pfn, sect_start_pfn, sect_end_pfn;
diff --git a/include/linux/node.h b/include/linux/node.h
index 548c226966a2..4866f32a02d8 100644
--- a/include/linux/node.h
+++ b/include/linux/node.h
@@ -137,8 +137,6 @@ static inline int register_one_node(int nid)
extern void unregister_one_node(int nid);
extern int register_cpu_under_node(unsigned int cpu, unsigned int nid);
extern int unregister_cpu_under_node(unsigned int cpu, unsigned int nid);
-extern int register_mem_sect_under_node(struct memory_block *mem_blk,
- void *arg);
extern void unregister_memory_block_under_nodes(struct memory_block *mem_blk);
extern int register_memory_node_under_compute_node(unsigned int mem_nid,
@@ -170,11 +168,6 @@ static inline int unregister_cpu_under_node(unsigned int cpu, unsigned int nid)
{
return 0;
}
-static inline int register_mem_sect_under_node(struct memory_block *mem_blk,
- void *arg)
-{
- return 0;
-}
static inline void unregister_memory_block_under_nodes(struct memory_block *mem_blk)
{
}
--
2.21.0
^ permalink raw reply related
* [PATCH v2 1/6] mm: Section numbers use the type "unsigned long"
From: David Hildenbrand @ 2019-06-20 10:35 UTC (permalink / raw)
To: linux-kernel
Cc: Dan Williams, Andrew Morton, linuxppc-dev, linux-acpi, linux-mm,
David Hildenbrand, Greg Kroah-Hartman, Rafael J. Wysocki,
Vlastimil Babka, Michal Hocko, Mel Gorman, Wei Yang,
Johannes Weiner, Arun KS, Pavel Tatashin, Oscar Salvador,
Stephen Rothwell, Mike Rapoport, Baoquan He
In-Reply-To: <20190620103520.23481-1-david@redhat.com>
We are using a mixture of "int" and "unsigned long". Let's make this
consistent by using "unsigned long" everywhere. We'll do the same with
memory block ids next.
While at it, turn the "unsigned long i" in removable_show() into an
int - sections_per_block is an int.
Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Cc: "Rafael J. Wysocki" <rafael@kernel.org>
Cc: Andrew Morton <akpm@linux-foundation.org>
Cc: Vlastimil Babka <vbabka@suse.cz>
Cc: Michal Hocko <mhocko@suse.com>
Cc: Dan Williams <dan.j.williams@intel.com>
Cc: Mel Gorman <mgorman@techsingularity.net>
Cc: Wei Yang <richard.weiyang@gmail.com>
Cc: Johannes Weiner <hannes@cmpxchg.org>
Cc: Arun KS <arunks@codeaurora.org>
Cc: Pavel Tatashin <pasha.tatashin@oracle.com>
Cc: Oscar Salvador <osalvador@suse.de>
Cc: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: Mike Rapoport <rppt@linux.vnet.ibm.com>
Cc: Baoquan He <bhe@redhat.com>
Signed-off-by: David Hildenbrand <david@redhat.com>
---
drivers/base/memory.c | 27 +++++++++++++--------------
include/linux/mmzone.h | 4 ++--
mm/sparse.c | 12 ++++++------
3 files changed, 21 insertions(+), 22 deletions(-)
diff --git a/drivers/base/memory.c b/drivers/base/memory.c
index 826dd76f662e..5947b5a5686d 100644
--- a/drivers/base/memory.c
+++ b/drivers/base/memory.c
@@ -34,7 +34,7 @@ static DEFINE_MUTEX(mem_sysfs_mutex);
static int sections_per_block;
-static inline int base_memory_block_id(int section_nr)
+static inline int base_memory_block_id(unsigned long section_nr)
{
return section_nr / sections_per_block;
}
@@ -131,9 +131,9 @@ static ssize_t phys_index_show(struct device *dev,
static ssize_t removable_show(struct device *dev, struct device_attribute *attr,
char *buf)
{
- unsigned long i, pfn;
- int ret = 1;
struct memory_block *mem = to_memory_block(dev);
+ unsigned long pfn;
+ int ret = 1, i;
if (mem->state != MEM_ONLINE)
goto out;
@@ -691,15 +691,15 @@ static int init_memory_block(struct memory_block **memory, int block_id,
return ret;
}
-static int add_memory_block(int base_section_nr)
+static int add_memory_block(unsigned long base_section_nr)
{
+ int ret, section_count = 0;
struct memory_block *mem;
- int i, ret, section_count = 0;
+ unsigned long nr;
- for (i = base_section_nr;
- i < base_section_nr + sections_per_block;
- i++)
- if (present_section_nr(i))
+ for (nr = base_section_nr; nr < base_section_nr + sections_per_block;
+ nr++)
+ if (present_section_nr(nr))
section_count++;
if (section_count == 0)
@@ -822,10 +822,9 @@ static const struct attribute_group *memory_root_attr_groups[] = {
*/
int __init memory_dev_init(void)
{
- unsigned int i;
int ret;
int err;
- unsigned long block_sz;
+ unsigned long block_sz, nr;
ret = subsys_system_register(&memory_subsys, memory_root_attr_groups);
if (ret)
@@ -839,9 +838,9 @@ int __init memory_dev_init(void)
* during boot and have been initialized
*/
mutex_lock(&mem_sysfs_mutex);
- for (i = 0; i <= __highest_present_section_nr;
- i += sections_per_block) {
- err = add_memory_block(i);
+ for (nr = 0; nr <= __highest_present_section_nr;
+ nr += sections_per_block) {
+ err = add_memory_block(nr);
if (!ret)
ret = err;
}
diff --git a/include/linux/mmzone.h b/include/linux/mmzone.h
index 427b79c39b3c..83b6aae16f13 100644
--- a/include/linux/mmzone.h
+++ b/include/linux/mmzone.h
@@ -1220,7 +1220,7 @@ static inline struct mem_section *__nr_to_section(unsigned long nr)
return NULL;
return &mem_section[SECTION_NR_TO_ROOT(nr)][nr & SECTION_ROOT_MASK];
}
-extern int __section_nr(struct mem_section* ms);
+extern unsigned long __section_nr(struct mem_section *ms);
extern unsigned long usemap_size(void);
/*
@@ -1292,7 +1292,7 @@ static inline struct mem_section *__pfn_to_section(unsigned long pfn)
return __nr_to_section(pfn_to_section_nr(pfn));
}
-extern int __highest_present_section_nr;
+extern unsigned long __highest_present_section_nr;
#ifndef CONFIG_HAVE_ARCH_PFN_VALID
static inline int pfn_valid(unsigned long pfn)
diff --git a/mm/sparse.c b/mm/sparse.c
index 1552c855d62a..e8c57e039be8 100644
--- a/mm/sparse.c
+++ b/mm/sparse.c
@@ -102,7 +102,7 @@ static inline int sparse_index_init(unsigned long section_nr, int nid)
#endif
#ifdef CONFIG_SPARSEMEM_EXTREME
-int __section_nr(struct mem_section* ms)
+unsigned long __section_nr(struct mem_section *ms)
{
unsigned long root_nr;
struct mem_section *root = NULL;
@@ -121,9 +121,9 @@ int __section_nr(struct mem_section* ms)
return (root_nr * SECTIONS_PER_ROOT) + (ms - root);
}
#else
-int __section_nr(struct mem_section* ms)
+unsigned long __section_nr(struct mem_section *ms)
{
- return (int)(ms - mem_section[0]);
+ return (unsigned long)(ms - mem_section[0]);
}
#endif
@@ -178,10 +178,10 @@ void __meminit mminit_validate_memmodel_limits(unsigned long *start_pfn,
* Keeping track of this gives us an easy way to break out of
* those loops early.
*/
-int __highest_present_section_nr;
+unsigned long __highest_present_section_nr;
static void section_mark_present(struct mem_section *ms)
{
- int section_nr = __section_nr(ms);
+ unsigned long section_nr = __section_nr(ms);
if (section_nr > __highest_present_section_nr)
__highest_present_section_nr = section_nr;
@@ -189,7 +189,7 @@ static void section_mark_present(struct mem_section *ms)
ms->section_mem_map |= SECTION_MARKED_PRESENT;
}
-static inline int next_present_section_nr(int section_nr)
+static inline unsigned long next_present_section_nr(unsigned long section_nr)
{
do {
section_nr++;
--
2.21.0
^ permalink raw reply related
* [PATCH v2 0/6] mm: Further memory block device cleanups
From: David Hildenbrand @ 2019-06-20 10:35 UTC (permalink / raw)
To: linux-kernel
Cc: Dan Williams, Andrew Morton, linuxppc-dev, linux-acpi, linux-mm,
David Hildenbrand, Andrew Banman, Anshuman Khandual, Arun KS,
Baoquan He, Benjamin Herrenschmidt, Greg Kroah-Hartman,
Johannes Weiner, Juergen Gross, Keith Busch, Len Brown,
Mel Gorman, Michael Ellerman, Michael Neuling, Michal Hocko,
Mike Rapoport, mike.travis@hpe.com, Oscar Salvador,
Oscar Salvador, Paul Mackerras, Pavel Tatashin, Pavel Tatashin,
Pavel Tatashin, Qian Cai, Rafael J. Wysocki, Rafael J. Wysocki,
Rashmica Gupta, Stephen Rothwell, Thomas Gleixner,
Vlastimil Babka, Wei Yang
@Andrew: Only patch 1 and 6 changed. The patches are based on the
same state as the previous patches (replace the old ones if possible).
Some further cleanups around memory block devices. Especially, clean up
and simplify walk_memory_range(). Including some other minor cleanups.
Compiled + tested on x86 with DIMMs under QEMU.
v1 -> v2:
- "mm: Section numbers use the type "unsigned long""
-- "unsigned long i" -> "unsigned long nr", in one case -> "int i"
- "drivers/base/memory.c: Get rid of find_memory_block_hinted("
-- Fix compilation error
-- Get rid of the "hint" parameter completely
David Hildenbrand (6):
mm: Section numbers use the type "unsigned long"
drivers/base/memory: Use "unsigned long" for block ids
mm: Make register_mem_sect_under_node() static
mm/memory_hotplug: Rename walk_memory_range() and pass start+size
instead of pfns
mm/memory_hotplug: Move and simplify walk_memory_blocks()
drivers/base/memory.c: Get rid of find_memory_block_hinted()
arch/powerpc/platforms/powernv/memtrace.c | 22 ++---
drivers/acpi/acpi_memhotplug.c | 19 +---
drivers/base/memory.c | 115 ++++++++++++++--------
drivers/base/node.c | 8 +-
include/linux/memory.h | 5 +-
include/linux/memory_hotplug.h | 2 -
include/linux/mmzone.h | 4 +-
include/linux/node.h | 7 --
mm/memory_hotplug.c | 57 +----------
mm/sparse.c | 12 +--
10 files changed, 105 insertions(+), 146 deletions(-)
--
2.21.0
^ permalink raw reply
* Re: Can we just get rid of kwset & obstack in favor of optimistically using PCRE v2 JIT?
From: Jeff King @ 2019-06-20 10:35 UTC (permalink / raw)
To: Ævar Arnfjörð Bjarmason
Cc: Johannes Schindelin via GitGitGadget, git, Junio C Hamano,
Johannes Schindelin, SZEDER Gábor, git-packagers
In-Reply-To: <87tvcr92m2.fsf@evledraar.gmail.com>
On Sat, Jun 15, 2019 at 01:19:33AM +0200, Ævar Arnfjörð Bjarmason wrote:
> ...small correction, we currently hard-rely on kwset() for any pattern
> containing a \0 for "git-grep" (these can only by supplied via the -f
> <pattern-from-file> option), this means that any pattern containing a \0
> is implicitly fixed, unless kwset() doesn't like it (-i and non-ASCII),
> what a mess.
>
> Since we hard depend on REG_STARTEND since 2f8952250a ("regex: add
> regexec_buf() that can work on a non NUL-terminated string", 2016-09-21)
> we should just fix that while we're at it. It's a backwards-incompatible
> change, but I doubt anyone is relying on our undocumented behavior of
> implicitly considering grep patterns with \0 in them always fixed.
That's only for NULs in the haystack, though. I don't think there's a
way to have a NUL in the pattern with regcomp(), since it takes a
NUL-terminated string.
I do agree with you that treating it like a fixed string is somewhat
insane. We're probably better off to die.
In general, your plan to get rid of kwset sounds like a good path. It
would be a slight regression for somebody who is truly feeding a
fixed-string pattern with a NUL in it, on a system without pcre. Right
now that works (via kwset), and if we would start feeding fixed strings
to regcomp() then obviously that won't work. I guess we could go back to
using memmem as a fallback, which is what it looks like we used before
9eceddeec6 (Use kwset in grep, 2011-08-21).
Seems like a code path that would get exercised approximately never,
though.
-Peff
^ permalink raw reply
* Re: [PATCH v2 3/4] drm/i915: Nuke drm_driver irq vfuncs
From: Chris Wilson @ 2019-06-20 10:35 UTC (permalink / raw)
To: Ville Syrjala, intel-gfx
In-Reply-To: <20190620103334.15651-1-ville.syrjala@linux.intel.com>
Quoting Ville Syrjala (2019-06-20 11:33:34)
> From: Ville Syrjälä <ville.syrjala@linux.intel.com>
>
> Stop using the irq vfuncs under drm_driver. That's not going to fly
> in a mixed gen environment since the structure is shared between all
> the devices.
>
> v2: Allow intel_irq_uninstall() to be called twice due to
> intel_modeset_cleanup() calling it as well. Toss in a
> FIXME to remind us that this is not great.
Fair enough.
> Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
> Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk> #v1
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
-Chris
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply
* [GIT PULL] mali-dp and komeda patches for drm-next
From: Liviu Dudau @ 2019-06-20 10:35 UTC (permalink / raw)
To: Dave Airlie, Daniel Vetter
Cc: MaliDP Maintainers, DRI devel, LKML,
Lowry Li (Arm Technology China),
james qian wang (Arm Technology China)
Hi DRM maintainers,
Picking up pace on the upstreaming of Komeda driver, with quite a lot
of new features added this time. On top of that we have the small
cleanups and improved usage of the debugfs functions. Please pull!
Best regards,
Liviu
The following changes since commit 52d2d44eee8091e740d0d275df1311fb8373c9a9:
Merge v5.2-rc5 into drm-next (2019-06-19 12:07:29 +0200)
are available in the Git repository at:
git://linux-arm.org/linux-ld.git for-upstream/mali-dp
for you to fetch changes up to 344f00e4d7d6538c1862505b25b662b47c9e0bb0:
drm/komeda: Make Komeda interrupts shareable (2019-06-19 17:04:21 +0100)
----------------------------------------------------------------
Arnd Bergmann (1):
drm/komeda: fix 32-bit komeda_crtc_update_clock_ratio
Ayan Halder (1):
drm/komeda: Make Komeda interrupts shareable
Greg Kroah-Hartman (2):
komeda: no need to check return value of debugfs_create functions
malidp: no need to check return value of debugfs_create functions
Liviu Dudau (1):
arm/komeda: Convert dp_wait_cond() to return an error code.
Lowry Li (Arm Technology China) (10):
drm/komeda: Creates plane alpha and blend mode properties
drm/komeda: Clear enable bit in CU_INPUTx_CONTROL
drm/komeda: Add rotation support on Komeda driver
drm/komeda: Adds limitation check for AFBC wide block not support Rot90
drm/komeda: Update HW up-sampling on D71
drm/komeda: Enable color-encoding (YUV format) support
drm/komeda: Adds SMMU support
dt/bindings: drm/komeda: Adds SMMU support for D71 devicetree
drm/komeda: Adds zorder support
drm/komeda: Add slave pipeline support
james qian wang (Arm Technology China) (21):
drm/komeda: Add writeback support
drm/komeda: Added AFBC support for komeda driver
drm/komeda: Attach scaler to drm as private object
drm/komeda: Add the initial scaler support for CORE
drm/komeda: Implement D71 scaler support
drm/komeda: Add writeback scaling support
drm/komeda: Add engine clock requirement check for the downscaling
drm/komeda: Add image enhancement support
drm/komeda: Add komeda_fb_check_src_coords
drm/komeda: Add format support for Y0L2, P010, YUV420_8/10BIT
drm/komeda: Unify mclk/pclk/pipeline->aclk to one MCLK
drm/komeda: Rename main engine clk name "mclk" to "aclk"
dt/bindings: drm/komeda: Unify mclk/pclk/pipeline->aclk to one ACLK
drm/komeda: Add component komeda_merger
drm/komeda: Add split support for scaler
drm/komeda: Add layer split support
drm/komeda: Refine function to_d71_input_id
drm/komeda: Accept null writeback configurations for writeback
drm/komeda: Add new component komeda_splitter
drm/komeda: Enable writeback split support
drm/komeda: Correct printk format specifier for "size_t"
.../devicetree/bindings/display/arm,komeda.txt | 23 +-
drivers/gpu/drm/arm/display/include/malidp_io.h | 7 +
drivers/gpu/drm/arm/display/include/malidp_utils.h | 5 +-
drivers/gpu/drm/arm/display/komeda/Makefile | 2 +
.../gpu/drm/arm/display/komeda/d71/d71_component.c | 582 +++++++++++++++++-
drivers/gpu/drm/arm/display/komeda/d71/d71_dev.c | 142 +++--
drivers/gpu/drm/arm/display/komeda/d71/d71_dev.h | 2 +
.../gpu/drm/arm/display/komeda/komeda_color_mgmt.c | 67 ++
.../gpu/drm/arm/display/komeda/komeda_color_mgmt.h | 17 +
drivers/gpu/drm/arm/display/komeda/komeda_crtc.c | 154 ++++-
drivers/gpu/drm/arm/display/komeda/komeda_dev.c | 59 +-
drivers/gpu/drm/arm/display/komeda/komeda_dev.h | 13 +-
.../drm/arm/display/komeda/komeda_format_caps.c | 58 ++
.../drm/arm/display/komeda/komeda_format_caps.h | 24 +-
.../drm/arm/display/komeda/komeda_framebuffer.c | 175 +++++-
.../drm/arm/display/komeda/komeda_framebuffer.h | 13 +-
drivers/gpu/drm/arm/display/komeda/komeda_kms.c | 130 +++-
drivers/gpu/drm/arm/display/komeda/komeda_kms.h | 71 ++-
.../gpu/drm/arm/display/komeda/komeda_pipeline.c | 66 +-
.../gpu/drm/arm/display/komeda/komeda_pipeline.h | 111 +++-
.../drm/arm/display/komeda/komeda_pipeline_state.c | 679 ++++++++++++++++++++-
drivers/gpu/drm/arm/display/komeda/komeda_plane.c | 191 +++++-
.../drm/arm/display/komeda/komeda_private_obj.c | 154 +++++
.../drm/arm/display/komeda/komeda_wb_connector.c | 199 ++++++
drivers/gpu/drm/arm/malidp_drv.c | 11 +-
25 files changed, 2728 insertions(+), 227 deletions(-)
create mode 100644 drivers/gpu/drm/arm/display/komeda/komeda_color_mgmt.c
create mode 100644 drivers/gpu/drm/arm/display/komeda/komeda_color_mgmt.h
create mode 100644 drivers/gpu/drm/arm/display/komeda/komeda_wb_connector.c
--
====================
| I would like to |
| fix the world, |
| but they're not |
| giving me the |
\ source code! /
---------------
¯\_(ツ)_/¯
^ permalink raw reply
* Re: [dpdk-dev] [PATCH v2 3/3] lib/lpm: remove unnecessary inline
From: Ruifeng Wang (Arm Technology China) @ 2019-06-20 10:34 UTC (permalink / raw)
To: Medvedkin, Vladimir, bruce.richardson@intel.com
Cc: dev@dpdk.org, Honnappa Nagarahalli,
Gavin Hu (Arm Technology China), nd, nd
In-Reply-To: <e5900a6f-2227-9185-6e1a-7841171ee328@intel.com>
Hi Vladimir,
> -----Original Message-----
> From: Medvedkin, Vladimir <vladimir.medvedkin@intel.com>
> Sent: Wednesday, June 19, 2019 20:51
> To: Ruifeng Wang (Arm Technology China) <Ruifeng.Wang@arm.com>;
> bruce.richardson@intel.com
> Cc: dev@dpdk.org; Honnappa Nagarahalli
> <Honnappa.Nagarahalli@arm.com>; Gavin Hu (Arm Technology China)
> <Gavin.Hu@arm.com>; nd <nd@arm.com>
> Subject: Re: [PATCH v2 3/3] lib/lpm: remove unnecessary inline
>
> Hi Wang,
>
> 1. It is better to explicitly use __rte_noinline with this function because my
> gcc still inlines it even without the inline qualifier.
>
> 2. The same should be applied to _v20 functions.
>
> 3. Please try running the tests again and show the results.
For x86, I can do test with E5 platform that we have.
>
> 4. Make this patch the first in a series.
>
Thanks. Will come back with new patch set.
> On 19/06/2019 06:36, Ruifeng Wang wrote:
> > Tests showed that the 'inline' keyword caused performance drop on some
> > x86 platforms after the memory ordering patches applied.
> > By removing the 'inline' keyword, the performance was recovered as
> > before on x86 and no impact to arm64 platforms.
> >
> > Suggested-by: Medvedkin Vladimir <vladimir.medvedkin@intel.com>
> > Signed-off-by: Ruifeng Wang <ruifeng.wang@arm.com>
> > Reviewed-by: Gavin Hu <gavin.hu@arm.com>
> > ---
> > v2: initail version to recover rte_lpm_add() performance
> >
> > lib/librte_lpm/rte_lpm.c | 4 ++--
> > 1 file changed, 2 insertions(+), 2 deletions(-)
> >
> > diff --git a/lib/librte_lpm/rte_lpm.c b/lib/librte_lpm/rte_lpm.c index
> > 0addff5d4..c97b602e6 100644
> > --- a/lib/librte_lpm/rte_lpm.c
> > +++ b/lib/librte_lpm/rte_lpm.c
> > @@ -778,7 +778,7 @@ add_depth_small_v20(struct rte_lpm_v20 *lpm,
> uint32_t ip, uint8_t depth,
> > return 0;
> > }
> >
> > -static inline int32_t
> > +static int32_t
> > add_depth_small_v1604(struct rte_lpm *lpm, uint32_t ip, uint8_t depth,
> > uint32_t next_hop)
> > {
> > @@ -975,7 +975,7 @@ add_depth_big_v20(struct rte_lpm_v20 *lpm,
> uint32_t ip_masked, uint8_t depth,
> > return 0;
> > }
> >
> > -static inline int32_t
> > +static int32_t
> > add_depth_big_v1604(struct rte_lpm *lpm, uint32_t ip_masked, uint8_t
> depth,
> > uint32_t next_hop)
> > {
>
> --
> Regards,
> Vladimir
^ permalink raw reply
* Re: [PATCH] iwlwifi: add support for hr1 RF ID
From: Luciano Coelho @ 2019-06-20 10:34 UTC (permalink / raw)
To: kvalo; +Cc: linux-wireless, Oren Givon, stable
In-Reply-To: <26ffc4023329e2421e459837bdcb92672f26cb62.camel@intel.com>
On Thu, 2019-06-20 at 13:30 +0300, Luciano Coelho wrote:
> Hi Kalle,
>
> Please take this to 5.1-rc* as well.
I obviously meant 5.2-rc*.
Thanks!
--
Luca.
^ permalink raw reply
* Re: [Ksummit-discuss] [media-submaintainers] [MAINTAINERS SUMMIT] Pull network and Patch Acceptance Consistency
From: Jani Nikula @ 2019-06-20 10:36 UTC (permalink / raw)
To: James Bottomley, Laurent Pinchart, Mauro Carvalho Chehab
Cc: media-submaintainers, kbuild, ksummit, Dan Carpenter
In-Reply-To: <1560959179.4729.10.camel@HansenPartnership.com>
On Wed, 19 Jun 2019, James Bottomley <James.Bottomley@HansenPartnership.com> wrote:
> On Wed, 2019-06-19 at 17:48 +0300, Laurent Pinchart wrote:
>> Hi Mauro,
>>
>> On Wed, Jun 19, 2019 at 11:39:02AM -0300, Mauro Carvalho Chehab
>> wrote:
>> > Em Wed, 19 Jun 2019 10:33:23 +0200 Daniel Vetter escreveu:
>> > > On Wed, Jun 19, 2019 at 9:56 AM Dan Carpenter wrote:
>> > > > On Mon, Jun 17, 2019 at 10:31:15AM -0300, Mauro Carvalho Chehab
>> > > > wrote:
>> > > > > Also, usually, the bots don't build with W=1, as, on most
>> > > > > subsystems, this cause lots of warnings[1].
>> > > > >
>> > > > > [1] On media, we have zero warnings with W=1.
>> > > >
>> > > > We could ask the kbuild devs if they would consider making W=1
>> > > > a per tree option.
>> > >
>> > > No need to ask, just add a Kconfig which sets additional cflags
>> > > for you for your tree and your good. The usual combinatorial
>> > > testing will discover the new warnings. That's at least what we
>> > > do for i915.ko (including -Werror). Gets the job done.
>> >
>> > While this works, having a W=1 per tree would, IMHO, work better,
>> > as, as new warnings get added to W=1, we'll get those for free.
>> >
>> > -
>> >
>> > I don't like the idea of having -Werror being automatically added,
>> > as this may cause problems when people try to compile with a
>> > different compiler version - or on some weird architectures.
>>
>> It's not automatic though, if it depends on a Kconfig option that is
>> disabled by default. The built bots can enable it, while users would
>> ignore it. That being said, having it as a per-tree build bot option
>> should work as well.
>
> I really don't think well made build bots would enable this. The
> problem with -Werror is it's single threaded on the first problem.
> What a generic build bot wants to do is compile the entire tree and
> then diff the output to find the additional warnings for everything. I
> could see a tree specific build bot being more interested (until the
> build fails on an unrelated subsystem).
>
>> > Specially on drivers that build with COMPILE_TEST[1], depending on
>> > the architecture they're built, false-positive warnings rise,
>> > specially on unusual architecture with has different defines for
>> > some arch-specific typedefs (signed/unsigned, different integer
>> > type, usage or not of volatile, a different address space, etc).
>>
>> All my kernel compilation scripts use -Werror, and that does a great
>> job at catching problems. It can be a bit annoying at times when
>> someone introduces a warning, but usually a fix will already be
>> posted when I notice my build breaks. The more we use -Werror
>> globally, the faster those new warnings will be caught.
>
> I buy this for small projects, and would own up to using it in my own
> because it's a great way to force contributors not to introduce
> warnings in their patches if the build breaks. The problem with
> something huge like linux, especially when it is fairly deeply entwined
> with compiler specifics, is twofold:
>
> 1. You're going to force us to annotate all those spurious warnings
> that we've been ignoring because gcc should get fixed; incorrectly
> flagged uninitialized variables being the most annoying.
In i915 we basically start off with -Wall -Wextra, and then disable the
warnings that we want ignored. Some of the disables are on a per-file
basis. We then have -Werror behind a config knob.
It's a nice way to clean up warnings in our corner of the codebase, and
ensure it stays that way. I'm sure other drivers and subsystems would
have a slightly different set of warning disabled, and necessarily the
global config needs to be a union of those sets of warnings.
> 2. Different versions of gcc produce different warnings: so now we'll
> eventually have to target a specific gcc version and not upgrade
> until we're ready because newer versions come with shiny new
> warnings.
On the other hand this allows us to be more aware of the new warnings
and take advantage of them. But with -Werror it obviously only works in
a limited or local setting.
> That's not to say we should forbid bots and subsystems from doing this,
> that's what we're currently doing with the per-subdir enabling of
> -Werror using subdir-ccflags-y if you look, but we shouldn't globally
> mandate it.
Agreed.
BR,
Jani.
--
Jani Nikula, Intel Open Source Graphics Center
^ permalink raw reply
* [PATCH 1/5] lib: logic_pio: Fix RCU usage
From: John Garry @ 2019-06-20 10:31 UTC (permalink / raw)
To: xuwei5; +Cc: bhelgaas, linuxarm, arm, linux-kernel, linux-pci, joe, John Garry
In-Reply-To: <1561026716-140537-1-git-send-email-john.garry@huawei.com>
The traversing of io_range_list with list_for_each_entry_rcu()
is not properly protected by rcu_read_lock(), so add it.
In addition, the list traversing used in logic_pio_register_range()
does not need to use the rcu variant.
Fixes: 031e3601869c ("lib: Add generic PIO mapping method")
Signed-off-by: John Garry <john.garry@huawei.com>
---
lib/logic_pio.c | 49 +++++++++++++++++++++++++++++++++++--------------
1 file changed, 35 insertions(+), 14 deletions(-)
diff --git a/lib/logic_pio.c b/lib/logic_pio.c
index feea48fd1a0d..761296376fbc 100644
--- a/lib/logic_pio.c
+++ b/lib/logic_pio.c
@@ -46,7 +46,7 @@ int logic_pio_register_range(struct logic_pio_hwaddr *new_range)
end = new_range->hw_start + new_range->size;
mutex_lock(&io_range_mutex);
- list_for_each_entry_rcu(range, &io_range_list, list) {
+ list_for_each_entry(range, &io_range_list, list) {
if (range->fwnode == new_range->fwnode) {
/* range already there */
goto end_register;
@@ -108,26 +108,38 @@ int logic_pio_register_range(struct logic_pio_hwaddr *new_range)
*/
struct logic_pio_hwaddr *find_io_range_by_fwnode(struct fwnode_handle *fwnode)
{
- struct logic_pio_hwaddr *range;
+ struct logic_pio_hwaddr *range, *found_range = NULL;
+ rcu_read_lock();
list_for_each_entry_rcu(range, &io_range_list, list) {
- if (range->fwnode == fwnode)
- return range;
+ if (range->fwnode == fwnode) {
+ found_range = range;
+ break;
+ }
}
- return NULL;
+ rcu_read_unlock();
+
+ return found_range;
}
/* Return a registered range given an input PIO token */
static struct logic_pio_hwaddr *find_io_range(unsigned long pio)
{
- struct logic_pio_hwaddr *range;
+ struct logic_pio_hwaddr *range, *found_range = NULL;
+ rcu_read_lock();
list_for_each_entry_rcu(range, &io_range_list, list) {
- if (in_range(pio, range->io_start, range->size))
- return range;
+ if (in_range(pio, range->io_start, range->size)) {
+ found_range = range;
+ break;
+ }
}
- pr_err("PIO entry token %lx invalid\n", pio);
- return NULL;
+ rcu_read_unlock();
+
+ if (!found_range)
+ pr_err("PIO entry token 0x%lx invalid\n", pio);
+
+ return found_range;
}
/**
@@ -180,14 +192,23 @@ unsigned long logic_pio_trans_cpuaddr(resource_size_t addr)
{
struct logic_pio_hwaddr *range;
+ rcu_read_lock();
list_for_each_entry_rcu(range, &io_range_list, list) {
if (range->flags != LOGIC_PIO_CPU_MMIO)
continue;
- if (in_range(addr, range->hw_start, range->size))
- return addr - range->hw_start + range->io_start;
+ if (in_range(addr, range->hw_start, range->size)) {
+ unsigned long cpuaddr;
+
+ cpuaddr = addr - range->hw_start + range->io_start;
+
+ rcu_read_unlock();
+ return cpuaddr;
+ }
}
- pr_err("addr %llx not registered in io_range_list\n",
- (unsigned long long) addr);
+ rcu_read_unlock();
+
+ pr_err("addr %pa not registered in io_range_list\n", &addr);
+
return ~0UL;
}
--
2.17.1
^ permalink raw reply related
* [PATCH 5/5] lib: logic_pio: Enforce LOGIC_PIO_INDIRECT region ops are set at registration
From: John Garry @ 2019-06-20 10:31 UTC (permalink / raw)
To: xuwei5; +Cc: bhelgaas, linuxarm, arm, linux-kernel, linux-pci, joe, John Garry
In-Reply-To: <1561026716-140537-1-git-send-email-john.garry@huawei.com>
Since the only LOGIC_PIO_INDIRECT host (hisi-lpc) now sets the ops prior
to registration, enforce this check at registration instead of in the IO
port accessors to simplify and marginally optimise the code.
A slight misalignment is also tidied.
Suggested-by: Bjorn Helgaas <bhelgaas@google.com>
Signed-off-by: John Garry <john.garry@huawei.com>
---
lib/logic_pio.c | 13 +++++++------
1 file changed, 7 insertions(+), 6 deletions(-)
diff --git a/lib/logic_pio.c b/lib/logic_pio.c
index 45eb57af2574..126593ed9049 100644
--- a/lib/logic_pio.c
+++ b/lib/logic_pio.c
@@ -39,7 +39,8 @@ int logic_pio_register_range(struct logic_pio_hwaddr *new_range)
resource_size_t iio_sz = MMIO_UPPER_LIMIT;
int ret = 0;
- if (!new_range || !new_range->fwnode || !new_range->size)
+ if (!new_range || !new_range->fwnode || !new_range->size ||
+ (new_range->flags == LOGIC_PIO_INDIRECT && !new_range->ops))
return -EINVAL;
start = new_range->hw_start;
@@ -237,7 +238,7 @@ type logic_in##bw(unsigned long addr) \
} else if (addr >= MMIO_UPPER_LIMIT && addr < IO_SPACE_LIMIT) { \
struct logic_pio_hwaddr *entry = find_io_range(addr); \
\
- if (entry && entry->ops) \
+ if (entry) \
ret = entry->ops->in(entry->hostdata, \
addr, sizeof(type)); \
else \
@@ -253,7 +254,7 @@ void logic_out##bw(type value, unsigned long addr) \
} else if (addr >= MMIO_UPPER_LIMIT && addr < IO_SPACE_LIMIT) { \
struct logic_pio_hwaddr *entry = find_io_range(addr); \
\
- if (entry && entry->ops) \
+ if (entry) \
entry->ops->out(entry->hostdata, \
addr, value, sizeof(type)); \
else \
@@ -261,7 +262,7 @@ void logic_out##bw(type value, unsigned long addr) \
} \
} \
\
-void logic_ins##bw(unsigned long addr, void *buffer, \
+void logic_ins##bw(unsigned long addr, void *buffer, \
unsigned int count) \
{ \
if (addr < MMIO_UPPER_LIMIT) { \
@@ -269,7 +270,7 @@ void logic_ins##bw(unsigned long addr, void *buffer, \
} else if (addr >= MMIO_UPPER_LIMIT && addr < IO_SPACE_LIMIT) { \
struct logic_pio_hwaddr *entry = find_io_range(addr); \
\
- if (entry && entry->ops) \
+ if (entry) \
entry->ops->ins(entry->hostdata, \
addr, buffer, sizeof(type), count); \
else \
@@ -286,7 +287,7 @@ void logic_outs##bw(unsigned long addr, const void *buffer, \
} else if (addr >= MMIO_UPPER_LIMIT && addr < IO_SPACE_LIMIT) { \
struct logic_pio_hwaddr *entry = find_io_range(addr); \
\
- if (entry && entry->ops) \
+ if (entry) \
entry->ops->outs(entry->hostdata, \
addr, buffer, sizeof(type), count); \
else \
--
2.17.1
^ permalink raw reply related
page: next (older) | prev (newer) | latest
- recent:[subjects (threaded)|topics (new)|topics (active)]
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.