* Re: [PATCH] pci_regs: reintroduce PCI_MSIX_FLAGS_BIRMASK [not found] <1435745608-21217-1-git-send-email-mst@redhat.com> @ 2015-07-13 15:11 ` Michael S. Tsirkin 2015-07-13 15:49 ` Bjorn Helgaas 2015-07-14 23:29 ` Bjorn Helgaas 0 siblings, 2 replies; 6+ messages in thread From: Michael S. Tsirkin @ 2015-07-13 15:11 UTC (permalink / raw) To: linux-kernel Cc: Bjorn Helgaas, Rajat Jain, Chen, Gong, Guenter Roeck, =?UTF-8?q?Rafa=C5=82=20Mi=C5=82ecki?=, linux-api, linux-pci On Wed, Jul 01, 2015 at 12:14:10PM +0200, Michael S. Tsirkin wrote: > This partially reverts commit 09a2c73ddfc7f173237fc7209a65b34dd5bcb5ed. > PCI: Remove unused PCI_MSIX_FLAGS_BIRMASK definition > > That commit dropped a symbol from an exported header claiming "no one > uses it". This isn't how Linux normally approaches userspace API though, > and in fact QEMU build fails if trying to use updated headers from linux > 3.12 and up. > > Sure, userspace can be fixed to use the new symbol, but the cost > of keeping the old one around is fairly low, too. > > Signed-off-by: Michael S. Tsirkin <mst@redhat.com> Ping. Can this be included upstream please? > --- > include/uapi/linux/pci_regs.h | 1 + > 1 file changed, 1 insertion(+) > > diff --git a/include/uapi/linux/pci_regs.h b/include/uapi/linux/pci_regs.h > index efe3443..66644ac 100644 > --- a/include/uapi/linux/pci_regs.h > +++ b/include/uapi/linux/pci_regs.h > @@ -319,6 +319,7 @@ > #define PCI_MSIX_PBA 8 /* Pending Bit Array offset */ > #define PCI_MSIX_PBA_BIR 0x00000007 /* BAR index */ > #define PCI_MSIX_PBA_OFFSET 0xfffffff8 /* Offset into specified BAR */ > +#define PCI_MSIX_FLAGS_BIRMASK PCI_MSIX_PBA_BIR /* deprecated */ > #define PCI_CAP_MSIX_SIZEOF 12 /* size of MSIX registers */ > > /* MSI-X Table entry format */ > -- > MST ^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH] pci_regs: reintroduce PCI_MSIX_FLAGS_BIRMASK 2015-07-13 15:11 ` [PATCH] pci_regs: reintroduce PCI_MSIX_FLAGS_BIRMASK Michael S. Tsirkin @ 2015-07-13 15:49 ` Bjorn Helgaas 2015-07-13 16:32 ` Michael S. Tsirkin 2015-07-14 23:29 ` Bjorn Helgaas 1 sibling, 1 reply; 6+ messages in thread From: Bjorn Helgaas @ 2015-07-13 15:49 UTC (permalink / raw) To: Michael S. Tsirkin Cc: linux-kernel@vger.kernel.org, Rajat Jain, Chen, Gong, Guenter Roeck, Rafał Miłecki, linux-api, linux-pci@vger.kernel.org On Mon, Jul 13, 2015 at 10:11 AM, Michael S. Tsirkin <mst@redhat.com> wrote: > On Wed, Jul 01, 2015 at 12:14:10PM +0200, Michael S. Tsirkin wrote: >> This partially reverts commit 09a2c73ddfc7f173237fc7209a65b34dd5bcb5ed. >> PCI: Remove unused PCI_MSIX_FLAGS_BIRMASK definition >> >> That commit dropped a symbol from an exported header claiming "no one >> uses it". This isn't how Linux normally approaches userspace API though, >> and in fact QEMU build fails if trying to use updated headers from linux >> 3.12 and up. >> >> Sure, userspace can be fixed to use the new symbol, but the cost >> of keeping the old one around is fairly low, too. >> >> Signed-off-by: Michael S. Tsirkin <mst@redhat.com> > > Ping. Can this be included upstream please? Yes, I plan to merge it, and I'll mark it for stable. This looks like a complete revert of 09a2c73ddfc7, not a partial revert. Am I missing something? 09a2c73ddfc7 appeared in v3.13 (not v3.12), so it wouldn't ordinarily be post-merge window material. But it seems pretty safe, so I might put it in for v4.2 instead of waiting for v4.3. >> --- >> include/uapi/linux/pci_regs.h | 1 + >> 1 file changed, 1 insertion(+) >> >> diff --git a/include/uapi/linux/pci_regs.h b/include/uapi/linux/pci_regs.h >> index efe3443..66644ac 100644 >> --- a/include/uapi/linux/pci_regs.h >> +++ b/include/uapi/linux/pci_regs.h >> @@ -319,6 +319,7 @@ >> #define PCI_MSIX_PBA 8 /* Pending Bit Array offset */ >> #define PCI_MSIX_PBA_BIR 0x00000007 /* BAR index */ >> #define PCI_MSIX_PBA_OFFSET 0xfffffff8 /* Offset into specified BAR */ >> +#define PCI_MSIX_FLAGS_BIRMASK PCI_MSIX_PBA_BIR /* deprecated */ >> #define PCI_CAP_MSIX_SIZEOF 12 /* size of MSIX registers */ >> >> /* MSI-X Table entry format */ >> -- >> MST ^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH] pci_regs: reintroduce PCI_MSIX_FLAGS_BIRMASK 2015-07-13 15:49 ` Bjorn Helgaas @ 2015-07-13 16:32 ` Michael S. Tsirkin 0 siblings, 0 replies; 6+ messages in thread From: Michael S. Tsirkin @ 2015-07-13 16:32 UTC (permalink / raw) To: Bjorn Helgaas Cc: linux-kernel@vger.kernel.org, Rajat Jain, Chen, Gong, Guenter Roeck, Rafał Miłecki, linux-api, linux-pci@vger.kernel.org On Mon, Jul 13, 2015 at 10:49:02AM -0500, Bjorn Helgaas wrote: > On Mon, Jul 13, 2015 at 10:11 AM, Michael S. Tsirkin <mst@redhat.com> wrote: > > On Wed, Jul 01, 2015 at 12:14:10PM +0200, Michael S. Tsirkin wrote: > >> This partially reverts commit 09a2c73ddfc7f173237fc7209a65b34dd5bcb5ed. > >> PCI: Remove unused PCI_MSIX_FLAGS_BIRMASK definition > >> > >> That commit dropped a symbol from an exported header claiming "no one > >> uses it". This isn't how Linux normally approaches userspace API though, > >> and in fact QEMU build fails if trying to use updated headers from linux > >> 3.12 and up. > >> > >> Sure, userspace can be fixed to use the new symbol, but the cost > >> of keeping the old one around is fairly low, too. > >> > >> Signed-off-by: Michael S. Tsirkin <mst@redhat.com> > > > > Ping. Can this be included upstream please? > > Yes, I plan to merge it, and I'll mark it for stable. This looks like > a complete revert of 09a2c73ddfc7, not a partial revert. Am I missing > something? Only that I redefine PCI_MSIX_FLAGS_BIRMASK in terms of PCI_MSIX_PBA_BIR so that there's no duplication. > 09a2c73ddfc7 appeared in v3.13 (not v3.12), so it wouldn't ordinarily > be post-merge window material. But it seems pretty safe, so I might > put it in for v4.2 instead of waiting for v4.3. > > >> --- > >> include/uapi/linux/pci_regs.h | 1 + > >> 1 file changed, 1 insertion(+) > >> > >> diff --git a/include/uapi/linux/pci_regs.h b/include/uapi/linux/pci_regs.h > >> index efe3443..66644ac 100644 > >> --- a/include/uapi/linux/pci_regs.h > >> +++ b/include/uapi/linux/pci_regs.h > >> @@ -319,6 +319,7 @@ > >> #define PCI_MSIX_PBA 8 /* Pending Bit Array offset */ > >> #define PCI_MSIX_PBA_BIR 0x00000007 /* BAR index */ > >> #define PCI_MSIX_PBA_OFFSET 0xfffffff8 /* Offset into specified BAR */ > >> +#define PCI_MSIX_FLAGS_BIRMASK PCI_MSIX_PBA_BIR /* deprecated */ > >> #define PCI_CAP_MSIX_SIZEOF 12 /* size of MSIX registers */ > >> > >> /* MSI-X Table entry format */ > >> -- > >> MST ^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH] pci_regs: reintroduce PCI_MSIX_FLAGS_BIRMASK 2015-07-13 15:11 ` [PATCH] pci_regs: reintroduce PCI_MSIX_FLAGS_BIRMASK Michael S. Tsirkin 2015-07-13 15:49 ` Bjorn Helgaas @ 2015-07-14 23:29 ` Bjorn Helgaas 2015-07-27 14:55 ` Michael S. Tsirkin 1 sibling, 1 reply; 6+ messages in thread From: Bjorn Helgaas @ 2015-07-14 23:29 UTC (permalink / raw) To: Michael S. Tsirkin Cc: linux-kernel, Rajat Jain, Chen, Gong, Guenter Roeck, =?UTF-8?q?Rafa=C5=82=20Mi=C5=82ecki?=, linux-api, linux-pci On Mon, Jul 13, 2015 at 06:11:38PM +0300, Michael S. Tsirkin wrote: > On Wed, Jul 01, 2015 at 12:14:10PM +0200, Michael S. Tsirkin wrote: > > This partially reverts commit 09a2c73ddfc7f173237fc7209a65b34dd5bcb5ed. > > PCI: Remove unused PCI_MSIX_FLAGS_BIRMASK definition > > > > That commit dropped a symbol from an exported header claiming "no one > > uses it". This isn't how Linux normally approaches userspace API though, > > and in fact QEMU build fails if trying to use updated headers from linux > > 3.12 and up. > > > > Sure, userspace can be fixed to use the new symbol, but the cost > > of keeping the old one around is fairly low, too. > > > > Signed-off-by: Michael S. Tsirkin <mst@redhat.com> Sorry, I lost the original message somehow, so I can't reply to it. I applied this by hand to my for-linus branch for v4.2, thanks! commit c9ddbac9c89110f77cb0fa07e634aaf1194899aa Author: Michael S. Tsirkin <mst@redhat.com> Date: Tue Jul 14 18:27:46 2015 -0500 PCI: Restore PCI_MSIX_FLAGS_BIRMASK definition 09a2c73ddfc7 ("PCI: Remove unused PCI_MSIX_FLAGS_BIRMASK definition") removed PCI_MSIX_FLAGS_BIRMASK from an exported header because it was unused in the kernel. But that breaks user programs that were using it (QEMU in particular). Restore the PCI_MSIX_FLAGS_BIRMASK definition. [bhelgaas: changelog] Signed-off-by: Michael S. Tsirkin <mst@redhat.com> Signed-off-by: Bjorn Helgaas <bhelgaas@google.com> CC: stable@vger.kernel.org # v3.13+ diff --git a/include/uapi/linux/pci_regs.h b/include/uapi/linux/pci_regs.h index efe3443..413417f 100644 --- a/include/uapi/linux/pci_regs.h +++ b/include/uapi/linux/pci_regs.h @@ -319,6 +319,7 @@ #define PCI_MSIX_PBA 8 /* Pending Bit Array offset */ #define PCI_MSIX_PBA_BIR 0x00000007 /* BAR index */ #define PCI_MSIX_PBA_OFFSET 0xfffffff8 /* Offset into specified BAR */ +#define PCI_MSIX_FLAGS_BIRMASK PCI_MSIX_PBA_BIR /* deprecated */ #define PCI_CAP_MSIX_SIZEOF 12 /* size of MSIX registers */ /* MSI-X Table entry format */ ^ permalink raw reply related [flat|nested] 6+ messages in thread
* Re: [PATCH] pci_regs: reintroduce PCI_MSIX_FLAGS_BIRMASK 2015-07-14 23:29 ` Bjorn Helgaas @ 2015-07-27 14:55 ` Michael S. Tsirkin 2015-07-27 16:13 ` Bjorn Helgaas 0 siblings, 1 reply; 6+ messages in thread From: Michael S. Tsirkin @ 2015-07-27 14:55 UTC (permalink / raw) To: Bjorn Helgaas Cc: linux-kernel, Rajat Jain, Chen, Gong, Guenter Roeck, =?UTF-8?q?Rafa=C5=82=20Mi=C5=82ecki?=, linux-api, linux-pci On Tue, Jul 14, 2015 at 06:29:24PM -0500, Bjorn Helgaas wrote: > On Mon, Jul 13, 2015 at 06:11:38PM +0300, Michael S. Tsirkin wrote: > > On Wed, Jul 01, 2015 at 12:14:10PM +0200, Michael S. Tsirkin wrote: > > > This partially reverts commit 09a2c73ddfc7f173237fc7209a65b34dd5bcb5ed. > > > PCI: Remove unused PCI_MSIX_FLAGS_BIRMASK definition > > > > > > That commit dropped a symbol from an exported header claiming "no one > > > uses it". This isn't how Linux normally approaches userspace API though, > > > and in fact QEMU build fails if trying to use updated headers from linux > > > 3.12 and up. > > > > > > Sure, userspace can be fixed to use the new symbol, but the cost > > > of keeping the old one around is fairly low, too. > > > > > > Signed-off-by: Michael S. Tsirkin <mst@redhat.com> > > Sorry, I lost the original message somehow, so I can't reply to it. I > applied this by hand to my for-linus branch for v4.2, thanks! Did you mean 4.2? time's running out on this one ... Just making sure - it's still not upstream, right? > > commit c9ddbac9c89110f77cb0fa07e634aaf1194899aa > Author: Michael S. Tsirkin <mst@redhat.com> > Date: Tue Jul 14 18:27:46 2015 -0500 > > PCI: Restore PCI_MSIX_FLAGS_BIRMASK definition > > 09a2c73ddfc7 ("PCI: Remove unused PCI_MSIX_FLAGS_BIRMASK definition") > removed PCI_MSIX_FLAGS_BIRMASK from an exported header because it was > unused in the kernel. But that breaks user programs that were using it > (QEMU in particular). > > Restore the PCI_MSIX_FLAGS_BIRMASK definition. > > [bhelgaas: changelog] > Signed-off-by: Michael S. Tsirkin <mst@redhat.com> > Signed-off-by: Bjorn Helgaas <bhelgaas@google.com> > CC: stable@vger.kernel.org # v3.13+ > > diff --git a/include/uapi/linux/pci_regs.h b/include/uapi/linux/pci_regs.h > index efe3443..413417f 100644 > --- a/include/uapi/linux/pci_regs.h > +++ b/include/uapi/linux/pci_regs.h > @@ -319,6 +319,7 @@ > #define PCI_MSIX_PBA 8 /* Pending Bit Array offset */ > #define PCI_MSIX_PBA_BIR 0x00000007 /* BAR index */ > #define PCI_MSIX_PBA_OFFSET 0xfffffff8 /* Offset into specified BAR */ > +#define PCI_MSIX_FLAGS_BIRMASK PCI_MSIX_PBA_BIR /* deprecated */ > #define PCI_CAP_MSIX_SIZEOF 12 /* size of MSIX registers */ > > /* MSI-X Table entry format */ ^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH] pci_regs: reintroduce PCI_MSIX_FLAGS_BIRMASK 2015-07-27 14:55 ` Michael S. Tsirkin @ 2015-07-27 16:13 ` Bjorn Helgaas 0 siblings, 0 replies; 6+ messages in thread From: Bjorn Helgaas @ 2015-07-27 16:13 UTC (permalink / raw) To: Michael S. Tsirkin Cc: linux-kernel@vger.kernel.org, Rajat Jain, Chen, Gong, Guenter Roeck, Rafał Miłecki, linux-api, linux-pci@vger.kernel.org On Mon, Jul 27, 2015 at 9:55 AM, Michael S. Tsirkin <mst@redhat.com> wrote: > On Tue, Jul 14, 2015 at 06:29:24PM -0500, Bjorn Helgaas wrote: >> On Mon, Jul 13, 2015 at 06:11:38PM +0300, Michael S. Tsirkin wrote: >> > On Wed, Jul 01, 2015 at 12:14:10PM +0200, Michael S. Tsirkin wrote: >> > > This partially reverts commit 09a2c73ddfc7f173237fc7209a65b34dd5bcb5ed. >> > > PCI: Remove unused PCI_MSIX_FLAGS_BIRMASK definition >> > > >> > > That commit dropped a symbol from an exported header claiming "no one >> > > uses it". This isn't how Linux normally approaches userspace API though, >> > > and in fact QEMU build fails if trying to use updated headers from linux >> > > 3.12 and up. >> > > >> > > Sure, userspace can be fixed to use the new symbol, but the cost >> > > of keeping the old one around is fairly low, too. >> > > >> > > Signed-off-by: Michael S. Tsirkin <mst@redhat.com> >> >> Sorry, I lost the original message somehow, so I can't reply to it. I >> applied this by hand to my for-linus branch for v4.2, thanks! > > > > Did you mean 4.2? time's running out on this one ... > Just making sure - it's still not upstream, right? It's on my for-linus branch and it's been in -next for a couple weeks. We're at -rc4, and I will send a pull request to Linus before v4.2 releases. This is a really minor fix, so I'm holding it in case there are other fixes that I can include in the same request. >> commit c9ddbac9c89110f77cb0fa07e634aaf1194899aa >> Author: Michael S. Tsirkin <mst@redhat.com> >> Date: Tue Jul 14 18:27:46 2015 -0500 >> >> PCI: Restore PCI_MSIX_FLAGS_BIRMASK definition >> >> 09a2c73ddfc7 ("PCI: Remove unused PCI_MSIX_FLAGS_BIRMASK definition") >> removed PCI_MSIX_FLAGS_BIRMASK from an exported header because it was >> unused in the kernel. But that breaks user programs that were using it >> (QEMU in particular). >> >> Restore the PCI_MSIX_FLAGS_BIRMASK definition. >> >> [bhelgaas: changelog] >> Signed-off-by: Michael S. Tsirkin <mst@redhat.com> >> Signed-off-by: Bjorn Helgaas <bhelgaas@google.com> >> CC: stable@vger.kernel.org # v3.13+ >> >> diff --git a/include/uapi/linux/pci_regs.h b/include/uapi/linux/pci_regs.h >> index efe3443..413417f 100644 >> --- a/include/uapi/linux/pci_regs.h >> +++ b/include/uapi/linux/pci_regs.h >> @@ -319,6 +319,7 @@ >> #define PCI_MSIX_PBA 8 /* Pending Bit Array offset */ >> #define PCI_MSIX_PBA_BIR 0x00000007 /* BAR index */ >> #define PCI_MSIX_PBA_OFFSET 0xfffffff8 /* Offset into specified BAR */ >> +#define PCI_MSIX_FLAGS_BIRMASK PCI_MSIX_PBA_BIR /* deprecated */ >> #define PCI_CAP_MSIX_SIZEOF 12 /* size of MSIX registers */ >> >> /* MSI-X Table entry format */ ^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2015-07-27 16:14 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
[not found] <1435745608-21217-1-git-send-email-mst@redhat.com>
2015-07-13 15:11 ` [PATCH] pci_regs: reintroduce PCI_MSIX_FLAGS_BIRMASK Michael S. Tsirkin
2015-07-13 15:49 ` Bjorn Helgaas
2015-07-13 16:32 ` Michael S. Tsirkin
2015-07-14 23:29 ` Bjorn Helgaas
2015-07-27 14:55 ` Michael S. Tsirkin
2015-07-27 16:13 ` Bjorn Helgaas
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox; as well as URLs for NNTP newsgroup(s).