From mboxrd@z Thu Jan 1 00:00:00 1970 From: Rusty Russell Subject: Re: [PATCH 1/2] virtio_pci_modern: type-safe io accessors Date: Mon, 16 Feb 2015 14:22:55 +1030 Message-ID: <87vbj28qco.fsf@rustcorp.com.au> References: <1423977123-10115-1-git-send-email-mst@redhat.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: In-Reply-To: <1423977123-10115-1-git-send-email-mst@redhat.com> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: virtualization-bounces@lists.linux-foundation.org Errors-To: virtualization-bounces@lists.linux-foundation.org To: "Michael S. Tsirkin" , linux-kernel@vger.kernel.org Cc: virtualization@lists.linux-foundation.org List-Id: virtualization@lists.linuxfoundation.org Ik1pY2hhZWwgUy4gVHNpcmtpbiIgPG1zdEByZWRoYXQuY29tPiB3cml0ZXM6Cj4gVGhlIHNwZWMg aXMgdmVyeSBjbGVhciBvbiB0aGlzOgo+Cj4gNC4xLjMuMSBEcml2ZXIgUmVxdWlyZW1lbnRzOiBQ Q0kgRGV2aWNlIExheW91dAo+Cj4gVGhlIGRyaXZlciBNVVNUIGFjY2VzcyBlYWNoIGZpZWxkIHVz aW5nIHRoZSDigJxuYXR1cmFs4oCdIGFjY2VzcyBtZXRob2QsCj4gaS5lLiAzMi1iaXQgYWNjZXNz ZXMgZm9yIDMyLWJpdCBmaWVsZHMsIDE2LWJpdCBhY2Nlc3NlcyBmb3IgMTYtYml0Cj4gZmllbGRz IGFuZCA4LWJpdCBhY2Nlc3NlcyBmb3IgOC1iaXQgZmllbGRzLgo+Cj4gQWRkIHR5cGUtc2FmZSB3 cmFwcGVycyB0byBwcmV2ZW50IGFjY2VzcyB3aXRoIGluY29ycmVjdCB3aWR0aC4KCkFwcGxpZWQg Ym90aCAoZm9yICpuZXh0KiBtZXJnZSB3aW5kb3cpLgoKVGhhbmtzLApSdXN0eS4KCj4gU2lnbmVk LW9mZi1ieTogTWljaGFlbCBTLiBUc2lya2luIDxtc3RAcmVkaGF0LmNvbT4KPiAtLS0KPiAgZHJp dmVycy92aXJ0aW8vdmlydGlvX3BjaV9tb2Rlcm4uYyB8IDM3ICsrKysrKysrKysrKysrKysrKysr KysrKysrKysrKysrKysrKysKPiAgMSBmaWxlIGNoYW5nZWQsIDM3IGluc2VydGlvbnMoKykKPgo+ IGRpZmYgLS1naXQgYS9kcml2ZXJzL3ZpcnRpby92aXJ0aW9fcGNpX21vZGVybi5jIGIvZHJpdmVy cy92aXJ0aW8vdmlydGlvX3BjaV9tb2Rlcm4uYwo+IGluZGV4IDJhYTM4ZTUuLjRlNzNlZjcgMTAw NjQ0Cj4gLS0tIGEvZHJpdmVycy92aXJ0aW8vdmlydGlvX3BjaV9tb2Rlcm4uYwo+ICsrKyBiL2Ry aXZlcnMvdmlydGlvL3ZpcnRpb19wY2lfbW9kZXJuLmMKPiBAQCAtMjAsNiArMjAsNDMgQEAKPiAg I2RlZmluZSBWSVJUSU9fUENJX05PX0xFR0FDWQo+ICAjaW5jbHVkZSAidmlydGlvX3BjaV9jb21t b24uaCIKPiAgCj4gKy8qCj4gKyAqIFR5cGUtc2FmZSB3cmFwcGVycyBmb3IgaW8gYWNjZXNzZXMu Cj4gKyAqIFVzZSB0aGVzZSB0byBlbmZvcmNlIGF0IGNvbXBpbGUgdGltZSB0aGUgZm9sbG93aW5n IHNwZWMgcmVxdWlyZW1lbnQ6Cj4gKyAqCj4gKyAqIFRoZSBkcml2ZXIgTVVTVCBhY2Nlc3MgZWFj aCBmaWVsZCB1c2luZyB0aGUg4oCcbmF0dXJhbOKAnSBhY2Nlc3MKPiArICogbWV0aG9kLCBpLmUu IDMyLWJpdCBhY2Nlc3NlcyBmb3IgMzItYml0IGZpZWxkcywgMTYtYml0IGFjY2Vzc2VzCj4gKyAq IGZvciAxNi1iaXQgZmllbGRzIGFuZCA4LWJpdCBhY2Nlc3NlcyBmb3IgOC1iaXQgZmllbGRzLgo+ ICsgKi8KPiArc3RhdGljIGlubGluZSB1OCB2cF9pb3JlYWQ4KHU4IF9faW9tZW0gKmFkZHIpCj4g K3sKPiArCXJldHVybiBpb3JlYWQ4KGFkZHIpOwo+ICt9Cj4gK3N0YXRpYyBpbmxpbmUgdTE2IHZw X2lvcmVhZDE2ICh1MTYgX19pb21lbSAqYWRkcikKPiArewo+ICsJcmV0dXJuIGlvcmVhZDE2KGFk ZHIpOwo+ICt9Cj4gKwo+ICtzdGF0aWMgaW5saW5lIHUzMiB2cF9pb3JlYWQzMih1MzIgX19pb21l bSAqYWRkcikKPiArewo+ICsJcmV0dXJuIGlvcmVhZDMyKGFkZHIpOwo+ICt9Cj4gKwo+ICtzdGF0 aWMgaW5saW5lIHZvaWQgdnBfaW93cml0ZTgodTggdmFsdWUsIHU4IF9faW9tZW0gKmFkZHIpCj4g K3sKPiArCWlvd3JpdGU4KHZhbHVlLCBhZGRyKTsKPiArfQo+ICsKPiArc3RhdGljIGlubGluZSB2 b2lkIHZwX2lvd3JpdGUxNih1MTYgdmFsdWUsIHUxNiBfX2lvbWVtICphZGRyKQo+ICt7Cj4gKwlp b3dyaXRlMTYodmFsdWUsIGFkZHIpOwo+ICt9Cj4gKwo+ICtzdGF0aWMgaW5saW5lIHZvaWQgdnBf aW93cml0ZTMyKHUzMiB2YWx1ZSwgdTMyIF9faW9tZW0gKmFkZHIpCj4gK3sKPiArCWlvd3JpdGUx Nih2YWx1ZSwgYWRkcik7Cj4gK30KPiArCj4gIHN0YXRpYyB2b2lkIF9faW9tZW0gKm1hcF9jYXBh YmlsaXR5KHN0cnVjdCBwY2lfZGV2ICpkZXYsIGludCBvZmYsCj4gIAkJCQkgICAgc2l6ZV90IG1p bmxlbiwKPiAgCQkJCSAgICB1MzIgYWxpZ24sCj4gLS0gCj4gTVNUCl9fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fClZpcnR1YWxpemF0aW9uIG1haWxpbmcgbGlz dApWaXJ0dWFsaXphdGlvbkBsaXN0cy5saW51eC1mb3VuZGF0aW9uLm9yZwpodHRwczovL2xpc3Rz LmxpbnV4Zm91bmRhdGlvbi5vcmcvbWFpbG1hbi9saXN0aW5mby92aXJ0dWFsaXphdGlvbg== From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932202AbbBPEKu (ORCPT ); Sun, 15 Feb 2015 23:10:50 -0500 Received: from ozlabs.org ([103.22.144.67]:40776 "EHLO ozlabs.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754490AbbBPEKs convert rfc822-to-8bit (ORCPT ); Sun, 15 Feb 2015 23:10:48 -0500 From: Rusty Russell To: "Michael S. Tsirkin" , linux-kernel@vger.kernel.org Cc: virtualization@lists.linux-foundation.org Subject: Re: [PATCH 1/2] virtio_pci_modern: type-safe io accessors In-Reply-To: <1423977123-10115-1-git-send-email-mst@redhat.com> References: <1423977123-10115-1-git-send-email-mst@redhat.com> User-Agent: Notmuch/0.17 (http://notmuchmail.org) Emacs/24.3.1 (x86_64-pc-linux-gnu) Date: Mon, 16 Feb 2015 14:22:55 +1030 Message-ID: <87vbj28qco.fsf@rustcorp.com.au> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8BIT Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org "Michael S. Tsirkin" writes: > The spec is very clear on this: > > 4.1.3.1 Driver Requirements: PCI Device Layout > > The driver MUST access each field using the “natural” access method, > i.e. 32-bit accesses for 32-bit fields, 16-bit accesses for 16-bit > fields and 8-bit accesses for 8-bit fields. > > Add type-safe wrappers to prevent access with incorrect width. Applied both (for *next* merge window). Thanks, Rusty. > Signed-off-by: Michael S. Tsirkin > --- > drivers/virtio/virtio_pci_modern.c | 37 +++++++++++++++++++++++++++++++++++++ > 1 file changed, 37 insertions(+) > > diff --git a/drivers/virtio/virtio_pci_modern.c b/drivers/virtio/virtio_pci_modern.c > index 2aa38e5..4e73ef7 100644 > --- a/drivers/virtio/virtio_pci_modern.c > +++ b/drivers/virtio/virtio_pci_modern.c > @@ -20,6 +20,43 @@ > #define VIRTIO_PCI_NO_LEGACY > #include "virtio_pci_common.h" > > +/* > + * Type-safe wrappers for io accesses. > + * Use these to enforce at compile time the following spec requirement: > + * > + * The driver MUST access each field using the “natural” access > + * method, i.e. 32-bit accesses for 32-bit fields, 16-bit accesses > + * for 16-bit fields and 8-bit accesses for 8-bit fields. > + */ > +static inline u8 vp_ioread8(u8 __iomem *addr) > +{ > + return ioread8(addr); > +} > +static inline u16 vp_ioread16 (u16 __iomem *addr) > +{ > + return ioread16(addr); > +} > + > +static inline u32 vp_ioread32(u32 __iomem *addr) > +{ > + return ioread32(addr); > +} > + > +static inline void vp_iowrite8(u8 value, u8 __iomem *addr) > +{ > + iowrite8(value, addr); > +} > + > +static inline void vp_iowrite16(u16 value, u16 __iomem *addr) > +{ > + iowrite16(value, addr); > +} > + > +static inline void vp_iowrite32(u32 value, u32 __iomem *addr) > +{ > + iowrite16(value, addr); > +} > + > static void __iomem *map_capability(struct pci_dev *dev, int off, > size_t minlen, > u32 align, > -- > MST